0030176: Problem with identifier attribute created to show discounts

diff --git a/src/org/openbravo/retail/posterminal/OrderLoader.java b/src/org/openbravo/retail/posterminal/OrderLoader.java
--- a/src/org/openbravo/retail/posterminal/OrderLoader.java
+++ b/src/org/openbravo/retail/posterminal/OrderLoader.java
@@ -1096,6 +1096,9 @@
           }
           promotion.setLineNo((long) ((p + 1) * 10));
           promotion.setSalesOrderLine(orderline);
+          if (jsonPromotion.has("identifier") && !jsonPromotion.isNull("identifier")) {
+            promotion.setObdiscIdentifier(jsonPromotion.getString("identifier"));
+          }
           orderline.getOrderLineOfferList().add(promotion);
         }
       }
diff --git a/src/org/openbravo/retail/posterminal/PaidReceipts.java b/src/org/openbravo/retail/posterminal/PaidReceipts.java
--- a/src/org/openbravo/retail/posterminal/PaidReceipts.java
+++ b/src/org/openbravo/retail/posterminal/PaidReceipts.java
@@ -157,6 +157,9 @@
             jsonPromo.put("amt", displayedAmount);
             jsonPromo.put("actualAmt", promotion.getTotalAmount());
             jsonPromo.put("hidden", BigDecimal.ZERO.equals(displayedAmount));
+            if (promotion.getObdiscIdentifier() != null) {
+              jsonPromo.put("identifier", promotion.getObdiscIdentifier());
+            }
             promotions.put(jsonPromo);
             hasPromotions = true;
           }
diff --git a/web/org.openbravo.retail.posterminal/js/components/renderorderline.js b/web/org.openbravo.retail.posterminal/js/components/renderorderline.js
--- a/web/org.openbravo.retail.posterminal/js/components/renderorderline.js
+++ b/web/org.openbravo.retail.posterminal/js/components/renderorderline.js
@@ -81,10 +81,11 @@
           // continue
           return;
         }
+        var identifierName = d.identifier ? d.identifier : d.name;
         this.createComponent({
           style: 'display: block;',
           components: [{
-            content: '-- ' + d.identifier,
+            content: '-- ' + identifierName,
             attributes: {
               style: 'float: left; width: 80%;'
             }
diff --git a/web/org.openbravo.retail.posterminal/js/model/order.js b/web/org.openbravo.retail.posterminal/js/model/order.js
--- a/web/org.openbravo.retail.posterminal/js/model/order.js
+++ b/web/org.openbravo.retail.posterminal/js/model/order.js
@@ -1116,8 +1116,6 @@
           discountRule = OB.Model.Discounts.discountRules[rule.attributes.discountType];
       if (discountRule.getIdentifier) {
         disc.identifier = discountRule.getIdentifier(rule, discount);
-      } else {
-        disc.identifier = discount.name || rule.get('printName') || rule.get('name');
       }
       disc.name = discount.name || rule.get('printName') || rule.get('name');
       disc.ruleId = rule.id || rule.get('ruleId');

diff --git a/src-db/database/model/modifiedTables/C_ORDERLINE_OFFER.xml b/src-db/database/model/modifiedTables/C_ORDERLINE_OFFER.xml
--- a/src-db/database/model/modifiedTables/C_ORDERLINE_OFFER.xml
+++ b/src-db/database/model/modifiedTables/C_ORDERLINE_OFFER.xml
@@ -5,5 +5,9 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="EM_OBDISC_IDENTIFIER" primaryKey="false" required="false" type="VARCHAR" size="50" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
     </table>
   </database>
diff --git a/src-db/database/sourcedata/AD_COLUMN.xml b/src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml
+++ b/src-db/database/sourcedata/AD_COLUMN.xml
@@ -213,6 +213,41 @@
 <!--3C0DD9BE7CB44969B88B4D24DA9A83EF-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--3C0DD9BE7CB44969B88B4D24DA9A83EF--></AD_COLUMN>
 
+<!--498190A8FAAA4858AD6A102F12BCF0C6--><AD_COLUMN>
+<!--498190A8FAAA4858AD6A102F12BCF0C6-->  <AD_COLUMN_ID><![CDATA[498190A8FAAA4858AD6A102F12BCF0C6]]></AD_COLUMN_ID>
+<!--498190A8FAAA4858AD6A102F12BCF0C6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--498190A8FAAA4858AD6A102F12BCF0C6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--498190A8FAAA4858AD6A102F12BCF0C6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--498190A8FAAA4858AD6A102F12BCF0C6-->  <NAME><![CDATA[EM_Obdisc_Identifier]]></NAME>
+<!--498190A8FAAA4858AD6A102F12BCF0C6-->  <DESCRIPTION><![CDATA[Identifier for discount]]></DESCRIPTION>
+<!--498190A8FAAA4858AD6A102F12BCF0C6-->  <HELP><![CDATA[Identifier for discount]]></HELP>
+<!--498190A8FAAA4858AD6A102F12BCF0C6-->  <COLUMNNAME><![CDATA[EM_Obdisc_Identifier]]></COLUMNNAME>
+<!--498190A8FAAA4858AD6A102F12BCF0C6-->  <AD_TABLE_ID><![CDATA[800185]]></AD_TABLE_ID>
+<!--498190A8FAAA4858AD6A102F12BCF0C6-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--498190A8FAAA4858AD6A102F12BCF0C6-->  <FIELDLENGTH><![CDATA[50]]></FIELDLENGTH>
+<!--498190A8FAAA4858AD6A102F12BCF0C6-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--498190A8FAAA4858AD6A102F12BCF0C6-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--498190A8FAAA4858AD6A102F12BCF0C6-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--498190A8FAAA4858AD6A102F12BCF0C6-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--498190A8FAAA4858AD6A102F12BCF0C6-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--498190A8FAAA4858AD6A102F12BCF0C6-->  <SEQNO><![CDATA[180]]></SEQNO>
+<!--498190A8FAAA4858AD6A102F12BCF0C6-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--498190A8FAAA4858AD6A102F12BCF0C6-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--498190A8FAAA4858AD6A102F12BCF0C6-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--498190A8FAAA4858AD6A102F12BCF0C6-->  <AD_ELEMENT_ID><![CDATA[D9120321467C480E93B6ECFBE515F4C2]]></AD_ELEMENT_ID>
+<!--498190A8FAAA4858AD6A102F12BCF0C6-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--498190A8FAAA4858AD6A102F12BCF0C6-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--498190A8FAAA4858AD6A102F12BCF0C6-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--498190A8FAAA4858AD6A102F12BCF0C6-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--498190A8FAAA4858AD6A102F12BCF0C6-->  <AD_MODULE_ID><![CDATA[B0801CBD73C74727AA4E27E8B2C206F6]]></AD_MODULE_ID>
+<!--498190A8FAAA4858AD6A102F12BCF0C6-->  <POSITION><![CDATA[18]]></POSITION>
+<!--498190A8FAAA4858AD6A102F12BCF0C6-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--498190A8FAAA4858AD6A102F12BCF0C6-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--498190A8FAAA4858AD6A102F12BCF0C6-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--498190A8FAAA4858AD6A102F12BCF0C6-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--498190A8FAAA4858AD6A102F12BCF0C6-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--498190A8FAAA4858AD6A102F12BCF0C6--></AD_COLUMN>
+
 <!--5A513EA77D434523A522031106826B1D--><AD_COLUMN>
 <!--5A513EA77D434523A522031106826B1D-->  <AD_COLUMN_ID><![CDATA[5A513EA77D434523A522031106826B1D]]></AD_COLUMN_ID>
 <!--5A513EA77D434523A522031106826B1D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src-db/database/sourcedata/AD_ELEMENT.xml b/src-db/database/sourcedata/AD_ELEMENT.xml
--- a/src-db/database/sourcedata/AD_ELEMENT.xml
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml
@@ -181,6 +181,20 @@
 <!--B08BBBEBB3314670884F8AB53781379A-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--B08BBBEBB3314670884F8AB53781379A--></AD_ELEMENT>
 
+<!--D9120321467C480E93B6ECFBE515F4C2--><AD_ELEMENT>
+<!--D9120321467C480E93B6ECFBE515F4C2-->  <AD_ELEMENT_ID><![CDATA[D9120321467C480E93B6ECFBE515F4C2]]></AD_ELEMENT_ID>
+<!--D9120321467C480E93B6ECFBE515F4C2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D9120321467C480E93B6ECFBE515F4C2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D9120321467C480E93B6ECFBE515F4C2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D9120321467C480E93B6ECFBE515F4C2-->  <COLUMNNAME><![CDATA[EM_Obdisc_Identifier]]></COLUMNNAME>
+<!--D9120321467C480E93B6ECFBE515F4C2-->  <NAME><![CDATA[Identifier]]></NAME>
+<!--D9120321467C480E93B6ECFBE515F4C2-->  <PRINTNAME><![CDATA[Identifier]]></PRINTNAME>
+<!--D9120321467C480E93B6ECFBE515F4C2-->  <DESCRIPTION><![CDATA[Identifier for discount]]></DESCRIPTION>
+<!--D9120321467C480E93B6ECFBE515F4C2-->  <HELP><![CDATA[Identifier for discount]]></HELP>
+<!--D9120321467C480E93B6ECFBE515F4C2-->  <AD_MODULE_ID><![CDATA[B0801CBD73C74727AA4E27E8B2C206F6]]></AD_MODULE_ID>
+<!--D9120321467C480E93B6ECFBE515F4C2-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--D9120321467C480E93B6ECFBE515F4C2--></AD_ELEMENT>
+
 <!--EC054F78131F4093826EBFDF6A918B6F--><AD_ELEMENT>
 <!--EC054F78131F4093826EBFDF6A918B6F-->  <AD_ELEMENT_ID><![CDATA[EC054F78131F4093826EBFDF6A918B6F]]></AD_ELEMENT_ID>
 <!--EC054F78131F4093826EBFDF6A918B6F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>