midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-2324 Env.parseVariable(String, PO, String, boolean) doesn't use format when keepUnparseable / based on patch from Nicolas Micoud (nmicoud)

This commit is contained in:
Carlos Ruiz 2014-11-19 11:33:36 -05:00
parent bd58ca4a3f
commit 6be4c15be0
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
org.adempiere.base/src/org/compiere/util/Env.java
View File

@ -1480,8 +1480,12 @@ public final class Env
String v = Env.getContext(ctx, token); String v = Env.getContext(ctx, token);
if (v != null && v.length() > 0) if (v != null && v.length() > 0)
outStr.append(v); outStr.append(v);
else if (keepUnparseable) else if (keepUnparseable) {
outStr.append("@"+token+"@"); outStr.append("@").append(token);
if (!Util.isEmpty(format))
outStr.append("<").append(format).append(">");
outStr.append("@");
}
} else if (po != null) { } else if (po != null) {
//take from po //take from po
if (po.get_ColumnIndex(token) >= 0) { if (po.get_ColumnIndex(token) >= 0) {
@ -1525,7 +1529,10 @@ public final class Env
} }
} }
} else if (keepUnparseable) { } else if (keepUnparseable) {
outStr.append("@"+token+"@"); outStr.append("@").append(token);
if (!Util.isEmpty(format))
outStr.append("<").append(format).append(">");
outStr.append("@");
} }
} }