details: https://code.openbravo.com/erp/devel/pi/rev/ea2f64fca427
changeset: 19003:ea2f64fca427
user: David Miguelez <david.miguelez <at> openbravo.com>
date: Tue Dec 11 09:58:51 2012 +0100
summary: Fixes Issue 22507. Adds row in Dimension Mapping for Organization
in Sales Order Lines. Checks if parenthesis are needed.
diffstat:
modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java
| 3 ++
src-db/database/sourcedata/AD_DIMENSION_MAPPING.xml
| 13 ++++++++++
2 files changed, 16 insertions(+), 0 deletions(-)
diffs (36 lines):
diff -r c2fb40b133bf -r ea2f64fca427
modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java
Tue Dec 11 09:58:38 2012 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java
Tue Dec 11 09:58:51 2012 +0100
@@ -150,6 +150,9 @@
}
String parsedDisplay =
DimensionDisplayUtility.computeAccountingDimensionDisplayLogic(
this.tab, this.field);
+ if (!"".equals(parsedDisplay)) {
+ parsedDisplay = "(" + parsedDisplay + ")";
+ }
jsCode = new
StringBuffer(jsCode.toString().replace(DimensionDisplayUtility.DIM_DISPLAYLOGIC,
parsedDisplay));
}
diff -r c2fb40b133bf -r ea2f64fca427
src-db/database/sourcedata/AD_DIMENSION_MAPPING.xml
--- a/src-db/database/sourcedata/AD_DIMENSION_MAPPING.xml Tue Dec 11
09:58:38 2012 +0100
+++ b/src-db/database/sourcedata/AD_DIMENSION_MAPPING.xml Tue Dec 11
09:58:51 2012 +0100
@@ -819,6 +819,19 @@
<!--36C963B730674B6A9E8945DD1E46C832-->
<DOCUMENTLEVEL><![CDATA[H]]></DOCUMENTLEVEL>
<!--36C963B730674B6A9E8945DD1E46C832--></AD_DIMENSION_MAPPING>
+<!--370464928D674630B40BD9D9E609F600--><AD_DIMENSION_MAPPING>
+<!--370464928D674630B40BD9D9E609F600-->
<AD_DIMENSION_MAPPING_ID><![CDATA[370464928D674630B40BD9D9E609F600]]></AD_DIMENSION_MAPPING_ID>
+<!--370464928D674630B40BD9D9E609F600-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--370464928D674630B40BD9D9E609F600--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--370464928D674630B40BD9D9E609F600--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--370464928D674630B40BD9D9E609F600--> <DIMENSION><![CDATA[OO]]></DIMENSION>
+<!--370464928D674630B40BD9D9E609F600-->
<DOCBASETYPE><![CDATA[SOO]]></DOCBASETYPE>
+<!--370464928D674630B40BD9D9E609F600-->
<AD_TABLE_ID><![CDATA[260]]></AD_TABLE_ID>
+<!--370464928D674630B40BD9D9E609F600-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--370464928D674630B40BD9D9E609F600-->
<ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--370464928D674630B40BD9D9E609F600-->
<DOCUMENTLEVEL><![CDATA[L]]></DOCUMENTLEVEL>
+<!--370464928D674630B40BD9D9E609F600--></AD_DIMENSION_MAPPING>
+
<!--376B1D16CFAA44168F2ACFDB21C0000B--><AD_DIMENSION_MAPPING>
<!--376B1D16CFAA44168F2ACFDB21C0000B-->
<AD_DIMENSION_MAPPING_ID><![CDATA[376B1D16CFAA44168F2ACFDB21C0000B]]></AD_DIMENSION_MAPPING_ID>
<!--376B1D16CFAA44168F2ACFDB21C0000B-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
