details: /erp/devel/main/rev/4c5b4bd34325
changeset: 8381:4c5b4bd34325
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Mon Sep 13 08:11:39 2010 +0200
summary: fixed bug 14431: Default tier 2 for commercial modules of old obx
files
details: /erp/devel/main/rev/256d276a675a
changeset: 8382:256d276a675a
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Mon Sep 13 10:39:15 2010 +0000
summary: CI: promote changesets from pi to main
diffstat:
src-db/database/sourcedata/AD_MODULE.xml | 2 +-
src/org/openbravo/erpCommon/modules/ImportModule.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diffs (25 lines):
diff -r 3f276cad5c27 -r 256d276a675a src-db/database/sourcedata/AD_MODULE.xml
--- a/src-db/database/sourcedata/AD_MODULE.xml Fri Sep 10 13:24:43 2010 +0200
+++ b/src-db/database/sourcedata/AD_MODULE.xml Mon Sep 13 10:39:15 2010 +0000
@@ -6,7 +6,7 @@
<!--0--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--0--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--0--> <NAME><![CDATA[core]]></NAME>
-<!--0--> <VERSION><![CDATA[2.50.18350]]></VERSION>
+<!--0--> <VERSION><![CDATA[2.50.18381]]></VERSION>
<!--0--> <DESCRIPTION><![CDATA[Core module is the base one]]></DESCRIPTION>
<!--0--> <HELP><![CDATA[Core module is the base one, all developments in core
are included as part of the standard Openbravo ERP.]]></HELP>
<!--0--> <URL><![CDATA[www.openbravo.com]]></URL>
diff -r 3f276cad5c27 -r 256d276a675a
src/org/openbravo/erpCommon/modules/ImportModule.java
--- a/src/org/openbravo/erpCommon/modules/ImportModule.java Fri Sep 10
13:24:43 2010 +0200
+++ b/src/org/openbravo/erpCommon/modules/ImportModule.java Mon Sep 13
10:39:15 2010 +0000
@@ -910,7 +910,8 @@
if (isCommercial) {
String tier = (String) dynModule.get("COMMERCIAL_TIER");
if (tier == null || tier.isEmpty()) {
- tier = "1";
+ // If tier is not set in the obx, assume tier 2 to show a more
restrictive error message
+ tier = "2";
}
additionalInfo.put("tier", tier);
}
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
