Related to issue 27205: Discounts and Promotions should be able to filter by product characteristics.
authorIoritz Cia <ioritz.cia@openbravo.com>
Thu, 28 Aug 2014 12:42:56 +0200
changeset 24352 1d7c83e41c43
parent 24351 65b98d7a5bf5
child 24353 057434bc0a7e
child 24356 af520c9729b9
Related to issue 27205: Discounts and Promotions should be able to filter by product characteristics.
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelApplicationInitializer.java
src-db/database/model/functions/M_ISPARENT_CH_VALUE.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_CHARACTERISTIC.xml
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_ELEMENT.xml
src-db/database/sourcedata/AD_FIELD.xml
src-db/database/sourcedata/AD_REFERENCE.xml
src-db/database/sourcedata/AD_REF_TREE.xml
src-db/database/sourcedata/AD_REF_TREE_FIELD.xml
src-db/database/sourcedata/AD_TAB.xml
src-db/database/sourcedata/AD_TABLE.xml
src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
src/org/openbravo/erpCommon/businessUtility/PriceAdjustment.java
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelApplicationInitializer.java	Fri Aug 29 01:35:03 2014 +0900
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelApplicationInitializer.java	Thu Aug 28 12:42:56 2014 +0200
@@ -37,5 +37,7 @@
         new StandardSQLFunction("ad_org_getcalendarowner", new StringType()));
     OBDal.getInstance().registerSQLFunction("ad_org_getperiodcontrolallow",
         new StandardSQLFunction("ad_org_getperiodcontrolallow", new StringType()));
+    OBDal.getInstance().registerSQLFunction("m_isparent_ch_value",
+        new StandardSQLFunction("m_isparent_ch_value", new StringType()));
   }
 }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/model/functions/M_ISPARENT_CH_VALUE.xml	Thu Aug 28 12:42:56 2014 +0200
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+  <database name="FUNCTION M_ISPARENT_CH_VALUE">
+    <function name="M_ISPARENT_CH_VALUE" type="NUMERIC">
+      <parameter name="p_ch_value_id" type="VARCHAR" mode="in">
+        <default/>
+      </parameter>
+      <parameter name="p_parent_ch_value_id" type="VARCHAR" mode="in">
+        <default/>
+      </parameter>
+      <parameter name="p_char_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) 2014 Openbravo SLU
+* All Rights Reserved.
+* Contributor(s):  ______________________________________.
+************************************************************************/
+/*************************************************************************
+* Title: Return 'Characteristic Value Level' if ch_value_id is a leaf of the characteristic tree
+*    where parent_ch_value_id is the root. Else return -1
+************************************************************************/
+  v_Level NUMBER:=0;
+  v_treeID varchar2(32) ;
+  v_Parent VARCHAR(32) ;
+  v_Node   VARCHAR(32) ;
+BEGIN
+  SELECT MAX(AD_TREE_ID)
+  INTO v_treeID
+  FROM m_characteristic
+  WHERE m_characteristic_id = p_char_id;
+  v_Parent := p_ch_value_id;
+  WHILE v_Parent IS NOT NULL
+  LOOP
+    v_Level:=v_Level + 1;
+    SELECT MAX(NODE_ID),
+      MAX(PARENT_ID)
+    INTO v_Node,
+      v_Parent
+    FROM AD_TREENODE
+    WHERE AD_TREE_ID=v_treeID
+      AND NODE_ID=v_Parent;
+    IF v_Node=p_parent_ch_value_id THEN
+      RETURN v_Level;
+    END IF;
+  END LOOP;
+  RETURN(-1) ;
+END M_ISPARENT_CH_VALUE
+]]></body>
+    </function>
+  </database>
--- a/src-db/database/model/functions/M_PROMOTION_CALCULATE.xml	Fri Aug 29 01:35:03 2014 +0900
+++ b/src-db/database/model/functions/M_PROMOTION_CALCULATE.xml	Thu Aug 28 12:42:56 2014 +0200
@@ -294,6 +294,23 @@
           WHERE O.M_OFFER_ID = M_OFFER.M_OFFER_ID
             AND O.AD_ORG_ID = Cur_Order.AD_Org_ID
           )))
+          AND ((CHARACTERISTICS_SELECTION = 'Y'
+          AND NOT EXISTS
+          (SELECT 1
+          FROM M_OFFER_CHARACTERISTIC C, M_PRODUCT_CH_VALUE V
+          WHERE C.M_OFFER_ID = M_OFFER.M_OFFER_ID
+            AND V.M_PRODUCT_ID = Cur_Order.M_Product_ID
+            AND m_isparent_ch_value(V.M_CH_VALUE_ID, C.M_CH_VALUE_ID, C.M_CHARACTERISTIC_ID) <> -1
+          ))
+          OR(CHARACTERISTICS_SELECTION = 'N'
+          AND EXISTS
+          (SELECT 1
+          FROM M_OFFER_CHARACTERISTIC C, M_PRODUCT_CH_VALUE V
+          WHERE C.M_OFFER_ID = M_OFFER.M_OFFER_ID
+            AND V.M_PRODUCT_ID = Cur_Order.M_Product_ID
+            AND m_isparent_ch_value(V.M_CH_VALUE_ID, C.M_CH_VALUE_ID, C.M_CHARACTERISTIC_ID) <> -1
+          ))
+          )
         ORDER BY PRIORITY,
           M_OFFER_ID
         )
--- a/src-db/database/model/tables/M_OFFER.xml	Fri Aug 29 01:35:03 2014 +0900
+++ b/src-db/database/model/tables/M_OFFER.xml	Thu Aug 28 12:42:56 2014 +0200
@@ -117,6 +117,10 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="CHARACTERISTICS_SELECTION" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false">
+        <default><![CDATA[Y]]></default>
+        <onCreateDefault><![CDATA['Y']]></onCreateDefault>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="M_OFFER_AD_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/model/tables/M_OFFER_CHARACTERISTIC.xml	Thu Aug 28 12:42:56 2014 +0200
@@ -0,0 +1,68 @@
+<?xml version="1.0"?>
+  <database name="TABLE M_OFFER_CHARACTERISTIC">
+    <table name="M_OFFER_CHARACTERISTIC" primaryKey="M_OFFER_CHARACTERISTIC_KEY">
+      <column name="M_OFFER_CHARACTERISTIC_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="M_OFFER_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="M_CHARACTERISTIC_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="M_CH_VALUE_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <foreign-key foreignTable="AD_CLIENT" name="M_OFF_CHAR_AD_CLIENT">
+        <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="M_OFF_CHAR_AD_ORG">
+        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="M_CHARACTERISTIC" name="M_OFF_CHAR_CHARACTERISTIC">
+        <reference local="M_CHARACTERISTIC_ID" foreign="M_CHARACTERISTIC_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="M_CH_VALUE" name="M_OFF_CHAR_CHVALUE">
+        <reference local="M_CH_VALUE_ID" foreign="M_CH_VALUE_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="M_OFFER" name="M_OFF_CHAR_OFFER">
+        <reference local="M_OFFER_ID" foreign="M_OFFER_ID"/>
+      </foreign-key>
+      <index name="M_OFFER_CHARACTERISTIC_OFFER" unique="false">
+        <index-column name="M_OFFER_ID"/>
+      </index>
+      <check name="M_OFF_CHAR_ISACTIVE"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
+    </table>
+  </database>
--- a/src-db/database/sourcedata/AD_COLUMN.xml	Fri Aug 29 01:35:03 2014 +0900
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Thu Aug 28 12:42:56 2014 +0200
@@ -220128,6 +220128,41 @@
 <!--00FA42F2239C49ACA79CAC3A030F8DCD-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--00FA42F2239C49ACA79CAC3A030F8DCD--></AD_COLUMN>
 
+<!--01730FB593B944F7AE8DCF140C9B6C90--><AD_COLUMN>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <AD_COLUMN_ID><![CDATA[01730FB593B944F7AE8DCF140C9B6C90]]></AD_COLUMN_ID>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <NAME><![CDATA[M_Offer_ID]]></NAME>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <DESCRIPTION><![CDATA[The ability to raise or lower prices.]]></DESCRIPTION>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <HELP><![CDATA[Promotion or Discount applied to a particular line (product) automatically by the system.]]></HELP>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <COLUMNNAME><![CDATA[M_Offer_ID]]></COLUMNNAME>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <AD_TABLE_ID><![CDATA[8FF90F99857D4F0F842FE3B2C356E9B4]]></AD_TABLE_ID>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <ISPARENT><![CDATA[Y]]></ISPARENT>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <SEQNO><![CDATA[110]]></SEQNO>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <AD_ELEMENT_ID><![CDATA[800273]]></AD_ELEMENT_ID>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <POSITION><![CDATA[9]]></POSITION>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--01730FB593B944F7AE8DCF140C9B6C90-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--01730FB593B944F7AE8DCF140C9B6C90--></AD_COLUMN>
+
 <!--01AB98F2E1B247CF9FE89FEECECA077D--><AD_COLUMN>
 <!--01AB98F2E1B247CF9FE89FEECECA077D-->  <AD_COLUMN_ID><![CDATA[01AB98F2E1B247CF9FE89FEECECA077D]]></AD_COLUMN_ID>
 <!--01AB98F2E1B247CF9FE89FEECECA077D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -229561,6 +229596,41 @@
 <!--2B8EAE6B89BE4C418795AA11EE377A3E-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--2B8EAE6B89BE4C418795AA11EE377A3E--></AD_COLUMN>
 
+<!--2B9B0E3218C742D4B7FE0F2681294FDC--><AD_COLUMN>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <AD_COLUMN_ID><![CDATA[2B9B0E3218C742D4B7FE0F2681294FDC]]></AD_COLUMN_ID>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <NAME><![CDATA[M_Ch_Value_ID]]></NAME>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <HELP><![CDATA[Identifies a possible value of a Product Characteristic]]></HELP>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <COLUMNNAME><![CDATA[M_Ch_Value_ID]]></COLUMNNAME>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <AD_TABLE_ID><![CDATA[8FF90F99857D4F0F842FE3B2C356E9B4]]></AD_TABLE_ID>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <AD_REFERENCE_ID><![CDATA[8C57A4A2E05F4261A1FADF47C30398AD]]></AD_REFERENCE_ID>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <AD_REFERENCE_VALUE_ID><![CDATA[ADE80203FF1D4143854E6B938CF3E8B9]]></AD_REFERENCE_VALUE_ID>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <SEQNO><![CDATA[120]]></SEQNO>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <AD_ELEMENT_ID><![CDATA[D6A392F2D7B69EE2E040007F01002D70]]></AD_ELEMENT_ID>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <POSITION><![CDATA[11]]></POSITION>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--2B9B0E3218C742D4B7FE0F2681294FDC--></AD_COLUMN>
+
 <!--2B9E746AE09F4E88AE00CBA9DBFC4062--><AD_COLUMN>
 <!--2B9E746AE09F4E88AE00CBA9DBFC4062-->  <AD_COLUMN_ID><![CDATA[2B9E746AE09F4E88AE00CBA9DBFC4062]]></AD_COLUMN_ID>
 <!--2B9E746AE09F4E88AE00CBA9DBFC4062-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -229960,6 +230030,41 @@
 <!--2D56F14A0C524D8F95282389F1A45878-->  <SQLLOGIC><![CDATA[SELECT coalesce(sum(psd.doubtfuldebt_amount),0) FROM fin_payment_scheduledetail psd left join fin_payment_detail pd on psd.fin_payment_detail_id = pd.fin_payment_detail_id left join fin_payment p on pd.fin_payment_id = p.fin_payment_id WHERE psd.fin_payment_schedule_invoice = fin_payment_schedule_id and psd.isinvoicepaid = 'N']]></SQLLOGIC>
 <!--2D56F14A0C524D8F95282389F1A45878--></AD_COLUMN>
 
+<!--2D64DA0BA824432DB229752F8B22A487--><AD_COLUMN>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <AD_COLUMN_ID><![CDATA[2D64DA0BA824432DB229752F8B22A487]]></AD_COLUMN_ID>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <NAME><![CDATA[Created By]]></NAME>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <DESCRIPTION><![CDATA[User who created this records]]></DESCRIPTION>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <HELP><![CDATA[The Created By field indicates the user who created this record.]]></HELP>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <COLUMNNAME><![CDATA[Createdby]]></COLUMNNAME>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <AD_TABLE_ID><![CDATA[8FF90F99857D4F0F842FE3B2C356E9B4]]></AD_TABLE_ID>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <AD_ELEMENT_ID><![CDATA[246]]></AD_ELEMENT_ID>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <POSITION><![CDATA[6]]></POSITION>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--2D64DA0BA824432DB229752F8B22A487-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--2D64DA0BA824432DB229752F8B22A487--></AD_COLUMN>
+
 <!--2D699F3974F64AFD8A48DC90748F4DBE--><AD_COLUMN>
 <!--2D699F3974F64AFD8A48DC90748F4DBE-->  <AD_COLUMN_ID><![CDATA[2D699F3974F64AFD8A48DC90748F4DBE]]></AD_COLUMN_ID>
 <!--2D699F3974F64AFD8A48DC90748F4DBE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -231655,6 +231760,42 @@
 <!--36D80698B9BF4F46BB523AC48EBA40CD-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--36D80698B9BF4F46BB523AC48EBA40CD--></AD_COLUMN>
 
+<!--36DE0332BC8240C7AC6AF5A1867EAC60--><AD_COLUMN>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <AD_COLUMN_ID><![CDATA[36DE0332BC8240C7AC6AF5A1867EAC60]]></AD_COLUMN_ID>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <NAME><![CDATA[Client]]></NAME>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <DESCRIPTION><![CDATA[Client for this installation.]]></DESCRIPTION>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <COLUMNNAME><![CDATA[AD_Client_ID]]></COLUMNNAME>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <AD_TABLE_ID><![CDATA[8FF90F99857D4F0F842FE3B2C356E9B4]]></AD_TABLE_ID>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <DEFAULTVALUE><![CDATA[@AD_CLIENT_ID@]]></DEFAULTVALUE>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <AD_ELEMENT_ID><![CDATA[102]]></AD_ELEMENT_ID>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <POSITION><![CDATA[2]]></POSITION>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--36DE0332BC8240C7AC6AF5A1867EAC60--></AD_COLUMN>
+
 <!--36EFD16DCDE148C5AE42895FD64F58FD--><AD_COLUMN>
 <!--36EFD16DCDE148C5AE42895FD64F58FD-->  <AD_COLUMN_ID><![CDATA[36EFD16DCDE148C5AE42895FD64F58FD]]></AD_COLUMN_ID>
 <!--36EFD16DCDE148C5AE42895FD64F58FD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -281285,6 +281426,42 @@
 <!--8391DD88AF66E827E040007F01016D35-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--8391DD88AF66E827E040007F01016D35--></AD_COLUMN>
 
+<!--83B57470A50D49F5830CE6F8F947F993--><AD_COLUMN>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <AD_COLUMN_ID><![CDATA[83B57470A50D49F5830CE6F8F947F993]]></AD_COLUMN_ID>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <NAME><![CDATA[Updated]]></NAME>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <AD_TABLE_ID><![CDATA[8FF90F99857D4F0F842FE3B2C356E9B4]]></AD_TABLE_ID>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <DEFAULTVALUE><![CDATA[@#Date@]]></DEFAULTVALUE>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <AD_ELEMENT_ID><![CDATA[607]]></AD_ELEMENT_ID>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <POSITION><![CDATA[7]]></POSITION>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--83B57470A50D49F5830CE6F8F947F993-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--83B57470A50D49F5830CE6F8F947F993--></AD_COLUMN>
+
 <!--8412930246D8472BA11E4B067115CD48--><AD_COLUMN>
 <!--8412930246D8472BA11E4B067115CD48-->  <AD_COLUMN_ID><![CDATA[8412930246D8472BA11E4B067115CD48]]></AD_COLUMN_ID>
 <!--8412930246D8472BA11E4B067115CD48-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -306402,6 +306579,42 @@
 <!--B928FFF6908B0124E040007F01004E03-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--B928FFF6908B0124E040007F01004E03--></AD_COLUMN>
 
+<!--B930E5F7089142CE90ABE9C5B01F59B2--><AD_COLUMN>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <AD_COLUMN_ID><![CDATA[B930E5F7089142CE90ABE9C5B01F59B2]]></AD_COLUMN_ID>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <NAME><![CDATA[Creation Date]]></NAME>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <DESCRIPTION><![CDATA[The date that this record is completed.]]></DESCRIPTION>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <HELP><![CDATA[The Created field indicates the date that this record was created.]]></HELP>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <COLUMNNAME><![CDATA[Created]]></COLUMNNAME>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <AD_TABLE_ID><![CDATA[8FF90F99857D4F0F842FE3B2C356E9B4]]></AD_TABLE_ID>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <DEFAULTVALUE><![CDATA[@#Date@]]></DEFAULTVALUE>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <AD_ELEMENT_ID><![CDATA[245]]></AD_ELEMENT_ID>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <POSITION><![CDATA[5]]></POSITION>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--B930E5F7089142CE90ABE9C5B01F59B2-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--B930E5F7089142CE90ABE9C5B01F59B2--></AD_COLUMN>
+
 <!--B9336FB7C2B0400EB495358FAB55E17F--><AD_COLUMN>
 <!--B9336FB7C2B0400EB495358FAB55E17F-->  <AD_COLUMN_ID><![CDATA[B9336FB7C2B0400EB495358FAB55E17F]]></AD_COLUMN_ID>
 <!--B9336FB7C2B0400EB495358FAB55E17F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -307456,6 +307669,44 @@
 <!--BACF545D3162DE54E040007F01006998-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--BACF545D3162DE54E040007F01006998--></AD_COLUMN>
 
+<!--BAE18F6D77384FA0AFF85A092F7655C9--><AD_COLUMN>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <AD_COLUMN_ID><![CDATA[BAE18F6D77384FA0AFF85A092F7655C9]]></AD_COLUMN_ID>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <NAME><![CDATA[Active]]></NAME>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <DESCRIPTION><![CDATA[A flag indicating whether this record is available for use or de-activated.]]></DESCRIPTION>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <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>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <COLUMNNAME><![CDATA[Isactive]]></COLUMNNAME>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <AD_TABLE_ID><![CDATA[8FF90F99857D4F0F842FE3B2C356E9B4]]></AD_TABLE_ID>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <AD_ELEMENT_ID><![CDATA[348]]></AD_ELEMENT_ID>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <POSITION><![CDATA[4]]></POSITION>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--BAE18F6D77384FA0AFF85A092F7655C9-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--BAE18F6D77384FA0AFF85A092F7655C9--></AD_COLUMN>
+
 <!--BAE2D17A6582452F9B756C8BC88FACBE--><AD_COLUMN>
 <!--BAE2D17A6582452F9B756C8BC88FACBE-->  <AD_COLUMN_ID><![CDATA[BAE2D17A6582452F9B756C8BC88FACBE]]></AD_COLUMN_ID>
 <!--BAE2D17A6582452F9B756C8BC88FACBE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -313051,6 +313302,42 @@
 <!--CAE75AF8924D478DB01BFB1B77FBA473-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--CAE75AF8924D478DB01BFB1B77FBA473--></AD_COLUMN>
 
+<!--CB017DFEE5BE4203BC36BD905328B0AE--><AD_COLUMN>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <AD_COLUMN_ID><![CDATA[CB017DFEE5BE4203BC36BD905328B0AE]]></AD_COLUMN_ID>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <NAME><![CDATA[Organization]]></NAME>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <COLUMNNAME><![CDATA[AD_Org_ID]]></COLUMNNAME>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <AD_TABLE_ID><![CDATA[8FF90F99857D4F0F842FE3B2C356E9B4]]></AD_TABLE_ID>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <DEFAULTVALUE><![CDATA[@AD_ORG_ID@]]></DEFAULTVALUE>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <AD_ELEMENT_ID><![CDATA[113]]></AD_ELEMENT_ID>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <POSITION><![CDATA[3]]></POSITION>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--CB017DFEE5BE4203BC36BD905328B0AE-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--CB017DFEE5BE4203BC36BD905328B0AE--></AD_COLUMN>
+
 <!--CB0FCC032C944B238FC720EEDD6061D2--><AD_COLUMN>
 <!--CB0FCC032C944B238FC720EEDD6061D2-->  <AD_COLUMN_ID><![CDATA[CB0FCC032C944B238FC720EEDD6061D2]]></AD_COLUMN_ID>
 <!--CB0FCC032C944B238FC720EEDD6061D2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -314986,6 +315273,41 @@
 <!--CE328F1A9A0A4A0EA7875B685F863C94-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--CE328F1A9A0A4A0EA7875B685F863C94--></AD_COLUMN>
 
+<!--CE3EEC5836914BEDA7C59F72D06D91D8--><AD_COLUMN>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <AD_COLUMN_ID><![CDATA[CE3EEC5836914BEDA7C59F72D06D91D8]]></AD_COLUMN_ID>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <NAME><![CDATA[Updated By]]></NAME>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <DESCRIPTION><![CDATA[User who updated this records]]></DESCRIPTION>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <HELP><![CDATA[The Updated By field indicates the user who updated this record.]]></HELP>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <COLUMNNAME><![CDATA[Updatedby]]></COLUMNNAME>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <AD_TABLE_ID><![CDATA[8FF90F99857D4F0F842FE3B2C356E9B4]]></AD_TABLE_ID>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <SEQNO><![CDATA[80]]></SEQNO>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <AD_ELEMENT_ID><![CDATA[608]]></AD_ELEMENT_ID>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <POSITION><![CDATA[8]]></POSITION>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--CE3EEC5836914BEDA7C59F72D06D91D8--></AD_COLUMN>
+
 <!--CE4DBA92A2E80C3CE040007F0100316C--><AD_COLUMN>
 <!--CE4DBA92A2E80C3CE040007F0100316C-->  <AD_COLUMN_ID><![CDATA[CE4DBA92A2E80C3CE040007F0100316C]]></AD_COLUMN_ID>
 <!--CE4DBA92A2E80C3CE040007F0100316C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -327044,6 +327366,77 @@
 <!--ED9A643C18EC4A3E811C9A0E20C59B80-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--ED9A643C18EC4A3E811C9A0E20C59B80--></AD_COLUMN>
 
+<!--EDA2301E6E14420BBA6E6D35589B0824--><AD_COLUMN>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <AD_COLUMN_ID><![CDATA[EDA2301E6E14420BBA6E6D35589B0824]]></AD_COLUMN_ID>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <NAME><![CDATA[Included Characteristics]]></NAME>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <DESCRIPTION><![CDATA[Product Characteristics Selection Mode]]></DESCRIPTION>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <HELP><![CDATA[Defines the way Product Characteristics will be selected (including or excluding the taken ones)]]></HELP>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <COLUMNNAME><![CDATA[Characteristics_Selection]]></COLUMNNAME>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <AD_TABLE_ID><![CDATA[800062]]></AD_TABLE_ID>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <AD_REFERENCE_ID><![CDATA[17]]></AD_REFERENCE_ID>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <AD_REFERENCE_VALUE_ID><![CDATA[800029]]></AD_REFERENCE_VALUE_ID>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <SEQNO><![CDATA[400]]></SEQNO>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <AD_ELEMENT_ID><![CDATA[6559D13B4A0444D7AA9FBCFD21F98E9E]]></AD_ELEMENT_ID>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <POSITION><![CDATA[43]]></POSITION>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--EDA2301E6E14420BBA6E6D35589B0824--></AD_COLUMN>
+
+<!--EDA51A595C0C4FE893801660D87AD9AD--><AD_COLUMN>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <AD_COLUMN_ID><![CDATA[EDA51A595C0C4FE893801660D87AD9AD]]></AD_COLUMN_ID>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <NAME><![CDATA[M_Offer_Characteristic_ID]]></NAME>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <HELP><![CDATA[Definition of a Product Characteristic]]></HELP>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <COLUMNNAME><![CDATA[M_Offer_Characteristic_ID]]></COLUMNNAME>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <AD_TABLE_ID><![CDATA[8FF90F99857D4F0F842FE3B2C356E9B4]]></AD_TABLE_ID>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <ISKEY><![CDATA[Y]]></ISKEY>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <AD_ELEMENT_ID><![CDATA[D69FE5544E75D667E040007F01001784]]></AD_ELEMENT_ID>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <POSITION><![CDATA[1]]></POSITION>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--EDA51A595C0C4FE893801660D87AD9AD-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--EDA51A595C0C4FE893801660D87AD9AD--></AD_COLUMN>
+
 <!--EDA6910C9FA81555E040007F010144E5--><AD_COLUMN>
 <!--EDA6910C9FA81555E040007F010144E5-->  <AD_COLUMN_ID><![CDATA[EDA6910C9FA81555E040007F010144E5]]></AD_COLUMN_ID>
 <!--EDA6910C9FA81555E040007F010144E5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -330429,6 +330822,40 @@
 <!--FCA27DEA87A04D738AAB1452C9FE14F7-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--FCA27DEA87A04D738AAB1452C9FE14F7--></AD_COLUMN>
 
+<!--FCA68B79DB904650A60CD5BC389A1036--><AD_COLUMN>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <AD_COLUMN_ID><![CDATA[FCA68B79DB904650A60CD5BC389A1036]]></AD_COLUMN_ID>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <NAME><![CDATA[M_Characteristic_ID]]></NAME>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <HELP><![CDATA[Definition of a Product Characteristic]]></HELP>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <COLUMNNAME><![CDATA[M_Characteristic_ID]]></COLUMNNAME>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <AD_TABLE_ID><![CDATA[8FF90F99857D4F0F842FE3B2C356E9B4]]></AD_TABLE_ID>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <ISPARENT><![CDATA[Y]]></ISPARENT>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <SEQNO><![CDATA[90]]></SEQNO>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <AD_ELEMENT_ID><![CDATA[D69FE5544E75D667E040007F01001784]]></AD_ELEMENT_ID>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <POSITION><![CDATA[10]]></POSITION>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--FCA68B79DB904650A60CD5BC389A1036-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--FCA68B79DB904650A60CD5BC389A1036--></AD_COLUMN>
+
 <!--FCE99F38BC0B43038220279E67815376--><AD_COLUMN>
 <!--FCE99F38BC0B43038220279E67815376-->  <AD_COLUMN_ID><![CDATA[FCE99F38BC0B43038220279E67815376]]></AD_COLUMN_ID>
 <!--FCE99F38BC0B43038220279E67815376-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_ELEMENT.xml	Fri Aug 29 01:35:03 2014 +0900
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Aug 28 12:42:56 2014 +0200
@@ -25184,6 +25184,20 @@
 <!--64F864C280D511DD91661FA657CE0B73-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--64F864C280D511DD91661FA657CE0B73--></AD_ELEMENT>
 
+<!--6559D13B4A0444D7AA9FBCFD21F98E9E--><AD_ELEMENT>
+<!--6559D13B4A0444D7AA9FBCFD21F98E9E-->  <AD_ELEMENT_ID><![CDATA[6559D13B4A0444D7AA9FBCFD21F98E9E]]></AD_ELEMENT_ID>
+<!--6559D13B4A0444D7AA9FBCFD21F98E9E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6559D13B4A0444D7AA9FBCFD21F98E9E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6559D13B4A0444D7AA9FBCFD21F98E9E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6559D13B4A0444D7AA9FBCFD21F98E9E-->  <COLUMNNAME><![CDATA[Characteristic_Selection]]></COLUMNNAME>
+<!--6559D13B4A0444D7AA9FBCFD21F98E9E-->  <NAME><![CDATA[Included Characteristics]]></NAME>
+<!--6559D13B4A0444D7AA9FBCFD21F98E9E-->  <PRINTNAME><![CDATA[Product Characteristics Selection Mode]]></PRINTNAME>
+<!--6559D13B4A0444D7AA9FBCFD21F98E9E-->  <DESCRIPTION><![CDATA[Product Characteristics Selection Mode]]></DESCRIPTION>
+<!--6559D13B4A0444D7AA9FBCFD21F98E9E-->  <HELP><![CDATA[Defines the way Product Characteristics will be selected (including or excluding the taken ones)]]></HELP>
+<!--6559D13B4A0444D7AA9FBCFD21F98E9E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--6559D13B4A0444D7AA9FBCFD21F98E9E-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--6559D13B4A0444D7AA9FBCFD21F98E9E--></AD_ELEMENT>
+
 <!--65F38EB415F049629A3ED49DD6BABF31--><AD_ELEMENT>
 <!--65F38EB415F049629A3ED49DD6BABF31-->  <AD_ELEMENT_ID><![CDATA[65F38EB415F049629A3ED49DD6BABF31]]></AD_ELEMENT_ID>
 <!--65F38EB415F049629A3ED49DD6BABF31-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_FIELD.xml	Fri Aug 29 01:35:03 2014 +0900
+++ b/src-db/database/sourcedata/AD_FIELD.xml	Thu Aug 28 12:42:56 2014 +0200
@@ -182772,6 +182772,33 @@
 <!--19B25B5CCE9F4D809670A9773ABB10CC-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--19B25B5CCE9F4D809670A9773ABB10CC--></AD_FIELD>
 
+<!--19D5946877B649FFB7EE9060020AB602--><AD_FIELD>
+<!--19D5946877B649FFB7EE9060020AB602-->  <AD_FIELD_ID><![CDATA[19D5946877B649FFB7EE9060020AB602]]></AD_FIELD_ID>
+<!--19D5946877B649FFB7EE9060020AB602-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--19D5946877B649FFB7EE9060020AB602-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--19D5946877B649FFB7EE9060020AB602-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--19D5946877B649FFB7EE9060020AB602-->  <NAME><![CDATA[Client]]></NAME>
+<!--19D5946877B649FFB7EE9060020AB602-->  <DESCRIPTION><![CDATA[Client for this installation.]]></DESCRIPTION>
+<!--19D5946877B649FFB7EE9060020AB602-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
+<!--19D5946877B649FFB7EE9060020AB602-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--19D5946877B649FFB7EE9060020AB602-->  <AD_TAB_ID><![CDATA[D28DF93499FC45D4B1DC4C0029FFA914]]></AD_TAB_ID>
+<!--19D5946877B649FFB7EE9060020AB602-->  <AD_COLUMN_ID><![CDATA[36DE0332BC8240C7AC6AF5A1867EAC60]]></AD_COLUMN_ID>
+<!--19D5946877B649FFB7EE9060020AB602-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--19D5946877B649FFB7EE9060020AB602-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--19D5946877B649FFB7EE9060020AB602-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--19D5946877B649FFB7EE9060020AB602-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--19D5946877B649FFB7EE9060020AB602-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--19D5946877B649FFB7EE9060020AB602-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--19D5946877B649FFB7EE9060020AB602-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--19D5946877B649FFB7EE9060020AB602-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--19D5946877B649FFB7EE9060020AB602-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--19D5946877B649FFB7EE9060020AB602-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--19D5946877B649FFB7EE9060020AB602-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--19D5946877B649FFB7EE9060020AB602-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--19D5946877B649FFB7EE9060020AB602-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--19D5946877B649FFB7EE9060020AB602-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--19D5946877B649FFB7EE9060020AB602--></AD_FIELD>
+
 <!--1A19D2C2CA9042E8A34A71847CA9E7CA--><AD_FIELD>
 <!--1A19D2C2CA9042E8A34A71847CA9E7CA-->  <AD_FIELD_ID><![CDATA[1A19D2C2CA9042E8A34A71847CA9E7CA]]></AD_FIELD_ID>
 <!--1A19D2C2CA9042E8A34A71847CA9E7CA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -193922,6 +193949,35 @@
 <!--3DE09F050A624C9D9E5477D0A94491A1-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--3DE09F050A624C9D9E5477D0A94491A1--></AD_FIELD>
 
+<!--3E3169911F044405AB4ED0F424E84CD5--><AD_FIELD>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <AD_FIELD_ID><![CDATA[3E3169911F044405AB4ED0F424E84CD5]]></AD_FIELD_ID>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <NAME><![CDATA[Included Characteristics]]></NAME>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <DESCRIPTION><![CDATA[Product Characteristics Selection Mode]]></DESCRIPTION>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <HELP><![CDATA[Defines the way Product Characteristics will be selected (including or excluding the taken ones)]]></HELP>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <AD_TAB_ID><![CDATA[800079]]></AD_TAB_ID>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <AD_COLUMN_ID><![CDATA[EDA2301E6E14420BBA6E6D35589B0824]]></AD_COLUMN_ID>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <SEQNO><![CDATA[152]]></SEQNO>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <GRID_SEQNO><![CDATA[155]]></GRID_SEQNO>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--3E3169911F044405AB4ED0F424E84CD5-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--3E3169911F044405AB4ED0F424E84CD5--></AD_FIELD>
+
 <!--3E4741567DA14D638DCD3AA008D18EC3--><AD_FIELD>
 <!--3E4741567DA14D638DCD3AA008D18EC3-->  <AD_FIELD_ID><![CDATA[3E4741567DA14D638DCD3AA008D18EC3]]></AD_FIELD_ID>
 <!--3E4741567DA14D638DCD3AA008D18EC3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -194545,6 +194601,33 @@
 <!--4067AD7F0E8F41FBA5E1FD302A6623C5-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--4067AD7F0E8F41FBA5E1FD302A6623C5--></AD_FIELD>
 
+<!--406CA27D80324D949C3CCB6120EBA84E--><AD_FIELD>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <AD_FIELD_ID><![CDATA[406CA27D80324D949C3CCB6120EBA84E]]></AD_FIELD_ID>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <NAME><![CDATA[Characteristic Value]]></NAME>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <HELP><![CDATA[Identifies a possible value of a Product Characteristic]]></HELP>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <AD_TAB_ID><![CDATA[D28DF93499FC45D4B1DC4C0029FFA914]]></AD_TAB_ID>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <AD_COLUMN_ID><![CDATA[2B9B0E3218C742D4B7FE0F2681294FDC]]></AD_COLUMN_ID>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--406CA27D80324D949C3CCB6120EBA84E-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--406CA27D80324D949C3CCB6120EBA84E--></AD_FIELD>
+
 <!--406CCAB2151D498799711099C60AECD1--><AD_FIELD>
 <!--406CCAB2151D498799711099C60AECD1-->  <AD_FIELD_ID><![CDATA[406CCAB2151D498799711099C60AECD1]]></AD_FIELD_ID>
 <!--406CCAB2151D498799711099C60AECD1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -203290,6 +203373,34 @@
 <!--569E7164AA3BAC7FE040007F01003003-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--569E7164AA3BAC7FE040007F01003003--></AD_FIELD>
 
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2--><AD_FIELD>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <AD_FIELD_ID><![CDATA[56B3BA3CF9024D688DCFAF2B3DD174F2]]></AD_FIELD_ID>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <NAME><![CDATA[Organization]]></NAME>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <AD_TAB_ID><![CDATA[D28DF93499FC45D4B1DC4C0029FFA914]]></AD_TAB_ID>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <AD_COLUMN_ID><![CDATA[CB017DFEE5BE4203BC36BD905328B0AE]]></AD_COLUMN_ID>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--56B3BA3CF9024D688DCFAF2B3DD174F2--></AD_FIELD>
+
 <!--56C90AF5286248D2804D12424D687AC1--><AD_FIELD>
 <!--56C90AF5286248D2804D12424D687AC1-->  <AD_FIELD_ID><![CDATA[56C90AF5286248D2804D12424D687AC1]]></AD_FIELD_ID>
 <!--56C90AF5286248D2804D12424D687AC1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -212872,6 +212983,32 @@
 <!--5FF0B38B62ED48A394B5FACE1259D83E-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--5FF0B38B62ED48A394B5FACE1259D83E--></AD_FIELD>
 
+<!--6007073CF8AC4E42937C11424D63BACC--><AD_FIELD>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <AD_FIELD_ID><![CDATA[6007073CF8AC4E42937C11424D63BACC]]></AD_FIELD_ID>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <NAME><![CDATA[Characteristic]]></NAME>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <HELP><![CDATA[Definition of a Product Characteristic]]></HELP>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <AD_TAB_ID><![CDATA[D28DF93499FC45D4B1DC4C0029FFA914]]></AD_TAB_ID>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <AD_COLUMN_ID><![CDATA[EDA51A595C0C4FE893801660D87AD9AD]]></AD_COLUMN_ID>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--6007073CF8AC4E42937C11424D63BACC-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--6007073CF8AC4E42937C11424D63BACC--></AD_FIELD>
+
 <!--600FD4C80DCC42AF82AEF75DCC7BC961--><AD_FIELD>
 <!--600FD4C80DCC42AF82AEF75DCC7BC961-->  <AD_FIELD_ID><![CDATA[600FD4C80DCC42AF82AEF75DCC7BC961]]></AD_FIELD_ID>
 <!--600FD4C80DCC42AF82AEF75DCC7BC961-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -263178,6 +263315,33 @@
 <!--C37BA16A2D2F4917BAACFAFD32DF6BDC-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--C37BA16A2D2F4917BAACFAFD32DF6BDC--></AD_FIELD>
 
+<!--C384006BD6DC400585A2788E76C8A5E8--><AD_FIELD>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <AD_FIELD_ID><![CDATA[C384006BD6DC400585A2788E76C8A5E8]]></AD_FIELD_ID>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <NAME><![CDATA[Characteristic]]></NAME>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <HELP><![CDATA[Definition of a Product Characteristic]]></HELP>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <AD_TAB_ID><![CDATA[D28DF93499FC45D4B1DC4C0029FFA914]]></AD_TAB_ID>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <AD_COLUMN_ID><![CDATA[FCA68B79DB904650A60CD5BC389A1036]]></AD_COLUMN_ID>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--C384006BD6DC400585A2788E76C8A5E8-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--C384006BD6DC400585A2788E76C8A5E8--></AD_FIELD>
+
 <!--C3851545D3EC83AAE040007F01000897--><AD_FIELD>
 <!--C3851545D3EC83AAE040007F01000897-->  <AD_FIELD_ID><![CDATA[C3851545D3EC83AAE040007F01000897]]></AD_FIELD_ID>
 <!--C3851545D3EC83AAE040007F01000897-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -278644,6 +278808,36 @@
 <!--E2A219F80DF744D590A3953A5CFCBC63-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--E2A219F80DF744D590A3953A5CFCBC63--></AD_FIELD>
 
+<!--E2A3E81260FB48F3B0DD029D747CA5B1--><AD_FIELD>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <AD_FIELD_ID><![CDATA[E2A3E81260FB48F3B0DD029D747CA5B1]]></AD_FIELD_ID>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <NAME><![CDATA[Active]]></NAME>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <DESCRIPTION><![CDATA[A flag indicating whether this record is available for use or de-activated.]]></DESCRIPTION>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <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>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <AD_TAB_ID><![CDATA[D28DF93499FC45D4B1DC4C0029FFA914]]></AD_TAB_ID>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <AD_COLUMN_ID><![CDATA[BAE18F6D77384FA0AFF85A092F7655C9]]></AD_COLUMN_ID>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--E2A3E81260FB48F3B0DD029D747CA5B1--></AD_FIELD>
+
 <!--E2BCC1ABBC3142A999E7AEFA1F757B1A--><AD_FIELD>
 <!--E2BCC1ABBC3142A999E7AEFA1F757B1A-->  <AD_FIELD_ID><![CDATA[E2BCC1ABBC3142A999E7AEFA1F757B1A]]></AD_FIELD_ID>
 <!--E2BCC1ABBC3142A999E7AEFA1F757B1A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -283324,6 +283518,34 @@
 <!--F3B4EB362BFD4277B79591C0AE3B7D9E-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--F3B4EB362BFD4277B79591C0AE3B7D9E--></AD_FIELD>
 
+<!--F3CABB1B744B4E3E99D3F6C687534779--><AD_FIELD>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <AD_FIELD_ID><![CDATA[F3CABB1B744B4E3E99D3F6C687534779]]></AD_FIELD_ID>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <NAME><![CDATA[Promotion/Discount]]></NAME>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <DESCRIPTION><![CDATA[The ability to raise or lower prices.]]></DESCRIPTION>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <HELP><![CDATA[Promotion or Discount applied to a particular line (product) automatically by the system.]]></HELP>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <AD_TAB_ID><![CDATA[D28DF93499FC45D4B1DC4C0029FFA914]]></AD_TAB_ID>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <AD_COLUMN_ID><![CDATA[01730FB593B944F7AE8DCF140C9B6C90]]></AD_COLUMN_ID>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--F3CABB1B744B4E3E99D3F6C687534779-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--F3CABB1B744B4E3E99D3F6C687534779--></AD_FIELD>
+
 <!--F4048AFA184E446AA24D564F837A1185--><AD_FIELD>
 <!--F4048AFA184E446AA24D564F837A1185-->  <AD_FIELD_ID><![CDATA[F4048AFA184E446AA24D564F837A1185]]></AD_FIELD_ID>
 <!--F4048AFA184E446AA24D564F837A1185-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_REFERENCE.xml	Fri Aug 29 01:35:03 2014 +0900
+++ b/src-db/database/sourcedata/AD_REFERENCE.xml	Thu Aug 28 12:42:56 2014 +0200
@@ -5879,6 +5879,18 @@
 <!--AD93286C917A4A74BE5898FD0158100A-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
 <!--AD93286C917A4A74BE5898FD0158100A--></AD_REFERENCE>
 
+<!--ADE80203FF1D4143854E6B938CF3E8B9--><AD_REFERENCE>
+<!--ADE80203FF1D4143854E6B938CF3E8B9-->  <AD_REFERENCE_ID><![CDATA[ADE80203FF1D4143854E6B938CF3E8B9]]></AD_REFERENCE_ID>
+<!--ADE80203FF1D4143854E6B938CF3E8B9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--ADE80203FF1D4143854E6B938CF3E8B9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--ADE80203FF1D4143854E6B938CF3E8B9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--ADE80203FF1D4143854E6B938CF3E8B9-->  <NAME><![CDATA[Characteristic Selector w/ filter]]></NAME>
+<!--ADE80203FF1D4143854E6B938CF3E8B9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--ADE80203FF1D4143854E6B938CF3E8B9-->  <ISBASEREFERENCE><![CDATA[N]]></ISBASEREFERENCE>
+<!--ADE80203FF1D4143854E6B938CF3E8B9-->  <PARENTREFERENCE_ID><![CDATA[8C57A4A2E05F4261A1FADF47C30398AD]]></PARENTREFERENCE_ID>
+<!--ADE80203FF1D4143854E6B938CF3E8B9-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
+<!--ADE80203FF1D4143854E6B938CF3E8B9--></AD_REFERENCE>
+
 <!--AE201981DDC0467FB59F64CA978C749F--><AD_REFERENCE>
 <!--AE201981DDC0467FB59F64CA978C749F-->  <AD_REFERENCE_ID><![CDATA[AE201981DDC0467FB59F64CA978C749F]]></AD_REFERENCE_ID>
 <!--AE201981DDC0467FB59F64CA978C749F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_REF_TREE.xml	Fri Aug 29 01:35:03 2014 +0900
+++ b/src-db/database/sourcedata/AD_REF_TREE.xml	Thu Aug 28 12:42:56 2014 +0200
@@ -14,4 +14,18 @@
 <!--95582A51651D415993D0FD3B64C8E861-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--95582A51651D415993D0FD3B64C8E861--></AD_REF_TREE>
 
+<!--FC3C572D3FF64B7AAC4C279C45235795--><AD_REF_TREE>
+<!--FC3C572D3FF64B7AAC4C279C45235795-->  <AD_REF_TREE_ID><![CDATA[FC3C572D3FF64B7AAC4C279C45235795]]></AD_REF_TREE_ID>
+<!--FC3C572D3FF64B7AAC4C279C45235795-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FC3C572D3FF64B7AAC4C279C45235795-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FC3C572D3FF64B7AAC4C279C45235795-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FC3C572D3FF64B7AAC4C279C45235795-->  <AD_REFERENCE_ID><![CDATA[ADE80203FF1D4143854E6B938CF3E8B9]]></AD_REFERENCE_ID>
+<!--FC3C572D3FF64B7AAC4C279C45235795-->  <AD_TABLE_ID><![CDATA[E913D17C9B3847CF92235082DBE2EC44]]></AD_TABLE_ID>
+<!--FC3C572D3FF64B7AAC4C279C45235795-->  <WHERECLAUSE><![CDATA[e.characteristic.id =@inpmCharacteristicId@]]></WHERECLAUSE>
+<!--FC3C572D3FF64B7AAC4C279C45235795-->  <VALUEFIELD_ID><![CDATA[ECE4447ED4F44F98A131EB1AA09F5817]]></VALUEFIELD_ID>
+<!--FC3C572D3FF64B7AAC4C279C45235795-->  <DISPLAYFIELD_ID><![CDATA[BB9B971B2D774C59B3B1AD0A76CC9294]]></DISPLAYFIELD_ID>
+<!--FC3C572D3FF64B7AAC4C279C45235795-->  <AD_TABLE_TREE_ID><![CDATA[B6C7204712CC4EDEB5705C93F706DF05]]></AD_TABLE_TREE_ID>
+<!--FC3C572D3FF64B7AAC4C279C45235795-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--FC3C572D3FF64B7AAC4C279C45235795--></AD_REF_TREE>
+
 </data>
--- a/src-db/database/sourcedata/AD_REF_TREE_FIELD.xml	Fri Aug 29 01:35:03 2014 +0900
+++ b/src-db/database/sourcedata/AD_REF_TREE_FIELD.xml	Thu Aug 28 12:42:56 2014 +0200
@@ -36,4 +36,40 @@
 <!--7B82AF2B5C2C48CDB05C78BA3DC26989-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
 <!--7B82AF2B5C2C48CDB05C78BA3DC26989--></AD_REF_TREE_FIELD>
 
+<!--BB9B971B2D774C59B3B1AD0A76CC9294--><AD_REF_TREE_FIELD>
+<!--BB9B971B2D774C59B3B1AD0A76CC9294-->  <AD_REF_TREE_FIELD_ID><![CDATA[BB9B971B2D774C59B3B1AD0A76CC9294]]></AD_REF_TREE_FIELD_ID>
+<!--BB9B971B2D774C59B3B1AD0A76CC9294-->  <AD_REF_TREE_ID><![CDATA[FC3C572D3FF64B7AAC4C279C45235795]]></AD_REF_TREE_ID>
+<!--BB9B971B2D774C59B3B1AD0A76CC9294-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BB9B971B2D774C59B3B1AD0A76CC9294-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BB9B971B2D774C59B3B1AD0A76CC9294-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--BB9B971B2D774C59B3B1AD0A76CC9294-->  <NAME><![CDATA[name]]></NAME>
+<!--BB9B971B2D774C59B3B1AD0A76CC9294-->  <PROPERTY><![CDATA[name]]></PROPERTY>
+<!--BB9B971B2D774C59B3B1AD0A76CC9294-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--BB9B971B2D774C59B3B1AD0A76CC9294-->  <SORT><![CDATA[N]]></SORT>
+<!--BB9B971B2D774C59B3B1AD0A76CC9294-->  <FILTER><![CDATA[Y]]></FILTER>
+<!--BB9B971B2D774C59B3B1AD0A76CC9294-->  <SEARCHINSUGGESTIONBOX><![CDATA[N]]></SEARCHINSUGGESTIONBOX>
+<!--BB9B971B2D774C59B3B1AD0A76CC9294-->  <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
+<!--BB9B971B2D774C59B3B1AD0A76CC9294-->  <SORTNO><![CDATA[0]]></SORTNO>
+<!--BB9B971B2D774C59B3B1AD0A76CC9294-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BB9B971B2D774C59B3B1AD0A76CC9294-->  <SHOWINPICKLIST><![CDATA[Y]]></SHOWINPICKLIST>
+<!--BB9B971B2D774C59B3B1AD0A76CC9294--></AD_REF_TREE_FIELD>
+
+<!--ECE4447ED4F44F98A131EB1AA09F5817--><AD_REF_TREE_FIELD>
+<!--ECE4447ED4F44F98A131EB1AA09F5817-->  <AD_REF_TREE_FIELD_ID><![CDATA[ECE4447ED4F44F98A131EB1AA09F5817]]></AD_REF_TREE_FIELD_ID>
+<!--ECE4447ED4F44F98A131EB1AA09F5817-->  <AD_REF_TREE_ID><![CDATA[FC3C572D3FF64B7AAC4C279C45235795]]></AD_REF_TREE_ID>
+<!--ECE4447ED4F44F98A131EB1AA09F5817-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--ECE4447ED4F44F98A131EB1AA09F5817-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--ECE4447ED4F44F98A131EB1AA09F5817-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--ECE4447ED4F44F98A131EB1AA09F5817-->  <NAME><![CDATA[ID]]></NAME>
+<!--ECE4447ED4F44F98A131EB1AA09F5817-->  <PROPERTY><![CDATA[id]]></PROPERTY>
+<!--ECE4447ED4F44F98A131EB1AA09F5817-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--ECE4447ED4F44F98A131EB1AA09F5817-->  <SORT><![CDATA[N]]></SORT>
+<!--ECE4447ED4F44F98A131EB1AA09F5817-->  <FILTER><![CDATA[N]]></FILTER>
+<!--ECE4447ED4F44F98A131EB1AA09F5817-->  <SEARCHINSUGGESTIONBOX><![CDATA[N]]></SEARCHINSUGGESTIONBOX>
+<!--ECE4447ED4F44F98A131EB1AA09F5817-->  <SHOWINGRID><![CDATA[N]]></SHOWINGRID>
+<!--ECE4447ED4F44F98A131EB1AA09F5817-->  <SORTNO><![CDATA[0]]></SORTNO>
+<!--ECE4447ED4F44F98A131EB1AA09F5817-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--ECE4447ED4F44F98A131EB1AA09F5817-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
+<!--ECE4447ED4F44F98A131EB1AA09F5817--></AD_REF_TREE_FIELD>
+
 </data>
--- a/src-db/database/sourcedata/AD_TAB.xml	Fri Aug 29 01:35:03 2014 +0900
+++ b/src-db/database/sourcedata/AD_TAB.xml	Thu Aug 28 12:42:56 2014 +0200
@@ -17878,6 +17878,37 @@
 <!--D173CDA24A0C431A94CEE845DC1E6290-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
 <!--D173CDA24A0C431A94CEE845DC1E6290--></AD_TAB>
 
+<!--D28DF93499FC45D4B1DC4C0029FFA914--><AD_TAB>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <AD_TAB_ID><![CDATA[D28DF93499FC45D4B1DC4C0029FFA914]]></AD_TAB_ID>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <NAME><![CDATA[Characteristics]]></NAME>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <DESCRIPTION><![CDATA[Add product characteristics in order to include or exclude them from a selected Promotion/Discount..]]></DESCRIPTION>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <HELP><![CDATA[Add product characteristics in order to include or exclude them from a selected Promotion/Discount..]]></HELP>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <AD_TABLE_ID><![CDATA[8FF90F99857D4F0F842FE3B2C356E9B4]]></AD_TABLE_ID>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <AD_WINDOW_ID><![CDATA[800028]]></AD_WINDOW_ID>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <TABLEVEL><![CDATA[1]]></TABLEVEL>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <ISSINGLEROW><![CDATA[N]]></ISSINGLEROW>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <ISINFOTAB><![CDATA[N]]></ISINFOTAB>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <ISTRANSLATIONTAB><![CDATA[N]]></ISTRANSLATIONTAB>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <HASTREE><![CDATA[N]]></HASTREE>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <PROCESSING><![CDATA[N]]></PROCESSING>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <IMPORTFIELDS><![CDATA[N]]></IMPORTFIELDS>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <ISSORTTAB><![CDATA[N]]></ISSORTTAB>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <ISREADONLYTREE><![CDATA[N]]></ISREADONLYTREE>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <ISSHOWTREENODEICONS><![CDATA[Y]]></ISSHOWTREENODEICONS>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
+<!--D28DF93499FC45D4B1DC4C0029FFA914-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
+<!--D28DF93499FC45D4B1DC4C0029FFA914--></AD_TAB>
+
 <!--D53F675ADB2745059623175D8870A721--><AD_TAB>
 <!--D53F675ADB2745059623175D8870A721-->  <AD_TAB_ID><![CDATA[D53F675ADB2745059623175D8870A721]]></AD_TAB_ID>
 <!--D53F675ADB2745059623175D8870A721-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_TABLE.xml	Fri Aug 29 01:35:03 2014 +0900
+++ b/src-db/database/sourcedata/AD_TABLE.xml	Thu Aug 28 12:42:56 2014 +0200
@@ -10857,6 +10857,31 @@
 <!--8FD3DEA921D74CAFB5D4296A0375E958-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--8FD3DEA921D74CAFB5D4296A0375E958--></AD_TABLE>
 
+<!--8FF90F99857D4F0F842FE3B2C356E9B4--><AD_TABLE>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4-->  <AD_TABLE_ID><![CDATA[8FF90F99857D4F0F842FE3B2C356E9B4]]></AD_TABLE_ID>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4-->  <NAME><![CDATA[PricingAdjustmentCharacteristic]]></NAME>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4-->  <DESCRIPTION><![CDATA[Characteristic configuration]]></DESCRIPTION>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4-->  <HELP><![CDATA[Used to select the product characteristics related to the Price Adjustment.]]></HELP>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4-->  <TABLENAME><![CDATA[M_Offer_Characteristic]]></TABLENAME>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4-->  <CLASSNAME><![CDATA[Characteristic]]></CLASSNAME>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4-->  <ISVIEW><![CDATA[N]]></ISVIEW>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4-->  <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4-->  <AD_WINDOW_ID><![CDATA[800028]]></AD_WINDOW_ID>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4-->  <ISSECURITYENABLED><![CDATA[N]]></ISSECURITYENABLED>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4-->  <ISDELETEABLE><![CDATA[Y]]></ISDELETEABLE>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4-->  <ISHIGHVOLUME><![CDATA[N]]></ISHIGHVOLUME>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4-->  <IMPORTTABLE><![CDATA[N]]></IMPORTTABLE>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4-->  <ISCHANGELOG><![CDATA[N]]></ISCHANGELOG>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4-->  <ISDEFAULTACCT><![CDATA[N]]></ISDEFAULTACCT>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4-->  <AD_PACKAGE_ID><![CDATA[5A3ED54AB1F54B84E040007F01006125]]></AD_PACKAGE_ID>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4-->  <ISTREE><![CDATA[N]]></ISTREE>
+<!--8FF90F99857D4F0F842FE3B2C356E9B4--></AD_TABLE>
+
 <!--9072A1C049584DB69E4F42AE20B5CB66--><AD_TABLE>
 <!--9072A1C049584DB69E4F42AE20B5CB66-->  <AD_TABLE_ID><![CDATA[9072A1C049584DB69E4F42AE20B5CB66]]></AD_TABLE_ID>
 <!--9072A1C049584DB69E4F42AE20B5CB66-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml	Fri Aug 29 01:35:03 2014 +0900
+++ b/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml	Thu Aug 28 12:42:56 2014 +0200
@@ -233,6 +233,7 @@
 <!--6B8309393CF44CCD977219C72458D625-->  <OBUIAPP_PROCESS_ID><![CDATA[B5C942145F354ABEBC9F16235D80D776]]></OBUIAPP_PROCESS_ID>
 <!--6B8309393CF44CCD977219C72458D625-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
 <!--6B8309393CF44CCD977219C72458D625-->  <DISPLAYLOGIC><![CDATA[@Amount@=false & @Default_Conversion_Rate@=false]]></DISPLAYLOGIC>
+<!--6B8309393CF44CCD977219C72458D625-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--6B8309393CF44CCD977219C72458D625-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
 <!--6B8309393CF44CCD977219C72458D625--></OBUIAPP_PARAMETER>
 
@@ -326,6 +327,7 @@
 <!--BD2E03E3599741679722CF98D4DF0B8A-->  <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE>
 <!--BD2E03E3599741679722CF98D4DF0B8A-->  <OBUIAPP_PROCESS_ID><![CDATA[B5C942145F354ABEBC9F16235D80D776]]></OBUIAPP_PROCESS_ID>
 <!--BD2E03E3599741679722CF98D4DF0B8A-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
+<!--BD2E03E3599741679722CF98D4DF0B8A-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--BD2E03E3599741679722CF98D4DF0B8A-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
 <!--BD2E03E3599741679722CF98D4DF0B8A--></OBUIAPP_PARAMETER>
 
@@ -372,6 +374,7 @@
 <!--C114239B5A004A45B27C7C6DA7D9EB14-->  <OBUIAPP_PROCESS_ID><![CDATA[B5C942145F354ABEBC9F16235D80D776]]></OBUIAPP_PROCESS_ID>
 <!--C114239B5A004A45B27C7C6DA7D9EB14-->  <STARTINNEWLINE><![CDATA[Y]]></STARTINNEWLINE>
 <!--C114239B5A004A45B27C7C6DA7D9EB14-->  <DISPLAYLOGIC><![CDATA[@Amount@=true]]></DISPLAYLOGIC>
+<!--C114239B5A004A45B27C7C6DA7D9EB14-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--C114239B5A004A45B27C7C6DA7D9EB14-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
 <!--C114239B5A004A45B27C7C6DA7D9EB14--></OBUIAPP_PARAMETER>
 
@@ -397,6 +400,7 @@
 <!--CBC804D8326C443985FB4A62D2EC7FD4-->  <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE>
 <!--CBC804D8326C443985FB4A62D2EC7FD4-->  <OBUIAPP_PROCESS_ID><![CDATA[B5C942145F354ABEBC9F16235D80D776]]></OBUIAPP_PROCESS_ID>
 <!--CBC804D8326C443985FB4A62D2EC7FD4-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
+<!--CBC804D8326C443985FB4A62D2EC7FD4-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--CBC804D8326C443985FB4A62D2EC7FD4-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
 <!--CBC804D8326C443985FB4A62D2EC7FD4--></OBUIAPP_PARAMETER>
 
@@ -491,6 +495,7 @@
 <!--F693A2C4889646C8AFD301133F7B0C1F-->  <OBUIAPP_PROCESS_ID><![CDATA[B5C942145F354ABEBC9F16235D80D776]]></OBUIAPP_PROCESS_ID>
 <!--F693A2C4889646C8AFD301133F7B0C1F-->  <STARTINNEWLINE><![CDATA[Y]]></STARTINNEWLINE>
 <!--F693A2C4889646C8AFD301133F7B0C1F-->  <DISPLAYLOGIC><![CDATA[@Amount@=false]]></DISPLAYLOGIC>
+<!--F693A2C4889646C8AFD301133F7B0C1F-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--F693A2C4889646C8AFD301133F7B0C1F-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
 <!--F693A2C4889646C8AFD301133F7B0C1F--></OBUIAPP_PARAMETER>
 
--- a/src/org/openbravo/erpCommon/businessUtility/PriceAdjustment.java	Fri Aug 29 01:35:03 2014 +0900
+++ b/src/org/openbravo/erpCommon/businessUtility/PriceAdjustment.java	Thu Aug 28 12:42:56 2014 +0200
@@ -229,6 +229,27 @@
     hql += "          and o.organization.id = :org )) ";
     hql += "    ) ";
 
+    // product characteristic
+    hql += "and ((includedCharacteristics='Y' ";
+    hql += "  and not exists (select 1 ";
+    hql += "         from Characteristic c ";
+    hql += "           join c.pricingAdjustmentCharacteristicList pac ";
+    hql += "           join c.productCharacteristicValueList pcv ";
+    hql += "         where  pcv.product = :product ";
+    hql += "          and pac.offer = p ";
+    hql += "          and m_isparent_ch_value(pcv.characteristicValue.id, pac.chValue.id, pac.characteristic.id) != -1 ";
+    hql += "          )) ";
+    hql += "   or (includedCharacteristics='N' ";
+    hql += "  and  exists (select 1 ";
+    hql += "         from Characteristic c ";
+    hql += "           join c.pricingAdjustmentCharacteristicList pac ";
+    hql += "           join c.productCharacteristicValueList pcv ";
+    hql += "         where  pcv.product = :product ";
+    hql += "          and pac.offer = p ";
+    hql += "          and m_isparent_ch_value(pcv.characteristicValue.id, pac.chValue.id, pac.characteristic.id) != -1 ";
+    hql += "          )) ";
+    hql += "    ) ";
+
     hql += " order by priority, id";
 
     OBQuery<org.openbravo.model.pricing.priceadjustment.PriceAdjustment> q = OBDal.getInstance()