fixed bug 24242: refresh expired license message hides non allowed
authorAsier Lostalé <asier.lostale@openbravo.com>
Fri, 19 Jul 2013 09:58:05 +0200
changeset 20768 5f1fed293f3d
parent 20767 da03f922c584
child 20769 488f9bf0ef52
fixed bug 24242: refresh expired license message hides non allowed
src/org/openbravo/erpCommon/ad_forms/InstanceManagement.java
--- a/src/org/openbravo/erpCommon/ad_forms/InstanceManagement.java	Fri Jul 19 01:27:15 2013 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/InstanceManagement.java	Fri Jul 19 09:58:05 2013 +0200
@@ -11,7 +11,7 @@
  * under the License. 
  * The Original Code is Openbravo ERP. 
  * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2009-2012 Openbravo SLU 
+ * All portions are Copyright (C) 2009-2013 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -328,8 +328,14 @@
       } else {
         myMessage = new OBError();
         myMessage.setType(activationKey.getMessageType());
-        myMessage.setMessage(Utility.parseTranslation(this, vars, vars.getLanguage(),
-            activationKey.getErrorMessage()));
+        String msgTxt = Utility.parseTranslation(this, vars, vars.getLanguage(),
+            activationKey.getErrorMessage());
+
+        OBError originalMessage = vars.getMessage("InstanceManagement");
+        if (originalMessage != null) {
+          msgTxt = originalMessage.getMessage() + "<br/>" + msgTxt;
+        }
+        myMessage.setMessage(msgTxt);
       }
 
       if (myMessage == null