From f74f08c52124dc87624ded7fe6c59ce7b0192e1a Mon Sep 17 00:00:00 2001
From: Carlos Ruiz <carg67@gmail.com>
Date: Fri, 8 Sep 2017 15:19:38 +0200
Subject: [PATCH] IDEMPIERE-3472 Env.parseVariable not keeping unparseable
 variable / thanks to Ricardo Santana (ralexsander)

---
 org.adempiere.base/src/org/compiere/util/Env.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/org.adempiere.base/src/org/compiere/util/Env.java b/org.adempiere.base/src/org/compiere/util/Env.java
index 3458c86fa9..c8eaa091f9 100644
--- a/org.adempiere.base/src/org/compiere/util/Env.java
+++ b/org.adempiere.base/src/org/compiere/util/Env.java
@@ -1673,7 +1673,14 @@ public final class Env
 					outStr.append("@");
 				}
 			}
-
+			else if (keepUnparseable)
+			{
+				outStr.append("@"+token);
+				if (format.length() > 0)
+					outStr.append("<"+format+">");
+				outStr.append("@");
+			}
+			
 			inStr = inStr.substring(j+1, inStr.length());	// from second @
 			i = inStr.indexOf('@');
 		}