# 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>
