[discount] Discount type is now an entity rather than a list
authorAsier Lostalé <asier.lostale@openbravo.com>
Fri, 05 Oct 2012 11:41:53 +0200
changeset 18314 bc2b1d9f2f6d
parent 18313 b7aacb57f4a1
child 18315 96a85548be44
[discount] Discount type is now an entity rather than a list
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_TREENODE.xml
src-db/database/model/functions/M_PROMOTION_CALCULATE.xml
src-db/database/model/tables/M_OFFER.xml
src-db/database/model/tables/M_OFFER_TYPE.xml
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_DATASET_TABLE.xml
src-db/database/sourcedata/AD_ELEMENT.xml
src-db/database/sourcedata/AD_FIELD.xml
src-db/database/sourcedata/AD_MENU.xml
src-db/database/sourcedata/AD_REFERENCE.xml
src-db/database/sourcedata/AD_REF_LIST.xml
src-db/database/sourcedata/AD_TAB.xml
src-db/database/sourcedata/AD_TABLE.xml
src-db/database/sourcedata/AD_TREENODE.xml
src-db/database/sourcedata/AD_WINDOW.xml
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_TREENODE.xml	Wed Oct 03 16:22:42 2012 +0200
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_TREENODE.xml	Fri Oct 05 11:41:53 2012 +0200
@@ -8,7 +8,7 @@
 <!--3E38D7EEF9CF48E5B223D6D71DF7EA05-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--3E38D7EEF9CF48E5B223D6D71DF7EA05-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3E38D7EEF9CF48E5B223D6D71DF7EA05-->  <PARENT_ID><![CDATA[153]]></PARENT_ID>
-<!--3E38D7EEF9CF48E5B223D6D71DF7EA05-->  <SEQNO><![CDATA[140]]></SEQNO>
+<!--3E38D7EEF9CF48E5B223D6D71DF7EA05-->  <SEQNO><![CDATA[149]]></SEQNO>
 <!--3E38D7EEF9CF48E5B223D6D71DF7EA05--></AD_TREENODE>
 
 <!--EEDE9E704B114114BB8AF2A5453F3D77--><AD_TREENODE>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/model/functions/M_PROMOTION_CALCULATE.xml	Fri Oct 05 11:41:53 2012 +0200
@@ -0,0 +1,134 @@
+<?xml version="1.0"?>
+  <database name="FUNCTION M_PROMOTION_CALCULATE">
+    <function name="M_PROMOTION_CALCULATE" type="NULL">
+      <parameter name="p_order_id" type="VARCHAR" mode="in">
+        <default/>
+      </parameter>
+      <body><![CDATA[/*************************************************************************
+* The contents of this file are subject to the Openbravo  Public  License
+* Version  1.1  (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 SLU
+* All portions are Copyright (C) 2012 Openbravo SLU
+* All Rights Reserved.
+* Contributor(s):  ______________________________________.
+************************************************************************/
+  v_date DATE;
+  v_partner VARCHAR2(32);
+  v_priceList VARCHAR2(32);
+  v_method VARCHAR(100);
+
+  Cur_Order RECORD;
+  Cur_Offer RECORD;
+ 
+BEGIN
+  select c_bpartner_id, m_priceList_id, dateordered
+    into v_partner, v_priceList, v_date
+    from C_Order
+   where C_Order_ID = p_order_id;
+
+  for Cur_Order in (select *
+                      from c_orderline 
+                     where c_order_id = p_order_id) loop
+
+    FOR Cur_Offer IN
+      (SELECT M_OFFER_ID, t.value, t.PL_Order_Implementor
+      FROM M_OFFER, M_Offer_Type t
+      WHERE v_date BETWEEN DATEFROM AND COALESCE(DATETO, TO_DATE('31-12-9999', 'DD-MM-YYYY'))
+        AND M_OFFER.IsActive = 'Y'
+        AND t.M_Offer_Type_ID = M_Offer.M_Offer_Type_ID
+  AND ((PRICELIST_SELECTION='Y' AND NOT EXISTS (SELECT 1 FROM M_OFFER_PRICELIST
+           WHERE M_OFFER_ID=M_OFFER.M_OFFER_ID
+           AND M_PRICELIST_ID = v_priceList))
+         OR (PRICELIST_SELECTION='N' AND EXISTS(SELECT 1 FROM M_OFFER_PRICELIST
+            WHERE M_OFFER_ID = M_OFFER.M_OFFER_ID
+            AND M_PRICELIST_ID = v_priceList)))
+        AND((BPARTNER_SELECTION = 'Y'
+        AND NOT EXISTS
+        (SELECT 1
+        FROM M_OFFER_BPARTNER
+        WHERE M_OFFER_ID = M_OFFER.M_OFFER_ID
+          AND C_BPARTNER_ID = v_partner
+        ))
+        OR(BPARTNER_SELECTION = 'N'
+        AND EXISTS
+        (SELECT 1
+        FROM M_OFFER_BPARTNER
+        WHERE M_OFFER_ID = M_OFFER.M_OFFER_ID
+          AND C_BPARTNER_ID = v_partner
+        )))
+        AND((BP_GROUP_SELECTION = 'Y'
+        AND NOT EXISTS
+        (SELECT 1
+        FROM C_BPARTNER B,
+          M_OFFER_BP_GROUP OB
+        WHERE OB.M_OFFER_ID = M_OFFER.M_OFFER_ID
+          AND B.C_BPARTNER_ID = v_partner
+          AND OB.C_BP_GROUP_ID = B.C_BP_GROUP_ID
+        ))
+        OR(BP_GROUP_SELECTION = 'N'
+        AND EXISTS
+        (SELECT 1
+        FROM C_BPARTNER B,
+          M_OFFER_BP_GROUP OB
+        WHERE OB.M_OFFER_ID = M_OFFER.M_OFFER_ID
+          AND B.C_BPARTNER_ID = v_partner
+          AND OB.C_BP_GROUP_ID = B.C_BP_GROUP_ID
+        )))
+        AND((PRODUCT_SELECTION = 'Y'
+        AND NOT EXISTS
+        (SELECT 1
+        FROM M_OFFER_PRODUCT
+        WHERE M_OFFER_ID = M_OFFER.M_OFFER_ID
+          AND M_PRODUCT_ID = Cur_Order.M_Product_ID
+        ))
+        OR(PRODUCT_SELECTION = 'N'
+        AND EXISTS
+        (SELECT 1
+        FROM M_OFFER_PRODUCT
+        WHERE M_OFFER_ID = M_OFFER.M_OFFER_ID
+          AND M_PRODUCT_ID = Cur_Order.M_Product_ID
+        )))
+        AND((PROD_CAT_SELECTION = 'Y'
+        AND NOT EXISTS
+        (SELECT 1
+        FROM M_PRODUCT P,
+          M_OFFER_PROD_CAT OP
+        WHERE OP.M_OFFER_ID = M_OFFER.M_OFFER_ID
+          AND P.M_PRODUCT_ID = Cur_Order.M_Product_ID
+          AND OP.M_PRODUCT_CATEGORY_ID = P.M_PRODUCT_CATEGORY_ID
+        ))
+        OR(PROD_CAT_SELECTION = 'N'
+        AND EXISTS
+        (SELECT 1
+        FROM M_PRODUCT P,
+          M_OFFER_PROD_CAT OP
+        WHERE OP.M_OFFER_ID = M_OFFER.M_OFFER_ID
+          AND P.M_PRODUCT_ID = Cur_Order.M_Product_ID
+          AND OP.M_PRODUCT_CATEGORY_ID = P.M_PRODUCT_CATEGORY_ID
+        )))
+      ORDER BY PRIORITY,
+        M_OFFER_ID ASC
+      )
+    loop
+      if (Cur_Offer.PL_Order_Implementor is not null) then
+        v_method := Cur_Offer.PL_Order_Implementor || '('''||Cur_Offer.M_Offer_ID||''','''||Cur_Order.C_OrderLine_ID||''')';
+        if (AD_Get_RDBMS() = 'ORACLE') then
+          execute 'CALL ' || v_method;
+        else
+          execute 'SELECT ' || v_method ||' FROM DUAL';
+        end if;
+      end if;
+    end loop;
+  end loop;
+END M_PROMOTION_CALCULATE
+]]></body>
+    </function>
+  </database>
--- a/src-db/database/model/tables/M_OFFER.xml	Wed Oct 03 16:22:42 2012 +0200
+++ b/src-db/database/model/tables/M_OFFER.xml	Fri Oct 05 11:41:53 2012 +0200
@@ -93,9 +93,9 @@
         <default/>
         <onCreateDefault/>
       </column>
-      <column name="DISCOUNT_TYPE" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false">
-        <default><![CDATA[ADJUSTMENT]]></default>
-        <onCreateDefault><![CDATA['ADJUSTMENT']]></onCreateDefault>
+      <column name="M_OFFER_TYPE_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default><![CDATA[5D4BAF6BB86D4D2C9ED3D5A6FC051579]]></default>
+        <onCreateDefault><![CDATA['5D4BAF6BB86D4D2C9ED3D5A6FC051579']]></onCreateDefault>
       </column>
       <column name="APPLY_NEXT" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
         <default><![CDATA[Y]]></default>
@@ -115,6 +115,9 @@
       <foreign-key foreignTable="AD_ORG" name="M_OFFER_AD_ORG">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="M_OFFER_TYPE" name="M_OFFER_OFFERTYPE">
+        <reference local="M_OFFER_TYPE_ID" foreign="M_OFFER_TYPE_ID"/>
+      </foreign-key>
       <check name="M_OFFER_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/model/tables/M_OFFER_TYPE.xml	Fri Oct 05 11:41:53 2012 +0200
@@ -0,0 +1,63 @@
+<?xml version="1.0"?>
+  <database name="TABLE M_OFFER_TYPE">
+    <table name="M_OFFER_TYPE" primaryKey="M_OFFERTYPE_KEY">
+      <column name="M_OFFER_TYPE_ID" primaryKey="true" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[Y]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
+        <default><![CDATA[SYSDATE]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
+        <default><![CDATA[SYSDATE]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_MODULE_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="PL_ORDER_IMPLEMENTOR" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <foreign-key foreignTable="AD_CLIENT" name="M_OFFERTYPE_AD_CLIENT">
+        <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="M_OFFERTYPE_AD_ORG">
+        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_MODULE" name="M_OFFERTYPE_MODULE">
+        <reference local="AD_MODULE_ID" foreign="AD_MODULE_ID"/>
+      </foreign-key>
+      <check name="M_OFFERTYPE_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
+    </table>
+  </database>
--- a/src-db/database/sourcedata/AD_COLUMN.xml	Wed Oct 03 16:22:42 2012 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Fri Oct 05 11:41:53 2012 +0200
@@ -224762,6 +224762,40 @@
 <!--2A3CDBEEACD94932B217E45E20040B63-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--2A3CDBEEACD94932B217E45E20040B63--></AD_COLUMN>
 
+<!--2AA57E9B932549BCB74C9DD283840AD2--><AD_COLUMN>
+<!--2AA57E9B932549BCB74C9DD283840AD2-->  <AD_COLUMN_ID><![CDATA[2AA57E9B932549BCB74C9DD283840AD2]]></AD_COLUMN_ID>
+<!--2AA57E9B932549BCB74C9DD283840AD2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2AA57E9B932549BCB74C9DD283840AD2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2AA57E9B932549BCB74C9DD283840AD2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2AA57E9B932549BCB74C9DD283840AD2-->  <NAME><![CDATA[Promotion Type]]></NAME>
+<!--2AA57E9B932549BCB74C9DD283840AD2-->  <HELP><![CDATA[Promotions and discounts functionality allows to apply different rules to order/invoice lines to adjust pricing. A type is each of these kinds of rules.]]></HELP>
+<!--2AA57E9B932549BCB74C9DD283840AD2-->  <COLUMNNAME><![CDATA[M_Offer_Type_ID]]></COLUMNNAME>
+<!--2AA57E9B932549BCB74C9DD283840AD2-->  <AD_TABLE_ID><![CDATA[4E9F9B0D69AC4BC2874FD2B80B948704]]></AD_TABLE_ID>
+<!--2AA57E9B932549BCB74C9DD283840AD2-->  <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
+<!--2AA57E9B932549BCB74C9DD283840AD2-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--2AA57E9B932549BCB74C9DD283840AD2-->  <ISKEY><![CDATA[Y]]></ISKEY>
+<!--2AA57E9B932549BCB74C9DD283840AD2-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--2AA57E9B932549BCB74C9DD283840AD2-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--2AA57E9B932549BCB74C9DD283840AD2-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--2AA57E9B932549BCB74C9DD283840AD2-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--2AA57E9B932549BCB74C9DD283840AD2-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--2AA57E9B932549BCB74C9DD283840AD2-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--2AA57E9B932549BCB74C9DD283840AD2-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--2AA57E9B932549BCB74C9DD283840AD2-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--2AA57E9B932549BCB74C9DD283840AD2-->  <AD_ELEMENT_ID><![CDATA[F1852A15D8FD45F9B9A54962B40E1E43]]></AD_ELEMENT_ID>
+<!--2AA57E9B932549BCB74C9DD283840AD2-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--2AA57E9B932549BCB74C9DD283840AD2-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--2AA57E9B932549BCB74C9DD283840AD2-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--2AA57E9B932549BCB74C9DD283840AD2-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--2AA57E9B932549BCB74C9DD283840AD2-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--2AA57E9B932549BCB74C9DD283840AD2-->  <POSITION><![CDATA[1]]></POSITION>
+<!--2AA57E9B932549BCB74C9DD283840AD2-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--2AA57E9B932549BCB74C9DD283840AD2-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--2AA57E9B932549BCB74C9DD283840AD2-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--2AA57E9B932549BCB74C9DD283840AD2-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--2AA57E9B932549BCB74C9DD283840AD2-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--2AA57E9B932549BCB74C9DD283840AD2--></AD_COLUMN>
+
 <!--2B5F702BA50F4C2ABB8E14B77F8BE893--><AD_COLUMN>
 <!--2B5F702BA50F4C2ABB8E14B77F8BE893-->  <AD_COLUMN_ID><![CDATA[2B5F702BA50F4C2ABB8E14B77F8BE893]]></AD_COLUMN_ID>
 <!--2B5F702BA50F4C2ABB8E14B77F8BE893-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -228406,6 +228440,42 @@
 <!--4B5F942C49634A9B8507A6DD4F66750B-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--4B5F942C49634A9B8507A6DD4F66750B--></AD_COLUMN>
 
+<!--4C935385499E485989264EA4AA71E60A--><AD_COLUMN>
+<!--4C935385499E485989264EA4AA71E60A-->  <AD_COLUMN_ID><![CDATA[4C935385499E485989264EA4AA71E60A]]></AD_COLUMN_ID>
+<!--4C935385499E485989264EA4AA71E60A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4C935385499E485989264EA4AA71E60A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4C935385499E485989264EA4AA71E60A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4C935385499E485989264EA4AA71E60A-->  <NAME><![CDATA[Client]]></NAME>
+<!--4C935385499E485989264EA4AA71E60A-->  <DESCRIPTION><![CDATA[Client for this installation.]]></DESCRIPTION>
+<!--4C935385499E485989264EA4AA71E60A-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
+<!--4C935385499E485989264EA4AA71E60A-->  <COLUMNNAME><![CDATA[AD_Client_ID]]></COLUMNNAME>
+<!--4C935385499E485989264EA4AA71E60A-->  <AD_TABLE_ID><![CDATA[4E9F9B0D69AC4BC2874FD2B80B948704]]></AD_TABLE_ID>
+<!--4C935385499E485989264EA4AA71E60A-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--4C935385499E485989264EA4AA71E60A-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--4C935385499E485989264EA4AA71E60A-->  <DEFAULTVALUE><![CDATA[@AD_CLIENT_ID@]]></DEFAULTVALUE>
+<!--4C935385499E485989264EA4AA71E60A-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--4C935385499E485989264EA4AA71E60A-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--4C935385499E485989264EA4AA71E60A-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--4C935385499E485989264EA4AA71E60A-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--4C935385499E485989264EA4AA71E60A-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--4C935385499E485989264EA4AA71E60A-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--4C935385499E485989264EA4AA71E60A-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--4C935385499E485989264EA4AA71E60A-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--4C935385499E485989264EA4AA71E60A-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--4C935385499E485989264EA4AA71E60A-->  <AD_ELEMENT_ID><![CDATA[102]]></AD_ELEMENT_ID>
+<!--4C935385499E485989264EA4AA71E60A-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--4C935385499E485989264EA4AA71E60A-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--4C935385499E485989264EA4AA71E60A-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--4C935385499E485989264EA4AA71E60A-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--4C935385499E485989264EA4AA71E60A-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--4C935385499E485989264EA4AA71E60A-->  <POSITION><![CDATA[2]]></POSITION>
+<!--4C935385499E485989264EA4AA71E60A-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--4C935385499E485989264EA4AA71E60A-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--4C935385499E485989264EA4AA71E60A-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--4C935385499E485989264EA4AA71E60A-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--4C935385499E485989264EA4AA71E60A-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--4C935385499E485989264EA4AA71E60A--></AD_COLUMN>
+
 <!--4CED13820EFB47E3B3A4A37CBEBB4BC6--><AD_COLUMN>
 <!--4CED13820EFB47E3B3A4A37CBEBB4BC6-->  <AD_COLUMN_ID><![CDATA[4CED13820EFB47E3B3A4A37CBEBB4BC6]]></AD_COLUMN_ID>
 <!--4CED13820EFB47E3B3A4A37CBEBB4BC6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -230821,6 +230891,42 @@
 <!--560E1957E5F6E683E040007F0100233C-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--560E1957E5F6E683E040007F0100233C--></AD_COLUMN>
 
+<!--560E65E19E474986AA05584DBBC09094--><AD_COLUMN>
+<!--560E65E19E474986AA05584DBBC09094-->  <AD_COLUMN_ID><![CDATA[560E65E19E474986AA05584DBBC09094]]></AD_COLUMN_ID>
+<!--560E65E19E474986AA05584DBBC09094-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--560E65E19E474986AA05584DBBC09094-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--560E65E19E474986AA05584DBBC09094-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--560E65E19E474986AA05584DBBC09094-->  <NAME><![CDATA[Updated]]></NAME>
+<!--560E65E19E474986AA05584DBBC09094-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
+<!--560E65E19E474986AA05584DBBC09094-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
+<!--560E65E19E474986AA05584DBBC09094-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
+<!--560E65E19E474986AA05584DBBC09094-->  <AD_TABLE_ID><![CDATA[4E9F9B0D69AC4BC2874FD2B80B948704]]></AD_TABLE_ID>
+<!--560E65E19E474986AA05584DBBC09094-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
+<!--560E65E19E474986AA05584DBBC09094-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--560E65E19E474986AA05584DBBC09094-->  <DEFAULTVALUE><![CDATA[@#Date@]]></DEFAULTVALUE>
+<!--560E65E19E474986AA05584DBBC09094-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--560E65E19E474986AA05584DBBC09094-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--560E65E19E474986AA05584DBBC09094-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--560E65E19E474986AA05584DBBC09094-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--560E65E19E474986AA05584DBBC09094-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--560E65E19E474986AA05584DBBC09094-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--560E65E19E474986AA05584DBBC09094-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--560E65E19E474986AA05584DBBC09094-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--560E65E19E474986AA05584DBBC09094-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--560E65E19E474986AA05584DBBC09094-->  <AD_ELEMENT_ID><![CDATA[607]]></AD_ELEMENT_ID>
+<!--560E65E19E474986AA05584DBBC09094-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--560E65E19E474986AA05584DBBC09094-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--560E65E19E474986AA05584DBBC09094-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--560E65E19E474986AA05584DBBC09094-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--560E65E19E474986AA05584DBBC09094-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--560E65E19E474986AA05584DBBC09094-->  <POSITION><![CDATA[7]]></POSITION>
+<!--560E65E19E474986AA05584DBBC09094-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--560E65E19E474986AA05584DBBC09094-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--560E65E19E474986AA05584DBBC09094-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--560E65E19E474986AA05584DBBC09094-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--560E65E19E474986AA05584DBBC09094-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--560E65E19E474986AA05584DBBC09094--></AD_COLUMN>
+
 <!--565E56DF64D99042E040007F01002829--><AD_COLUMN>
 <!--565E56DF64D99042E040007F01002829-->  <AD_COLUMN_ID><![CDATA[565E56DF64D99042E040007F01002829]]></AD_COLUMN_ID>
 <!--565E56DF64D99042E040007F01002829-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -245549,6 +245655,41 @@
 <!--623FEEB84686C86EE040007F0101639E-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--623FEEB84686C86EE040007F0101639E--></AD_COLUMN>
 
+<!--62D58DE741344625BB85B770C2007281--><AD_COLUMN>
+<!--62D58DE741344625BB85B770C2007281-->  <AD_COLUMN_ID><![CDATA[62D58DE741344625BB85B770C2007281]]></AD_COLUMN_ID>
+<!--62D58DE741344625BB85B770C2007281-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--62D58DE741344625BB85B770C2007281-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--62D58DE741344625BB85B770C2007281-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--62D58DE741344625BB85B770C2007281-->  <NAME><![CDATA[Updated By]]></NAME>
+<!--62D58DE741344625BB85B770C2007281-->  <DESCRIPTION><![CDATA[User who updated this records]]></DESCRIPTION>
+<!--62D58DE741344625BB85B770C2007281-->  <HELP><![CDATA[The Updated By field indicates the user who updated this record.]]></HELP>
+<!--62D58DE741344625BB85B770C2007281-->  <COLUMNNAME><![CDATA[Updatedby]]></COLUMNNAME>
+<!--62D58DE741344625BB85B770C2007281-->  <AD_TABLE_ID><![CDATA[4E9F9B0D69AC4BC2874FD2B80B948704]]></AD_TABLE_ID>
+<!--62D58DE741344625BB85B770C2007281-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--62D58DE741344625BB85B770C2007281-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--62D58DE741344625BB85B770C2007281-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--62D58DE741344625BB85B770C2007281-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--62D58DE741344625BB85B770C2007281-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--62D58DE741344625BB85B770C2007281-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--62D58DE741344625BB85B770C2007281-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--62D58DE741344625BB85B770C2007281-->  <SEQNO><![CDATA[80]]></SEQNO>
+<!--62D58DE741344625BB85B770C2007281-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--62D58DE741344625BB85B770C2007281-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--62D58DE741344625BB85B770C2007281-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--62D58DE741344625BB85B770C2007281-->  <AD_ELEMENT_ID><![CDATA[608]]></AD_ELEMENT_ID>
+<!--62D58DE741344625BB85B770C2007281-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--62D58DE741344625BB85B770C2007281-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--62D58DE741344625BB85B770C2007281-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--62D58DE741344625BB85B770C2007281-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--62D58DE741344625BB85B770C2007281-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--62D58DE741344625BB85B770C2007281-->  <POSITION><![CDATA[8]]></POSITION>
+<!--62D58DE741344625BB85B770C2007281-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--62D58DE741344625BB85B770C2007281-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--62D58DE741344625BB85B770C2007281-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--62D58DE741344625BB85B770C2007281-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--62D58DE741344625BB85B770C2007281-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--62D58DE741344625BB85B770C2007281--></AD_COLUMN>
+
 <!--62DD925A901F41099D962DFEFE9CC84F--><AD_COLUMN>
 <!--62DD925A901F41099D962DFEFE9CC84F-->  <AD_COLUMN_ID><![CDATA[62DD925A901F41099D962DFEFE9CC84F]]></AD_COLUMN_ID>
 <!--62DD925A901F41099D962DFEFE9CC84F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -250519,6 +250660,41 @@
 <!--70BA08AD70E84EB99EA0693BCD9CEEC5-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--70BA08AD70E84EB99EA0693BCD9CEEC5--></AD_COLUMN>
 
+<!--70C8CAD9B93245F6AE219E6075017CE9--><AD_COLUMN>
+<!--70C8CAD9B93245F6AE219E6075017CE9-->  <AD_COLUMN_ID><![CDATA[70C8CAD9B93245F6AE219E6075017CE9]]></AD_COLUMN_ID>
+<!--70C8CAD9B93245F6AE219E6075017CE9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--70C8CAD9B93245F6AE219E6075017CE9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--70C8CAD9B93245F6AE219E6075017CE9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--70C8CAD9B93245F6AE219E6075017CE9-->  <NAME><![CDATA[Created By]]></NAME>
+<!--70C8CAD9B93245F6AE219E6075017CE9-->  <DESCRIPTION><![CDATA[User who created this records]]></DESCRIPTION>
+<!--70C8CAD9B93245F6AE219E6075017CE9-->  <HELP><![CDATA[The Created By field indicates the user who created this record.]]></HELP>
+<!--70C8CAD9B93245F6AE219E6075017CE9-->  <COLUMNNAME><![CDATA[Createdby]]></COLUMNNAME>
+<!--70C8CAD9B93245F6AE219E6075017CE9-->  <AD_TABLE_ID><![CDATA[4E9F9B0D69AC4BC2874FD2B80B948704]]></AD_TABLE_ID>
+<!--70C8CAD9B93245F6AE219E6075017CE9-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--70C8CAD9B93245F6AE219E6075017CE9-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--70C8CAD9B93245F6AE219E6075017CE9-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--70C8CAD9B93245F6AE219E6075017CE9-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--70C8CAD9B93245F6AE219E6075017CE9-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--70C8CAD9B93245F6AE219E6075017CE9-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--70C8CAD9B93245F6AE219E6075017CE9-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--70C8CAD9B93245F6AE219E6075017CE9-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--70C8CAD9B93245F6AE219E6075017CE9-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--70C8CAD9B93245F6AE219E6075017CE9-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--70C8CAD9B93245F6AE219E6075017CE9-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--70C8CAD9B93245F6AE219E6075017CE9-->  <AD_ELEMENT_ID><![CDATA[246]]></AD_ELEMENT_ID>
+<!--70C8CAD9B93245F6AE219E6075017CE9-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--70C8CAD9B93245F6AE219E6075017CE9-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--70C8CAD9B93245F6AE219E6075017CE9-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--70C8CAD9B93245F6AE219E6075017CE9-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--70C8CAD9B93245F6AE219E6075017CE9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--70C8CAD9B93245F6AE219E6075017CE9-->  <POSITION><![CDATA[6]]></POSITION>
+<!--70C8CAD9B93245F6AE219E6075017CE9-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--70C8CAD9B93245F6AE219E6075017CE9-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--70C8CAD9B93245F6AE219E6075017CE9-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--70C8CAD9B93245F6AE219E6075017CE9-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--70C8CAD9B93245F6AE219E6075017CE9-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--70C8CAD9B93245F6AE219E6075017CE9--></AD_COLUMN>
+
 <!--71C55A63912B47B29F6B532A398B166C--><AD_COLUMN>
 <!--71C55A63912B47B29F6B532A398B166C-->  <AD_COLUMN_ID><![CDATA[71C55A63912B47B29F6B532A398B166C]]></AD_COLUMN_ID>
 <!--71C55A63912B47B29F6B532A398B166C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -257171,6 +257347,42 @@
 <!--7E011D1981B2E366E040007F01013030-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--7E011D1981B2E366E040007F01013030--></AD_COLUMN>
 
+<!--7E19D5ACFC6440CF84BBC9C79FEDA10B--><AD_COLUMN>
+<!--7E19D5ACFC6440CF84BBC9C79FEDA10B-->  <AD_COLUMN_ID><![CDATA[7E19D5ACFC6440CF84BBC9C79FEDA10B]]></AD_COLUMN_ID>
+<!--7E19D5ACFC6440CF84BBC9C79FEDA10B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E19D5ACFC6440CF84BBC9C79FEDA10B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E19D5ACFC6440CF84BBC9C79FEDA10B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E19D5ACFC6440CF84BBC9C79FEDA10B-->  <NAME><![CDATA[Module]]></NAME>
+<!--7E19D5ACFC6440CF84BBC9C79FEDA10B-->  <DESCRIPTION><![CDATA[Module]]></DESCRIPTION>
+<!--7E19D5ACFC6440CF84BBC9C79FEDA10B-->  <HELP><![CDATA[Indicates the module the element forms part of.]]></HELP>
+<!--7E19D5ACFC6440CF84BBC9C79FEDA10B-->  <COLUMNNAME><![CDATA[AD_Module_ID]]></COLUMNNAME>
+<!--7E19D5ACFC6440CF84BBC9C79FEDA10B-->  <AD_TABLE_ID><![CDATA[4E9F9B0D69AC4BC2874FD2B80B948704]]></AD_TABLE_ID>
+<!--7E19D5ACFC6440CF84BBC9C79FEDA10B-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--7E19D5ACFC6440CF84BBC9C79FEDA10B-->  <AD_VAL_RULE_ID><![CDATA[C45CFD74FF5145B0A356E9233D49996F]]></AD_VAL_RULE_ID>
+<!--7E19D5ACFC6440CF84BBC9C79FEDA10B-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--7E19D5ACFC6440CF84BBC9C79FEDA10B-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7E19D5ACFC6440CF84BBC9C79FEDA10B-->  <ISPARENT><![CDATA[Y]]></ISPARENT>
+<!--7E19D5ACFC6440CF84BBC9C79FEDA10B-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--7E19D5ACFC6440CF84BBC9C79FEDA10B-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--7E19D5ACFC6440CF84BBC9C79FEDA10B-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7E19D5ACFC6440CF84BBC9C79FEDA10B-->  <SEQNO><![CDATA[90]]></SEQNO>
+<!--7E19D5ACFC6440CF84BBC9C79FEDA10B-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7E19D5ACFC6440CF84BBC9C79FEDA10B-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7E19D5ACFC6440CF84BBC9C79FEDA10B-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7E19D5ACFC6440CF84BBC9C79FEDA10B-->  <AD_ELEMENT_ID><![CDATA[565E666A619A2693E040007F01002851]]></AD_ELEMENT_ID>
+<!--7E19D5ACFC6440CF84BBC9C79FEDA10B-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7E19D5ACFC6440CF84BBC9C79FEDA10B-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7E19D5ACFC6440CF84BBC9C79FEDA10B-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7E19D5ACFC6440CF84BBC9C79FEDA10B-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7E19D5ACFC6440CF84BBC9C79FEDA10B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E19D5ACFC6440CF84BBC9C79FEDA10B-->  <POSITION><![CDATA[9]]></POSITION>
+<!--7E19D5ACFC6440CF84BBC9C79FEDA10B-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7E19D5ACFC6440CF84BBC9C79FEDA10B-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--7E19D5ACFC6440CF84BBC9C79FEDA10B-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--7E19D5ACFC6440CF84BBC9C79FEDA10B-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--7E19D5ACFC6440CF84BBC9C79FEDA10B-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--7E19D5ACFC6440CF84BBC9C79FEDA10B--></AD_COLUMN>
+
 <!--7E28A3F0EA09F997E040007F01006F15--><AD_COLUMN>
 <!--7E28A3F0EA09F997E040007F01006F15-->  <AD_COLUMN_ID><![CDATA[7E28A3F0EA09F997E040007F01006F15]]></AD_COLUMN_ID>
 <!--7E28A3F0EA09F997E040007F01006F15-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -278984,6 +279196,44 @@
 <!--A437240FB0894CFFAA0C96A925D69141-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A437240FB0894CFFAA0C96A925D69141--></AD_COLUMN>
 
+<!--A474A30DFC524BDFA5D17CE7F4D317A1--><AD_COLUMN>
+<!--A474A30DFC524BDFA5D17CE7F4D317A1-->  <AD_COLUMN_ID><![CDATA[A474A30DFC524BDFA5D17CE7F4D317A1]]></AD_COLUMN_ID>
+<!--A474A30DFC524BDFA5D17CE7F4D317A1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A474A30DFC524BDFA5D17CE7F4D317A1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A474A30DFC524BDFA5D17CE7F4D317A1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A474A30DFC524BDFA5D17CE7F4D317A1-->  <NAME><![CDATA[Active]]></NAME>
+<!--A474A30DFC524BDFA5D17CE7F4D317A1-->  <DESCRIPTION><![CDATA[A flag indicating whether this record is available for use or de-activated.]]></DESCRIPTION>
+<!--A474A30DFC524BDFA5D17CE7F4D317A1-->  <HELP><![CDATA[There are two methods of making records unavailable in the system: One is to delete the record, the other is to de-activate the record. A de-activated record is not available for selection, but available for reporting. There are two reasons for de-activating and not deleting records: 
+(1) The system requires the record for auditing purposes.
+(2) The record is referenced by other records. E.g., you cannot delete a Business Partner, if there are existing invoices for it. By de-activating the Business Partner you prevent it from being used in future transactions.]]></HELP>
+<!--A474A30DFC524BDFA5D17CE7F4D317A1-->  <COLUMNNAME><![CDATA[Isactive]]></COLUMNNAME>
+<!--A474A30DFC524BDFA5D17CE7F4D317A1-->  <AD_TABLE_ID><![CDATA[4E9F9B0D69AC4BC2874FD2B80B948704]]></AD_TABLE_ID>
+<!--A474A30DFC524BDFA5D17CE7F4D317A1-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--A474A30DFC524BDFA5D17CE7F4D317A1-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--A474A30DFC524BDFA5D17CE7F4D317A1-->  <DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE>
+<!--A474A30DFC524BDFA5D17CE7F4D317A1-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--A474A30DFC524BDFA5D17CE7F4D317A1-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--A474A30DFC524BDFA5D17CE7F4D317A1-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--A474A30DFC524BDFA5D17CE7F4D317A1-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--A474A30DFC524BDFA5D17CE7F4D317A1-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--A474A30DFC524BDFA5D17CE7F4D317A1-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--A474A30DFC524BDFA5D17CE7F4D317A1-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--A474A30DFC524BDFA5D17CE7F4D317A1-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--A474A30DFC524BDFA5D17CE7F4D317A1-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--A474A30DFC524BDFA5D17CE7F4D317A1-->  <AD_ELEMENT_ID><![CDATA[348]]></AD_ELEMENT_ID>
+<!--A474A30DFC524BDFA5D17CE7F4D317A1-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--A474A30DFC524BDFA5D17CE7F4D317A1-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--A474A30DFC524BDFA5D17CE7F4D317A1-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--A474A30DFC524BDFA5D17CE7F4D317A1-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--A474A30DFC524BDFA5D17CE7F4D317A1-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--A474A30DFC524BDFA5D17CE7F4D317A1-->  <POSITION><![CDATA[4]]></POSITION>
+<!--A474A30DFC524BDFA5D17CE7F4D317A1-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--A474A30DFC524BDFA5D17CE7F4D317A1-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--A474A30DFC524BDFA5D17CE7F4D317A1-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--A474A30DFC524BDFA5D17CE7F4D317A1-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--A474A30DFC524BDFA5D17CE7F4D317A1-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--A474A30DFC524BDFA5D17CE7F4D317A1--></AD_COLUMN>
+
 <!--A581C9F44F0B4A51963ACFEC7EECA642--><AD_COLUMN>
 <!--A581C9F44F0B4A51963ACFEC7EECA642-->  <AD_COLUMN_ID><![CDATA[A581C9F44F0B4A51963ACFEC7EECA642]]></AD_COLUMN_ID>
 <!--A581C9F44F0B4A51963ACFEC7EECA642-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -282785,6 +283035,41 @@
 <!--B059FE65C36A128FE040007F0100785F-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--B059FE65C36A128FE040007F0100785F--></AD_COLUMN>
 
+<!--B0718076FC0140809F31330F12ED1A49--><AD_COLUMN>
+<!--B0718076FC0140809F31330F12ED1A49-->  <AD_COLUMN_ID><![CDATA[B0718076FC0140809F31330F12ED1A49]]></AD_COLUMN_ID>
+<!--B0718076FC0140809F31330F12ED1A49-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B0718076FC0140809F31330F12ED1A49-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B0718076FC0140809F31330F12ED1A49-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B0718076FC0140809F31330F12ED1A49-->  <NAME><![CDATA[Description]]></NAME>
+<!--B0718076FC0140809F31330F12ED1A49-->  <DESCRIPTION><![CDATA[A space to write additional related information.]]></DESCRIPTION>
+<!--B0718076FC0140809F31330F12ED1A49-->  <HELP><![CDATA[A description is limited to 255 characters.]]></HELP>
+<!--B0718076FC0140809F31330F12ED1A49-->  <COLUMNNAME><![CDATA[Description]]></COLUMNNAME>
+<!--B0718076FC0140809F31330F12ED1A49-->  <AD_TABLE_ID><![CDATA[4E9F9B0D69AC4BC2874FD2B80B948704]]></AD_TABLE_ID>
+<!--B0718076FC0140809F31330F12ED1A49-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--B0718076FC0140809F31330F12ED1A49-->  <FIELDLENGTH><![CDATA[255]]></FIELDLENGTH>
+<!--B0718076FC0140809F31330F12ED1A49-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--B0718076FC0140809F31330F12ED1A49-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--B0718076FC0140809F31330F12ED1A49-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--B0718076FC0140809F31330F12ED1A49-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--B0718076FC0140809F31330F12ED1A49-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--B0718076FC0140809F31330F12ED1A49-->  <SEQNO><![CDATA[120]]></SEQNO>
+<!--B0718076FC0140809F31330F12ED1A49-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--B0718076FC0140809F31330F12ED1A49-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--B0718076FC0140809F31330F12ED1A49-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--B0718076FC0140809F31330F12ED1A49-->  <AD_ELEMENT_ID><![CDATA[275]]></AD_ELEMENT_ID>
+<!--B0718076FC0140809F31330F12ED1A49-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--B0718076FC0140809F31330F12ED1A49-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--B0718076FC0140809F31330F12ED1A49-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--B0718076FC0140809F31330F12ED1A49-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--B0718076FC0140809F31330F12ED1A49-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--B0718076FC0140809F31330F12ED1A49-->  <POSITION><![CDATA[12]]></POSITION>
+<!--B0718076FC0140809F31330F12ED1A49-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--B0718076FC0140809F31330F12ED1A49-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--B0718076FC0140809F31330F12ED1A49-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--B0718076FC0140809F31330F12ED1A49-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--B0718076FC0140809F31330F12ED1A49-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--B0718076FC0140809F31330F12ED1A49--></AD_COLUMN>
+
 <!--B0766D6D0B7C4542B13135435CFB8AD5--><AD_COLUMN>
 <!--B0766D6D0B7C4542B13135435CFB8AD5-->  <AD_COLUMN_ID><![CDATA[B0766D6D0B7C4542B13135435CFB8AD5]]></AD_COLUMN_ID>
 <!--B0766D6D0B7C4542B13135435CFB8AD5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -288909,10 +289194,9 @@
 <!--C2B3550416934E0997553A95F75C543C-->  <NAME><![CDATA[Discount Type]]></NAME>
 <!--C2B3550416934E0997553A95F75C543C-->  <DESCRIPTION><![CDATA[Discount Type to determine the rules the discount is based on]]></DESCRIPTION>
 <!--C2B3550416934E0997553A95F75C543C-->  <HELP><![CDATA[Different discount types define different rules to apply discounts and promotions. External modules can provide new types.]]></HELP>
-<!--C2B3550416934E0997553A95F75C543C-->  <COLUMNNAME><![CDATA[Discount_Type]]></COLUMNNAME>
+<!--C2B3550416934E0997553A95F75C543C-->  <COLUMNNAME><![CDATA[M_Offer_Type_ID]]></COLUMNNAME>
 <!--C2B3550416934E0997553A95F75C543C-->  <AD_TABLE_ID><![CDATA[800062]]></AD_TABLE_ID>
-<!--C2B3550416934E0997553A95F75C543C-->  <AD_REFERENCE_ID><![CDATA[17]]></AD_REFERENCE_ID>
-<!--C2B3550416934E0997553A95F75C543C-->  <AD_REFERENCE_VALUE_ID><![CDATA[01DA733A1705432C95B71F980E1190DB]]></AD_REFERENCE_VALUE_ID>
+<!--C2B3550416934E0997553A95F75C543C-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
 <!--C2B3550416934E0997553A95F75C543C-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
 <!--C2B3550416934E0997553A95F75C543C-->  <DEFAULTVALUE><![CDATA[ADJUSTMENT]]></DEFAULTVALUE>
 <!--C2B3550416934E0997553A95F75C543C-->  <ISKEY><![CDATA[N]]></ISKEY>
@@ -288924,7 +289208,7 @@
 <!--C2B3550416934E0997553A95F75C543C-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--C2B3550416934E0997553A95F75C543C-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--C2B3550416934E0997553A95F75C543C-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--C2B3550416934E0997553A95F75C543C-->  <AD_ELEMENT_ID><![CDATA[986276AC7A70401F9FE704D03C995B32]]></AD_ELEMENT_ID>
+<!--C2B3550416934E0997553A95F75C543C-->  <AD_ELEMENT_ID><![CDATA[B02C0C3B0972423D91DA3661B369F3E7]]></AD_ELEMENT_ID>
 <!--C2B3550416934E0997553A95F75C543C-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
 <!--C2B3550416934E0997553A95F75C543C-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--C2B3550416934E0997553A95F75C543C-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
@@ -290044,6 +290328,42 @@
 <!--CA49F473D15C4B778B338AE9ECB5DEA7-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--CA49F473D15C4B778B338AE9ECB5DEA7--></AD_COLUMN>
 
+<!--CA58212DB9A046B0B641FB6AE8C4D90D--><AD_COLUMN>
+<!--CA58212DB9A046B0B641FB6AE8C4D90D-->  <AD_COLUMN_ID><![CDATA[CA58212DB9A046B0B641FB6AE8C4D90D]]></AD_COLUMN_ID>
+<!--CA58212DB9A046B0B641FB6AE8C4D90D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--CA58212DB9A046B0B641FB6AE8C4D90D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--CA58212DB9A046B0B641FB6AE8C4D90D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--CA58212DB9A046B0B641FB6AE8C4D90D-->  <NAME><![CDATA[Creation Date]]></NAME>
+<!--CA58212DB9A046B0B641FB6AE8C4D90D-->  <DESCRIPTION><![CDATA[The date that this record is completed.]]></DESCRIPTION>
+<!--CA58212DB9A046B0B641FB6AE8C4D90D-->  <HELP><![CDATA[The Created field indicates the date that this record was created.]]></HELP>
+<!--CA58212DB9A046B0B641FB6AE8C4D90D-->  <COLUMNNAME><![CDATA[Created]]></COLUMNNAME>
+<!--CA58212DB9A046B0B641FB6AE8C4D90D-->  <AD_TABLE_ID><![CDATA[4E9F9B0D69AC4BC2874FD2B80B948704]]></AD_TABLE_ID>
+<!--CA58212DB9A046B0B641FB6AE8C4D90D-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
+<!--CA58212DB9A046B0B641FB6AE8C4D90D-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--CA58212DB9A046B0B641FB6AE8C4D90D-->  <DEFAULTVALUE><![CDATA[@#Date@]]></DEFAULTVALUE>
+<!--CA58212DB9A046B0B641FB6AE8C4D90D-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--CA58212DB9A046B0B641FB6AE8C4D90D-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--CA58212DB9A046B0B641FB6AE8C4D90D-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--CA58212DB9A046B0B641FB6AE8C4D90D-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--CA58212DB9A046B0B641FB6AE8C4D90D-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--CA58212DB9A046B0B641FB6AE8C4D90D-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--CA58212DB9A046B0B641FB6AE8C4D90D-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--CA58212DB9A046B0B641FB6AE8C4D90D-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--CA58212DB9A046B0B641FB6AE8C4D90D-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--CA58212DB9A046B0B641FB6AE8C4D90D-->  <AD_ELEMENT_ID><![CDATA[245]]></AD_ELEMENT_ID>
+<!--CA58212DB9A046B0B641FB6AE8C4D90D-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--CA58212DB9A046B0B641FB6AE8C4D90D-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--CA58212DB9A046B0B641FB6AE8C4D90D-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--CA58212DB9A046B0B641FB6AE8C4D90D-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--CA58212DB9A046B0B641FB6AE8C4D90D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--CA58212DB9A046B0B641FB6AE8C4D90D-->  <POSITION><![CDATA[5]]></POSITION>
+<!--CA58212DB9A046B0B641FB6AE8C4D90D-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--CA58212DB9A046B0B641FB6AE8C4D90D-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--CA58212DB9A046B0B641FB6AE8C4D90D-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--CA58212DB9A046B0B641FB6AE8C4D90D-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--CA58212DB9A046B0B641FB6AE8C4D90D-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--CA58212DB9A046B0B641FB6AE8C4D90D--></AD_COLUMN>
+
 <!--CA831A159AAC4A729AE8BF7F5C8206AF--><AD_COLUMN>
 <!--CA831A159AAC4A729AE8BF7F5C8206AF-->  <AD_COLUMN_ID><![CDATA[CA831A159AAC4A729AE8BF7F5C8206AF]]></AD_COLUMN_ID>
 <!--CA831A159AAC4A729AE8BF7F5C8206AF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -290953,6 +291273,40 @@
 <!--D651E163B279486F8F399DC05B63D426-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--D651E163B279486F8F399DC05B63D426--></AD_COLUMN>
 
+<!--D78D221F30EF470BAC7C194A2CA6FA59--><AD_COLUMN>
+<!--D78D221F30EF470BAC7C194A2CA6FA59-->  <AD_COLUMN_ID><![CDATA[D78D221F30EF470BAC7C194A2CA6FA59]]></AD_COLUMN_ID>
+<!--D78D221F30EF470BAC7C194A2CA6FA59-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D78D221F30EF470BAC7C194A2CA6FA59-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D78D221F30EF470BAC7C194A2CA6FA59-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D78D221F30EF470BAC7C194A2CA6FA59-->  <NAME><![CDATA[Order PL/SQL Implementor]]></NAME>
+<!--D78D221F30EF470BAC7C194A2CA6FA59-->  <HELP><![CDATA[PL/SQL function that implements the logic for this kind of rule. This function will be invoked when applying the rule for an order line.]]></HELP>
+<!--D78D221F30EF470BAC7C194A2CA6FA59-->  <COLUMNNAME><![CDATA[PL_Order_Implementor]]></COLUMNNAME>
+<!--D78D221F30EF470BAC7C194A2CA6FA59-->  <AD_TABLE_ID><![CDATA[4E9F9B0D69AC4BC2874FD2B80B948704]]></AD_TABLE_ID>
+<!--D78D221F30EF470BAC7C194A2CA6FA59-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--D78D221F30EF470BAC7C194A2CA6FA59-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--D78D221F30EF470BAC7C194A2CA6FA59-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--D78D221F30EF470BAC7C194A2CA6FA59-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--D78D221F30EF470BAC7C194A2CA6FA59-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--D78D221F30EF470BAC7C194A2CA6FA59-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--D78D221F30EF470BAC7C194A2CA6FA59-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--D78D221F30EF470BAC7C194A2CA6FA59-->  <SEQNO><![CDATA[130]]></SEQNO>
+<!--D78D221F30EF470BAC7C194A2CA6FA59-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--D78D221F30EF470BAC7C194A2CA6FA59-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--D78D221F30EF470BAC7C194A2CA6FA59-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--D78D221F30EF470BAC7C194A2CA6FA59-->  <AD_ELEMENT_ID><![CDATA[E8AC05B29AAF4C439C8CD5413613C136]]></AD_ELEMENT_ID>
+<!--D78D221F30EF470BAC7C194A2CA6FA59-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--D78D221F30EF470BAC7C194A2CA6FA59-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--D78D221F30EF470BAC7C194A2CA6FA59-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--D78D221F30EF470BAC7C194A2CA6FA59-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--D78D221F30EF470BAC7C194A2CA6FA59-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D78D221F30EF470BAC7C194A2CA6FA59-->  <POSITION><![CDATA[13]]></POSITION>
+<!--D78D221F30EF470BAC7C194A2CA6FA59-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--D78D221F30EF470BAC7C194A2CA6FA59-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--D78D221F30EF470BAC7C194A2CA6FA59-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--D78D221F30EF470BAC7C194A2CA6FA59-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--D78D221F30EF470BAC7C194A2CA6FA59-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--D78D221F30EF470BAC7C194A2CA6FA59--></AD_COLUMN>
+
 <!--D7915EA89A2941A39C8D2570B0F56FC4--><AD_COLUMN>
 <!--D7915EA89A2941A39C8D2570B0F56FC4-->  <AD_COLUMN_ID><![CDATA[D7915EA89A2941A39C8D2570B0F56FC4]]></AD_COLUMN_ID>
 <!--D7915EA89A2941A39C8D2570B0F56FC4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -292434,6 +292788,42 @@
 <!--E83170858DE8441C94B64CDA46BC91FF-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--E83170858DE8441C94B64CDA46BC91FF--></AD_COLUMN>
 
+<!--E84331AB8307479C87F6C369887D8867--><AD_COLUMN>
+<!--E84331AB8307479C87F6C369887D8867-->  <AD_COLUMN_ID><![CDATA[E84331AB8307479C87F6C369887D8867]]></AD_COLUMN_ID>
+<!--E84331AB8307479C87F6C369887D8867-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E84331AB8307479C87F6C369887D8867-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E84331AB8307479C87F6C369887D8867-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E84331AB8307479C87F6C369887D8867-->  <NAME><![CDATA[Organization]]></NAME>
+<!--E84331AB8307479C87F6C369887D8867-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
+<!--E84331AB8307479C87F6C369887D8867-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
+<!--E84331AB8307479C87F6C369887D8867-->  <COLUMNNAME><![CDATA[AD_Org_ID]]></COLUMNNAME>
+<!--E84331AB8307479C87F6C369887D8867-->  <AD_TABLE_ID><![CDATA[4E9F9B0D69AC4BC2874FD2B80B948704]]></AD_TABLE_ID>
+<!--E84331AB8307479C87F6C369887D8867-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--E84331AB8307479C87F6C369887D8867-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--E84331AB8307479C87F6C369887D8867-->  <DEFAULTVALUE><![CDATA[@AD_ORG_ID@]]></DEFAULTVALUE>
+<!--E84331AB8307479C87F6C369887D8867-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--E84331AB8307479C87F6C369887D8867-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--E84331AB8307479C87F6C369887D8867-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--E84331AB8307479C87F6C369887D8867-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--E84331AB8307479C87F6C369887D8867-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--E84331AB8307479C87F6C369887D8867-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--E84331AB8307479C87F6C369887D8867-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--E84331AB8307479C87F6C369887D8867-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--E84331AB8307479C87F6C369887D8867-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--E84331AB8307479C87F6C369887D8867-->  <AD_ELEMENT_ID><![CDATA[113]]></AD_ELEMENT_ID>
+<!--E84331AB8307479C87F6C369887D8867-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--E84331AB8307479C87F6C369887D8867-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--E84331AB8307479C87F6C369887D8867-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--E84331AB8307479C87F6C369887D8867-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--E84331AB8307479C87F6C369887D8867-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--E84331AB8307479C87F6C369887D8867-->  <POSITION><![CDATA[3]]></POSITION>
+<!--E84331AB8307479C87F6C369887D8867-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--E84331AB8307479C87F6C369887D8867-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--E84331AB8307479C87F6C369887D8867-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--E84331AB8307479C87F6C369887D8867-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--E84331AB8307479C87F6C369887D8867-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--E84331AB8307479C87F6C369887D8867--></AD_COLUMN>
+
 <!--E94E132EFCCC422CA9DB4E98BB648E92--><AD_COLUMN>
 <!--E94E132EFCCC422CA9DB4E98BB648E92-->  <AD_COLUMN_ID><![CDATA[E94E132EFCCC422CA9DB4E98BB648E92]]></AD_COLUMN_ID>
 <!--E94E132EFCCC422CA9DB4E98BB648E92-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -293723,6 +294113,41 @@
 <!--F7178AA9B020433FABEDAAD065CFEA4E-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--F7178AA9B020433FABEDAAD065CFEA4E--></AD_COLUMN>
 
+<!--F755E1C257E040D3880FA7398612B26D--><AD_COLUMN>
+<!--F755E1C257E040D3880FA7398612B26D-->  <AD_COLUMN_ID><![CDATA[F755E1C257E040D3880FA7398612B26D]]></AD_COLUMN_ID>
+<!--F755E1C257E040D3880FA7398612B26D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F755E1C257E040D3880FA7398612B26D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F755E1C257E040D3880FA7398612B26D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F755E1C257E040D3880FA7398612B26D-->  <NAME><![CDATA[Commercial Name]]></NAME>
+<!--F755E1C257E040D3880FA7398612B26D-->  <DESCRIPTION><![CDATA[Commercial Name of the Business Partner]]></DESCRIPTION>
+<!--F755E1C257E040D3880FA7398612B26D-->  <HELP><![CDATA[Commercial Name of the Business Partner]]></HELP>
+<!--F755E1C257E040D3880FA7398612B26D-->  <COLUMNNAME><![CDATA[Name]]></COLUMNNAME>
+<!--F755E1C257E040D3880FA7398612B26D-->  <AD_TABLE_ID><![CDATA[4E9F9B0D69AC4BC2874FD2B80B948704]]></AD_TABLE_ID>
+<!--F755E1C257E040D3880FA7398612B26D-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--F755E1C257E040D3880FA7398612B26D-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--F755E1C257E040D3880FA7398612B26D-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--F755E1C257E040D3880FA7398612B26D-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--F755E1C257E040D3880FA7398612B26D-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--F755E1C257E040D3880FA7398612B26D-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--F755E1C257E040D3880FA7398612B26D-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
+<!--F755E1C257E040D3880FA7398612B26D-->  <SEQNO><![CDATA[110]]></SEQNO>
+<!--F755E1C257E040D3880FA7398612B26D-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--F755E1C257E040D3880FA7398612B26D-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--F755E1C257E040D3880FA7398612B26D-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--F755E1C257E040D3880FA7398612B26D-->  <AD_ELEMENT_ID><![CDATA[91534ABABD064DF8A702EE18DEE8F998]]></AD_ELEMENT_ID>
+<!--F755E1C257E040D3880FA7398612B26D-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--F755E1C257E040D3880FA7398612B26D-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--F755E1C257E040D3880FA7398612B26D-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--F755E1C257E040D3880FA7398612B26D-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--F755E1C257E040D3880FA7398612B26D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--F755E1C257E040D3880FA7398612B26D-->  <POSITION><![CDATA[11]]></POSITION>
+<!--F755E1C257E040D3880FA7398612B26D-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--F755E1C257E040D3880FA7398612B26D-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--F755E1C257E040D3880FA7398612B26D-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--F755E1C257E040D3880FA7398612B26D-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--F755E1C257E040D3880FA7398612B26D-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--F755E1C257E040D3880FA7398612B26D--></AD_COLUMN>
+
 <!--F7C3EA8A7200421F931929BDFA6441E6--><AD_COLUMN>
 <!--F7C3EA8A7200421F931929BDFA6441E6-->  <AD_COLUMN_ID><![CDATA[F7C3EA8A7200421F931929BDFA6441E6]]></AD_COLUMN_ID>
 <!--F7C3EA8A7200421F931929BDFA6441E6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_DATASET_TABLE.xml	Wed Oct 03 16:22:42 2012 +0200
+++ b/src-db/database/sourcedata/AD_DATASET_TABLE.xml	Fri Oct 05 11:41:53 2012 +0200
@@ -1035,6 +1035,20 @@
 <!--758FDFF7061C4C64B171AD3525246031-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--758FDFF7061C4C64B171AD3525246031--></AD_DATASET_TABLE>
 
+<!--76B32D8BF98A4068A7F2B90FEABB46DC--><AD_DATASET_TABLE>
+<!--76B32D8BF98A4068A7F2B90FEABB46DC-->  <AD_DATASET_TABLE_ID><![CDATA[76B32D8BF98A4068A7F2B90FEABB46DC]]></AD_DATASET_TABLE_ID>
+<!--76B32D8BF98A4068A7F2B90FEABB46DC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--76B32D8BF98A4068A7F2B90FEABB46DC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--76B32D8BF98A4068A7F2B90FEABB46DC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--76B32D8BF98A4068A7F2B90FEABB46DC-->  <AD_DATASET_ID><![CDATA[0]]></AD_DATASET_ID>
+<!--76B32D8BF98A4068A7F2B90FEABB46DC-->  <AD_TABLE_ID><![CDATA[4E9F9B0D69AC4BC2874FD2B80B948704]]></AD_TABLE_ID>
+<!--76B32D8BF98A4068A7F2B90FEABB46DC-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
+<!--76B32D8BF98A4068A7F2B90FEABB46DC-->  <WHERECLAUSE><![CDATA[ad_module_id in (:moduleid)]]></WHERECLAUSE>
+<!--76B32D8BF98A4068A7F2B90FEABB46DC-->  <EXCLUDEAUDITINFO><![CDATA[N]]></EXCLUDEAUDITINFO>
+<!--76B32D8BF98A4068A7F2B90FEABB46DC-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
+<!--76B32D8BF98A4068A7F2B90FEABB46DC-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--76B32D8BF98A4068A7F2B90FEABB46DC--></AD_DATASET_TABLE>
+
 <!--7769D3EF15F249ABB74BF3368622448B--><AD_DATASET_TABLE>
 <!--7769D3EF15F249ABB74BF3368622448B-->  <AD_DATASET_TABLE_ID><![CDATA[7769D3EF15F249ABB74BF3368622448B]]></AD_DATASET_TABLE_ID>
 <!--7769D3EF15F249ABB74BF3368622448B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_ELEMENT.xml	Wed Oct 03 16:22:42 2012 +0200
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml	Fri Oct 05 11:41:53 2012 +0200
@@ -27493,20 +27493,6 @@
 <!--951BDF474AC441B19A2DD03DDD455C7B-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--951BDF474AC441B19A2DD03DDD455C7B--></AD_ELEMENT>
 
-<!--986276AC7A70401F9FE704D03C995B32--><AD_ELEMENT>
-<!--986276AC7A70401F9FE704D03C995B32-->  <AD_ELEMENT_ID><![CDATA[986276AC7A70401F9FE704D03C995B32]]></AD_ELEMENT_ID>
-<!--986276AC7A70401F9FE704D03C995B32-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--986276AC7A70401F9FE704D03C995B32-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--986276AC7A70401F9FE704D03C995B32-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--986276AC7A70401F9FE704D03C995B32-->  <COLUMNNAME><![CDATA[Discount_Type]]></COLUMNNAME>
-<!--986276AC7A70401F9FE704D03C995B32-->  <NAME><![CDATA[Discount Type]]></NAME>
-<!--986276AC7A70401F9FE704D03C995B32-->  <PRINTNAME><![CDATA[Discount Type]]></PRINTNAME>
-<!--986276AC7A70401F9FE704D03C995B32-->  <DESCRIPTION><![CDATA[Discount Type to determine the rules the discount is based on]]></DESCRIPTION>
-<!--986276AC7A70401F9FE704D03C995B32-->  <HELP><![CDATA[Different discount types define different rules to apply discounts and promotions. External modules can provide new types.]]></HELP>
-<!--986276AC7A70401F9FE704D03C995B32-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--986276AC7A70401F9FE704D03C995B32-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
-<!--986276AC7A70401F9FE704D03C995B32--></AD_ELEMENT>
-
 <!--9910D5BD35894A8FBBB365FB9239B711--><AD_ELEMENT>
 <!--9910D5BD35894A8FBBB365FB9239B711-->  <AD_ELEMENT_ID><![CDATA[9910D5BD35894A8FBBB365FB9239B711]]></AD_ELEMENT_ID>
 <!--9910D5BD35894A8FBBB365FB9239B711-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -27987,6 +27973,20 @@
 <!--AF7A8ABE9B6711DDA4130016D4C601F7-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--AF7A8ABE9B6711DDA4130016D4C601F7--></AD_ELEMENT>
 
+<!--B02C0C3B0972423D91DA3661B369F3E7--><AD_ELEMENT>
+<!--B02C0C3B0972423D91DA3661B369F3E7-->  <AD_ELEMENT_ID><![CDATA[B02C0C3B0972423D91DA3661B369F3E7]]></AD_ELEMENT_ID>
+<!--B02C0C3B0972423D91DA3661B369F3E7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B02C0C3B0972423D91DA3661B369F3E7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B02C0C3B0972423D91DA3661B369F3E7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B02C0C3B0972423D91DA3661B369F3E7-->  <COLUMNNAME><![CDATA[M_Offer_Type]]></COLUMNNAME>
+<!--B02C0C3B0972423D91DA3661B369F3E7-->  <NAME><![CDATA[Discount Type]]></NAME>
+<!--B02C0C3B0972423D91DA3661B369F3E7-->  <PRINTNAME><![CDATA[Discount Type]]></PRINTNAME>
+<!--B02C0C3B0972423D91DA3661B369F3E7-->  <DESCRIPTION><![CDATA[Discount Type to determine the rules the discount is based on]]></DESCRIPTION>
+<!--B02C0C3B0972423D91DA3661B369F3E7-->  <HELP><![CDATA[Different discount types define different rules to apply discounts and promotions. External modules can provide new types.]]></HELP>
+<!--B02C0C3B0972423D91DA3661B369F3E7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--B02C0C3B0972423D91DA3661B369F3E7-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--B02C0C3B0972423D91DA3661B369F3E7--></AD_ELEMENT>
+
 <!--B04AF439C0EBCC90E040007F010032CD--><AD_ELEMENT>
 <!--B04AF439C0EBCC90E040007F010032CD-->  <AD_ELEMENT_ID><![CDATA[B04AF439C0EBCC90E040007F010032CD]]></AD_ELEMENT_ID>
 <!--B04AF439C0EBCC90E040007F010032CD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -28678,18 +28678,6 @@
 <!--C0FEDDACE59D4AA59AFB2D1D65D748E0-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--C0FEDDACE59D4AA59AFB2D1D65D748E0--></AD_ELEMENT>
 
-<!--C24AEC9F726C4311AFE6D7473CACDDC9--><AD_ELEMENT>
-<!--C24AEC9F726C4311AFE6D7473CACDDC9-->  <AD_ELEMENT_ID><![CDATA[C24AEC9F726C4311AFE6D7473CACDDC9]]></AD_ELEMENT_ID>
-<!--C24AEC9F726C4311AFE6D7473CACDDC9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--C24AEC9F726C4311AFE6D7473CACDDC9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--C24AEC9F726C4311AFE6D7473CACDDC9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--C24AEC9F726C4311AFE6D7473CACDDC9-->  <COLUMNNAME><![CDATA[Discount_Type]]></COLUMNNAME>
-<!--C24AEC9F726C4311AFE6D7473CACDDC9-->  <NAME><![CDATA[Discount_Type]]></NAME>
-<!--C24AEC9F726C4311AFE6D7473CACDDC9-->  <PRINTNAME><![CDATA[Discount_Type]]></PRINTNAME>
-<!--C24AEC9F726C4311AFE6D7473CACDDC9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--C24AEC9F726C4311AFE6D7473CACDDC9-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
-<!--C24AEC9F726C4311AFE6D7473CACDDC9--></AD_ELEMENT>
-
 <!--C2FE8DEF5C13482F8758744125B6251E--><AD_ELEMENT>
 <!--C2FE8DEF5C13482F8758744125B6251E-->  <AD_ELEMENT_ID><![CDATA[C2FE8DEF5C13482F8758744125B6251E]]></AD_ELEMENT_ID>
 <!--C2FE8DEF5C13482F8758744125B6251E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -29330,6 +29318,19 @@
 <!--E89D147962E04590B41F406D9AEF4C8E-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--E89D147962E04590B41F406D9AEF4C8E--></AD_ELEMENT>
 
+<!--E8AC05B29AAF4C439C8CD5413613C136--><AD_ELEMENT>
+<!--E8AC05B29AAF4C439C8CD5413613C136-->  <AD_ELEMENT_ID><![CDATA[E8AC05B29AAF4C439C8CD5413613C136]]></AD_ELEMENT_ID>
+<!--E8AC05B29AAF4C439C8CD5413613C136-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E8AC05B29AAF4C439C8CD5413613C136-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E8AC05B29AAF4C439C8CD5413613C136-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E8AC05B29AAF4C439C8CD5413613C136-->  <COLUMNNAME><![CDATA[PL_Order_Implementor]]></COLUMNNAME>
+<!--E8AC05B29AAF4C439C8CD5413613C136-->  <NAME><![CDATA[Order PL/SQL Implementor]]></NAME>
+<!--E8AC05B29AAF4C439C8CD5413613C136-->  <PRINTNAME><![CDATA[Order PL/SQL Implementor]]></PRINTNAME>
+<!--E8AC05B29AAF4C439C8CD5413613C136-->  <HELP><![CDATA[PL/SQL function that implements the logic for this kind of rule. This function will be invoked when applying the rule for an order line.]]></HELP>
+<!--E8AC05B29AAF4C439C8CD5413613C136-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--E8AC05B29AAF4C439C8CD5413613C136-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--E8AC05B29AAF4C439C8CD5413613C136--></AD_ELEMENT>
+
 <!--EB58AFE2D52942FEA4B7DA407282DC1D--><AD_ELEMENT>
 <!--EB58AFE2D52942FEA4B7DA407282DC1D-->  <AD_ELEMENT_ID><![CDATA[EB58AFE2D52942FEA4B7DA407282DC1D]]></AD_ELEMENT_ID>
 <!--EB58AFE2D52942FEA4B7DA407282DC1D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -29384,6 +29385,19 @@
 <!--EFEA4EEE05CD434DB4B4363C8B498DF6-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--EFEA4EEE05CD434DB4B4363C8B498DF6--></AD_ELEMENT>
 
+<!--F1852A15D8FD45F9B9A54962B40E1E43--><AD_ELEMENT>
+<!--F1852A15D8FD45F9B9A54962B40E1E43-->  <AD_ELEMENT_ID><![CDATA[F1852A15D8FD45F9B9A54962B40E1E43]]></AD_ELEMENT_ID>
+<!--F1852A15D8FD45F9B9A54962B40E1E43-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F1852A15D8FD45F9B9A54962B40E1E43-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F1852A15D8FD45F9B9A54962B40E1E43-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F1852A15D8FD45F9B9A54962B40E1E43-->  <COLUMNNAME><![CDATA[M_Offer_Type_ID]]></COLUMNNAME>
+<!--F1852A15D8FD45F9B9A54962B40E1E43-->  <NAME><![CDATA[Promotion Type]]></NAME>
+<!--F1852A15D8FD45F9B9A54962B40E1E43-->  <PRINTNAME><![CDATA[Promotion Type]]></PRINTNAME>
+<!--F1852A15D8FD45F9B9A54962B40E1E43-->  <HELP><![CDATA[Promotions and discounts functionality allows to apply different rules to order/invoice lines to adjust pricing. A type is each of these kinds of rules.]]></HELP>
+<!--F1852A15D8FD45F9B9A54962B40E1E43-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--F1852A15D8FD45F9B9A54962B40E1E43-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--F1852A15D8FD45F9B9A54962B40E1E43--></AD_ELEMENT>
+
 <!--F197B6D6CCCE4C2F8EB42C34B560428E--><AD_ELEMENT>
 <!--F197B6D6CCCE4C2F8EB42C34B560428E-->  <AD_ELEMENT_ID><![CDATA[F197B6D6CCCE4C2F8EB42C34B560428E]]></AD_ELEMENT_ID>
 <!--F197B6D6CCCE4C2F8EB42C34B560428E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_FIELD.xml	Wed Oct 03 16:22:42 2012 +0200
+++ b/src-db/database/sourcedata/AD_FIELD.xml	Fri Oct 05 11:41:53 2012 +0200
@@ -184182,6 +184182,34 @@
 <!--5056DBAF06014411BBDE8DB8D3070651-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--5056DBAF06014411BBDE8DB8D3070651--></AD_FIELD>
 
+<!--506A870502FB4C73B377A2D1F72E0E41--><AD_FIELD>
+<!--506A870502FB4C73B377A2D1F72E0E41-->  <AD_FIELD_ID><![CDATA[506A870502FB4C73B377A2D1F72E0E41]]></AD_FIELD_ID>
+<!--506A870502FB4C73B377A2D1F72E0E41-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--506A870502FB4C73B377A2D1F72E0E41-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--506A870502FB4C73B377A2D1F72E0E41-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--506A870502FB4C73B377A2D1F72E0E41-->  <NAME><![CDATA[Module]]></NAME>
+<!--506A870502FB4C73B377A2D1F72E0E41-->  <DESCRIPTION><![CDATA[Module]]></DESCRIPTION>
+<!--506A870502FB4C73B377A2D1F72E0E41-->  <HELP><![CDATA[Indicates the module the element forms part of.]]></HELP>
+<!--506A870502FB4C73B377A2D1F72E0E41-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--506A870502FB4C73B377A2D1F72E0E41-->  <AD_TAB_ID><![CDATA[79C291C04E5C48B2BB3A4779E44C1291]]></AD_TAB_ID>
+<!--506A870502FB4C73B377A2D1F72E0E41-->  <AD_COLUMN_ID><![CDATA[7E19D5ACFC6440CF84BBC9C79FEDA10B]]></AD_COLUMN_ID>
+<!--506A870502FB4C73B377A2D1F72E0E41-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--506A870502FB4C73B377A2D1F72E0E41-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--506A870502FB4C73B377A2D1F72E0E41-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--506A870502FB4C73B377A2D1F72E0E41-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--506A870502FB4C73B377A2D1F72E0E41-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--506A870502FB4C73B377A2D1F72E0E41-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--506A870502FB4C73B377A2D1F72E0E41-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--506A870502FB4C73B377A2D1F72E0E41-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--506A870502FB4C73B377A2D1F72E0E41-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--506A870502FB4C73B377A2D1F72E0E41-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--506A870502FB4C73B377A2D1F72E0E41-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--506A870502FB4C73B377A2D1F72E0E41-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--506A870502FB4C73B377A2D1F72E0E41-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--506A870502FB4C73B377A2D1F72E0E41-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--506A870502FB4C73B377A2D1F72E0E41-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--506A870502FB4C73B377A2D1F72E0E41--></AD_FIELD>
+
 <!--50D9B08EA13C4546BC86338AC576FC1F--><AD_FIELD>
 <!--50D9B08EA13C4546BC86338AC576FC1F-->  <AD_FIELD_ID><![CDATA[50D9B08EA13C4546BC86338AC576FC1F]]></AD_FIELD_ID>
 <!--50D9B08EA13C4546BC86338AC576FC1F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -186037,6 +186065,33 @@
 <!--528A51F4048E44A8873FD1BF4BC6C5A9-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--528A51F4048E44A8873FD1BF4BC6C5A9--></AD_FIELD>
 
+<!--52A0CCB65ABA4BA8A124342806100C46--><AD_FIELD>
+<!--52A0CCB65ABA4BA8A124342806100C46-->  <AD_FIELD_ID><![CDATA[52A0CCB65ABA4BA8A124342806100C46]]></AD_FIELD_ID>
+<!--52A0CCB65ABA4BA8A124342806100C46-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--52A0CCB65ABA4BA8A124342806100C46-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--52A0CCB65ABA4BA8A124342806100C46-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--52A0CCB65ABA4BA8A124342806100C46-->  <NAME><![CDATA[Order PL/SQL Implementor]]></NAME>
+<!--52A0CCB65ABA4BA8A124342806100C46-->  <HELP><![CDATA[PL/SQL function that implements the logic for this kind of rule. This function will be invoked when applying the rule for an order line.]]></HELP>
+<!--52A0CCB65ABA4BA8A124342806100C46-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--52A0CCB65ABA4BA8A124342806100C46-->  <AD_TAB_ID><![CDATA[79C291C04E5C48B2BB3A4779E44C1291]]></AD_TAB_ID>
+<!--52A0CCB65ABA4BA8A124342806100C46-->  <AD_COLUMN_ID><![CDATA[D78D221F30EF470BAC7C194A2CA6FA59]]></AD_COLUMN_ID>
+<!--52A0CCB65ABA4BA8A124342806100C46-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--52A0CCB65ABA4BA8A124342806100C46-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--52A0CCB65ABA4BA8A124342806100C46-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
+<!--52A0CCB65ABA4BA8A124342806100C46-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--52A0CCB65ABA4BA8A124342806100C46-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--52A0CCB65ABA4BA8A124342806100C46-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--52A0CCB65ABA4BA8A124342806100C46-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--52A0CCB65ABA4BA8A124342806100C46-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--52A0CCB65ABA4BA8A124342806100C46-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--52A0CCB65ABA4BA8A124342806100C46-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--52A0CCB65ABA4BA8A124342806100C46-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--52A0CCB65ABA4BA8A124342806100C46-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--52A0CCB65ABA4BA8A124342806100C46-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--52A0CCB65ABA4BA8A124342806100C46-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--52A0CCB65ABA4BA8A124342806100C46-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--52A0CCB65ABA4BA8A124342806100C46--></AD_FIELD>
+
 <!--52A824B46A194D0B88F92D3DC34B5FF8--><AD_FIELD>
 <!--52A824B46A194D0B88F92D3DC34B5FF8-->  <AD_FIELD_ID><![CDATA[52A824B46A194D0B88F92D3DC34B5FF8]]></AD_FIELD_ID>
 <!--52A824B46A194D0B88F92D3DC34B5FF8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -186066,6 +186121,33 @@
 <!--52A824B46A194D0B88F92D3DC34B5FF8-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--52A824B46A194D0B88F92D3DC34B5FF8--></AD_FIELD>
 
+<!--52EE2D7DB16A4CDA9F1D7D1CF831B89F--><AD_FIELD>
+<!--52EE2D7DB16A4CDA9F1D7D1CF831B89F-->  <AD_FIELD_ID><![CDATA[52EE2D7DB16A4CDA9F1D7D1CF831B89F]]></AD_FIELD_ID>
+<!--52EE2D7DB16A4CDA9F1D7D1CF831B89F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--52EE2D7DB16A4CDA9F1D7D1CF831B89F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--52EE2D7DB16A4CDA9F1D7D1CF831B89F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--52EE2D7DB16A4CDA9F1D7D1CF831B89F-->  <NAME><![CDATA[Client]]></NAME>
+<!--52EE2D7DB16A4CDA9F1D7D1CF831B89F-->  <DESCRIPTION><![CDATA[Client for this installation.]]></DESCRIPTION>
+<!--52EE2D7DB16A4CDA9F1D7D1CF831B89F-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
+<!--52EE2D7DB16A4CDA9F1D7D1CF831B89F-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--52EE2D7DB16A4CDA9F1D7D1CF831B89F-->  <AD_TAB_ID><![CDATA[79C291C04E5C48B2BB3A4779E44C1291]]></AD_TAB_ID>
+<!--52EE2D7DB16A4CDA9F1D7D1CF831B89F-->  <AD_COLUMN_ID><![CDATA[4C935385499E485989264EA4AA71E60A]]></AD_COLUMN_ID>
+<!--52EE2D7DB16A4CDA9F1D7D1CF831B89F-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--52EE2D7DB16A4CDA9F1D7D1CF831B89F-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--52EE2D7DB16A4CDA9F1D7D1CF831B89F-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--52EE2D7DB16A4CDA9F1D7D1CF831B89F-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--52EE2D7DB16A4CDA9F1D7D1CF831B89F-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--52EE2D7DB16A4CDA9F1D7D1CF831B89F-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--52EE2D7DB16A4CDA9F1D7D1CF831B89F-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--52EE2D7DB16A4CDA9F1D7D1CF831B89F-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--52EE2D7DB16A4CDA9F1D7D1CF831B89F-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--52EE2D7DB16A4CDA9F1D7D1CF831B89F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--52EE2D7DB16A4CDA9F1D7D1CF831B89F-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--52EE2D7DB16A4CDA9F1D7D1CF831B89F-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--52EE2D7DB16A4CDA9F1D7D1CF831B89F-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--52EE2D7DB16A4CDA9F1D7D1CF831B89F-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--52EE2D7DB16A4CDA9F1D7D1CF831B89F--></AD_FIELD>
+
 <!--532FD4B7469C45BBB47F46CCBA15E450--><AD_FIELD>
 <!--532FD4B7469C45BBB47F46CCBA15E450-->  <AD_FIELD_ID><![CDATA[532FD4B7469C45BBB47F46CCBA15E450]]></AD_FIELD_ID>
 <!--532FD4B7469C45BBB47F46CCBA15E450-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -195164,6 +195246,33 @@
 <!--5DEE7AFA496940ACA3E55E3BE0F13DA6-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--5DEE7AFA496940ACA3E55E3BE0F13DA6--></AD_FIELD>
 
+<!--5E219C5344E344AEBB40C901BF1D8CEA--><AD_FIELD>
+<!--5E219C5344E344AEBB40C901BF1D8CEA-->  <AD_FIELD_ID><![CDATA[5E219C5344E344AEBB40C901BF1D8CEA]]></AD_FIELD_ID>
+<!--5E219C5344E344AEBB40C901BF1D8CEA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5E219C5344E344AEBB40C901BF1D8CEA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5E219C5344E344AEBB40C901BF1D8CEA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5E219C5344E344AEBB40C901BF1D8CEA-->  <NAME><![CDATA[Organization]]></NAME>
+<!--5E219C5344E344AEBB40C901BF1D8CEA-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
+<!--5E219C5344E344AEBB40C901BF1D8CEA-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
+<!--5E219C5344E344AEBB40C901BF1D8CEA-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--5E219C5344E344AEBB40C901BF1D8CEA-->  <AD_TAB_ID><![CDATA[79C291C04E5C48B2BB3A4779E44C1291]]></AD_TAB_ID>
+<!--5E219C5344E344AEBB40C901BF1D8CEA-->  <AD_COLUMN_ID><![CDATA[E84331AB8307479C87F6C369887D8867]]></AD_COLUMN_ID>
+<!--5E219C5344E344AEBB40C901BF1D8CEA-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--5E219C5344E344AEBB40C901BF1D8CEA-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--5E219C5344E344AEBB40C901BF1D8CEA-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--5E219C5344E344AEBB40C901BF1D8CEA-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--5E219C5344E344AEBB40C901BF1D8CEA-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--5E219C5344E344AEBB40C901BF1D8CEA-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--5E219C5344E344AEBB40C901BF1D8CEA-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--5E219C5344E344AEBB40C901BF1D8CEA-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--5E219C5344E344AEBB40C901BF1D8CEA-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--5E219C5344E344AEBB40C901BF1D8CEA-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--5E219C5344E344AEBB40C901BF1D8CEA-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--5E219C5344E344AEBB40C901BF1D8CEA-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--5E219C5344E344AEBB40C901BF1D8CEA-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--5E219C5344E344AEBB40C901BF1D8CEA-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--5E219C5344E344AEBB40C901BF1D8CEA--></AD_FIELD>
+
 <!--5E2C9CB60FDC40C2AA3844A5266D0C85--><AD_FIELD>
 <!--5E2C9CB60FDC40C2AA3844A5266D0C85-->  <AD_FIELD_ID><![CDATA[5E2C9CB60FDC40C2AA3844A5266D0C85]]></AD_FIELD_ID>
 <!--5E2C9CB60FDC40C2AA3844A5266D0C85-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -209377,6 +209486,36 @@
 <!--87DE1FC3BC414CA8844296CC3FA2505B-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--87DE1FC3BC414CA8844296CC3FA2505B--></AD_FIELD>
 
+<!--8823FD2EC4044635AE910E9BB6B27E04--><AD_FIELD>
+<!--8823FD2EC4044635AE910E9BB6B27E04-->  <AD_FIELD_ID><![CDATA[8823FD2EC4044635AE910E9BB6B27E04]]></AD_FIELD_ID>
+<!--8823FD2EC4044635AE910E9BB6B27E04-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8823FD2EC4044635AE910E9BB6B27E04-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8823FD2EC4044635AE910E9BB6B27E04-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8823FD2EC4044635AE910E9BB6B27E04-->  <NAME><![CDATA[Active]]></NAME>
+<!--8823FD2EC4044635AE910E9BB6B27E04-->  <DESCRIPTION><![CDATA[A flag indicating whether this record is available for use or de-activated.]]></DESCRIPTION>
+<!--8823FD2EC4044635AE910E9BB6B27E04-->  <HELP><![CDATA[There are two methods of making records unavailable in the system: One is to delete the record, the other is to de-activate the record. A de-activated record is not available for selection, but available for reporting. There are two reasons for de-activating and not deleting records: 
+(1) The system requires the record for auditing purposes.
+(2) The record is referenced by other records. E.g., you cannot delete a Business Partner, if there are existing invoices for it. By de-activating the Business Partner you prevent it from being used in future transactions.]]></HELP>
+<!--8823FD2EC4044635AE910E9BB6B27E04-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--8823FD2EC4044635AE910E9BB6B27E04-->  <AD_TAB_ID><![CDATA[79C291C04E5C48B2BB3A4779E44C1291]]></AD_TAB_ID>
+<!--8823FD2EC4044635AE910E9BB6B27E04-->  <AD_COLUMN_ID><![CDATA[A474A30DFC524BDFA5D17CE7F4D317A1]]></AD_COLUMN_ID>
+<!--8823FD2EC4044635AE910E9BB6B27E04-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--8823FD2EC4044635AE910E9BB6B27E04-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--8823FD2EC4044635AE910E9BB6B27E04-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--8823FD2EC4044635AE910E9BB6B27E04-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--8823FD2EC4044635AE910E9BB6B27E04-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--8823FD2EC4044635AE910E9BB6B27E04-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--8823FD2EC4044635AE910E9BB6B27E04-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--8823FD2EC4044635AE910E9BB6B27E04-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--8823FD2EC4044635AE910E9BB6B27E04-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--8823FD2EC4044635AE910E9BB6B27E04-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--8823FD2EC4044635AE910E9BB6B27E04-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--8823FD2EC4044635AE910E9BB6B27E04-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--8823FD2EC4044635AE910E9BB6B27E04-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--8823FD2EC4044635AE910E9BB6B27E04-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--8823FD2EC4044635AE910E9BB6B27E04-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--8823FD2EC4044635AE910E9BB6B27E04--></AD_FIELD>
+
 <!--884400D513D34D7DBBD04915658E3CB3--><AD_FIELD>
 <!--884400D513D34D7DBBD04915658E3CB3-->  <AD_FIELD_ID><![CDATA[884400D513D34D7DBBD04915658E3CB3]]></AD_FIELD_ID>
 <!--884400D513D34D7DBBD04915658E3CB3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -225610,6 +225749,33 @@
 <!--B6023522D214452493F4A2D2A8CFC089-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--B6023522D214452493F4A2D2A8CFC089--></AD_FIELD>
 
+<!--B605AEB3E5F14DDEA36DEEE5809DDD6D--><AD_FIELD>
+<!--B605AEB3E5F14DDEA36DEEE5809DDD6D-->  <AD_FIELD_ID><![CDATA[B605AEB3E5F14DDEA36DEEE5809DDD6D]]></AD_FIELD_ID>
+<!--B605AEB3E5F14DDEA36DEEE5809DDD6D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B605AEB3E5F14DDEA36DEEE5809DDD6D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B605AEB3E5F14DDEA36DEEE5809DDD6D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B605AEB3E5F14DDEA36DEEE5809DDD6D-->  <NAME><![CDATA[Promotion Type]]></NAME>
+<!--B605AEB3E5F14DDEA36DEEE5809DDD6D-->  <HELP><![CDATA[Promotions and discounts functionality allows to apply different rules to order/invoice lines to adjust pricing. A type is each of these kinds of rules.]]></HELP>
+<!--B605AEB3E5F14DDEA36DEEE5809DDD6D-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--B605AEB3E5F14DDEA36DEEE5809DDD6D-->  <AD_TAB_ID><![CDATA[79C291C04E5C48B2BB3A4779E44C1291]]></AD_TAB_ID>
+<!--B605AEB3E5F14DDEA36DEEE5809DDD6D-->  <AD_COLUMN_ID><![CDATA[2AA57E9B932549BCB74C9DD283840AD2]]></AD_COLUMN_ID>
+<!--B605AEB3E5F14DDEA36DEEE5809DDD6D-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--B605AEB3E5F14DDEA36DEEE5809DDD6D-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--B605AEB3E5F14DDEA36DEEE5809DDD6D-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--B605AEB3E5F14DDEA36DEEE5809DDD6D-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--B605AEB3E5F14DDEA36DEEE5809DDD6D-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--B605AEB3E5F14DDEA36DEEE5809DDD6D-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--B605AEB3E5F14DDEA36DEEE5809DDD6D-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--B605AEB3E5F14DDEA36DEEE5809DDD6D-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--B605AEB3E5F14DDEA36DEEE5809DDD6D-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--B605AEB3E5F14DDEA36DEEE5809DDD6D-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--B605AEB3E5F14DDEA36DEEE5809DDD6D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--B605AEB3E5F14DDEA36DEEE5809DDD6D-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--B605AEB3E5F14DDEA36DEEE5809DDD6D-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--B605AEB3E5F14DDEA36DEEE5809DDD6D-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--B605AEB3E5F14DDEA36DEEE5809DDD6D-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--B605AEB3E5F14DDEA36DEEE5809DDD6D--></AD_FIELD>
+
 <!--B61A5865E3A04B50AA05F85609FFC75B--><AD_FIELD>
 <!--B61A5865E3A04B50AA05F85609FFC75B-->  <AD_FIELD_ID><![CDATA[B61A5865E3A04B50AA05F85609FFC75B]]></AD_FIELD_ID>
 <!--B61A5865E3A04B50AA05F85609FFC75B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -234722,6 +234888,62 @@
 <!--EEDFDF2CA660438AA280EA447C0D5FC1-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--EEDFDF2CA660438AA280EA447C0D5FC1--></AD_FIELD>
 
+<!--EF232FEE3DD749A49279EAD8783044C2--><AD_FIELD>
+<!--EF232FEE3DD749A49279EAD8783044C2-->  <AD_FIELD_ID><![CDATA[EF232FEE3DD749A49279EAD8783044C2]]></AD_FIELD_ID>
+<!--EF232FEE3DD749A49279EAD8783044C2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--EF232FEE3DD749A49279EAD8783044C2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--EF232FEE3DD749A49279EAD8783044C2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--EF232FEE3DD749A49279EAD8783044C2-->  <NAME><![CDATA[Commercial Name]]></NAME>
+<!--EF232FEE3DD749A49279EAD8783044C2-->  <DESCRIPTION><![CDATA[Commercial Name of the Business Partner]]></DESCRIPTION>
+<!--EF232FEE3DD749A49279EAD8783044C2-->  <HELP><![CDATA[Commercial Name of the Business Partner]]></HELP>
+<!--EF232FEE3DD749A49279EAD8783044C2-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--EF232FEE3DD749A49279EAD8783044C2-->  <AD_TAB_ID><![CDATA[79C291C04E5C48B2BB3A4779E44C1291]]></AD_TAB_ID>
+<!--EF232FEE3DD749A49279EAD8783044C2-->  <AD_COLUMN_ID><![CDATA[F755E1C257E040D3880FA7398612B26D]]></AD_COLUMN_ID>
+<!--EF232FEE3DD749A49279EAD8783044C2-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--EF232FEE3DD749A49279EAD8783044C2-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--EF232FEE3DD749A49279EAD8783044C2-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
+<!--EF232FEE3DD749A49279EAD8783044C2-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--EF232FEE3DD749A49279EAD8783044C2-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--EF232FEE3DD749A49279EAD8783044C2-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--EF232FEE3DD749A49279EAD8783044C2-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--EF232FEE3DD749A49279EAD8783044C2-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--EF232FEE3DD749A49279EAD8783044C2-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--EF232FEE3DD749A49279EAD8783044C2-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--EF232FEE3DD749A49279EAD8783044C2-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--EF232FEE3DD749A49279EAD8783044C2-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--EF232FEE3DD749A49279EAD8783044C2-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--EF232FEE3DD749A49279EAD8783044C2-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--EF232FEE3DD749A49279EAD8783044C2-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--EF232FEE3DD749A49279EAD8783044C2--></AD_FIELD>
+
+<!--EF38B99B681142B0BE2BD753A2425032--><AD_FIELD>
+<!--EF38B99B681142B0BE2BD753A2425032-->  <AD_FIELD_ID><![CDATA[EF38B99B681142B0BE2BD753A2425032]]></AD_FIELD_ID>
+<!--EF38B99B681142B0BE2BD753A2425032-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--EF38B99B681142B0BE2BD753A2425032-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--EF38B99B681142B0BE2BD753A2425032-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--EF38B99B681142B0BE2BD753A2425032-->  <NAME><![CDATA[Description]]></NAME>
+<!--EF38B99B681142B0BE2BD753A2425032-->  <DESCRIPTION><![CDATA[A space to write additional related information.]]></DESCRIPTION>
+<!--EF38B99B681142B0BE2BD753A2425032-->  <HELP><![CDATA[A description is limited to 255 characters.]]></HELP>
+<!--EF38B99B681142B0BE2BD753A2425032-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--EF38B99B681142B0BE2BD753A2425032-->  <AD_TAB_ID><![CDATA[79C291C04E5C48B2BB3A4779E44C1291]]></AD_TAB_ID>
+<!--EF38B99B681142B0BE2BD753A2425032-->  <AD_COLUMN_ID><![CDATA[B0718076FC0140809F31330F12ED1A49]]></AD_COLUMN_ID>
+<!--EF38B99B681142B0BE2BD753A2425032-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--EF38B99B681142B0BE2BD753A2425032-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--EF38B99B681142B0BE2BD753A2425032-->  <DISPLAYLENGTH><![CDATA[255]]></DISPLAYLENGTH>
+<!--EF38B99B681142B0BE2BD753A2425032-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--EF38B99B681142B0BE2BD753A2425032-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--EF38B99B681142B0BE2BD753A2425032-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--EF38B99B681142B0BE2BD753A2425032-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--EF38B99B681142B0BE2BD753A2425032-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--EF38B99B681142B0BE2BD753A2425032-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--EF38B99B681142B0BE2BD753A2425032-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--EF38B99B681142B0BE2BD753A2425032-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--EF38B99B681142B0BE2BD753A2425032-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--EF38B99B681142B0BE2BD753A2425032-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--EF38B99B681142B0BE2BD753A2425032-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--EF38B99B681142B0BE2BD753A2425032-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--EF38B99B681142B0BE2BD753A2425032--></AD_FIELD>
+
 <!--EFB8B3470E0648C49F552674E5E79066--><AD_FIELD>
 <!--EFB8B3470E0648C49F552674E5E79066-->  <AD_FIELD_ID><![CDATA[EFB8B3470E0648C49F552674E5E79066]]></AD_FIELD_ID>
 <!--EFB8B3470E0648C49F552674E5E79066-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_MENU.xml	Wed Oct 03 16:22:42 2012 +0200
+++ b/src-db/database/sourcedata/AD_MENU.xml	Fri Oct 05 11:41:53 2012 +0200
@@ -4374,6 +4374,18 @@
 <!--26BF4F6D476E4D0CAF5E62EBC63E440E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--26BF4F6D476E4D0CAF5E62EBC63E440E--></AD_MENU>
 
+<!--31D7EC462DD7401EA90200C393B3EB9B--><AD_MENU>
+<!--31D7EC462DD7401EA90200C393B3EB9B-->  <AD_MENU_ID><![CDATA[31D7EC462DD7401EA90200C393B3EB9B]]></AD_MENU_ID>
+<!--31D7EC462DD7401EA90200C393B3EB9B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--31D7EC462DD7401EA90200C393B3EB9B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--31D7EC462DD7401EA90200C393B3EB9B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--31D7EC462DD7401EA90200C393B3EB9B-->  <NAME><![CDATA[Promotion Type]]></NAME>
+<!--31D7EC462DD7401EA90200C393B3EB9B-->  <ISSUMMARY><![CDATA[N]]></ISSUMMARY>
+<!--31D7EC462DD7401EA90200C393B3EB9B-->  <ACTION><![CDATA[W]]></ACTION>
+<!--31D7EC462DD7401EA90200C393B3EB9B-->  <AD_WINDOW_ID><![CDATA[9153155013C843839F88E9940B976148]]></AD_WINDOW_ID>
+<!--31D7EC462DD7401EA90200C393B3EB9B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--31D7EC462DD7401EA90200C393B3EB9B--></AD_MENU>
+
 <!--392A7B0601FA42F9AFC41FD8E576610D--><AD_MENU>
 <!--392A7B0601FA42F9AFC41FD8E576610D-->  <AD_MENU_ID><![CDATA[392A7B0601FA42F9AFC41FD8E576610D]]></AD_MENU_ID>
 <!--392A7B0601FA42F9AFC41FD8E576610D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_REFERENCE.xml	Wed Oct 03 16:22:42 2012 +0200
+++ b/src-db/database/sourcedata/AD_REFERENCE.xml	Fri Oct 05 11:41:53 2012 +0200
@@ -4139,19 +4139,6 @@
 <!--001BC3A319184B40ACB36A3C9B994904-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
 <!--001BC3A319184B40ACB36A3C9B994904--></AD_REFERENCE>
 
-<!--01DA733A1705432C95B71F980E1190DB--><AD_REFERENCE>
-<!--01DA733A1705432C95B71F980E1190DB-->  <AD_REFERENCE_ID><![CDATA[01DA733A1705432C95B71F980E1190DB]]></AD_REFERENCE_ID>
-<!--01DA733A1705432C95B71F980E1190DB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--01DA733A1705432C95B71F980E1190DB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--01DA733A1705432C95B71F980E1190DB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--01DA733A1705432C95B71F980E1190DB-->  <NAME><![CDATA[Discount & Promotion type]]></NAME>
-<!--01DA733A1705432C95B71F980E1190DB-->  <HELP><![CDATA[Defines each of the possible types of discounts & promotions]]></HELP>
-<!--01DA733A1705432C95B71F980E1190DB-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--01DA733A1705432C95B71F980E1190DB-->  <ISBASEREFERENCE><![CDATA[N]]></ISBASEREFERENCE>
-<!--01DA733A1705432C95B71F980E1190DB-->  <PARENTREFERENCE_ID><![CDATA[17]]></PARENTREFERENCE_ID>
-<!--01DA733A1705432C95B71F980E1190DB-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
-<!--01DA733A1705432C95B71F980E1190DB--></AD_REFERENCE>
-
 <!--01F377BC3C0743E7868F81C20D062AA8--><AD_REFERENCE>
 <!--01F377BC3C0743E7868F81C20D062AA8-->  <AD_REFERENCE_ID><![CDATA[01F377BC3C0743E7868F81C20D062AA8]]></AD_REFERENCE_ID>
 <!--01F377BC3C0743E7868F81C20D062AA8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_REF_LIST.xml	Wed Oct 03 16:22:42 2012 +0200
+++ b/src-db/database/sourcedata/AD_REF_LIST.xml	Fri Oct 05 11:41:53 2012 +0200
@@ -9955,17 +9955,6 @@
 <!--9E62AD3C959646F5ADA430E17844EDC6-->  <SEQNO><![CDATA[10]]></SEQNO>
 <!--9E62AD3C959646F5ADA430E17844EDC6--></AD_REF_LIST>
 
-<!--A1C5227CBD1B43049A6CE77337139291--><AD_REF_LIST>
-<!--A1C5227CBD1B43049A6CE77337139291-->  <AD_REF_LIST_ID><![CDATA[A1C5227CBD1B43049A6CE77337139291]]></AD_REF_LIST_ID>
-<!--A1C5227CBD1B43049A6CE77337139291-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--A1C5227CBD1B43049A6CE77337139291-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--A1C5227CBD1B43049A6CE77337139291-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--A1C5227CBD1B43049A6CE77337139291-->  <VALUE><![CDATA[ADJUSTMENT]]></VALUE>
-<!--A1C5227CBD1B43049A6CE77337139291-->  <NAME><![CDATA[Price Adjustment]]></NAME>
-<!--A1C5227CBD1B43049A6CE77337139291-->  <AD_REFERENCE_ID><![CDATA[01DA733A1705432C95B71F980E1190DB]]></AD_REFERENCE_ID>
-<!--A1C5227CBD1B43049A6CE77337139291-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--A1C5227CBD1B43049A6CE77337139291--></AD_REF_LIST>
-
 <!--A27B7159B661436A9A6C282BAFA4EA62--><AD_REF_LIST>
 <!--A27B7159B661436A9A6C282BAFA4EA62-->  <AD_REF_LIST_ID><![CDATA[A27B7159B661436A9A6C282BAFA4EA62]]></AD_REF_LIST_ID>
 <!--A27B7159B661436A9A6C282BAFA4EA62-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_TAB.xml	Wed Oct 03 16:22:42 2012 +0200
+++ b/src-db/database/sourcedata/AD_TAB.xml	Fri Oct 05 11:41:53 2012 +0200
@@ -13219,6 +13219,32 @@
 <!--78DB1C6BBAFF46A5B80AA1FB3D5F18F9-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
 <!--78DB1C6BBAFF46A5B80AA1FB3D5F18F9--></AD_TAB>
 
+<!--79C291C04E5C48B2BB3A4779E44C1291--><AD_TAB>
+<!--79C291C04E5C48B2BB3A4779E44C1291-->  <AD_TAB_ID><![CDATA[79C291C04E5C48B2BB3A4779E44C1291]]></AD_TAB_ID>
+<!--79C291C04E5C48B2BB3A4779E44C1291-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--79C291C04E5C48B2BB3A4779E44C1291-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--79C291C04E5C48B2BB3A4779E44C1291-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--79C291C04E5C48B2BB3A4779E44C1291-->  <NAME><![CDATA[Promotion Type]]></NAME>
+<!--79C291C04E5C48B2BB3A4779E44C1291-->  <AD_TABLE_ID><![CDATA[4E9F9B0D69AC4BC2874FD2B80B948704]]></AD_TABLE_ID>
+<!--79C291C04E5C48B2BB3A4779E44C1291-->  <AD_WINDOW_ID><![CDATA[9153155013C843839F88E9940B976148]]></AD_WINDOW_ID>
+<!--79C291C04E5C48B2BB3A4779E44C1291-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--79C291C04E5C48B2BB3A4779E44C1291-->  <TABLEVEL><![CDATA[0]]></TABLEVEL>
+<!--79C291C04E5C48B2BB3A4779E44C1291-->  <ISSINGLEROW><![CDATA[N]]></ISSINGLEROW>
+<!--79C291C04E5C48B2BB3A4779E44C1291-->  <ISINFOTAB><![CDATA[N]]></ISINFOTAB>
+<!--79C291C04E5C48B2BB3A4779E44C1291-->  <ISTRANSLATIONTAB><![CDATA[N]]></ISTRANSLATIONTAB>
+<!--79C291C04E5C48B2BB3A4779E44C1291-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--79C291C04E5C48B2BB3A4779E44C1291-->  <HASTREE><![CDATA[N]]></HASTREE>
+<!--79C291C04E5C48B2BB3A4779E44C1291-->  <PROCESSING><![CDATA[N]]></PROCESSING>
+<!--79C291C04E5C48B2BB3A4779E44C1291-->  <IMPORTFIELDS><![CDATA[N]]></IMPORTFIELDS>
+<!--79C291C04E5C48B2BB3A4779E44C1291-->  <ISSORTTAB><![CDATA[N]]></ISSORTTAB>
+<!--79C291C04E5C48B2BB3A4779E44C1291-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--79C291C04E5C48B2BB3A4779E44C1291-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
+<!--79C291C04E5C48B2BB3A4779E44C1291-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--79C291C04E5C48B2BB3A4779E44C1291-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--79C291C04E5C48B2BB3A4779E44C1291-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
+<!--79C291C04E5C48B2BB3A4779E44C1291-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
+<!--79C291C04E5C48B2BB3A4779E44C1291--></AD_TAB>
+
 <!--7F5E8E4C55914138A358F5087B532B59--><AD_TAB>
 <!--7F5E8E4C55914138A358F5087B532B59-->  <AD_TAB_ID><![CDATA[7F5E8E4C55914138A358F5087B532B59]]></AD_TAB_ID>
 <!--7F5E8E4C55914138A358F5087B532B59-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_TABLE.xml	Wed Oct 03 16:22:42 2012 +0200
+++ b/src-db/database/sourcedata/AD_TABLE.xml	Fri Oct 05 11:41:53 2012 +0200
@@ -8796,6 +8796,27 @@
 <!--4D8C3B3C31D1410DA046140C9F024D17-->  <ACCTCLASSNAME><![CDATA[org.openbravo.erpCommon.ad_forms.DocFINFinAccTransaction]]></ACCTCLASSNAME>
 <!--4D8C3B3C31D1410DA046140C9F024D17--></AD_TABLE>
 
+<!--4E9F9B0D69AC4BC2874FD2B80B948704--><AD_TABLE>
+<!--4E9F9B0D69AC4BC2874FD2B80B948704-->  <AD_TABLE_ID><![CDATA[4E9F9B0D69AC4BC2874FD2B80B948704]]></AD_TABLE_ID>
+<!--4E9F9B0D69AC4BC2874FD2B80B948704-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4E9F9B0D69AC4BC2874FD2B80B948704-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4E9F9B0D69AC4BC2874FD2B80B948704-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4E9F9B0D69AC4BC2874FD2B80B948704-->  <NAME><![CDATA[PromotionType]]></NAME>
+<!--4E9F9B0D69AC4BC2874FD2B80B948704-->  <HELP><![CDATA[Promotions and discounts functionality allows to apply different rules to order/invoice lines to adjust pricing. Each of different possible types of these promotions is defined here.]]></HELP>
+<!--4E9F9B0D69AC4BC2874FD2B80B948704-->  <TABLENAME><![CDATA[M_Offer_Type]]></TABLENAME>
+<!--4E9F9B0D69AC4BC2874FD2B80B948704-->  <CLASSNAME><![CDATA[PromotionType]]></CLASSNAME>
+<!--4E9F9B0D69AC4BC2874FD2B80B948704-->  <ISVIEW><![CDATA[N]]></ISVIEW>
+<!--4E9F9B0D69AC4BC2874FD2B80B948704-->  <ACCESSLEVEL><![CDATA[4]]></ACCESSLEVEL>
+<!--4E9F9B0D69AC4BC2874FD2B80B948704-->  <ISSECURITYENABLED><![CDATA[N]]></ISSECURITYENABLED>
+<!--4E9F9B0D69AC4BC2874FD2B80B948704-->  <ISDELETEABLE><![CDATA[Y]]></ISDELETEABLE>
+<!--4E9F9B0D69AC4BC2874FD2B80B948704-->  <ISHIGHVOLUME><![CDATA[N]]></ISHIGHVOLUME>
+<!--4E9F9B0D69AC4BC2874FD2B80B948704-->  <IMPORTTABLE><![CDATA[N]]></IMPORTTABLE>
+<!--4E9F9B0D69AC4BC2874FD2B80B948704-->  <ISCHANGELOG><![CDATA[N]]></ISCHANGELOG>
+<!--4E9F9B0D69AC4BC2874FD2B80B948704-->  <ISDEFAULTACCT><![CDATA[N]]></ISDEFAULTACCT>
+<!--4E9F9B0D69AC4BC2874FD2B80B948704-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--4E9F9B0D69AC4BC2874FD2B80B948704-->  <AD_PACKAGE_ID><![CDATA[5A3ED54AB1F54B84E040007F01006125]]></AD_PACKAGE_ID>
+<!--4E9F9B0D69AC4BC2874FD2B80B948704--></AD_TABLE>
+
 <!--500802D634BB44269BD28B1E489934DC--><AD_TABLE>
 <!--500802D634BB44269BD28B1E489934DC-->  <AD_TABLE_ID><![CDATA[500802D634BB44269BD28B1E489934DC]]></AD_TABLE_ID>
 <!--500802D634BB44269BD28B1E489934DC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_TREENODE.xml	Wed Oct 03 16:22:42 2012 +0200
+++ b/src-db/database/sourcedata/AD_TREENODE.xml	Fri Oct 05 11:41:53 2012 +0200
@@ -11,6 +11,17 @@
 <!--0892B6AE549941E0B9113759E19ED97D-->  <SEQNO><![CDATA[190]]></SEQNO>
 <!--0892B6AE549941E0B9113759E19ED97D--></AD_TREENODE>
 
+<!--1CF209805D0946ABAEC796C4DCD007CE--><AD_TREENODE>
+<!--1CF209805D0946ABAEC796C4DCD007CE-->  <AD_TREENODE_ID><![CDATA[1CF209805D0946ABAEC796C4DCD007CE]]></AD_TREENODE_ID>
+<!--1CF209805D0946ABAEC796C4DCD007CE-->  <AD_TREE_ID><![CDATA[10]]></AD_TREE_ID>
+<!--1CF209805D0946ABAEC796C4DCD007CE-->  <NODE_ID><![CDATA[31D7EC462DD7401EA90200C393B3EB9B]]></NODE_ID>
+<!--1CF209805D0946ABAEC796C4DCD007CE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1CF209805D0946ABAEC796C4DCD007CE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1CF209805D0946ABAEC796C4DCD007CE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1CF209805D0946ABAEC796C4DCD007CE-->  <PARENT_ID><![CDATA[153]]></PARENT_ID>
+<!--1CF209805D0946ABAEC796C4DCD007CE-->  <SEQNO><![CDATA[129]]></SEQNO>
+<!--1CF209805D0946ABAEC796C4DCD007CE--></AD_TREENODE>
+
 <!--29C956E61F0811DE98DB8F290236BC17--><AD_TREENODE>
 <!--29C956E61F0811DE98DB8F290236BC17-->  <AD_TREENODE_ID><![CDATA[29C956E61F0811DE98DB8F290236BC17]]></AD_TREENODE_ID>
 <!--29C956E61F0811DE98DB8F290236BC17-->  <AD_TREE_ID><![CDATA[10]]></AD_TREE_ID>
@@ -975,7 +986,7 @@
 <!--52118BF1A2484D84E040007F01005FEC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--52118BF1A2484D84E040007F01005FEC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--52118BF1A2484D84E040007F01005FEC-->  <PARENT_ID><![CDATA[153]]></PARENT_ID>
-<!--52118BF1A2484D84E040007F01005FEC-->  <SEQNO><![CDATA[170]]></SEQNO>
+<!--52118BF1A2484D84E040007F01005FEC-->  <SEQNO><![CDATA[179]]></SEQNO>
 <!--52118BF1A2484D84E040007F01005FEC--></AD_TREENODE>
 
 <!--52118BF1A24E4D84E040007F01005FEC--><AD_TREENODE>
@@ -2317,7 +2328,7 @@
 <!--52118BF1A2FD4D84E040007F01005FEC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--52118BF1A2FD4D84E040007F01005FEC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--52118BF1A2FD4D84E040007F01005FEC-->  <PARENT_ID><![CDATA[153]]></PARENT_ID>
-<!--52118BF1A2FD4D84E040007F01005FEC-->  <SEQNO><![CDATA[160]]></SEQNO>
+<!--52118BF1A2FD4D84E040007F01005FEC-->  <SEQNO><![CDATA[169]]></SEQNO>
 <!--52118BF1A2FD4D84E040007F01005FEC--></AD_TREENODE>
 
 <!--52118BF1A3024D84E040007F01005FEC--><AD_TREENODE>
@@ -3076,7 +3087,7 @@
 <!--52118BF1A34D4D84E040007F01005FEC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--52118BF1A34D4D84E040007F01005FEC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--52118BF1A34D4D84E040007F01005FEC-->  <PARENT_ID><![CDATA[153]]></PARENT_ID>
-<!--52118BF1A34D4D84E040007F01005FEC-->  <SEQNO><![CDATA[126]]></SEQNO>
+<!--52118BF1A34D4D84E040007F01005FEC-->  <SEQNO><![CDATA[139]]></SEQNO>
 <!--52118BF1A34D4D84E040007F01005FEC--></AD_TREENODE>
 
 <!--52118BF1A34E4D84E040007F01005FEC--><AD_TREENODE>
@@ -3087,7 +3098,7 @@
 <!--52118BF1A34E4D84E040007F01005FEC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--52118BF1A34E4D84E040007F01005FEC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--52118BF1A34E4D84E040007F01005FEC-->  <PARENT_ID><![CDATA[153]]></PARENT_ID>
-<!--52118BF1A34E4D84E040007F01005FEC-->  <SEQNO><![CDATA[150]]></SEQNO>
+<!--52118BF1A34E4D84E040007F01005FEC-->  <SEQNO><![CDATA[159]]></SEQNO>
 <!--52118BF1A34E4D84E040007F01005FEC--></AD_TREENODE>
 
 <!--52118BF1A34F4D84E040007F01005FEC--><AD_TREENODE>
--- a/src-db/database/sourcedata/AD_WINDOW.xml	Wed Oct 03 16:22:42 2012 +0200
+++ b/src-db/database/sourcedata/AD_WINDOW.xml	Fri Oct 05 11:41:53 2012 +0200
@@ -2856,6 +2856,21 @@
 <!--6F8F913FA60F4CBD93DC1D3AA696E76E-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--6F8F913FA60F4CBD93DC1D3AA696E76E--></AD_WINDOW>
 
+<!--9153155013C843839F88E9940B976148--><AD_WINDOW>
+<!--9153155013C843839F88E9940B976148-->  <AD_WINDOW_ID><![CDATA[9153155013C843839F88E9940B976148]]></AD_WINDOW_ID>
+<!--9153155013C843839F88E9940B976148-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9153155013C843839F88E9940B976148-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9153155013C843839F88E9940B976148-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9153155013C843839F88E9940B976148-->  <NAME><![CDATA[Promotion Type]]></NAME>
+<!--9153155013C843839F88E9940B976148-->  <WINDOWTYPE><![CDATA[M]]></WINDOWTYPE>
+<!--9153155013C843839F88E9940B976148-->  <ISSOTRX><![CDATA[Y]]></ISSOTRX>
+<!--9153155013C843839F88E9940B976148-->  <PROCESSING><![CDATA[N]]></PROCESSING>
+<!--9153155013C843839F88E9940B976148-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
+<!--9153155013C843839F88E9940B976148-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--9153155013C843839F88E9940B976148-->  <ISTHREADSAFE><![CDATA[Y]]></ISTHREADSAFE>
+<!--9153155013C843839F88E9940B976148-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
+<!--9153155013C843839F88E9940B976148--></AD_WINDOW>
+
 <!--94EAA455D2644E04AB25D93BE5157B6D--><AD_WINDOW>
 <!--94EAA455D2644E04AB25D93BE5157B6D-->  <AD_WINDOW_ID><![CDATA[94EAA455D2644E04AB25D93BE5157B6D]]></AD_WINDOW_ID>
 <!--94EAA455D2644E04AB25D93BE5157B6D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>