merge
authorRM packaging bot <staff.rm@openbravo.com>
Wed, 12 May 2010 19:28:52 +0200
changeset 7137 589a3f2e0db7
parent 7136 90b8d485df22 (current diff)
parent 7133 cef540a389e2 (diff)
child 7138 41915c2f5ec6
merge
.hgsigs
.hgtags
--- a/.hgsigs	Wed May 12 19:17:02 2010 +0200
+++ b/.hgsigs	Wed May 12 19:28:52 2010 +0200
@@ -15,4 +15,5 @@
 75b887d57378e59138c0362b928a504db568ed9b 0 iEYEABECAAYFAkuSHAsACgkQCX/oGf+2qkOEpwCeM6aKuQ/VK5ywylW5Jiki2L5YX0UAoPtzt8ELfu+2n0hTB2E36NgVq1IU
 8df12cedf6a200183c73497ae0cefa3fee0a0427 0 iEYEABECAAYFAkuzHu4ACgkQCX/oGf+2qkNkzwCeJC2mfV4HG3jDDH4B9ovaplpzyWwAoOQY9wuMO2XNnVJ9xw7JS+Qjy52k
 5c7276ed55f2605be4e0163a90820437ae51b35a 0 iEYEABECAAYFAkvoPD0ACgkQCX/oGf+2qkPJwwCgvsSfRbgj8XvBTAe0D98MuzYC9X0AnR61u2gYKK5GgGlgo6B6S7dfDCUr
+a56977f8bc9c70b88f49eccc4e05d4703926df8b 0 iEYEABECAAYFAkvpHhQACgkQCX/oGf+2qkNE2gCfRUvL9gvk0xEg6OjMlTbJbplKpNkAnAz8f8WZ4NY9NFmiefa6afLiiyIG
 8594549ee5becd6e51d6a295a6b473c42bacbbb9 0 iEYEABECAAYFAkvq4o4ACgkQCX/oGf+2qkPvLACfdPEl+S1cRY59u90LiQRmROPIL8cAniZtSjiAg13GifqOFZCZZ+zilCep
--- a/.hgtags	Wed May 12 19:17:02 2010 +0200
+++ b/.hgtags	Wed May 12 19:28:52 2010 +0200
@@ -25,4 +25,5 @@
 65aa17bbe739f7d3370aba319e68474c2356fdf2 2.50MP13
 17a70403b6d39988147a0b8a11bb3a57ed04c373 2.50MP14
 66ff592fb792f3bc13a076db81cd1f5729f1b881 2.50MP15
+30fd49cdc1b1a5d3ff7233f2569e8afb8d0523f3 2.50MP16
 8a6462c8520ce811b77ee562c87387a7f0663d39 2.50MP16
--- a/src/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html	Wed May 12 19:17:02 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html	Wed May 12 19:28:52 2010 +0200
@@ -237,7 +237,7 @@
                 </div>
                 
                 <div id="CEInstance">
-                <div><FIELD_TMP id="name">xxxModuleDetails</FIELD_TMP><br /></div>
+                <div><p class="Label_ReadOnly_Text">The following module(s) are released under a commercial license that require acquiring an activation key before installation:&nbsp;<FIELD_TMP id="name"></FIELD_TMP><br /></p>
                 <p><br><a class="Label_ReadOnly_Text LabelLink_noicon" href="http://www.openbravo.com/product/erp/acquire" target="_blank">Learn how</a>&nbsp;to acquire a subscription and activate your instance.</p>
                 <br/>
                 </div>
--- a/src/org/openbravo/erpCommon/obps/ActivationKey.java	Wed May 12 19:17:02 2010 +0200
+++ b/src/org/openbravo/erpCommon/obps/ActivationKey.java	Wed May 12 19:28:52 2010 +0200
@@ -557,6 +557,9 @@
    */
   public HashMap<String, CommercialModuleStatus> getSubscribedModules() {
     HashMap<String, CommercialModuleStatus> moduleList = new HashMap<String, CommercialModuleStatus>();
+    if (instanceProperties == null) {
+      return moduleList;
+    }
 
     SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");