| Attached Files |  I33963_DiscountRule_PosTerminal.patch [^] (3,786 bytes) 2016-09-15 15:53 [Show Content] [Hide Content]# HG changeset patch
# User Silambarasan Sekar <silambarasan@qualiantech.com>
# Date 1473849948 -19800
# Wed Sep 14 16:15:48 2016 +0530
# Node ID 3e08b2d9de57d261765c2663eee0fb27e843fe4b
# Parent 5a0d4a37f9b6a7046f1e82cb8a071df2897574e3
Related to Issue 33963: Added new Discount Rule "Price Adjustment List" for calculating discounts from Products tab.
diff -r 5a0d4a37f9b6 -r 3e08b2d9de57 src/org/openbravo/retail/posterminal/master/DiscountFilterProductProperties.java
--- a/src/org/openbravo/retail/posterminal/master/DiscountFilterProductProperties.java Tue Sep 13 08:30:49 2016 -0600
+++ b/src/org/openbravo/retail/posterminal/master/DiscountFilterProductProperties.java Wed Sep 14 16:15:48 2016 +0530
@@ -37,6 +37,9 @@
add(new HQLProperty("ap.obdiscIsGift", "obdiscIsGift"));
add(new HQLProperty("ap.obdiscQty", "obdiscQty"));
add(new HQLProperty("ap.obdiscGifqty", "obdiscGifqty"));
+ add(new HQLProperty("ap.discountAmount", "discountAmount"));
+ add(new HQLProperty("ap.discount", "discount"));
+ add(new HQLProperty("ap.fixedUnitPrice", "fixedUnitPrice"));
add(new HQLProperty("concat(ap.priceAdjustment.name, ' - ', ap.product.name)",
"_identifier"));
add(new HQLProperty(
diff -r 5a0d4a37f9b6 -r 3e08b2d9de57 web/org.openbravo.retail.posterminal/js/model/discounts.js
--- a/web/org.openbravo.retail.posterminal/js/model/discounts.js Tue Sep 13 08:30:49 2016 -0600
+++ b/web/org.openbravo.retail.posterminal/js/model/discounts.js Wed Sep 14 16:15:48 2016 +0530
@@ -378,6 +378,53 @@
}
});
+ //Price Adjustment List
+ OB.Model.Discounts.registerRule('9FF0F09112994CABB5451BE47E7B23AD', {
+ async: true,
+ implementation: function (discountRule, receipt, line, listener) {
+ var linePrice, discountedLinePrice, qty = line.get('qty'),
+ minQty = discountRule.get('minQuantity'),
+ maxQty = discountRule.get('maxQuantity'),
+ criteria;
+
+ if ((minQty && qty < minQty) || (maxQty && qty > maxQty)) {
+ return;
+ }
+
+ linePrice = line.get('discountedLinePrice') || line.get('price');
+ // Query local DB to know detail about the rule (products and quantities)
+ criteria = {
+ priceAdjustment: discountRule.id,
+ product: line.get('product').id
+ };
+
+ OB.Dal.find(OB.Model.DiscountFilterProduct, criteria, function (products) {
+ // getting discount values from product tab
+ var discountedProduct = products.models[0];
+ discountRule.set('fixedPrice', discountedProduct.get('fixedUnitPrice'));
+ discountRule.set('discountAmount', discountedProduct.get('discountAmount'));
+ discountRule.set('discount', discountedProduct.get('discount'));
+
+ if (discountRule.get('fixedPrice') || discountRule.get('fixedPrice') === 0) {
+ discountedLinePrice = discountRule.get('fixedPrice');
+ } else {
+ discountedLinePrice = (linePrice - discountRule.get('discountAmount')) * (1 - discountRule.get('discount') / 100);
+ }
+ discountRule.set('qtyOffer', qty);
+ receipt.addPromotion(line, discountRule, {
+ amt: OB.DEC.toNumber((linePrice - (new BigDecimal(String(discountedLinePrice)))) * qty)
+ });
+ line.set('discountedLinePrice', discountedLinePrice);
+
+ listener.trigger('completed');
+
+ }, function () {
+ window.console.error('Error querying for Price Adjustment List products', discountRule, receipt, line, arguments);
+ listener.trigger('completed');
+ });
+
+ }
+ });
// Because of dependency models cannot be directly registered in promotions module
if (OB && OB.Model && OB.Model.Discounts && OB.Model.Discounts.extraModels) {
I33963_DiscountRule_Core.patch [^] (23,839 bytes) 2016-09-15 15:53 [Show Content] [Hide Content]# HG changeset patch
# User Silambarasan Sekar <silambarasan@qualiantech.com>
# Date 1473849902 -19800
# Wed Sep 14 16:15:02 2016 +0530
# Node ID 3884ff9bf3f4b071a4777a845d2f4db669b3b7a2
# Parent 6413719aeee51e03cb1089624e00293c7e1416ec
Related to Issue 33963: Added new Discount Rule "Price Adjustment List" for calculating discounts from Products tab.
diff -r 6413719aeee5 -r 3884ff9bf3f4 src-db/database/model/tables/M_OFFER_PRODUCT.xml
--- a/src-db/database/model/tables/M_OFFER_PRODUCT.xml Mon Sep 12 12:15:22 2016 +0200
+++ b/src-db/database/model/tables/M_OFFER_PRODUCT.xml Wed Sep 14 16:15:02 2016 +0530
@@ -41,6 +41,18 @@
<default/>
<onCreateDefault/>
</column>
+ <column name="ADDAMT" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false">
+ <default><![CDATA[0]]></default>
+ <onCreateDefault/>
+ </column>
+ <column name="DISCOUNT" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false">
+ <default><![CDATA[0]]></default>
+ <onCreateDefault/>
+ </column>
+ <column name="FIXED" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
<foreign-key foreignTable="AD_CLIENT" name="M_OFFER_PRODUCT_CLIENT">
<reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
</foreign-key>
diff -r 6413719aeee5 -r 3884ff9bf3f4 src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Mon Sep 12 12:15:22 2016 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Wed Sep 14 16:15:02 2016 +0530
@@ -246575,6 +246575,45 @@
<!--0D90B26B67BF4A0CB256CCBF8E7E9828--> <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
<!--0D90B26B67BF4A0CB256CCBF8E7E9828--></AD_COLUMN>
+<!--0D956F76AC0B430987BDC8F8680BE0C9--><AD_COLUMN>
+<!--0D956F76AC0B430987BDC8F8680BE0C9--> <AD_COLUMN_ID><![CDATA[0D956F76AC0B430987BDC8F8680BE0C9]]></AD_COLUMN_ID>
+<!--0D956F76AC0B430987BDC8F8680BE0C9--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0D956F76AC0B430987BDC8F8680BE0C9--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0D956F76AC0B430987BDC8F8680BE0C9--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0D956F76AC0B430987BDC8F8680BE0C9--> <NAME><![CDATA[Discount %]]></NAME>
+<!--0D956F76AC0B430987BDC8F8680BE0C9--> <DESCRIPTION><![CDATA[The proportional discount given to an item, without respect to any previously defined discounts.]]></DESCRIPTION>
+<!--0D956F76AC0B430987BDC8F8680BE0C9--> <HELP><![CDATA[The Discount indicates the discount applied or taken as a percentage.]]></HELP>
+<!--0D956F76AC0B430987BDC8F8680BE0C9--> <COLUMNNAME><![CDATA[Discount]]></COLUMNNAME>
+<!--0D956F76AC0B430987BDC8F8680BE0C9--> <AD_TABLE_ID><![CDATA[800065]]></AD_TABLE_ID>
+<!--0D956F76AC0B430987BDC8F8680BE0C9--> <AD_REFERENCE_ID><![CDATA[22]]></AD_REFERENCE_ID>
+<!--0D956F76AC0B430987BDC8F8680BE0C9--> <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--0D956F76AC0B430987BDC8F8680BE0C9--> <DEFAULTVALUE><![CDATA[0]]></DEFAULTVALUE>
+<!--0D956F76AC0B430987BDC8F8680BE0C9--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--0D956F76AC0B430987BDC8F8680BE0C9--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--0D956F76AC0B430987BDC8F8680BE0C9--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--0D956F76AC0B430987BDC8F8680BE0C9--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--0D956F76AC0B430987BDC8F8680BE0C9--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--0D956F76AC0B430987BDC8F8680BE0C9--> <SEQNO><![CDATA[150]]></SEQNO>
+<!--0D956F76AC0B430987BDC8F8680BE0C9--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--0D956F76AC0B430987BDC8F8680BE0C9--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--0D956F76AC0B430987BDC8F8680BE0C9--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--0D956F76AC0B430987BDC8F8680BE0C9--> <AD_ELEMENT_ID><![CDATA[280]]></AD_ELEMENT_ID>
+<!--0D956F76AC0B430987BDC8F8680BE0C9--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--0D956F76AC0B430987BDC8F8680BE0C9--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--0D956F76AC0B430987BDC8F8680BE0C9--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--0D956F76AC0B430987BDC8F8680BE0C9--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--0D956F76AC0B430987BDC8F8680BE0C9--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--0D956F76AC0B430987BDC8F8680BE0C9--> <POSITION><![CDATA[15]]></POSITION>
+<!--0D956F76AC0B430987BDC8F8680BE0C9--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--0D956F76AC0B430987BDC8F8680BE0C9--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--0D956F76AC0B430987BDC8F8680BE0C9--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--0D956F76AC0B430987BDC8F8680BE0C9--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--0D956F76AC0B430987BDC8F8680BE0C9--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--0D956F76AC0B430987BDC8F8680BE0C9--> <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--0D956F76AC0B430987BDC8F8680BE0C9--> <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--0D956F76AC0B430987BDC8F8680BE0C9--> <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--0D956F76AC0B430987BDC8F8680BE0C9--></AD_COLUMN>
+
<!--0DB315DDD47B4BB3ABF93B6439A858DA--><AD_COLUMN>
<!--0DB315DDD47B4BB3ABF93B6439A858DA--> <AD_COLUMN_ID><![CDATA[0DB315DDD47B4BB3ABF93B6439A858DA]]></AD_COLUMN_ID>
<!--0DB315DDD47B4BB3ABF93B6439A858DA--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -324176,6 +324215,44 @@
<!--8D6169322485477F8D53E2E246723D3A--> <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
<!--8D6169322485477F8D53E2E246723D3A--></AD_COLUMN>
+<!--8D86F721E7614DFEB9442AE6312166CA--><AD_COLUMN>
+<!--8D86F721E7614DFEB9442AE6312166CA--> <AD_COLUMN_ID><![CDATA[8D86F721E7614DFEB9442AE6312166CA]]></AD_COLUMN_ID>
+<!--8D86F721E7614DFEB9442AE6312166CA--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8D86F721E7614DFEB9442AE6312166CA--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8D86F721E7614DFEB9442AE6312166CA--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8D86F721E7614DFEB9442AE6312166CA--> <NAME><![CDATA[Fixed Unit Price]]></NAME>
+<!--8D86F721E7614DFEB9442AE6312166CA--> <DESCRIPTION><![CDATA[A price that does not change when price adjustments are made.]]></DESCRIPTION>
+<!--8D86F721E7614DFEB9442AE6312166CA--> <HELP><![CDATA[Fixed price for the promotion. When the promotion is applied, this is the final price the product will have.]]></HELP>
+<!--8D86F721E7614DFEB9442AE6312166CA--> <COLUMNNAME><![CDATA[Fixed]]></COLUMNNAME>
+<!--8D86F721E7614DFEB9442AE6312166CA--> <AD_TABLE_ID><![CDATA[800065]]></AD_TABLE_ID>
+<!--8D86F721E7614DFEB9442AE6312166CA--> <AD_REFERENCE_ID><![CDATA[800008]]></AD_REFERENCE_ID>
+<!--8D86F721E7614DFEB9442AE6312166CA--> <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--8D86F721E7614DFEB9442AE6312166CA--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--8D86F721E7614DFEB9442AE6312166CA--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--8D86F721E7614DFEB9442AE6312166CA--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--8D86F721E7614DFEB9442AE6312166CA--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--8D86F721E7614DFEB9442AE6312166CA--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--8D86F721E7614DFEB9442AE6312166CA--> <SEQNO><![CDATA[160]]></SEQNO>
+<!--8D86F721E7614DFEB9442AE6312166CA--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--8D86F721E7614DFEB9442AE6312166CA--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--8D86F721E7614DFEB9442AE6312166CA--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--8D86F721E7614DFEB9442AE6312166CA--> <AD_ELEMENT_ID><![CDATA[800270]]></AD_ELEMENT_ID>
+<!--8D86F721E7614DFEB9442AE6312166CA--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--8D86F721E7614DFEB9442AE6312166CA--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--8D86F721E7614DFEB9442AE6312166CA--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--8D86F721E7614DFEB9442AE6312166CA--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--8D86F721E7614DFEB9442AE6312166CA--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--8D86F721E7614DFEB9442AE6312166CA--> <POSITION><![CDATA[16]]></POSITION>
+<!--8D86F721E7614DFEB9442AE6312166CA--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--8D86F721E7614DFEB9442AE6312166CA--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--8D86F721E7614DFEB9442AE6312166CA--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--8D86F721E7614DFEB9442AE6312166CA--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--8D86F721E7614DFEB9442AE6312166CA--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--8D86F721E7614DFEB9442AE6312166CA--> <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--8D86F721E7614DFEB9442AE6312166CA--> <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--8D86F721E7614DFEB9442AE6312166CA--> <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--8D86F721E7614DFEB9442AE6312166CA--></AD_COLUMN>
+
<!--8D87BBF4A1EBD0C9E040007F01011665--><AD_COLUMN>
<!--8D87BBF4A1EBD0C9E040007F01011665--> <AD_COLUMN_ID><![CDATA[8D87BBF4A1EBD0C9E040007F01011665]]></AD_COLUMN_ID>
<!--8D87BBF4A1EBD0C9E040007F01011665--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -373893,6 +373970,45 @@
<!--F40E66C9722549AC9C199DE1A8212CB3--> <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
<!--F40E66C9722549AC9C199DE1A8212CB3--></AD_COLUMN>
+<!--F481B31FB3C64269AD1B0F1A62D4A054--><AD_COLUMN>
+<!--F481B31FB3C64269AD1B0F1A62D4A054--> <AD_COLUMN_ID><![CDATA[F481B31FB3C64269AD1B0F1A62D4A054]]></AD_COLUMN_ID>
+<!--F481B31FB3C64269AD1B0F1A62D4A054--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F481B31FB3C64269AD1B0F1A62D4A054--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F481B31FB3C64269AD1B0F1A62D4A054--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F481B31FB3C64269AD1B0F1A62D4A054--> <NAME><![CDATA[Discount Amount]]></NAME>
+<!--F481B31FB3C64269AD1B0F1A62D4A054--> <DESCRIPTION><![CDATA[Fixed discount amount]]></DESCRIPTION>
+<!--F481B31FB3C64269AD1B0F1A62D4A054--> <HELP><![CDATA[Fixed discount amount]]></HELP>
+<!--F481B31FB3C64269AD1B0F1A62D4A054--> <COLUMNNAME><![CDATA[Addamt]]></COLUMNNAME>
+<!--F481B31FB3C64269AD1B0F1A62D4A054--> <AD_TABLE_ID><![CDATA[800065]]></AD_TABLE_ID>
+<!--F481B31FB3C64269AD1B0F1A62D4A054--> <AD_REFERENCE_ID><![CDATA[800008]]></AD_REFERENCE_ID>
+<!--F481B31FB3C64269AD1B0F1A62D4A054--> <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--F481B31FB3C64269AD1B0F1A62D4A054--> <DEFAULTVALUE><![CDATA[0]]></DEFAULTVALUE>
+<!--F481B31FB3C64269AD1B0F1A62D4A054--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--F481B31FB3C64269AD1B0F1A62D4A054--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--F481B31FB3C64269AD1B0F1A62D4A054--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--F481B31FB3C64269AD1B0F1A62D4A054--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--F481B31FB3C64269AD1B0F1A62D4A054--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--F481B31FB3C64269AD1B0F1A62D4A054--> <SEQNO><![CDATA[140]]></SEQNO>
+<!--F481B31FB3C64269AD1B0F1A62D4A054--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--F481B31FB3C64269AD1B0F1A62D4A054--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--F481B31FB3C64269AD1B0F1A62D4A054--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--F481B31FB3C64269AD1B0F1A62D4A054--> <AD_ELEMENT_ID><![CDATA[800267]]></AD_ELEMENT_ID>
+<!--F481B31FB3C64269AD1B0F1A62D4A054--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--F481B31FB3C64269AD1B0F1A62D4A054--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--F481B31FB3C64269AD1B0F1A62D4A054--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--F481B31FB3C64269AD1B0F1A62D4A054--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--F481B31FB3C64269AD1B0F1A62D4A054--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--F481B31FB3C64269AD1B0F1A62D4A054--> <POSITION><![CDATA[14]]></POSITION>
+<!--F481B31FB3C64269AD1B0F1A62D4A054--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--F481B31FB3C64269AD1B0F1A62D4A054--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--F481B31FB3C64269AD1B0F1A62D4A054--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--F481B31FB3C64269AD1B0F1A62D4A054--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--F481B31FB3C64269AD1B0F1A62D4A054--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--F481B31FB3C64269AD1B0F1A62D4A054--> <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--F481B31FB3C64269AD1B0F1A62D4A054--> <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--F481B31FB3C64269AD1B0F1A62D4A054--> <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--F481B31FB3C64269AD1B0F1A62D4A054--></AD_COLUMN>
+
<!--F52ACA48CA874F2DA0A778A92691E8F2--><AD_COLUMN>
<!--F52ACA48CA874F2DA0A778A92691E8F2--> <AD_COLUMN_ID><![CDATA[F52ACA48CA874F2DA0A778A92691E8F2]]></AD_COLUMN_ID>
<!--F52ACA48CA874F2DA0A778A92691E8F2--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 6413719aeee5 -r 3884ff9bf3f4 src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml Mon Sep 12 12:15:22 2016 +0200
+++ b/src-db/database/sourcedata/AD_FIELD.xml Wed Sep 14 16:15:02 2016 +0530
@@ -265540,6 +265540,36 @@
<!--AB4100F93B9E45C095DB385B7517F453--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
<!--AB4100F93B9E45C095DB385B7517F453--></AD_FIELD>
+<!--AB850C78C9334F899B899C854FE0511E--><AD_FIELD>
+<!--AB850C78C9334F899B899C854FE0511E--> <AD_FIELD_ID><![CDATA[AB850C78C9334F899B899C854FE0511E]]></AD_FIELD_ID>
+<!--AB850C78C9334F899B899C854FE0511E--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--AB850C78C9334F899B899C854FE0511E--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--AB850C78C9334F899B899C854FE0511E--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--AB850C78C9334F899B899C854FE0511E--> <NAME><![CDATA[Discount %]]></NAME>
+<!--AB850C78C9334F899B899C854FE0511E--> <DESCRIPTION><![CDATA[The proportional discount given to an item, without respect to any previously defined discounts.]]></DESCRIPTION>
+<!--AB850C78C9334F899B899C854FE0511E--> <HELP><![CDATA[The Discount indicates the discount applied or taken as a percentage.]]></HELP>
+<!--AB850C78C9334F899B899C854FE0511E--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--AB850C78C9334F899B899C854FE0511E--> <AD_TAB_ID><![CDATA[800082]]></AD_TAB_ID>
+<!--AB850C78C9334F899B899C854FE0511E--> <AD_COLUMN_ID><![CDATA[0D956F76AC0B430987BDC8F8680BE0C9]]></AD_COLUMN_ID>
+<!--AB850C78C9334F899B899C854FE0511E--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--AB850C78C9334F899B899C854FE0511E--> <AD_FIELDGROUP_ID><![CDATA[72644AE293D3494B9631412FEA0B878E]]></AD_FIELDGROUP_ID>
+<!--AB850C78C9334F899B899C854FE0511E--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--AB850C78C9334F899B899C854FE0511E--> <DISPLAYLOGIC><![CDATA[@M_Offer_Type_ID@='9FF0F09112994CABB5451BE47E7B23AD']]></DISPLAYLOGIC>
+<!--AB850C78C9334F899B899C854FE0511E--> <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
+<!--AB850C78C9334F899B899C854FE0511E--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--AB850C78C9334F899B899C854FE0511E--> <SEQNO><![CDATA[50]]></SEQNO>
+<!--AB850C78C9334F899B899C854FE0511E--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--AB850C78C9334F899B899C854FE0511E--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--AB850C78C9334F899B899C854FE0511E--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--AB850C78C9334F899B899C854FE0511E--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--AB850C78C9334F899B899C854FE0511E--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--AB850C78C9334F899B899C854FE0511E--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--AB850C78C9334F899B899C854FE0511E--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--AB850C78C9334F899B899C854FE0511E--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--AB850C78C9334F899B899C854FE0511E--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--AB850C78C9334F899B899C854FE0511E--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--AB850C78C9334F899B899C854FE0511E--></AD_FIELD>
+
<!--ABA8AFDB0CDD49B9B20A24D2D8127B38--><AD_FIELD>
<!--ABA8AFDB0CDD49B9B20A24D2D8127B38--> <AD_FIELD_ID><![CDATA[ABA8AFDB0CDD49B9B20A24D2D8127B38]]></AD_FIELD_ID>
<!--ABA8AFDB0CDD49B9B20A24D2D8127B38--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -273193,6 +273223,35 @@
<!--AFB7E84D2A8F4373933612C29602EBEF--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
<!--AFB7E84D2A8F4373933612C29602EBEF--></AD_FIELD>
+<!--AFC8C1A0408242FDA6AF605E535D93EC--><AD_FIELD>
+<!--AFC8C1A0408242FDA6AF605E535D93EC--> <AD_FIELD_ID><![CDATA[AFC8C1A0408242FDA6AF605E535D93EC]]></AD_FIELD_ID>
+<!--AFC8C1A0408242FDA6AF605E535D93EC--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--AFC8C1A0408242FDA6AF605E535D93EC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--AFC8C1A0408242FDA6AF605E535D93EC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--AFC8C1A0408242FDA6AF605E535D93EC--> <NAME><![CDATA[Fixed Unit Price]]></NAME>
+<!--AFC8C1A0408242FDA6AF605E535D93EC--> <DESCRIPTION><![CDATA[A price that does not change when price adjustments are made.]]></DESCRIPTION>
+<!--AFC8C1A0408242FDA6AF605E535D93EC--> <HELP><![CDATA[Fixed price for the promotion. When the promotion is applied, this is the final price the product will have.]]></HELP>
+<!--AFC8C1A0408242FDA6AF605E535D93EC--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--AFC8C1A0408242FDA6AF605E535D93EC--> <AD_TAB_ID><![CDATA[800082]]></AD_TAB_ID>
+<!--AFC8C1A0408242FDA6AF605E535D93EC--> <AD_COLUMN_ID><![CDATA[8D86F721E7614DFEB9442AE6312166CA]]></AD_COLUMN_ID>
+<!--AFC8C1A0408242FDA6AF605E535D93EC--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--AFC8C1A0408242FDA6AF605E535D93EC--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--AFC8C1A0408242FDA6AF605E535D93EC--> <DISPLAYLOGIC><![CDATA[@M_Offer_Type_ID@='9FF0F09112994CABB5451BE47E7B23AD']]></DISPLAYLOGIC>
+<!--AFC8C1A0408242FDA6AF605E535D93EC--> <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
+<!--AFC8C1A0408242FDA6AF605E535D93EC--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--AFC8C1A0408242FDA6AF605E535D93EC--> <SEQNO><![CDATA[70]]></SEQNO>
+<!--AFC8C1A0408242FDA6AF605E535D93EC--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--AFC8C1A0408242FDA6AF605E535D93EC--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--AFC8C1A0408242FDA6AF605E535D93EC--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--AFC8C1A0408242FDA6AF605E535D93EC--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--AFC8C1A0408242FDA6AF605E535D93EC--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--AFC8C1A0408242FDA6AF605E535D93EC--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--AFC8C1A0408242FDA6AF605E535D93EC--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--AFC8C1A0408242FDA6AF605E535D93EC--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--AFC8C1A0408242FDA6AF605E535D93EC--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--AFC8C1A0408242FDA6AF605E535D93EC--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--AFC8C1A0408242FDA6AF605E535D93EC--></AD_FIELD>
+
<!--AFCAC02426F149D0B1F71C6923057A5E--><AD_FIELD>
<!--AFCAC02426F149D0B1F71C6923057A5E--> <AD_FIELD_ID><![CDATA[AFCAC02426F149D0B1F71C6923057A5E]]></AD_FIELD_ID>
<!--AFCAC02426F149D0B1F71C6923057A5E--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -305546,6 +305605,35 @@
<!--ED6F09B3770A4F0F94058E0644BDE1E7--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
<!--ED6F09B3770A4F0F94058E0644BDE1E7--></AD_FIELD>
+<!--ED978D64AAD44CEA859D70B205A4722E--><AD_FIELD>
+<!--ED978D64AAD44CEA859D70B205A4722E--> <AD_FIELD_ID><![CDATA[ED978D64AAD44CEA859D70B205A4722E]]></AD_FIELD_ID>
+<!--ED978D64AAD44CEA859D70B205A4722E--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--ED978D64AAD44CEA859D70B205A4722E--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--ED978D64AAD44CEA859D70B205A4722E--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--ED978D64AAD44CEA859D70B205A4722E--> <NAME><![CDATA[Discount Amount]]></NAME>
+<!--ED978D64AAD44CEA859D70B205A4722E--> <DESCRIPTION><![CDATA[Fixed discount amount]]></DESCRIPTION>
+<!--ED978D64AAD44CEA859D70B205A4722E--> <HELP><![CDATA[Fixed discount amount]]></HELP>
+<!--ED978D64AAD44CEA859D70B205A4722E--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--ED978D64AAD44CEA859D70B205A4722E--> <AD_TAB_ID><![CDATA[800082]]></AD_TAB_ID>
+<!--ED978D64AAD44CEA859D70B205A4722E--> <AD_COLUMN_ID><![CDATA[F481B31FB3C64269AD1B0F1A62D4A054]]></AD_COLUMN_ID>
+<!--ED978D64AAD44CEA859D70B205A4722E--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--ED978D64AAD44CEA859D70B205A4722E--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--ED978D64AAD44CEA859D70B205A4722E--> <DISPLAYLOGIC><![CDATA[@M_Offer_Type_ID@='9FF0F09112994CABB5451BE47E7B23AD']]></DISPLAYLOGIC>
+<!--ED978D64AAD44CEA859D70B205A4722E--> <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
+<!--ED978D64AAD44CEA859D70B205A4722E--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--ED978D64AAD44CEA859D70B205A4722E--> <SEQNO><![CDATA[60]]></SEQNO>
+<!--ED978D64AAD44CEA859D70B205A4722E--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--ED978D64AAD44CEA859D70B205A4722E--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--ED978D64AAD44CEA859D70B205A4722E--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--ED978D64AAD44CEA859D70B205A4722E--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--ED978D64AAD44CEA859D70B205A4722E--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--ED978D64AAD44CEA859D70B205A4722E--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--ED978D64AAD44CEA859D70B205A4722E--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--ED978D64AAD44CEA859D70B205A4722E--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--ED978D64AAD44CEA859D70B205A4722E--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--ED978D64AAD44CEA859D70B205A4722E--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--ED978D64AAD44CEA859D70B205A4722E--></AD_FIELD>
+
<!--EDB13C4793724ABDAC74144874EAC0BB--><AD_FIELD>
<!--EDB13C4793724ABDAC74144874EAC0BB--> <AD_FIELD_ID><![CDATA[EDB13C4793724ABDAC74144874EAC0BB]]></AD_FIELD_ID>
<!--EDB13C4793724ABDAC74144874EAC0BB--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 6413719aeee5 -r 3884ff9bf3f4 src-db/database/sourcedata/M_OFFER_TYPE.xml
--- a/src-db/database/sourcedata/M_OFFER_TYPE.xml Mon Sep 12 12:15:22 2016 +0200
+++ b/src-db/database/sourcedata/M_OFFER_TYPE.xml Wed Sep 14 16:15:02 2016 +0530
@@ -8,6 +8,18 @@
<!--5D4BAF6BB86D4D2C9ED3D5A6FC051579--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--5D4BAF6BB86D4D2C9ED3D5A6FC051579--> <NAME><![CDATA[Price Adjustment]]></NAME>
<!--5D4BAF6BB86D4D2C9ED3D5A6FC051579--> <PL_ORDER_IMPLEMENTOR><![CDATA[M_Promotion_Adjustment]]></PL_ORDER_IMPLEMENTOR>
+<!--5D4BAF6BB86D4D2C9ED3D5A6FC051579--> <EM_OBPOS_ISCATEGORY><![CDATA[N]]></EM_OBPOS_ISCATEGORY>
<!--5D4BAF6BB86D4D2C9ED3D5A6FC051579--></M_OFFER_TYPE>
+<!--9FF0F09112994CABB5451BE47E7B23AD--><M_OFFER_TYPE>
+<!--9FF0F09112994CABB5451BE47E7B23AD--> <M_OFFER_TYPE_ID><![CDATA[9FF0F09112994CABB5451BE47E7B23AD]]></M_OFFER_TYPE_ID>
+<!--9FF0F09112994CABB5451BE47E7B23AD--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9FF0F09112994CABB5451BE47E7B23AD--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9FF0F09112994CABB5451BE47E7B23AD--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9FF0F09112994CABB5451BE47E7B23AD--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--9FF0F09112994CABB5451BE47E7B23AD--> <NAME><![CDATA[Price Adjustment List]]></NAME>
+<!--9FF0F09112994CABB5451BE47E7B23AD--> <PL_ORDER_IMPLEMENTOR><![CDATA[M_Promotion_Adjustment_List]]></PL_ORDER_IMPLEMENTOR>
+<!--9FF0F09112994CABB5451BE47E7B23AD--> <EM_OBPOS_ISCATEGORY><![CDATA[N]]></EM_OBPOS_ISCATEGORY>
+<!--9FF0F09112994CABB5451BE47E7B23AD--></M_OFFER_TYPE>
+
</data>
I33963_DiscountRule_Test2.patch [^] (7,574 bytes) 2016-09-15 15:54 [Show Content] [Hide Content]# HG changeset patch
# User Silambarasan Sekar <silambarasan@qualiantech.com>
# Date 1473849976 -19800
# Wed Sep 14 16:16:16 2016 +0530
# Node ID a76ef78853209eb0a40579dee2bcf5c364199f2b
# Parent 0152d1ed091fc1d3bf88a3bbfeab634d808615a8
Test case modification with respect to I33963, Insert Statements Fixed
diff -r 0152d1ed091f -r a76ef7885320 src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/discountsandpromotions/I30542_BuyXPayYDiffProd_Average.java
--- a/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/discountsandpromotions/I30542_BuyXPayYDiffProd_Average.java Tue Sep 13 16:09:52 2016 +0530
+++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/discountsandpromotions/I30542_BuyXPayYDiffProd_Average.java Wed Sep 14 16:16:16 2016 +0530
@@ -491,8 +491,14 @@
private void changePromotion() {
final String sql = "UPDATE m_offer SET name = '6 x 4 Descenders', em_obdisc_y = 4, em_obdisc_subtype = 'AVG', em_obdisc_distribute = 'N' where m_offer_id = 'A5190E45A59E4E4DBA19E06A8ED543D5' AND m_offer_type_id = '312D41071ED34BA18B748607CA679F44'";
new DatabaseHelperInsertUpdateOrDelete().execute(sql, 1);
- final String sql2 = "insert into m_offer_product VALUES ('BD57E04D50B047A8AD3C8B2338F9124C','39363B0921BB4293B48383844325E84C','67839EEFA49E44AC969BD60093FCC899','Y', "
- + "now(),'100',now(),'100','A5190E45A59E4E4DBA19E06A8ED543D5','1F72D8EB04C24FC588F1BF0B4E4B2203','N',null,null)";
+ final String sql2 = "insert into m_offer_product(m_offer_product_id, ad_client_id, ad_org_id, isactive, "
+ + "created, createdby, updated, updatedby, "
+ + "m_offer_id, m_product_id, em_obdisc_is_gift, em_obdisc_qty, "
+ + "em_obdisc_gifqty) "
+ + "VALUES ('BD57E04D50B047A8AD3C8B2338F9124C','39363B0921BB4293B48383844325E84C','67839EEFA49E44AC969BD60093FCC899','Y', "
+ + "now(),'100',now(),'100',"
+ + " 'A5190E45A59E4E4DBA19E06A8ED543D5','1F72D8EB04C24FC588F1BF0B4E4B2203','N',null,"
+ + "null)";
new DatabaseHelperInsertUpdateOrDelete().execute(sql2, 1);
}
}
\ No newline at end of file
diff -r 0152d1ed091f -r a76ef7885320 src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/discountsandpromotions/I30542_BuyXPayYDiffProd_Lowest.java
--- a/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/discountsandpromotions/I30542_BuyXPayYDiffProd_Lowest.java Tue Sep 13 16:09:52 2016 +0530
+++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/discountsandpromotions/I30542_BuyXPayYDiffProd_Lowest.java Wed Sep 14 16:16:16 2016 +0530
@@ -474,8 +474,14 @@
private void changePromotion() {
final String sql = "UPDATE m_offer SET name = '6 x 4 Descenders', em_obdisc_y = 4, em_obdisc_subtype = 'CHEAPEST', em_obdisc_distribute = 'N' where m_offer_id = 'A5190E45A59E4E4DBA19E06A8ED543D5' AND m_offer_type_id = '312D41071ED34BA18B748607CA679F44'";
new DatabaseHelperInsertUpdateOrDelete().execute(sql, 1);
- final String sql2 = "insert into m_offer_product VALUES ('BD57E04D50B047A8AD3C8B2338F9124C','39363B0921BB4293B48383844325E84C','67839EEFA49E44AC969BD60093FCC899','Y', "
- + "now(),'100',now(),'100','A5190E45A59E4E4DBA19E06A8ED543D5','1F72D8EB04C24FC588F1BF0B4E4B2203','N',null,null)";
+ final String sql2 = "insert into m_offer_product(m_offer_product_id, ad_client_id, ad_org_id, isactive, "
+ + "created, createdby, updated, updatedby, "
+ + "m_offer_id, m_product_id, em_obdisc_is_gift, em_obdisc_qty, "
+ + "em_obdisc_gifqty) "
+ + "VALUES ('BD57E04D50B047A8AD3C8B2338F9124C','39363B0921BB4293B48383844325E84C','67839EEFA49E44AC969BD60093FCC899','Y', "
+ + "now(),'100',now(),'100', "
+ + "'A5190E45A59E4E4DBA19E06A8ED543D5','1F72D8EB04C24FC588F1BF0B4E4B2203','N',null, "
+ + "null)";
new DatabaseHelperInsertUpdateOrDelete().execute(sql2, 1);
}
}
\ No newline at end of file
diff -r 0152d1ed091f -r a76ef7885320 src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/discountsandpromotions/I30542_BuyXPayYDiffProd_LowestDistrib.java
--- a/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/discountsandpromotions/I30542_BuyXPayYDiffProd_LowestDistrib.java Tue Sep 13 16:09:52 2016 +0530
+++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/discountsandpromotions/I30542_BuyXPayYDiffProd_LowestDistrib.java Wed Sep 14 16:16:16 2016 +0530
@@ -475,8 +475,14 @@
private void changePromotion() {
final String sql = "UPDATE m_offer SET name = '6 x 4 Descenders', em_obdisc_y = 4, em_obdisc_subtype = 'CHEAPEST', em_obdisc_distribute = 'Y' where m_offer_id = 'A5190E45A59E4E4DBA19E06A8ED543D5' AND m_offer_type_id = '312D41071ED34BA18B748607CA679F44'";
new DatabaseHelperInsertUpdateOrDelete().execute(sql, 1);
- final String sql2 = "insert into m_offer_product VALUES ('BD57E04D50B047A8AD3C8B2338F9124C','39363B0921BB4293B48383844325E84C','67839EEFA49E44AC969BD60093FCC899','Y', "
- + "now(),'100',now(),'100','A5190E45A59E4E4DBA19E06A8ED543D5','1F72D8EB04C24FC588F1BF0B4E4B2203','N',null,null)";
+ final String sql2 = "insert into m_offer_product(m_offer_product_id, ad_client_id, ad_org_id, isactive, "
+ + "created, createdby, updated, updatedby, "
+ + "m_offer_id, m_product_id, em_obdisc_is_gift, em_obdisc_qty, "
+ + "em_obdisc_gifqty) "
+ + "VALUES ('BD57E04D50B047A8AD3C8B2338F9124C','39363B0921BB4293B48383844325E84C','67839EEFA49E44AC969BD60093FCC899','Y', "
+ + "now(),'100',now(),'100',"
+ + "'A5190E45A59E4E4DBA19E06A8ED543D5','1F72D8EB04C24FC588F1BF0B4E4B2203','N',null,"
+ + "null)";
new DatabaseHelperInsertUpdateOrDelete().execute(sql2, 1);
}
}
\ No newline at end of file
diff -r 0152d1ed091f -r a76ef7885320 src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/discountsandpromotions/I30542_BuyXPayYDiffProd_MostExpensive.java
--- a/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/discountsandpromotions/I30542_BuyXPayYDiffProd_MostExpensive.java Tue Sep 13 16:09:52 2016 +0530
+++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/discountsandpromotions/I30542_BuyXPayYDiffProd_MostExpensive.java Wed Sep 14 16:16:16 2016 +0530
@@ -490,8 +490,14 @@
private void changePromotion() {
final String sql = "UPDATE m_offer SET name = '6 x 4 Descenders', em_obdisc_y = 4, em_obdisc_subtype = null, em_obdisc_distribute = 'N' where m_offer_id = 'A5190E45A59E4E4DBA19E06A8ED543D5' AND m_offer_type_id = '312D41071ED34BA18B748607CA679F44'";
new DatabaseHelperInsertUpdateOrDelete().execute(sql, 1);
- final String sql2 = "insert into m_offer_product VALUES ('BD57E04D50B047A8AD3C8B2338F9124C','39363B0921BB4293B48383844325E84C','67839EEFA49E44AC969BD60093FCC899','Y', "
- + "now(),'100',now(),'100','A5190E45A59E4E4DBA19E06A8ED543D5','1F72D8EB04C24FC588F1BF0B4E4B2203','N',null,null)";
+ final String sql2 = "insert into m_offer_product(m_offer_product_id, ad_client_id, ad_org_id, isactive, "
+ + "created, createdby, updated, updatedby, "
+ + "m_offer_id, m_product_id, em_obdisc_is_gift, em_obdisc_qty, "
+ + "em_obdisc_gifqty) "
+ + "VALUES ('BD57E04D50B047A8AD3C8B2338F9124C','39363B0921BB4293B48383844325E84C','67839EEFA49E44AC969BD60093FCC899','Y', "
+ + "now(),'100',now(),'100', "
+ + "'A5190E45A59E4E4DBA19E06A8ED543D5','1F72D8EB04C24FC588F1BF0B4E4B2203','N',null, "
+ + "null)";
new DatabaseHelperInsertUpdateOrDelete().execute(sql2, 1);
}
}
\ No newline at end of file
I33963_DiscountRule_Test.patch [^] (5,220 bytes) 2016-09-15 15:54 [Show Content] [Hide Content]# HG changeset patch
# User Silambarasan Sekar <silambarasan@qualiantech.com>
# Date 1473763192 -19800
# Tue Sep 13 16:09:52 2016 +0530
# Node ID 0152d1ed091fc1d3bf88a3bbfeab634d808615a8
# Parent ffce906916db130bf4d6e739d0de7f161713f9d7
Verifies issue 33963: Check discount is calculated from Product Tab
when using a product configured with "Price Adjustment List" Discount Rule
Added test I33963_PriceAdjustmentlist.
diff -r ffce906916db -r 0152d1ed091f src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/discountsandpromotions/I33963_PriceAdjustmentlist.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/discountsandpromotions/I33963_PriceAdjustmentlist.java Tue Sep 13 16:09:52 2016 +0530
@@ -0,0 +1,105 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo Public License
+ * Version 1.0 (the "License"), being the Mozilla Public License
+ * Version 1.1 with a permitted attribution clause; you may not use this
+ * file except in compliance with the License. You may obtain a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo S.L.U.
+ * All portions are Copyright (C) 2008-2014 Openbravo S.L.U.
+ * All Rights Reserved.
+ * Contributor(s):
+ ************************************************************************
+ *
+ * @author SIM
+ *
+ */
+
+package org.openbravo.test.mobile.retail.pack.selenium.tests.discountsandpromotions;
+
+import static org.junit.Assert.assertEquals;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import org.junit.Test;
+import org.openbravo.test.mobile.common.selenium.WebPOSTerminalHelper;
+import org.openbravo.test.mobile.common.selenium.database.DatabaseHelperInsertUpdateOrDelete;
+import org.openbravo.test.mobile.common.selenium.database.DatabaseHelperSelect;
+import org.openbravo.test.mobile.common.selenium.javascript.BackboneHelper;
+import org.openbravo.test.mobile.retail.pack.selenium.TestIdPack;
+
+public class I33963_PriceAdjustmentlist extends WebPOSTerminalHelper {
+
+ public static final String priceAdjustmentListId = "DA83FF27481D4A4E8CB3A56903EC4326";
+
+ @Test
+ public void test() {
+
+ tap(TestIdPack.BUTTON_BROWSE);
+ tap(TestIdPack.BUTTON_CATEGORY_MOUNTAINEERING);
+ tap(TestIdPack.BUTTON_PRODUCT_MOUNTAINEERING_CRAMPONS10POINT);
+ verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTNAME, "-- Price Adjustment List");
+ verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTAMOUNT, "-3.99");
+ verify(TestIdPack.LABEL_TOTALTOPAY, "35.91");
+ final String receiptNo = BackboneHelper.getDocumentNo();
+ tap(TestIdPack.BUTTON_PAY);
+ tap(TestIdPack.BUTTON_PAY_EXACT);
+ tap(TestIdPack.BUTTON_PAY_DONE);
+ verify(TestIdPack.LABEL_TOTALTOPAY, "0.00");
+
+ verifyPromotion(receiptNo);
+
+ }
+
+ private void verifyPromotion(final String receiptNo) {
+ // verifications IV. promotion
+ final String sql = "SELECT"
+ + " c_orderline_offer.line AS line,"
+ + " m_offer.name AS promotion_name,"
+ + " c_orderline_offer.amtoffer AS discountperunit,"
+ + " c_orderline_offer.totalamt AS totalamount"
+ + " FROM c_order"
+ + " INNER JOIN c_orderline ON c_order.c_order_id = c_orderline.c_order_id"
+ + " INNER JOIN c_orderline_offer ON c_orderline.c_orderline_id = c_orderline_offer.c_orderline_id"
+ + " INNER JOIN m_offer ON c_orderline_offer.m_offer_id = m_offer.m_offer_id"
+ + " WHERE c_order.documentno = '" + receiptNo + "'";
+
+ new DatabaseHelperSelect() {
+ @Override
+ protected void yieldResultSet(final ResultSet rs) throws SQLException {
+ logger.info("Verifying the Sale Promotion in the backend");
+ final int line = rs.getInt("line");
+ final String promotionName = rs.getString("promotion_name");
+ final float discountPerUnit = rs.getFloat("discountperunit");
+ final float totalDiscount = rs.getFloat("totalamount");
+
+ assertEquals(10, line);
+ assertEquals("Price Adjustment List", promotionName);
+ assertEquals(3.99, discountPerUnit, 0.1);
+ assertEquals(3.99, totalDiscount, 0.1);
+ }
+ }.execute(sql, 1);
+ }
+
+ @Override
+ public void beforeWithReload() {
+ final String updateDiscountActive = String.format(
+ "update m_offer set isactive='Y' where m_offer_id='%s'", priceAdjustmentListId);
+ new DatabaseHelperInsertUpdateOrDelete().execute(updateDiscountActive, 1);
+
+ }
+
+ @Override
+ public void afterWithReload() {
+ final String updateDiscountActive = String.format(
+ "update m_offer set isactive='N' where m_offer_id='%s'", priceAdjustmentListId);
+ new DatabaseHelperInsertUpdateOrDelete().execute(updateDiscountActive, 1);
+ }
+
+}
I33963_DiscountRule_SampleData.patch [^] (24,506 bytes) 2016-09-15 15:54 [Show Content] [Hide Content]# HG changeset patch
# User Silambarasan Sekar <silambarasan@qualiantech.com>
# Date 1473849925 -19800
# Wed Sep 14 16:15:25 2016 +0530
# Node ID 4bd579062d9b399505ccfda08f26ce442393b152
# Parent 6b435866bba6ac2660067d23994dfdd6ad2e9df6
Related to Issue 33963: Added new Discount Rule "Price Adjustment List" data
diff -r 6b435866bba6 -r 4bd579062d9b referencedata/sampledata/The_White_Valley_Group/M_OFFER.xml
--- a/referencedata/sampledata/The_White_Valley_Group/M_OFFER.xml Mon Sep 05 19:12:58 2016 +0200
+++ b/referencedata/sampledata/The_White_Valley_Group/M_OFFER.xml Wed Sep 14 16:15:25 2016 +0530
@@ -751,6 +751,34 @@
</M_OFFER>
<M_OFFER>
+ <M_OFFER_ID><![CDATA[DA83FF27481D4A4E8CB3A56903EC4326]]></M_OFFER_ID>
+ <AD_CLIENT_ID><![CDATA[39363B0921BB4293B48383844325E84C]]></AD_CLIENT_ID>
+ <AD_ORG_ID><![CDATA[BF129721D9FB4EB0819509934153E972]]></AD_ORG_ID>
+ <ISACTIVE><![CDATA[N]]></ISACTIVE>
+ <CREATED><![CDATA[2016-09-13 14:42:51.165]]></CREATED>
+ <CREATEDBY><![CDATA[100]]></CREATEDBY>
+ <UPDATED><![CDATA[2016-09-13 14:42:51.165]]></UPDATED>
+ <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+ <NAME><![CDATA[Price Adjustment List]]></NAME>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
+ <DATEFROM><![CDATA[2016-09-13 00:00:00.0]]></DATEFROM>
+ <BPARTNER_SELECTION><![CDATA[Y]]></BPARTNER_SELECTION>
+ <BP_GROUP_SELECTION><![CDATA[Y]]></BP_GROUP_SELECTION>
+ <PRODUCT_SELECTION><![CDATA[N]]></PRODUCT_SELECTION>
+ <PROD_CAT_SELECTION><![CDATA[Y]]></PROD_CAT_SELECTION>
+ <PRICELIST_SELECTION><![CDATA[Y]]></PRICELIST_SELECTION>
+ <M_OFFER_TYPE_ID><![CDATA[9FF0F09112994CABB5451BE47E7B23AD]]></M_OFFER_TYPE_ID>
+ <APPLY_NEXT><![CDATA[Y]]></APPLY_NEXT>
+ <ORG_SELECTION><![CDATA[Y]]></ORG_SELECTION>
+ <ISMULTIPLE><![CDATA[N]]></ISMULTIPLE>
+ <CHARACTERISTICS_SELECTION><![CDATA[Y]]></CHARACTERISTICS_SELECTION>
+ <EM_OBDISC_DISTRIBUTE><![CDATA[N]]></EM_OBDISC_DISTRIBUTE>
+ <EM_OBDISC_ROLE_SELECTION><![CDATA[Y]]></EM_OBDISC_ROLE_SELECTION>
+ <EM_OBDISC_APPROVAL_REQUIRED><![CDATA[N]]></EM_OBDISC_APPROVAL_REQUIRED>
+</M_OFFER>
+
+<M_OFFER>
<M_OFFER_ID><![CDATA[DBE6100C27484800A19B6D5044B12715]]></M_OFFER_ID>
<AD_CLIENT_ID><![CDATA[39363B0921BB4293B48383844325E84C]]></AD_CLIENT_ID>
<AD_ORG_ID><![CDATA[67839EEFA49E44AC969BD60093FCC899]]></AD_ORG_ID>
diff -r 6b435866bba6 -r 4bd579062d9b referencedata/sampledata/The_White_Valley_Group/M_OFFER_PRODUCT.xml
--- a/referencedata/sampledata/The_White_Valley_Group/M_OFFER_PRODUCT.xml Mon Sep 05 19:12:58 2016 +0200
+++ b/referencedata/sampledata/The_White_Valley_Group/M_OFFER_PRODUCT.xml Wed Sep 14 16:15:25 2016 +0530
@@ -11,6 +11,8 @@
<UPDATEDBY><![CDATA[100]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[74F2E10500374BD8B2EED9E7594279EE]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[64C57438293E4E408904F82E6BA4A3B1]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -25,6 +27,8 @@
<UPDATEDBY><![CDATA[100]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[1C47E773ACB341C48C8C7B970955C3DE]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[59D05A3647B94D1D8996E0959E4563CD]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -39,6 +43,8 @@
<UPDATEDBY><![CDATA[100]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[74F2E10500374BD8B2EED9E7594279EE]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[8F45F3F5F5FD42BA870A2AB4ABA49FF8]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -53,6 +59,8 @@
<UPDATEDBY><![CDATA[100]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[84408A74ADE548358E6701E0BF85CAC9]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[49F6A1DEF78A425DBED64608B8553D43]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -67,6 +75,8 @@
<UPDATEDBY><![CDATA[100]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[65BD8402B1CD428A952A0AF37B325BC3]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[29BFBE9FD89E4E64A117C478A024AA7E]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
<EM_OBDISC_QTY><![CDATA[2]]></EM_OBDISC_QTY>
</M_OFFER_PRODUCT>
@@ -82,6 +92,8 @@
<UPDATEDBY><![CDATA[0]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[C26B841C84B14FE2AB1A334DD3672E87]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[744687339BC84DFA833713C662FE5E4B]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -96,6 +108,8 @@
<UPDATEDBY><![CDATA[0]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[D474D3CFFC214A0CB2C0218A74E40C2A]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[288935D96601435BBDE66A231B6E066C]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -110,6 +124,8 @@
<UPDATEDBY><![CDATA[0]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[DBE6100C27484800A19B6D5044B12715]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[8843919EC3E349799477F9CFA4621892]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
<EM_OBDISC_QTY><![CDATA[1]]></EM_OBDISC_QTY>
</M_OFFER_PRODUCT>
@@ -125,6 +141,8 @@
<UPDATEDBY><![CDATA[0]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[DFE103F5DA1040DFA2425ECD47AF4483]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[02A2FDAA4B3D468AA1C46194F21B94A8]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -139,6 +157,8 @@
<UPDATEDBY><![CDATA[100]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[A5190E45A59E4E4DBA19E06A8ED543D5]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[A19641ECD20B4A85B692646469B17369]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -153,6 +173,8 @@
<UPDATEDBY><![CDATA[100]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[9B5F1139A656454898AE5D5D8C5A77EE]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[3CB5D8276B36448C8D2BA9317CC30A05]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -167,6 +189,8 @@
<UPDATEDBY><![CDATA[100]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[1C47E773ACB341C48C8C7B970955C3DE]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[9266EE41998C4BC2A268E4FAE16267EF]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -181,6 +205,8 @@
<UPDATEDBY><![CDATA[100]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[9B5F1139A656454898AE5D5D8C5A77EE]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[C446EF9A753B43BEB7478560E4A34EA9]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -195,6 +221,8 @@
<UPDATEDBY><![CDATA[100]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[84408A74ADE548358E6701E0BF85CAC9]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[64C57438293E4E408904F82E6BA4A3B1]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -209,6 +237,8 @@
<UPDATEDBY><![CDATA[0]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[95AF235142FB4656A4B7D5A08DE24927]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[26286B6890194168A55525A7D597AA47]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -223,6 +253,8 @@
<UPDATEDBY><![CDATA[100]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[84408A74ADE548358E6701E0BF85CAC9]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[9266EE41998C4BC2A268E4FAE16267EF]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -237,6 +269,8 @@
<UPDATEDBY><![CDATA[0]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[95AF235142FB4656A4B7D5A08DE24927]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[391A77152E314C2A84DD7291CBD55FCB]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -251,6 +285,8 @@
<UPDATEDBY><![CDATA[100]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[86D0C2B35B454D95A0A09E245B430FED]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[26286B6890194168A55525A7D597AA47]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
<EM_OBDISC_QTY><![CDATA[2]]></EM_OBDISC_QTY>
</M_OFFER_PRODUCT>
@@ -266,6 +302,8 @@
<UPDATEDBY><![CDATA[100]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[A3D9A10C254B44B4B44F66646A84D5FD]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[967711F04BF6414299A3259CD44C390A]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -280,6 +318,8 @@
<UPDATEDBY><![CDATA[100]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[84408A74ADE548358E6701E0BF85CAC9]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[59D05A3647B94D1D8996E0959E4563CD]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -294,6 +334,8 @@
<UPDATEDBY><![CDATA[100]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[74F2E10500374BD8B2EED9E7594279EE]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[3AD51B5AF5704106A3C5A9D21E20D3D7]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -308,6 +350,8 @@
<UPDATEDBY><![CDATA[100]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[1C47E773ACB341C48C8C7B970955C3DE]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[3AD51B5AF5704106A3C5A9D21E20D3D7]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -322,6 +366,8 @@
<UPDATEDBY><![CDATA[100]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[32667D80D9194E608342B3AA4F2F20BD]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[3BD414F7A8024D108AF4759F240A966C]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -336,6 +382,8 @@
<UPDATEDBY><![CDATA[0]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[DFE103F5DA1040DFA2425ECD47AF4483]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[14C44E2C7A814539BCF848208A499C93]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -350,6 +398,8 @@
<UPDATEDBY><![CDATA[100]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[41616748FCCD42D287CFA1C0B5116140]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[EDDA3BD4C2BB496A8BE8D4F9BDB57982]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -364,6 +414,8 @@
<UPDATEDBY><![CDATA[100]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[84408A74ADE548358E6701E0BF85CAC9]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[3AD51B5AF5704106A3C5A9D21E20D3D7]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -378,6 +430,8 @@
<UPDATEDBY><![CDATA[100]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[74F2E10500374BD8B2EED9E7594279EE]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[59D05A3647B94D1D8996E0959E4563CD]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -392,6 +446,8 @@
<UPDATEDBY><![CDATA[0]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[DBE6100C27484800A19B6D5044B12715]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[090AD5EA347C4E809FD0BEBF08E82332]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
<EM_OBDISC_QTY><![CDATA[2]]></EM_OBDISC_QTY>
</M_OFFER_PRODUCT>
@@ -407,6 +463,8 @@
<UPDATEDBY><![CDATA[100]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[84408A74ADE548358E6701E0BF85CAC9]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[40F113AD33F748E7ACAF04B47FA5E1A4]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -421,6 +479,8 @@
<UPDATEDBY><![CDATA[100]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[74F2E10500374BD8B2EED9E7594279EE]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[9266EE41998C4BC2A268E4FAE16267EF]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -435,6 +495,8 @@
<UPDATEDBY><![CDATA[100]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[1C47E773ACB341C48C8C7B970955C3DE]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[49F6A1DEF78A425DBED64608B8553D43]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -449,6 +511,8 @@
<UPDATEDBY><![CDATA[100]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[1C47E773ACB341C48C8C7B970955C3DE]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[8F45F3F5F5FD42BA870A2AB4ABA49FF8]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -463,6 +527,8 @@
<UPDATEDBY><![CDATA[100]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[41616748FCCD42D287CFA1C0B5116140]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[EA2527A320434B16BBB86F614858CC04]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[Y]]></EM_OBDISC_IS_GIFT>
<EM_OBDISC_GIFQTY><![CDATA[1]]></EM_OBDISC_GIFQTY>
</M_OFFER_PRODUCT>
@@ -478,6 +544,8 @@
<UPDATEDBY><![CDATA[100]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[1849B5E666D94ACD9EA7A9CCD8F28639]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[3BD414F7A8024D108AF4759F240A966C]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -492,6 +560,8 @@
<UPDATEDBY><![CDATA[0]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[95AF235142FB4656A4B7D5A08DE24927]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[3BD414F7A8024D108AF4759F240A966C]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -506,6 +576,8 @@
<UPDATEDBY><![CDATA[100]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[4A73666C74B045BCBEE9DD43BF163F81]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[19015A9B3ABC4BDBAE9C07C3E7297A27]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -520,6 +592,8 @@
<UPDATEDBY><![CDATA[100]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[74F2E10500374BD8B2EED9E7594279EE]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[40F113AD33F748E7ACAF04B47FA5E1A4]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -534,6 +608,8 @@
<UPDATEDBY><![CDATA[100]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[AEBCDD6E9FD647C38E521E6AEABFEBA9]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[AC79520FEB4743B3AAA379BF70B9B7DA]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -548,6 +624,8 @@
<UPDATEDBY><![CDATA[100]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[A5190E45A59E4E4DBA19E06A8ED543D5]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[B5E239231DD04529B36E836BCBE62799]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -562,6 +640,8 @@
<UPDATEDBY><![CDATA[100]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[84408A74ADE548358E6701E0BF85CAC9]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[8F45F3F5F5FD42BA870A2AB4ABA49FF8]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -576,6 +656,8 @@
<UPDATEDBY><![CDATA[100]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[65BD8402B1CD428A952A0AF37B325BC3]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[9E6C4D4318EE4D26841F7B2042F8A2C8]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
<EM_OBDISC_QTY><![CDATA[1]]></EM_OBDISC_QTY>
</M_OFFER_PRODUCT>
@@ -591,6 +673,8 @@
<UPDATEDBY><![CDATA[0]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[95AF235142FB4656A4B7D5A08DE24927]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[82C57D1547554EA9843DA21D3B72E237]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -605,6 +689,8 @@
<UPDATEDBY><![CDATA[0]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[1C36D6974F4E4C41AA92E1EEBCD577E1]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[46A48EF6EA94426FAE6465047FA3B75F]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[Y]]></EM_OBDISC_IS_GIFT>
<EM_OBDISC_GIFQTY><![CDATA[1]]></EM_OBDISC_GIFQTY>
</M_OFFER_PRODUCT>
@@ -620,6 +706,8 @@
<UPDATEDBY><![CDATA[100]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[1C47E773ACB341C48C8C7B970955C3DE]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[40F113AD33F748E7ACAF04B47FA5E1A4]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -634,6 +722,24 @@
<UPDATEDBY><![CDATA[100]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[81160DCD7C274BB186ABDD5C267D7225]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[7FF7B76FD0B54E39BFF71AF603CB7CF6]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
+ <EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
+</M_OFFER_PRODUCT>
+
+<M_OFFER_PRODUCT>
+ <M_OFFER_PRODUCT_ID><![CDATA[C518E10AABD44BD3BE814810D7B5F530]]></M_OFFER_PRODUCT_ID>
+ <AD_CLIENT_ID><![CDATA[39363B0921BB4293B48383844325E84C]]></AD_CLIENT_ID>
+ <AD_ORG_ID><![CDATA[BF129721D9FB4EB0819509934153E972]]></AD_ORG_ID>
+ <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+ <CREATED><![CDATA[2016-09-13 14:44:56.192]]></CREATED>
+ <CREATEDBY><![CDATA[100]]></CREATEDBY>
+ <UPDATED><![CDATA[2016-09-13 14:47:03.188]]></UPDATED>
+ <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+ <M_OFFER_ID><![CDATA[DA83FF27481D4A4E8CB3A56903EC4326]]></M_OFFER_ID>
+ <M_PRODUCT_ID><![CDATA[14C44E2C7A814539BCF848208A499C93]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[10]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -648,6 +754,8 @@
<UPDATEDBY><![CDATA[0]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[1C36D6974F4E4C41AA92E1EEBCD577E1]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[772EE3421FE84D768A674840C2EB855B]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
<EM_OBDISC_QTY><![CDATA[1]]></EM_OBDISC_QTY>
</M_OFFER_PRODUCT>
@@ -663,6 +771,8 @@
<UPDATEDBY><![CDATA[100]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[6C41BA4C0AA44BC9B38A64353DEDCB21]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[C446EF9A753B43BEB7478560E4A34EA9]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -677,6 +787,8 @@
<UPDATEDBY><![CDATA[100]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[AEBCDD6E9FD647C38E521E6AEABFEBA9]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[F7029D77812B442C98611AE5C898CA8E]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -691,6 +803,8 @@
<UPDATEDBY><![CDATA[100]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[1C47E773ACB341C48C8C7B970955C3DE]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[64C57438293E4E408904F82E6BA4A3B1]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -705,6 +819,8 @@
<UPDATEDBY><![CDATA[100]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[21BF154DAD644B38A667A58E12A45CAB]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[1672B669156943CD8CCA690B4B5472FF]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -719,6 +835,8 @@
<UPDATEDBY><![CDATA[100]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[86D0C2B35B454D95A0A09E245B430FED]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[8843919EC3E349799477F9CFA4621892]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
<EM_OBDISC_QTY><![CDATA[1]]></EM_OBDISC_QTY>
</M_OFFER_PRODUCT>
@@ -734,6 +852,8 @@
<UPDATEDBY><![CDATA[100]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[86D0C2B35B454D95A0A09E245B430FED]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[090AD5EA347C4E809FD0BEBF08E82332]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
<EM_OBDISC_QTY><![CDATA[2]]></EM_OBDISC_QTY>
</M_OFFER_PRODUCT>
@@ -749,6 +869,8 @@
<UPDATEDBY><![CDATA[100]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[6C41BA4C0AA44BC9B38A64353DEDCB21]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[3CB5D8276B36448C8D2BA9317CC30A05]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -763,6 +885,8 @@
<UPDATEDBY><![CDATA[100]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[21BF154DAD644B38A667A58E12A45CAB]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[F20B56C4FBF448B2824030A7E7304B51]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -777,6 +901,8 @@
<UPDATEDBY><![CDATA[100]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[4D4D1F80D92240BCBCCCB7F447FB930D]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[5D82FBC226144FF088BA8FF54150C753]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -791,6 +917,8 @@
<UPDATEDBY><![CDATA[100]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[74F2E10500374BD8B2EED9E7594279EE]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[49F6A1DEF78A425DBED64608B8553D43]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
@@ -805,6 +933,8 @@
<UPDATEDBY><![CDATA[0]]></UPDATEDBY>
<M_OFFER_ID><![CDATA[C26B841C84B14FE2AB1A334DD3672E87]]></M_OFFER_ID>
<M_PRODUCT_ID><![CDATA[5EF5047C1B924B9E84867FDBD9F00E75]]></M_PRODUCT_ID>
+ <ADDAMT><![CDATA[0]]></ADDAMT>
+ <DISCOUNT><![CDATA[0]]></DISCOUNT>
<EM_OBDISC_IS_GIFT><![CDATA[N]]></EM_OBDISC_IS_GIFT>
</M_OFFER_PRODUCT>
|
Relationships [ Relation Graph ]
[ Dependency Graph ]
Relationships 