Update to 3.0PR18Q2 3.0PR18Q2
authorRM packaging bot <staff.rm@openbravo.com>
Wed, 09 May 2018 04:45:09 +0000
changeset 810 637d28fbea6d
parent 809 d4b4b7b31846
child 811 0001f56248f9
Update to 3.0PR18Q2
java/reference/java.japi.gz
model/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_TAX_PAYMENT.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/AD_ORG.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINANCIAL_ACCOUNT.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_VAL_RULE.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PROCESS.xml
model/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml
model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml
model/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml
model/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/src-db/database/model/functions/AD_SYNCHRONIZE.xml
model/src-db/database/model/functions/A_ASSET_CREATE.xml
model/src-db/database/model/functions/A_ASSET_POST.xml
model/src-db/database/model/functions/C_CHANGEPROJECTSTATUS.xml
model/src-db/database/model/functions/C_DEBT_PAYMENT_BALANCING_REP.xml
model/src-db/database/model/functions/C_DP_MANAGEMENT_POST.xml
model/src-db/database/model/functions/C_INVOICELINE_TAX.xml
model/src-db/database/model/functions/C_INVOICE_CANCEL.xml
model/src-db/database/model/functions/C_INVOICE_CREATE.xml
model/src-db/database/model/functions/C_INVOICE_POST.xml
model/src-db/database/model/functions/C_ORDER_POST1.xml
model/src-db/database/model/functions/C_SETTLEMENT_POST.xml
model/src-db/database/model/functions/C_TAXPAYMENT_POST.xml
model/src-db/database/model/functions/C_VALIDCOMBINATION_CLONE.xml
model/src-db/database/model/functions/FACT_ACCT_RESET.xml
model/src-db/database/model/functions/GL_JOURNAL_POST.xml
model/src-db/database/model/functions/MA_PRODUCTION_COST.xml
model/src-db/database/model/functions/MA_STANDARD_COST_SEQUENCE.xml
model/src-db/database/model/functions/MA_WORKEFFORT_VALIDATE.xml
model/src-db/database/model/functions/MA_WORKREQUIREMENT_CLOSE.xml
model/src-db/database/model/functions/MA_WORKREQUIREMENT_PROCESS.xml
model/src-db/database/model/functions/MA_WRPHASE_CLOSE.xml
model/src-db/database/model/functions/M_CREATE_RESERVE_FROM_SOL.xml
model/src-db/database/model/functions/M_DISCOUNTSCHEMA_RESEQ.xml
model/src-db/database/model/functions/M_EXPLODEBOMNOTSTOCK.xml
model/src-db/database/model/functions/M_FREIGHT_CALCULATE.xml
model/src-db/database/model/functions/M_GENERATE_AVERAGE_COSTS.xml
model/src-db/database/model/functions/M_GENERATE_STANDARD_COSTS.xml
model/src-db/database/model/functions/M_GET_STOCK_PARAM.xml
model/src-db/database/model/functions/M_INOUTEXPLODEBOMNOTSTOCK.xml
model/src-db/database/model/functions/M_INOUT_CREATE.xml
model/src-db/database/model/functions/M_INOUT_CREATEINVOICE.xml
model/src-db/database/model/functions/M_INOUT_POST.xml
model/src-db/database/model/functions/M_INOUT_UPDATEQUANTITYES.xml
model/src-db/database/model/functions/M_MOVEMENT_POST.xml
model/src-db/database/model/functions/M_PROMOTION_ADJUSTMENT.xml
model/src-db/database/model/functions/M_PROMOTION_CALCULATE.xml
model/src-db/database/model/functions/M_REQUISITION_CREATEPO.xml
model/src-db/database/model/functions/M_RESERVATION_CONSUMPTION.xml
model/src-db/database/model/functions/M_RESERVE_STOCK_MANUAL.xml
model/src-db/database/model/functions/M_UNIQUELOCATOR_RULE_PARAM.xml
model/src-db/database/model/functions/M_UPDATE_INVENTORY.xml
model/src-db/database/model/prescript-PostgreSql.sql
model/src-db/database/model/tables/AD_CLUSTER_SERVICE.xml
model/src-db/database/model/tables/AD_CLUSTER_SERVICE_SETTINGS.xml
model/src-db/database/model/tables/AD_HEARTBEAT_LOG.xml
model/src-db/database/model/tables/AD_MODULE.xml
model/src-db/database/model/tables/AD_MODULE_INSTALL.xml
model/src-db/database/model/tables/AD_SYSTEM_INFO.xml
model/src-db/database/model/tables/C_INVOICELINE.xml
model/src-db/database/model/tables/C_ORDERLINE.xml
model/src-db/database/model/tables/M_ATTRIBUTESETINSTANCE.xml
model/src-db/database/model/tables/M_INOUT.xml
model/src-db/database/model/tables/M_INVENTORYLINE.xml
model/src-db/database/model/tables/M_STORAGE_DETAIL.xml
model/src-db/database/model/triggers/A_ASSET_TRG.xml
model/src-db/database/model/triggers/C_ATTACHMENT_METHOD_MOD_TRG.xml
model/src-db/database/model/triggers/C_BPARTNER_TRG.xml
model/src-db/database/model/triggers/C_INVLINE_CHK_RESTRICTIONS_TRG.xml
model/src-db/database/model/triggers/C_INVOICELINETAX_TRG.xml
model/src-db/database/model/triggers/C_INVOICELINE_TRG.xml
model/src-db/database/model/triggers/C_INVOICELINE_TRG2.xml
model/src-db/database/model/triggers/C_ORDERLINE2_TRG.xml
model/src-db/database/model/triggers/C_ORDERLINETAX_TRG.xml
model/src-db/database/model/triggers/C_ORDERLINE_TRG.xml
model/src-db/database/model/triggers/C_ORDERLINE_TRG2.xml
model/src-db/database/model/triggers/C_ORDLINE_CHK_RESTRICTIONS_TRG.xml
model/src-db/database/model/triggers/C_PROJECTLINE_TRG.xml
model/src-db/database/model/triggers/C_PROJECT_TRG3.xml
model/src-db/database/model/triggers/MA_GLOBALUSE_TRG.xml
model/src-db/database/model/triggers/M_COSTADJUSTMENTLINE_CHK_TRG.xml
model/src-db/database/model/triggers/M_INTERNAL_CONSUMPTIONLINE_TRG.xml
model/src-db/database/model/triggers/M_INVENTORYLINE2_TRG.xml
model/src-db/database/model/triggers/M_IOLINE_CHK_RESTRICTIONS_TRG.xml
model/src-db/database/model/triggers/M_MOVEMENTLINE_TRG.xml
model/src-db/database/model/triggers/M_OFFER_TYPE_MOD_TRG.xml
model/src-db/database/model/triggers/M_PRODUCTIONLINE_TRG.xml
model/src-db/database/model/triggers/M_REQUISITIONLINE_TRG.xml
model/src-db/database/model/triggers/M_RESERVATION_TRG.xml
model/src-db/database/model/triggers/M_STORAGE_DETAIL_TRG.xml
model/src-db/database/model/triggers/M_TRANSACTION_TRG2.xml
model/src-db/database/model/triggers/S_TIMEEXPENSELINE_TRG.xml
model/src-db/database/model/views/C_INVOICE_CANDIDATE_V.xml
model/src-db/database/model/views/M_PRODUCT_STOCK_V.xml
model/src-db/database/sourcedata/AD_AUXILIARINPUT.xml
model/src-db/database/sourcedata/AD_CALLOUT.xml
model/src-db/database/sourcedata/AD_COLUMN.xml
model/src-db/database/sourcedata/AD_DATASET_COLUMN.xml
model/src-db/database/sourcedata/AD_DATASET_TABLE.xml
model/src-db/database/sourcedata/AD_ELEMENT.xml
model/src-db/database/sourcedata/AD_EXTENSION_POINTS.xml
model/src-db/database/sourcedata/AD_FIELD.xml
model/src-db/database/sourcedata/AD_MENU.xml
model/src-db/database/sourcedata/AD_MESSAGE.xml
model/src-db/database/sourcedata/AD_MODEL_OBJECT.xml
model/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml
model/src-db/database/sourcedata/AD_MODEL_OBJECT_PARA.xml
model/src-db/database/sourcedata/AD_MODULE.xml
model/src-db/database/sourcedata/AD_PROCESS.xml
model/src-db/database/sourcedata/AD_REFERENCE.xml
model/src-db/database/sourcedata/AD_REF_LIST.xml
model/src-db/database/sourcedata/AD_TAB.xml
model/src-db/database/sourcedata/AD_TABLE.xml
model/src-db/database/sourcedata/AD_TABLE_NAVIGATION.xml
model/src-db/database/sourcedata/AD_TABLE_TREE.xml
model/src-db/database/sourcedata/AD_TEXTINTERFACES.xml
model/src-db/database/sourcedata/AD_TREENODE.xml
model/src-db/database/sourcedata/AD_VAL_RULE.xml
model/src-db/database/sourcedata/AD_WINDOW.xml
model/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
model/src-db/database/sourcedata/OBUIAPP_PROCESS.xml
model/src-db/database/sourcedata/OBUIAPP_REF_WINDOW.xml
model/src-db/database/sourcedata/OBUISEL_SELECTOR.xml
model/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
model/src-db/database/sourcedata/referencedData/AD_IMAGE.xml
Binary file java/reference/java.japi.gz has changed
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml	Wed May 09 04:45:09 2018 +0000
@@ -16,7 +16,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2010-2017 Openbravo SLU
+* All portions are Copyright (C) 2010-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -95,6 +95,7 @@
 v_paymentamt NUMBER:=0;
 v_depositamt NUMBER:=0;
 v_transactiontype VARCHAR2(32);
+v_finalsettlementdate C_Invoice.FinalSettlement%TYPE;
 
 BEGIN
 
@@ -613,6 +614,15 @@
       WHERE C_INVOICE_ID=P_RECORD_ID
         AND OUTSTANDINGAMT != 0;
 
+      IF(v_OutstandingAmount = 0) THEN
+        SELECT MAX(lastpayment)
+        INTO v_finalsettlementdate
+        FROM fin_payment_sched_inv_v
+        WHERE c_invoice_id = P_RECORD_ID;
+      ELSE
+        v_finalsettlementdate := NULL;
+      END IF;
+
       --Updating Payment Monitor values into C_INVOICE
       UPDATE C_INVOICE
       SET TOTALPAID = v_PaidAmount,
@@ -621,7 +631,7 @@
           DAYSTILLDUE = V_DayStillDue,
           LASTCALCULATEDONDATE = now(),
           ISPAID = CASE v_OutstandingAmount WHEN 0 THEN 'Y' ELSE 'N' END,
-          FINALSETTLEMENT = CASE v_OutstandingAmount WHEN 0 THEN now() ELSE NULL END
+          FINALSETTLEMENT = v_finalsettlementdate
       WHERE C_INVOICE_ID = P_RECORD_ID;
 
       -- Updating SO_CREDITUSED when Invoices are being processed
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml	Wed May 09 04:45:09 2018 +0000
@@ -21,11 +21,9 @@
 * Contributor(s):  ______________________________________.
 ************************************************************************/
 
-p_message VARCHAR(2000);
 p_record_id VARCHAR(60);
 p_docAction VARCHAR(60);
 p_user VARCHAR(60);
-p_result NUMBER;
 
 v_ResultStr VARCHAR2(2000):='';
 v_GrandTotal NUMBER:=0;
@@ -57,10 +55,6 @@
       p_record_id := cur_params.p_string;
     ELSIF (cur_params.parametername LIKE 'User') THEN
       p_user := cur_params.p_string;
-    ELSIF (cur_params.parametername LIKE 'Message') THEN
-      p_message := cur_params.p_text;
-    ELSIF (cur_params.parametername LIKE 'Result') THEN
-      p_result := cur_params.p_number;
     END IF;
   END LOOP;
 
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_TAX_PAYMENT.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_TAX_PAYMENT.xml	Wed May 09 04:45:09 2018 +0000
@@ -26,8 +26,6 @@
 p_GLItem VARCHAR2(32);
 p_Amount NUMBER;
 p_IsReceipt CHAR(1);
-p_message VARCHAR(2000);
-p_result NUMBER;
 
 v_TaxPaymentName VARCHAR2(60);
 v_FinancialAccountName VARCHAR2(60);
@@ -77,10 +75,6 @@
       p_amount := cur_params.p_number;
     ELSIF (cur_params.parametername LIKE 'IsReceipt') THEN
       p_isReceipt := cur_params.p_string;
-    ELSIF (cur_params.parametername LIKE 'Message') THEN
-      p_message := cur_params.p_text;
-    ELSIF (cur_params.parametername LIKE 'Result') THEN
-      p_result := cur_params.p_number;
     END IF;
   END LOOP;
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/AD_ORG.xml	Wed May 09 04:45:09 2018 +0000
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+  <database name="MODIFIED TABLE AD_ORG">
+    <table name="AD_ORG" primaryKey="AD_ORG_KEY">
+      <column name="EM_APRM_GLITEM_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <foreign-key foreignTable="C_GLITEM" name="EM_APRM_ORG_GLITEM">
+        <reference local="EM_APRM_GLITEM_ID" foreign="C_GLITEM_ID"/>
+      </foreign-key>
+    </table>
+  </database>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINANCIAL_ACCOUNT.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINANCIAL_ACCOUNT.xml	Wed May 09 04:45:09 2018 +0000
@@ -37,5 +37,10 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="EM_APRM_ISFUNDSTRANS_ENABLED" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[Y]]></default>
+        <onCreateDefault/>
+      </column>
+      <check name="EM_APRM_FIN_FINACC_ISFUNDS_CHK"><![CDATA[EM_APRM_ISFUNDSTRANS_ENABLED IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml	Wed May 09 04:45:09 2018 +0000
@@ -10100,6 +10100,45 @@
 <!--B44BDBCFCEC243179D78A333FA0497A5-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--B44BDBCFCEC243179D78A333FA0497A5--></AD_COLUMN>
 
+<!--B502077EB5A64A43A07CD42323BBAC57--><AD_COLUMN>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <AD_COLUMN_ID><![CDATA[B502077EB5A64A43A07CD42323BBAC57]]></AD_COLUMN_ID>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <NAME><![CDATA[EM_Aprm_Isfundstrans_Enabled]]></NAME>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <DESCRIPTION><![CDATA[Funds Transfer Enabled flag is used to show/hide funds transfer button process.]]></DESCRIPTION>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <HELP><![CDATA[Funds Transfer Enabled flag is used to show/hide funds transfer button process and to show/hide Financial Accounts in Funds Transfer Process]]></HELP>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <COLUMNNAME><![CDATA[EM_Aprm_Isfundstrans_Enabled]]></COLUMNNAME>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <AD_TABLE_ID><![CDATA[B129E53BC0E747879F7BA17F0AECEC32]]></AD_TABLE_ID>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <SEQNO><![CDATA[520]]></SEQNO>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <AD_ELEMENT_ID><![CDATA[F18571A261AB41D49246E1C04D647256]]></AD_ELEMENT_ID>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <POSITION><![CDATA[45]]></POSITION>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--B502077EB5A64A43A07CD42323BBAC57-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--B502077EB5A64A43A07CD42323BBAC57--></AD_COLUMN>
+
 <!--B50241F11C4F404583CACB2A88CE875F--><AD_COLUMN>
 <!--B50241F11C4F404583CACB2A88CE875F-->  <AD_COLUMN_ID><![CDATA[B50241F11C4F404583CACB2A88CE875F]]></AD_COLUMN_ID>
 <!--B50241F11C4F404583CACB2A88CE875F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -10141,6 +10180,45 @@
 <!--B50241F11C4F404583CACB2A88CE875F-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--B50241F11C4F404583CACB2A88CE875F--></AD_COLUMN>
 
+<!--B5066970A1944B9EBDA0A2BE48F026F6--><AD_COLUMN>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <AD_COLUMN_ID><![CDATA[B5066970A1944B9EBDA0A2BE48F026F6]]></AD_COLUMN_ID>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <NAME><![CDATA[EM_APRM_Glitem_ID]]></NAME>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <DESCRIPTION><![CDATA[Default G/L Item used for Funds Transfer Process]]></DESCRIPTION>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <HELP><![CDATA[Default G/L Item used for Funds Transfer Process in Financial Account Window]]></HELP>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <COLUMNNAME><![CDATA[EM_APRM_Glitem_ID]]></COLUMNNAME>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <AD_TABLE_ID><![CDATA[155]]></AD_TABLE_ID>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <AD_REFERENCE_VALUE_ID><![CDATA[1A6C5E0A5868417786ECCF3C02B17D65]]></AD_REFERENCE_VALUE_ID>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <SEQNO><![CDATA[81]]></SEQNO>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <AD_ELEMENT_ID><![CDATA[A3F4495893084689A6F604722ACA1EC2]]></AD_ELEMENT_ID>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <POSITION><![CDATA[20]]></POSITION>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--B5066970A1944B9EBDA0A2BE48F026F6-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--B5066970A1944B9EBDA0A2BE48F026F6--></AD_COLUMN>
+
 <!--B591815987C54A369525A5BA485F5FC0--><AD_COLUMN>
 <!--B591815987C54A369525A5BA485F5FC0-->  <AD_COLUMN_ID><![CDATA[B591815987C54A369525A5BA485F5FC0]]></AD_COLUMN_ID>
 <!--B591815987C54A369525A5BA485F5FC0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml	Wed May 09 04:45:09 2018 +0000
@@ -1208,6 +1208,20 @@
 <!--A37C6F84AA463F50E040007F01006E35-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--A37C6F84AA463F50E040007F01006E35--></AD_ELEMENT>
 
+<!--A3F4495893084689A6F604722ACA1EC2--><AD_ELEMENT>
+<!--A3F4495893084689A6F604722ACA1EC2-->  <AD_ELEMENT_ID><![CDATA[A3F4495893084689A6F604722ACA1EC2]]></AD_ELEMENT_ID>
+<!--A3F4495893084689A6F604722ACA1EC2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A3F4495893084689A6F604722ACA1EC2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A3F4495893084689A6F604722ACA1EC2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A3F4495893084689A6F604722ACA1EC2-->  <COLUMNNAME><![CDATA[EM_APRM_Glitem_ID]]></COLUMNNAME>
+<!--A3F4495893084689A6F604722ACA1EC2-->  <NAME><![CDATA[Default G/L Item for Funds Transfer]]></NAME>
+<!--A3F4495893084689A6F604722ACA1EC2-->  <PRINTNAME><![CDATA[Default G/L Item for Funds Transfer]]></PRINTNAME>
+<!--A3F4495893084689A6F604722ACA1EC2-->  <DESCRIPTION><![CDATA[Default G/L Item used for Funds Transfer Process]]></DESCRIPTION>
+<!--A3F4495893084689A6F604722ACA1EC2-->  <HELP><![CDATA[Default G/L Item used for Funds Transfer Process in Financial Account Window]]></HELP>
+<!--A3F4495893084689A6F604722ACA1EC2-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--A3F4495893084689A6F604722ACA1EC2-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--A3F4495893084689A6F604722ACA1EC2--></AD_ELEMENT>
+
 <!--A62C80360F274C44AA6BF58315DF65FF--><AD_ELEMENT>
 <!--A62C80360F274C44AA6BF58315DF65FF-->  <AD_ELEMENT_ID><![CDATA[A62C80360F274C44AA6BF58315DF65FF]]></AD_ELEMENT_ID>
 <!--A62C80360F274C44AA6BF58315DF65FF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1706,6 +1720,20 @@
 <!--F109FCAF8CC1462AB2A94F73F4E51EA7-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--F109FCAF8CC1462AB2A94F73F4E51EA7--></AD_ELEMENT>
 
+<!--F18571A261AB41D49246E1C04D647256--><AD_ELEMENT>
+<!--F18571A261AB41D49246E1C04D647256-->  <AD_ELEMENT_ID><![CDATA[F18571A261AB41D49246E1C04D647256]]></AD_ELEMENT_ID>
+<!--F18571A261AB41D49246E1C04D647256-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F18571A261AB41D49246E1C04D647256-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F18571A261AB41D49246E1C04D647256-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F18571A261AB41D49246E1C04D647256-->  <COLUMNNAME><![CDATA[EM_Aprm_Isfundstrans_Enabled]]></COLUMNNAME>
+<!--F18571A261AB41D49246E1C04D647256-->  <NAME><![CDATA[Funds Transfer Enabled]]></NAME>
+<!--F18571A261AB41D49246E1C04D647256-->  <PRINTNAME><![CDATA[Funds Transfer Enabled]]></PRINTNAME>
+<!--F18571A261AB41D49246E1C04D647256-->  <DESCRIPTION><![CDATA[Funds Transfer Enabled flag is used to show/hide funds transfer button process.]]></DESCRIPTION>
+<!--F18571A261AB41D49246E1C04D647256-->  <HELP><![CDATA[Funds Transfer Enabled flag is used to show/hide funds transfer button process and to show/hide Financial Accounts in Funds Transfer Process]]></HELP>
+<!--F18571A261AB41D49246E1C04D647256-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--F18571A261AB41D49246E1C04D647256-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--F18571A261AB41D49246E1C04D647256--></AD_ELEMENT>
+
 <!--F1D81ADE47094291B577E6B10B2B95E4--><AD_ELEMENT>
 <!--F1D81ADE47094291B577E6B10B2B95E4-->  <AD_ELEMENT_ID><![CDATA[F1D81ADE47094291B577E6B10B2B95E4]]></AD_ELEMENT_ID>
 <!--F1D81ADE47094291B577E6B10B2B95E4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml	Wed May 09 04:45:09 2018 +0000
@@ -877,7 +877,8 @@
 <!--0A650E8E8BD944018FD4FD6866AF1481-->  <AD_COLUMN_ID><![CDATA[AFFEB1DBCEFF4A63871F1E214E01071C]]></AD_COLUMN_ID>
 <!--0A650E8E8BD944018FD4FD6866AF1481-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--0A650E8E8BD944018FD4FD6866AF1481-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--0A650E8E8BD944018FD4FD6866AF1481-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <DISPLAYLOGIC><![CDATA[@EM_Aprm_Isfundstrans_Enabled@='Y']]></DISPLAYLOGIC>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
 <!--0A650E8E8BD944018FD4FD6866AF1481-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--0A650E8E8BD944018FD4FD6866AF1481-->  <SEQNO><![CDATA[440]]></SEQNO>
 <!--0A650E8E8BD944018FD4FD6866AF1481-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
@@ -13580,6 +13581,35 @@
 <!--9AF76E97875345F587C9DD8F64B96431-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--9AF76E97875345F587C9DD8F64B96431--></AD_FIELD>
 
+<!--9BF656872BAF4AFBA443E4430237D527--><AD_FIELD>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <AD_FIELD_ID><![CDATA[9BF656872BAF4AFBA443E4430237D527]]></AD_FIELD_ID>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <NAME><![CDATA[Default G/L Item for Funds Transfer]]></NAME>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <DESCRIPTION><![CDATA[Default G/L Item used for Funds Transfer Process]]></DESCRIPTION>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <HELP><![CDATA[Default G/L Item used for Funds Transfer Process in Financial Account Window]]></HELP>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <AD_TAB_ID><![CDATA[143]]></AD_TAB_ID>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <AD_COLUMN_ID><![CDATA[B5066970A1944B9EBDA0A2BE48F026F6]]></AD_COLUMN_ID>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <SEQNO><![CDATA[106]]></SEQNO>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <GRID_SEQNO><![CDATA[100]]></GRID_SEQNO>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--9BF656872BAF4AFBA443E4430237D527-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--9BF656872BAF4AFBA443E4430237D527--></AD_FIELD>
+
 <!--9CB868DC0BCD49C197CA4AFBBF92093E--><AD_FIELD>
 <!--9CB868DC0BCD49C197CA4AFBBF92093E-->  <AD_FIELD_ID><![CDATA[9CB868DC0BCD49C197CA4AFBBF92093E]]></AD_FIELD_ID>
 <!--9CB868DC0BCD49C197CA4AFBBF92093E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -13778,6 +13808,35 @@
 <!--9E41C5369B034F2DB102624F5277353B-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--9E41C5369B034F2DB102624F5277353B--></AD_FIELD>
 
+<!--9E4ED210DB344E538CA6921C0111E8DD--><AD_FIELD>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <AD_FIELD_ID><![CDATA[9E4ED210DB344E538CA6921C0111E8DD]]></AD_FIELD_ID>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <NAME><![CDATA[Funds Transfer Enabled]]></NAME>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <DESCRIPTION><![CDATA[Funds Transfer Enabled flag is used to show/hide funds transfer button process.]]></DESCRIPTION>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <HELP><![CDATA[Funds Transfer Enabled flag is used to show/hide funds transfer button process.]]></HELP>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <AD_TAB_ID><![CDATA[2845D761A8394468BD3BA4710AA888D4]]></AD_TAB_ID>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <AD_COLUMN_ID><![CDATA[B502077EB5A64A43A07CD42323BBAC57]]></AD_COLUMN_ID>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <SEQNO><![CDATA[135]]></SEQNO>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <GRID_SEQNO><![CDATA[110]]></GRID_SEQNO>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--9E4ED210DB344E538CA6921C0111E8DD-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--9E4ED210DB344E538CA6921C0111E8DD--></AD_FIELD>
+
 <!--9FF475A41081408A892922BF1F7EC5CE--><AD_FIELD>
 <!--9FF475A41081408A892922BF1F7EC5CE-->  <AD_FIELD_ID><![CDATA[9FF475A41081408A892922BF1F7EC5CE]]></AD_FIELD_ID>
 <!--9FF475A41081408A892922BF1F7EC5CE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Wed May 09 04:45:09 2018 +0000
@@ -6,7 +6,7 @@
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></NAME>
-<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.33184]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.33777]]></VERSION>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <DESCRIPTION><![CDATA[Managing your finances with an ERP does not have to be difficult. Enjoy a radically improved user experience that combines the power of an enterprise grade financial application with the simplicity and ease of a web 2.0 personal accounting service.]]></DESCRIPTION>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <HELP><![CDATA[Advanced Payables and Receivables Management simplifies and automates the business processes around the management of financial accounts, from the receipt and issue of payment, to the reconciliation of those events with bank statements.
 If you would like to help shape this module you are welcome to take part in the forum discussions or register feature requests or issues in the corresponding (Forum and Bug Tracking) sections in the Advanced Payables and Receivable project in the OB Forge.]]></HELP>
@@ -25,7 +25,7 @@
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <UPDATEINFO><![CDATA[Fixed issue with document sequence numbers reset in case of applying dataset second time.
 Fixed issue 15305.]]></UPDATEINFO>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <REFERENCEDATAINFO><![CDATA[Document types and default algorithm for bank statement auto matching]]></REFERENCEDATAINFO>
-<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION_LABEL><![CDATA[PR18Q2]]></VERSION_LABEL>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--A918E3331C404B889D69AA9BFAFB23AC--></AD_MODULE>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed May 09 04:45:09 2018 +0000
@@ -7,7 +7,7 @@
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID>
-<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.33184]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.33777]]></STARTVERSION>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Selector]]></DEPENDANT_MODULE_NAME>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--B97FC854C6DD41E692161585645A900F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--B97FC854C6DD41E692161585645A900F-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--B97FC854C6DD41E692161585645A900F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--B97FC854C6DD41E692161585645A900F-->  <STARTVERSION><![CDATA[3.0.33184]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->  <STARTVERSION><![CDATA[3.0.33777]]></STARTVERSION>
 <!--B97FC854C6DD41E692161585645A900F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--B97FC854C6DD41E692161585645A900F-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--B97FC854C6DD41E692161585645A900F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_VAL_RULE.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_VAL_RULE.xml	Wed May 09 04:45:09 2018 +0000
@@ -93,9 +93,10 @@
 <!--8CEAB789915E4575BDEB66F1930067BA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--8CEAB789915E4575BDEB66F1930067BA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--8CEAB789915E4575BDEB66F1930067BA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8CEAB789915E4575BDEB66F1930067BA-->  <NAME><![CDATA[Not selected FIN_Financial_Account]]></NAME>
+<!--8CEAB789915E4575BDEB66F1930067BA-->  <NAME><![CDATA[Not selected Financial Account with enabled Funds Transfer]]></NAME>
+<!--8CEAB789915E4575BDEB66F1930067BA-->  <DESCRIPTION><![CDATA[Validates that the financial account is not the same as the selected one and that it has the flag Funds Transfer enabled]]></DESCRIPTION>
 <!--8CEAB789915E4575BDEB66F1930067BA-->  <TYPE><![CDATA[HQL_JS]]></TYPE>
-<!--8CEAB789915E4575BDEB66F1930067BA-->  <CODE><![CDATA["e.id != '" + OB.getParameters().get('inpfinFinancialAccountId') + "'"]]></CODE>
+<!--8CEAB789915E4575BDEB66F1930067BA-->  <CODE><![CDATA["e.aprmIsfundstransEnabled = true and e.id != '" + OB.getParameters().get('inpfinFinancialAccountId') + "'"]]></CODE>
 <!--8CEAB789915E4575BDEB66F1930067BA-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--8CEAB789915E4575BDEB66F1930067BA--></AD_VAL_RULE>
 
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml	Wed May 09 04:45:09 2018 +0000
@@ -207,6 +207,31 @@
 <!--111000BF6C4445E785AA08331A268E1B-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--111000BF6C4445E785AA08331A268E1B--></OBUIAPP_PARAMETER>
 
+<!--11D3060AAE0C4BA8BDC136623F250CD3--><OBUIAPP_PARAMETER>
+<!--11D3060AAE0C4BA8BDC136623F250CD3-->  <OBUIAPP_PARAMETER_ID><![CDATA[11D3060AAE0C4BA8BDC136623F250CD3]]></OBUIAPP_PARAMETER_ID>
+<!--11D3060AAE0C4BA8BDC136623F250CD3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--11D3060AAE0C4BA8BDC136623F250CD3-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--11D3060AAE0C4BA8BDC136623F250CD3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--11D3060AAE0C4BA8BDC136623F250CD3-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--11D3060AAE0C4BA8BDC136623F250CD3-->  <NAME><![CDATA[Description]]></NAME>
+<!--11D3060AAE0C4BA8BDC136623F250CD3-->  <DESCRIPTION><![CDATA[A space to write additional related information.]]></DESCRIPTION>
+<!--11D3060AAE0C4BA8BDC136623F250CD3-->  <HELP><![CDATA[A description is limited to 255 characters.]]></HELP>
+<!--11D3060AAE0C4BA8BDC136623F250CD3-->  <SEQNO><![CDATA[255]]></SEQNO>
+<!--11D3060AAE0C4BA8BDC136623F250CD3-->  <AD_REFERENCE_ID><![CDATA[14]]></AD_REFERENCE_ID>
+<!--11D3060AAE0C4BA8BDC136623F250CD3-->  <COLUMNNAME><![CDATA[description]]></COLUMNNAME>
+<!--11D3060AAE0C4BA8BDC136623F250CD3-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--11D3060AAE0C4BA8BDC136623F250CD3-->  <FIELDLENGTH><![CDATA[255]]></FIELDLENGTH>
+<!--11D3060AAE0C4BA8BDC136623F250CD3-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--11D3060AAE0C4BA8BDC136623F250CD3-->  <AD_ELEMENT_ID><![CDATA[275]]></AD_ELEMENT_ID>
+<!--11D3060AAE0C4BA8BDC136623F250CD3-->  <ISFIXED><![CDATA[N]]></ISFIXED>
+<!--11D3060AAE0C4BA8BDC136623F250CD3-->  <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE>
+<!--11D3060AAE0C4BA8BDC136623F250CD3-->  <OBUIAPP_PROCESS_ID><![CDATA[CC73C4845CDC487395804946EACB225F]]></OBUIAPP_PROCESS_ID>
+<!--11D3060AAE0C4BA8BDC136623F250CD3-->  <STARTINNEWLINE><![CDATA[Y]]></STARTINNEWLINE>
+<!--11D3060AAE0C4BA8BDC136623F250CD3-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
+<!--11D3060AAE0C4BA8BDC136623F250CD3-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--11D3060AAE0C4BA8BDC136623F250CD3-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
+<!--11D3060AAE0C4BA8BDC136623F250CD3--></OBUIAPP_PARAMETER>
+
 <!--12DDAD2FBC404963B7A49D2E54985DF9--><OBUIAPP_PARAMETER>
 <!--12DDAD2FBC404963B7A49D2E54985DF9-->  <OBUIAPP_PARAMETER_ID><![CDATA[12DDAD2FBC404963B7A49D2E54985DF9]]></OBUIAPP_PARAMETER_ID>
 <!--12DDAD2FBC404963B7A49D2E54985DF9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1058,6 +1083,7 @@
 <!--7B77F9EF9387445FBB5A40E84D256EE4-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--7B77F9EF9387445FBB5A40E84D256EE4-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
 <!--7B77F9EF9387445FBB5A40E84D256EE4-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--7B77F9EF9387445FBB5A40E84D256EE4-->  <DEFAULTVALUE><![CDATA[OB.getFilterExpression("org.openbravo.advpaymentmngt.filterexpression.FundsTransferGLItemDefaultValueExpression")]]></DEFAULTVALUE>
 <!--7B77F9EF9387445FBB5A40E84D256EE4-->  <AD_ELEMENT_ID><![CDATA[DABC92A3E32E4DBFB78068CF6A4FBAC7]]></AD_ELEMENT_ID>
 <!--7B77F9EF9387445FBB5A40E84D256EE4-->  <ISFIXED><![CDATA[N]]></ISFIXED>
 <!--7B77F9EF9387445FBB5A40E84D256EE4-->  <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PROCESS.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PROCESS.xml	Wed May 09 04:45:09 2018 +0000
@@ -155,6 +155,7 @@
 <!--CC73C4845CDC487395804946EACB225F-->  <ISMULTIRECORD><![CDATA[N]]></ISMULTIRECORD>
 <!--CC73C4845CDC487395804946EACB225F-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--CC73C4845CDC487395804946EACB225F-->  <ISGRIDLEGACY><![CDATA[N]]></ISGRIDLEGACY>
+<!--CC73C4845CDC487395804946EACB225F-->  <ON_LOAD_FUNCTION><![CDATA[OB.APRM.FundsTranfer.onLoad]]></ON_LOAD_FUNCTION>
 <!--CC73C4845CDC487395804946EACB225F-->  <ISCANADDRECORDSTOSELECTOR><![CDATA[N]]></ISCANADDRECORDSTOSELECTOR>
 <!--CC73C4845CDC487395804946EACB225F--></OBUIAPP_PROCESS>
 
--- a/model/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml	Wed May 09 04:45:09 2018 +0000
@@ -6,7 +6,7 @@
 <!--8A098711BB324335A19833286BDB093D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--8A098711BB324335A19833286BDB093D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8A098711BB324335A19833286BDB093D-->  <NAME><![CDATA[Apache External Connection Pool]]></NAME>
-<!--8A098711BB324335A19833286BDB093D-->  <VERSION><![CDATA[1.0.33184]]></VERSION>
+<!--8A098711BB324335A19833286BDB093D-->  <VERSION><![CDATA[1.0.33777]]></VERSION>
 <!--8A098711BB324335A19833286BDB093D-->  <DESCRIPTION><![CDATA[Apache External Connection Pool]]></DESCRIPTION>
 <!--8A098711BB324335A19833286BDB093D-->  <HELP><![CDATA[This module implements the Apache JDBC Connection Pool (http://wiki.openbravo.com/wiki/Modules:Apache_JDBC_Connection_Pool).]]></HELP>
 <!--8A098711BB324335A19833286BDB093D-->  <TYPE><![CDATA[M]]></TYPE>
@@ -20,7 +20,7 @@
 <!--8A098711BB324335A19833286BDB093D-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--8A098711BB324335A19833286BDB093D-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--8A098711BB324335A19833286BDB093D-->  <UPDATEINFO><![CDATA[fixed issue #26663: configuration is read from servlet context]]></UPDATEINFO>
-<!--8A098711BB324335A19833286BDB093D-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
+<!--8A098711BB324335A19833286BDB093D-->  <VERSION_LABEL><![CDATA[PR18Q2]]></VERSION_LABEL>
 <!--8A098711BB324335A19833286BDB093D-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--8A098711BB324335A19833286BDB093D-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--8A098711BB324335A19833286BDB093D--></AD_MODULE>
--- a/model/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed May 09 04:45:09 2018 +0000
@@ -7,7 +7,7 @@
 <!--1467C397BC5F4999A5606F39CD6FF8A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--1467C397BC5F4999A5606F39CD6FF8A4-->  <AD_MODULE_ID><![CDATA[8A098711BB324335A19833286BDB093D]]></AD_MODULE_ID>
 <!--1467C397BC5F4999A5606F39CD6FF8A4-->  <AD_DEPENDENT_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_DEPENDENT_MODULE_ID>
-<!--1467C397BC5F4999A5606F39CD6FF8A4-->  <STARTVERSION><![CDATA[2.1.33184]]></STARTVERSION>
+<!--1467C397BC5F4999A5606F39CD6FF8A4-->  <STARTVERSION><![CDATA[2.1.33777]]></STARTVERSION>
 <!--1467C397BC5F4999A5606F39CD6FF8A4-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--1467C397BC5F4999A5606F39CD6FF8A4-->  <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME>
 <!--1467C397BC5F4999A5606F39CD6FF8A4-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Wed May 09 04:45:09 2018 +0000
@@ -6,7 +6,7 @@
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <NAME><![CDATA[JBoss Weld]]></NAME>
-<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.33184]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.33777]]></VERSION>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <DESCRIPTION><![CDATA[JBoss Weld]]></DESCRIPTION>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <HELP><![CDATA[Provides the JBoss Weld framework: Java Contexts and Dependency Injection for the Java EE platform (CDI). For more information see http://seamframework.org/Weld]]></HELP>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <URL><![CDATA[http://forge.openbravo.com/projects/weld]]></URL>
@@ -22,7 +22,7 @@
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <UPDATEINFO><![CDATA[Bug fixing.]]></UPDATEINFO>
-<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION_LABEL><![CDATA[PR18Q2]]></VERSION_LABEL>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--C70732EA90A14EC0916078B85CC33D2D--></AD_MODULE>
--- a/model/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed May 09 04:45:09 2018 +0000
@@ -7,7 +7,7 @@
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <AD_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_MODULE_ID>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.33184]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.33777]]></STARTVERSION>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml	Wed May 09 04:45:09 2018 +0000
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<data>
+<!--1C2AFF192F7A496BB3BB6AD5D5B4BC1A--><AD_MODEL_OBJECT_MAPPING>
+<!--1C2AFF192F7A496BB3BB6AD5D5B4BC1A-->  <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[1C2AFF192F7A496BB3BB6AD5D5B4BC1A]]></AD_MODEL_OBJECT_MAPPING_ID>
+<!--1C2AFF192F7A496BB3BB6AD5D5B4BC1A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1C2AFF192F7A496BB3BB6AD5D5B4BC1A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1C2AFF192F7A496BB3BB6AD5D5B4BC1A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1C2AFF192F7A496BB3BB6AD5D5B4BC1A-->  <AD_MODEL_OBJECT_ID><![CDATA[28D385B356E74EC797B7FA1D9EE7EEE1]]></AD_MODEL_OBJECT_ID>
+<!--1C2AFF192F7A496BB3BB6AD5D5B4BC1A-->  <MAPPINGNAME><![CDATA[/org.openbravo.client.application.ad_callouts/GC_SequenceNumber_Callout.html]]></MAPPINGNAME>
+<!--1C2AFF192F7A496BB3BB6AD5D5B4BC1A-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
+<!--1C2AFF192F7A496BB3BB6AD5D5B4BC1A--></AD_MODEL_OBJECT_MAPPING>
+
+<!--2FF54F2CDA8006CDE0530100007F54CE--><AD_MODEL_OBJECT_MAPPING>
+<!--2FF54F2CDA8006CDE0530100007F54CE-->  <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[2FF54F2CDA8006CDE0530100007F54CE]]></AD_MODEL_OBJECT_MAPPING_ID>
+<!--2FF54F2CDA8006CDE0530100007F54CE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2FF54F2CDA8006CDE0530100007F54CE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2FF54F2CDA8006CDE0530100007F54CE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2FF54F2CDA8006CDE0530100007F54CE-->  <AD_MODEL_OBJECT_ID><![CDATA[2FF54F2CDA7F06CDE0530100007F54CE]]></AD_MODEL_OBJECT_ID>
+<!--2FF54F2CDA8006CDE0530100007F54CE-->  <MAPPINGNAME><![CDATA[/org.openbravo.client.application.ad_callouts/MetadataOnTab.html]]></MAPPINGNAME>
+<!--2FF54F2CDA8006CDE0530100007F54CE-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
+<!--2FF54F2CDA8006CDE0530100007F54CE--></AD_MODEL_OBJECT_MAPPING>
+
+<!--974EBD0DC79B0489E040007F01005279--><AD_MODEL_OBJECT_MAPPING>
+<!--974EBD0DC79B0489E040007F01005279-->  <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[974EBD0DC79B0489E040007F01005279]]></AD_MODEL_OBJECT_MAPPING_ID>
+<!--974EBD0DC79B0489E040007F01005279-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--974EBD0DC79B0489E040007F01005279-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--974EBD0DC79B0489E040007F01005279-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--974EBD0DC79B0489E040007F01005279-->  <AD_MODEL_OBJECT_ID><![CDATA[974EBD0DC79A0489E040007F01005279]]></AD_MODEL_OBJECT_ID>
+<!--974EBD0DC79B0489E040007F01005279-->  <MAPPINGNAME><![CDATA[/org.openbravo.client.application.ad_callouts/FixedValueExpression.html]]></MAPPINGNAME>
+<!--974EBD0DC79B0489E040007F01005279-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
+<!--974EBD0DC79B0489E040007F01005279--></AD_MODEL_OBJECT_MAPPING>
+
+</data>
--- a/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Wed May 09 04:45:09 2018 +0000
@@ -6,7 +6,7 @@
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <NAME><![CDATA[User Interface Application]]></NAME>
-<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.33184]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.33777]]></VERSION>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <DESCRIPTION><![CDATA[Provides the main application components for the openbravo user interface]]></DESCRIPTION>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <HELP><![CDATA[Provides the main application components for the openbravo user interface. The main layout incorporates a navigation bar and a main view area.]]></HELP>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <URL><![CDATA[http://forge.openbravo.com/projects/clientapplication]]></URL>
@@ -22,7 +22,7 @@
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <UPDATEINFO><![CDATA[Styling bugfixing]]></UPDATEINFO>
-<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION_LABEL><![CDATA[PR18Q2]]></VERSION_LABEL>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--9BA0836A3CD74EE4AB48753A47211BCC--></AD_MODULE>
--- a/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed May 09 04:45:09 2018 +0000
@@ -7,7 +7,7 @@
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID>
-<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.33184]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.33777]]></STARTVERSION>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--60A170212F36499D83B8AD38D01F46B3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--60A170212F36499D83B8AD38D01F46B3-->  <STARTVERSION><![CDATA[2.1.33184]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->  <STARTVERSION><![CDATA[2.1.33777]]></STARTVERSION>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--824D60CB352E4099B1D8C903CA139DAE-->  <STARTVERSION><![CDATA[3.0.33184]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->  <STARTVERSION><![CDATA[3.0.33777]]></STARTVERSION>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID>
-<!--E8FD820AFE3D4FE08C02FC47769026AD-->  <STARTVERSION><![CDATA[8.1.33184]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->  <STARTVERSION><![CDATA[8.1.33777]]></STARTVERSION>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Wed May 09 04:45:09 2018 +0000
@@ -6,7 +6,7 @@
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <NAME><![CDATA[HTML Widget]]></NAME>
-<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.33184]]></VERSION>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.33777]]></VERSION>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <DESCRIPTION><![CDATA[Provides the HTML Widget superclass that allows to create widget classes that embed the html code.]]></DESCRIPTION>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <HELP><![CDATA[With this module you can define your own widget classes just setting up your own html code or the html code provided by third parties.]]></HELP>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <URL><![CDATA[http://forge.openbravo.com/projects/htmlwidget]]></URL>
@@ -21,7 +21,7 @@
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION_LABEL><![CDATA[PR18Q2]]></VERSION_LABEL>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--D393BE6F22BB44B7B728259B34FC795A--></AD_MODULE>
--- a/model/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed May 09 04:45:09 2018 +0000
@@ -7,7 +7,7 @@
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <AD_MODULE_ID><![CDATA[D393BE6F22BB44B7B728259B34FC795A]]></AD_MODULE_ID>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.33184]]></STARTVERSION>
+<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.33777]]></STARTVERSION>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Wed May 09 04:45:09 2018 +0000
@@ -6,7 +6,7 @@
 <!--4B828F4D03264080AA1D2057B13F613C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <NAME><![CDATA[User Interface Client Kernel]]></NAME>
-<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.33184]]></VERSION>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.33777]]></VERSION>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <DESCRIPTION><![CDATA[Provides framework functionality for the Openbravo User Interface]]></DESCRIPTION>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <HELP><![CDATA[The user interface client kernel is a generation framework for generating client (browser) components used in Openbravo. Its components are mainly used by other modules to provide customizable and extendable user interfaces.]]></HELP>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <URL><![CDATA[http://forge.openbravo.com/projects/openbravoclientkernel]]></URL>
@@ -22,7 +22,7 @@
 <!--4B828F4D03264080AA1D2057B13F613C-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <UPDATEINFO><![CDATA[Bug fix for issue 15289]]></UPDATEINFO>
-<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION_LABEL><![CDATA[PR18Q2]]></VERSION_LABEL>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--4B828F4D03264080AA1D2057B13F613C--></AD_MODULE>
--- a/model/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed May 09 04:45:09 2018 +0000
@@ -7,7 +7,7 @@
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.33184]]></STARTVERSION>
+<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.33777]]></STARTVERSION>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <STARTVERSION><![CDATA[1.1.33184]]></STARTVERSION>
+<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <STARTVERSION><![CDATA[1.1.33777]]></STARTVERSION>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <AD_DEPENDENT_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_DEPENDENT_MODULE_ID>
-<!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <STARTVERSION><![CDATA[2.0.33184]]></STARTVERSION>
+<!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <STARTVERSION><![CDATA[2.0.33777]]></STARTVERSION>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON REST Webservice]]></DEPENDANT_MODULE_NAME>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Wed May 09 04:45:09 2018 +0000
@@ -6,7 +6,7 @@
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <NAME><![CDATA[Workspace & Widgets]]></NAME>
-<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.33184]]></VERSION>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.33777]]></VERSION>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <DESCRIPTION><![CDATA[Workspace & Widgets]]></DESCRIPTION>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <HELP><![CDATA[Provides the infrastructure of workspace tab (formerly My Openbravo)]]></HELP>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <URL><![CDATA[http://forge.openbravo.com/projects/myopenbravo]]></URL>
@@ -23,7 +23,7 @@
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <UPDATEINFO><![CDATA[Styling bugfixing]]></UPDATEINFO>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <REFERENCEDATAINFO><![CDATA[Provides the infrastructure of workspace tab]]></REFERENCEDATAINFO>
-<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION_LABEL><![CDATA[PR18Q2]]></VERSION_LABEL>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--2758CD25B2704AF6BBAD10365FC82C06--></AD_MODULE>
--- a/model/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed May 09 04:45:09 2018 +0000
@@ -7,7 +7,7 @@
 <!--15F51F03882F444CAB6593B4566DC929-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--15F51F03882F444CAB6593B4566DC929-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
 <!--15F51F03882F444CAB6593B4566DC929-->  <AD_DEPENDENT_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_DEPENDENT_MODULE_ID>
-<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.33184]]></STARTVERSION>
+<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.33777]]></STARTVERSION>
 <!--15F51F03882F444CAB6593B4566DC929-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--15F51F03882F444CAB6593B4566DC929-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Application]]></DEPENDANT_MODULE_NAME>
 <!--15F51F03882F444CAB6593B4566DC929-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--E71B28FC949D481D9F59C17D01E46EF9-->  <STARTVERSION><![CDATA[3.0.33184]]></STARTVERSION>
+<!--E71B28FC949D481D9F59C17D01E46EF9-->  <STARTVERSION><![CDATA[3.0.33777]]></STARTVERSION>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml	Wed May 09 04:45:09 2018 +0000
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<data>
+<!--47C1F5E2C77C4758A1E0AEDA79546F58--><AD_MODEL_OBJECT_MAPPING>
+<!--47C1F5E2C77C4758A1E0AEDA79546F58-->  <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[47C1F5E2C77C4758A1E0AEDA79546F58]]></AD_MODEL_OBJECT_MAPPING_ID>
+<!--47C1F5E2C77C4758A1E0AEDA79546F58-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--47C1F5E2C77C4758A1E0AEDA79546F58-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--47C1F5E2C77C4758A1E0AEDA79546F58-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--47C1F5E2C77C4758A1E0AEDA79546F58-->  <AD_MODEL_OBJECT_ID><![CDATA[3F74C9717FE2408484E9DE88159D34C3]]></AD_MODEL_OBJECT_ID>
+<!--47C1F5E2C77C4758A1E0AEDA79546F58-->  <MAPPINGNAME><![CDATA[/org.openbravo.client.querylist/CheckOptionalFilterCallout.html]]></MAPPINGNAME>
+<!--47C1F5E2C77C4758A1E0AEDA79546F58-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
+<!--47C1F5E2C77C4758A1E0AEDA79546F58--></AD_MODEL_OBJECT_MAPPING>
+
+</data>
--- a/model/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Wed May 09 04:45:09 2018 +0000
@@ -6,7 +6,7 @@
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <NAME><![CDATA[Query/List Widget]]></NAME>
-<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.33184]]></VERSION>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.33777]]></VERSION>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <DESCRIPTION><![CDATA[Provides the Query/List superclass widget that allows to create widget classes that prints a grid of data based on a query.]]></DESCRIPTION>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <HELP><![CDATA[With this module you can define your own widget classes that just with simple Application Dictionary shows a grid of data based on a HQL Query.]]></HELP>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <URL><![CDATA[http://forge.openbravo.com/projects/querylistwidget]]></URL>
@@ -21,7 +21,7 @@
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION_LABEL><![CDATA[PR18Q2]]></VERSION_LABEL>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC--></AD_MODULE>
--- a/model/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed May 09 04:45:09 2018 +0000
@@ -7,7 +7,7 @@
 <!--26558497C31140BFAB067BA4BC47D799-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--26558497C31140BFAB067BA4BC47D799-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
 <!--26558497C31140BFAB067BA4BC47D799-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.33184]]></STARTVERSION>
+<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.33777]]></STARTVERSION>
 <!--26558497C31140BFAB067BA4BC47D799-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--26558497C31140BFAB067BA4BC47D799-->  <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME>
 <!--26558497C31140BFAB067BA4BC47D799-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Wed May 09 04:45:09 2018 +0000
@@ -6,7 +6,7 @@
 <!--FF8080812D842086012D844F3CC0003E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FF8080812D842086012D844F3CC0003E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080812D842086012D844F3CC0003E-->  <NAME><![CDATA[Widgets Collection]]></NAME>
-<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.33184]]></VERSION>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.33777]]></VERSION>
 <!--FF8080812D842086012D844F3CC0003E-->  <DESCRIPTION><![CDATA[Collection of Workspace Widgets]]></DESCRIPTION>
 <!--FF8080812D842086012D844F3CC0003E-->  <HELP><![CDATA[Collection of Workspace Widgets]]></HELP>
 <!--FF8080812D842086012D844F3CC0003E-->  <URL><![CDATA[http://forge.openbravo.com/projects/widgetscollection]]></URL>
@@ -22,7 +22,7 @@
 <!--FF8080812D842086012D844F3CC0003E-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--FF8080812D842086012D844F3CC0003E-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--FF8080812D842086012D844F3CC0003E-->  <UPDATEINFO><![CDATA[Added Currency Converter. Added Google Docs]]></UPDATEINFO>
-<!--FF8080812D842086012D844F3CC0003E-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION_LABEL><![CDATA[PR18Q2]]></VERSION_LABEL>
 <!--FF8080812D842086012D844F3CC0003E-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--FF8080812D842086012D844F3CC0003E-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--FF8080812D842086012D844F3CC0003E--></AD_MODULE>
--- a/model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed May 09 04:45:09 2018 +0000
@@ -7,7 +7,7 @@
 <!--FF8080812D842086012D845002070046-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080812D842086012D845002070046-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
 <!--FF8080812D842086012D845002070046-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.33184]]></STARTVERSION>
+<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.33777]]></STARTVERSION>
 <!--FF8080812D842086012D845002070046-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080812D842086012D845002070046-->  <DEPENDANT_MODULE_NAME><![CDATA[Workspace & Widgets]]></DEPENDANT_MODULE_NAME>
 <!--FF8080812D842086012D845002070046-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Wed May 09 04:45:09 2018 +0000
@@ -6,7 +6,7 @@
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <NAME><![CDATA[Payment Report]]></NAME>
-<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.33184]]></VERSION>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.33777]]></VERSION>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <DESCRIPTION><![CDATA[Payment Report]]></DESCRIPTION>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <URL><![CDATA[http://forge.openbravo.com/projects/paymentreport]]></URL>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <TYPE><![CDATA[M]]></TYPE>
@@ -22,7 +22,7 @@
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION_LABEL><![CDATA[PR18Q2]]></VERSION_LABEL>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--2A5EE903D7974AC298C0504FBC4501A7--></AD_MODULE>
--- a/model/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed May 09 04:45:09 2018 +0000
@@ -7,7 +7,7 @@
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_DEPENDENT_MODULE_ID>
-<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.33184]]></STARTVERSION>
+<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.33777]]></STARTVERSION>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <DEPENDANT_MODULE_NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></DEPENDANT_MODULE_NAME>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Wed May 09 04:45:09 2018 +0000
@@ -6,7 +6,7 @@
 <!--3A3A943684D64DEF9EC39F588A656848-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <NAME><![CDATA[Orders Awaiting Delivery]]></NAME>
-<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.33184]]></VERSION>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.33777]]></VERSION>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <DESCRIPTION><![CDATA[Report displaying sales orders not shipped.]]></DESCRIPTION>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <URL><![CDATA[http://forge.openbravo.com/projects/ordersawaitingdlivery]]></URL>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <TYPE><![CDATA[M]]></TYPE>
@@ -19,7 +19,7 @@
 <!--3A3A943684D64DEF9EC39F588A656848-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION_LABEL><![CDATA[PR18Q2]]></VERSION_LABEL>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--3A3A943684D64DEF9EC39F588A656848--></AD_MODULE>
--- a/model/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed May 09 04:45:09 2018 +0000
@@ -7,7 +7,7 @@
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <AD_MODULE_ID><![CDATA[3A3A943684D64DEF9EC39F588A656848]]></AD_MODULE_ID>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.33184]]></STARTVERSION>
+<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.33777]]></STARTVERSION>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Wed May 09 04:45:09 2018 +0000
@@ -6,7 +6,7 @@
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <NAME><![CDATA[JSON Datasource]]></NAME>
-<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION><![CDATA[2.1.33184]]></VERSION>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION><![CDATA[2.1.33777]]></VERSION>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <DESCRIPTION><![CDATA[Provides data source CRUD functionality using JSON as the data format]]></DESCRIPTION>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <HELP><![CDATA[This module implements the datasource concept. Datasources play a central role in Smartclient applications. The datasource module automatically creates a datasource for each Openbravo entity. In addition custom data source implementations can be defined.]]></HELP>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <URL><![CDATA[http://forge.openbravo.com/projects/datasourceservice]]></URL>
@@ -22,7 +22,7 @@
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <UPDATEINFO><![CDATA[Bug fixing & new development for 3.0]]></UPDATEINFO>
-<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION_LABEL><![CDATA[PR18Q2]]></VERSION_LABEL>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4--></AD_MODULE>
--- a/model/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed May 09 04:45:09 2018 +0000
@@ -7,7 +7,7 @@
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <STARTVERSION><![CDATA[1.1.33184]]></STARTVERSION>
+<!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <STARTVERSION><![CDATA[1.1.33777]]></STARTVERSION>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <AD_DEPENDENT_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_DEPENDENT_MODULE_ID>
-<!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <STARTVERSION><![CDATA[2.0.33184]]></STARTVERSION>
+<!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <STARTVERSION><![CDATA[2.0.33777]]></STARTVERSION>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON REST Webservice]]></DEPENDANT_MODULE_NAME>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--4FCE95802A854F7E8623AFF7C33D13EE-->  <STARTVERSION><![CDATA[3.0.33184]]></STARTVERSION>
+<!--4FCE95802A854F7E8623AFF7C33D13EE-->  <STARTVERSION><![CDATA[3.0.33777]]></STARTVERSION>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--54AF8B39C55E4E7496902893ECD82786-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--54AF8B39C55E4E7496902893ECD82786-->  <STARTVERSION><![CDATA[2.1.33184]]></STARTVERSION>
+<!--54AF8B39C55E4E7496902893ECD82786-->  <STARTVERSION><![CDATA[2.1.33777]]></STARTVERSION>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -63,7 +63,7 @@
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID>
-<!--D03C56D8A4E14F45A5466350E05C631F-->  <STARTVERSION><![CDATA[8.1.33184]]></STARTVERSION>
+<!--D03C56D8A4E14F45A5466350E05C631F-->  <STARTVERSION><![CDATA[8.1.33777]]></STARTVERSION>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Wed May 09 04:45:09 2018 +0000
@@ -6,7 +6,7 @@
 <!--FF8080813129ADA401312CA1222A0005-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FF8080813129ADA401312CA1222A0005-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813129ADA401312CA1222A0005-->  <NAME><![CDATA[Integration with Google APIs]]></NAME>
-<!--FF8080813129ADA401312CA1222A0005-->  <VERSION><![CDATA[0.1.33184]]></VERSION>
+<!--FF8080813129ADA401312CA1222A0005-->  <VERSION><![CDATA[0.1.33777]]></VERSION>
 <!--FF8080813129ADA401312CA1222A0005-->  <DESCRIPTION><![CDATA[Integration with Google APIs]]></DESCRIPTION>
 <!--FF8080813129ADA401312CA1222A0005-->  <TYPE><![CDATA[M]]></TYPE>
 <!--FF8080813129ADA401312CA1222A0005-->  <LICENSE><![CDATA[Licensed under the Openbravo Public License Version 1.1.
@@ -19,7 +19,7 @@
 <!--FF8080813129ADA401312CA1222A0005-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--FF8080813129ADA401312CA1222A0005-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--FF8080813129ADA401312CA1222A0005-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--FF8080813129ADA401312CA1222A0005-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
+<!--FF8080813129ADA401312CA1222A0005-->  <VERSION_LABEL><![CDATA[PR18Q2]]></VERSION_LABEL>
 <!--FF8080813129ADA401312CA1222A0005-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--FF8080813129ADA401312CA1222A0005-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--FF8080813129ADA401312CA1222A0005--></AD_MODULE>
--- a/model/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed May 09 04:45:09 2018 +0000
@@ -7,7 +7,7 @@
 <!--FF8080813141B198013141BA0F7D0012-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813141B198013141BA0F7D0012-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
 <!--FF8080813141B198013141BA0F7D0012-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813141B198013141BA0F7D0012-->  <STARTVERSION><![CDATA[0.1.33184]]></STARTVERSION>
+<!--FF8080813141B198013141BA0F7D0012-->  <STARTVERSION><![CDATA[0.1.33777]]></STARTVERSION>
 <!--FF8080813141B198013141BA0F7D0012-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080813141B198013141BA0F7D0012-->  <DEPENDANT_MODULE_NAME><![CDATA[OpenID Service Integration]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813141B198013141BA0F7D0012-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--FF8080813151AEE1013151C4ACE6001B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <AD_DEPENDENT_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813151AEE1013151C4ACE6001B-->  <STARTVERSION><![CDATA[2.1.33184]]></STARTVERSION>
+<!--FF8080813151AEE1013151C4ACE6001B-->  <STARTVERSION><![CDATA[2.1.33777]]></STARTVERSION>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Wed May 09 04:45:09 2018 +0000
@@ -6,7 +6,7 @@
 <!--FF8080813141B198013141B86DD70003-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FF8080813141B198013141B86DD70003-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813141B198013141B86DD70003-->  <NAME><![CDATA[OpenID Service Integration]]></NAME>
-<!--FF8080813141B198013141B86DD70003-->  <VERSION><![CDATA[0.1.33184]]></VERSION>
+<!--FF8080813141B198013141B86DD70003-->  <VERSION><![CDATA[0.1.33777]]></VERSION>
 <!--FF8080813141B198013141B86DD70003-->  <DESCRIPTION><![CDATA[OpenID Service Integration]]></DESCRIPTION>
 <!--FF8080813141B198013141B86DD70003-->  <TYPE><![CDATA[M]]></TYPE>
 <!--FF8080813141B198013141B86DD70003-->  <LICENSE><![CDATA[Licensed under the Openbravo Public License Version 1.1.
@@ -19,7 +19,7 @@
 <!--FF8080813141B198013141B86DD70003-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--FF8080813141B198013141B86DD70003-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--FF8080813141B198013141B86DD70003-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--FF8080813141B198013141B86DD70003-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
+<!--FF8080813141B198013141B86DD70003-->  <VERSION_LABEL><![CDATA[PR18Q2]]></VERSION_LABEL>
 <!--FF8080813141B198013141B86DD70003-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--FF8080813141B198013141B86DD70003-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--FF8080813141B198013141B86DD70003--></AD_MODULE>
--- a/model/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed May 09 04:45:09 2018 +0000
@@ -7,7 +7,7 @@
 <!--FF8080813141B198013141B8B21B0006-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813141B198013141B8B21B0006-->  <AD_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_MODULE_ID>
 <!--FF8080813141B198013141B8B21B0006-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813141B198013141B8B21B0006-->  <STARTVERSION><![CDATA[3.0.33184]]></STARTVERSION>
+<!--FF8080813141B198013141B8B21B0006-->  <STARTVERSION><![CDATA[3.0.33777]]></STARTVERSION>
 <!--FF8080813141B198013141B8B21B0006-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080813141B198013141B8B21B0006-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813141B198013141B8B21B0006-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Wed May 09 04:45:09 2018 +0000
@@ -6,7 +6,7 @@
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <NAME><![CDATA[JSON REST Webservice]]></NAME>
-<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION><![CDATA[2.0.33184]]></VERSION>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION><![CDATA[2.0.33777]]></VERSION>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <DESCRIPTION><![CDATA[Provides a JSON REST webservice for CRUD service requests]]></DESCRIPTION>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <HELP><![CDATA[Provides a JSON REST webservice for CRUD service requests. Both the servlet implementation (receiving HTTP REST requests in JSON) as the backend processing are provided.]]></HELP>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <URL><![CDATA[http://forge.openbravo.com/projects/openbravojsonrest]]></URL>
@@ -22,7 +22,7 @@
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <UPDATEINFO><![CDATA[Bug fixing & new development for 3.0]]></UPDATEINFO>
-<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION_LABEL><![CDATA[PR18Q2]]></VERSION_LABEL>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1--></AD_MODULE>
--- a/model/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed May 09 04:45:09 2018 +0000
@@ -7,7 +7,7 @@
 <!--9E3E7B42DB16405FB794496D309D7044-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <AD_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_MODULE_ID>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--9E3E7B42DB16405FB794496D309D7044-->  <STARTVERSION><![CDATA[3.0.33184]]></STARTVERSION>
+<!--9E3E7B42DB16405FB794496D309D7044-->  <STARTVERSION><![CDATA[3.0.33777]]></STARTVERSION>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml	Wed May 09 04:45:09 2018 +0000
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<data>
+<!--5A6ADE55146C46B68800FA8FBD8C672B--><AD_MODEL_OBJECT_MAPPING>
+<!--5A6ADE55146C46B68800FA8FBD8C672B-->  <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[5A6ADE55146C46B68800FA8FBD8C672B]]></AD_MODEL_OBJECT_MAPPING_ID>
+<!--5A6ADE55146C46B68800FA8FBD8C672B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5A6ADE55146C46B68800FA8FBD8C672B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5A6ADE55146C46B68800FA8FBD8C672B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5A6ADE55146C46B68800FA8FBD8C672B-->  <AD_MODEL_OBJECT_ID><![CDATA[F7FF75897F0442CAA12FA95119AF2402]]></AD_MODEL_OBJECT_ID>
+<!--5A6ADE55146C46B68800FA8FBD8C672B-->  <MAPPINGNAME><![CDATA[/org.openbravo.userinterface.selector.ad_callouts/Selector_Field_Property_Callout.html]]></MAPPINGNAME>
+<!--5A6ADE55146C46B68800FA8FBD8C672B-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
+<!--5A6ADE55146C46B68800FA8FBD8C672B--></AD_MODEL_OBJECT_MAPPING>
+
+<!--CAED82047C4C465D9283F6992DE81777--><AD_MODEL_OBJECT_MAPPING>
+<!--CAED82047C4C465D9283F6992DE81777-->  <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[CAED82047C4C465D9283F6992DE81777]]></AD_MODEL_OBJECT_MAPPING_ID>
+<!--CAED82047C4C465D9283F6992DE81777-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--CAED82047C4C465D9283F6992DE81777-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--CAED82047C4C465D9283F6992DE81777-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--CAED82047C4C465D9283F6992DE81777-->  <AD_MODEL_OBJECT_ID><![CDATA[3EDFC11F25BA442899734561818CFBD6]]></AD_MODEL_OBJECT_ID>
+<!--CAED82047C4C465D9283F6992DE81777-->  <MAPPINGNAME><![CDATA[/org.openbravo.userinterface.selector.ad_callouts/DefaultExpression.html]]></MAPPINGNAME>
+<!--CAED82047C4C465D9283F6992DE81777-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
+<!--CAED82047C4C465D9283F6992DE81777--></AD_MODEL_OBJECT_MAPPING>
+
+</data>
--- a/model/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Wed May 09 04:45:09 2018 +0000
@@ -6,7 +6,7 @@
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <NAME><![CDATA[User Interface Selector]]></NAME>
-<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION><![CDATA[2.1.33184]]></VERSION>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION><![CDATA[2.1.33777]]></VERSION>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <DESCRIPTION><![CDATA[Provides a selector with a suggestion box and popup grid window]]></DESCRIPTION>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <HELP><![CDATA[The Openbravo selector provides new selector functionality which is used inside of existing Openbravo forms. The selector is mainly used for supporting foreign key references in the user interface. The selector combines both suggestion box behavior with a popup grid.]]></HELP>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <URL><![CDATA[http://forge.openbravo.com/projects/selector]]></URL>
@@ -22,7 +22,7 @@
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <UPDATEINFO><![CDATA[Bug fixing & new development for 3.0]]></UPDATEINFO>
-<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION_LABEL><![CDATA[PR18Q2]]></VERSION_LABEL>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--5EB4F15C80684ACA904756BDC12ADBE5--></AD_MODULE>
--- a/model/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed May 09 04:45:09 2018 +0000
@@ -7,7 +7,7 @@
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID>
-<!--38825CAED43941D38CA0C78DB04FCFA0-->  <STARTVERSION><![CDATA[8.1.33184]]></STARTVERSION>
+<!--38825CAED43941D38CA0C78DB04FCFA0-->  <STARTVERSION><![CDATA[8.1.33777]]></STARTVERSION>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <AD_DEPENDENT_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_DEPENDENT_MODULE_ID>
-<!--6DDE7B1A70174242AF82B5022FB89279-->  <STARTVERSION><![CDATA[2.1.33184]]></STARTVERSION>
+<!--6DDE7B1A70174242AF82B5022FB89279-->  <STARTVERSION><![CDATA[2.1.33777]]></STARTVERSION>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Application]]></DEPENDANT_MODULE_NAME>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--94F9CD2CB5EF4467A67475C786C984A7-->  <STARTVERSION><![CDATA[2.1.33184]]></STARTVERSION>
+<!--94F9CD2CB5EF4467A67475C786C984A7-->  <STARTVERSION><![CDATA[2.1.33777]]></STARTVERSION>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <STARTVERSION><![CDATA[1.1.33184]]></STARTVERSION>
+<!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <STARTVERSION><![CDATA[1.1.33777]]></STARTVERSION>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -63,7 +63,7 @@
 <!--C8DAC574B88649D08C9468521B343F12-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--C8DAC574B88649D08C9468521B343F12-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--C8DAC574B88649D08C9468521B343F12-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--C8DAC574B88649D08C9468521B343F12-->  <STARTVERSION><![CDATA[3.0.33184]]></STARTVERSION>
+<!--C8DAC574B88649D08C9468521B343F12-->  <STARTVERSION><![CDATA[3.0.33777]]></STARTVERSION>
 <!--C8DAC574B88649D08C9468521B343F12-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--C8DAC574B88649D08C9468521B343F12-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--C8DAC574B88649D08C9468521B343F12-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -77,7 +77,7 @@
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID>
-<!--F14EB17946BE4724A46F80CB1A47EC70-->  <STARTVERSION><![CDATA[2.1.33184]]></STARTVERSION>
+<!--F14EB17946BE4724A46F80CB1A47EC70-->  <STARTVERSION><![CDATA[2.1.33777]]></STARTVERSION>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Wed May 09 04:45:09 2018 +0000
@@ -6,7 +6,7 @@
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <NAME><![CDATA[2.50 to 3.00 Compatibility Skin]]></NAME>
-<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION><![CDATA[2.0.33184]]></VERSION>
+<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION><![CDATA[2.0.33777]]></VERSION>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <DESCRIPTION><![CDATA[Skin module to proper visualization of classic windows inside the MDI interface]]></DESCRIPTION>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <HELP><![CDATA[With this skin module the classic windows styles will display in a way more coherent with the new 3.00 styles]]></HELP>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <URL><![CDATA[www.openbravo.com]]></URL>
@@ -23,7 +23,7 @@
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
+<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION_LABEL><![CDATA[PR18Q2]]></VERSION_LABEL>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--96998CBC42744B3DBEE28AC8095C9335--></AD_MODULE>
--- a/model/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed May 09 04:45:09 2018 +0000
@@ -7,7 +7,7 @@
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <AD_MODULE_ID><![CDATA[96998CBC42744B3DBEE28AC8095C9335]]></AD_MODULE_ID>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--39BF75AD9AB3453698BF5DE29E727AA9-->  <STARTVERSION><![CDATA[3.0.33184]]></STARTVERSION>
+<!--39BF75AD9AB3453698BF5DE29E727AA9-->  <STARTVERSION><![CDATA[3.0.33777]]></STARTVERSION>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Wed May 09 04:45:09 2018 +0000
@@ -6,7 +6,7 @@
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <NAME><![CDATA[Smartclient]]></NAME>
-<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION><![CDATA[8.1.33184]]></VERSION>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION><![CDATA[8.1.33777]]></VERSION>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <DESCRIPTION><![CDATA[SmartClient libraries for use within Openbravo]]></DESCRIPTION>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <HELP><![CDATA[This module contains the SmartClient libraries for usage by other modules. It also contains some simple test pages to validate that SmartClient is working correctly. Also contains generic Openbravo SmartClient components]]></HELP>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <URL><![CDATA[http://forge.openbravo.com/projects/obsmartclient]]></URL>
@@ -23,7 +23,7 @@
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <UPDATEINFO><![CDATA[Bug fixing & new development for 3.0
 Updated to new SmartClient 8.3d 26-May-2012]]></UPDATEINFO>
-<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION_LABEL><![CDATA[PR18Q2]]></VERSION_LABEL>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9--></AD_MODULE>
--- a/model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed May 09 04:45:09 2018 +0000
@@ -7,7 +7,7 @@
 <!--086331E18477496B8AC74D2CFEBD1307-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <AD_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_MODULE_ID>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--086331E18477496B8AC74D2CFEBD1307-->  <STARTVERSION><![CDATA[3.0.33184]]></STARTVERSION>
+<!--086331E18477496B8AC74D2CFEBD1307-->  <STARTVERSION><![CDATA[3.0.33777]]></STARTVERSION>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--DC5D4EF450244482BD2B458DAA496333-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--DC5D4EF450244482BD2B458DAA496333-->  <AD_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_MODULE_ID>
 <!--DC5D4EF450244482BD2B458DAA496333-->  <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--DC5D4EF450244482BD2B458DAA496333-->  <STARTVERSION><![CDATA[2.1.33184]]></STARTVERSION>
+<!--DC5D4EF450244482BD2B458DAA496333-->  <STARTVERSION><![CDATA[2.1.33777]]></STARTVERSION>
 <!--DC5D4EF450244482BD2B458DAA496333-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--DC5D4EF450244482BD2B458DAA496333-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
 <!--DC5D4EF450244482BD2B458DAA496333-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <AD_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_MODULE_ID>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--F2AF15C0AF5540E393D96BE506E20648-->  <STARTVERSION><![CDATA[1.1.33184]]></STARTVERSION>
+<!--F2AF15C0AF5540E393D96BE506E20648-->  <STARTVERSION><![CDATA[1.1.33777]]></STARTVERSION>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml	Wed May 09 04:45:09 2018 +0000
@@ -6,7 +6,7 @@
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <NAME><![CDATA[Log Clean Up Utility]]></NAME>
-<!--8A34B301DC524EA3A07513DF9F42CC90-->  <VERSION><![CDATA[1.0.33184]]></VERSION>
+<!--8A34B301DC524EA3A07513DF9F42CC90-->  <VERSION><![CDATA[1.0.33777]]></VERSION>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <DESCRIPTION><![CDATA[Log Clean Up Utility]]></DESCRIPTION>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <HELP><![CDATA[Utility to periodically cleanup log tables]]></HELP>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <URL><![CDATA[http://centralrepository.openbravo.com/heartbeat-server/org.openbravo.forge.ui/ForgeProjectDetail?projectId=7DC25E3B7ADE426CAD71E7804B95C1BF]]></URL>
@@ -21,7 +21,7 @@
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
-<!--8A34B301DC524EA3A07513DF9F42CC90-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
+<!--8A34B301DC524EA3A07513DF9F42CC90-->  <VERSION_LABEL><![CDATA[PR18Q2]]></VERSION_LABEL>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--8A34B301DC524EA3A07513DF9F42CC90--></AD_MODULE>
--- a/model/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed May 09 04:45:09 2018 +0000
@@ -7,7 +7,7 @@
 <!--86EBD30DEB8045508185B457896C9F6D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <AD_MODULE_ID><![CDATA[8A34B301DC524EA3A07513DF9F42CC90]]></AD_MODULE_ID>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <AD_DEPENDENT_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_DEPENDENT_MODULE_ID>
-<!--86EBD30DEB8045508185B457896C9F6D-->  <STARTVERSION><![CDATA[2.1.33184]]></STARTVERSION>
+<!--86EBD30DEB8045508185B457896C9F6D-->  <STARTVERSION><![CDATA[2.1.33777]]></STARTVERSION>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Wed May 09 04:45:09 2018 +0000
@@ -6,7 +6,7 @@
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <NAME><![CDATA[Standard Roles]]></NAME>
-<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION><![CDATA[3.0.33184]]></VERSION>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION><![CDATA[3.0.33777]]></VERSION>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <DESCRIPTION><![CDATA[Pre-configured collection of standard ERP roles]]></DESCRIPTION>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <HELP><![CDATA[This dataset contains the following roles with their access to corresponding Openbravo entities - windows, reports, actions.
 * Employee - Any person of the enterprise
@@ -28,7 +28,7 @@
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <REFERENCEDATAINFO><![CDATA[Pre-configured collection of standard ERP roles]]></REFERENCEDATAINFO>
-<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION_LABEL><![CDATA[PR18Q2]]></VERSION_LABEL>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61--></AD_MODULE>
--- a/model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed May 09 04:45:09 2018 +0000
@@ -7,7 +7,7 @@
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <AD_MODULE_ID><![CDATA[883B5872CA0548F9AF2BBBE7D2DDFA61]]></AD_MODULE_ID>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--148A000EE9A04A3CA653B1296A00B8E6-->  <STARTVERSION><![CDATA[3.0.33184]]></STARTVERSION>
+<!--148A000EE9A04A3CA653B1296A00B8E6-->  <STARTVERSION><![CDATA[3.0.33777]]></STARTVERSION>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--30F966407A6F4E15965821BAEE34D25B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--30F966407A6F4E15965821BAEE34D25B-->  <AD_MODULE_ID><![CDATA[883B5872CA0548F9AF2BBBE7D2DDFA61]]></AD_MODULE_ID>
 <!--30F966407A6F4E15965821BAEE34D25B-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_DEPENDENT_MODULE_ID>
-<!--30F966407A6F4E15965821BAEE34D25B-->  <STARTVERSION><![CDATA[3.0.33184]]></STARTVERSION>
+<!--30F966407A6F4E15965821BAEE34D25B-->  <STARTVERSION><![CDATA[3.0.33777]]></STARTVERSION>
 <!--30F966407A6F4E15965821BAEE34D25B-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--30F966407A6F4E15965821BAEE34D25B-->  <DEPENDANT_MODULE_NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></DEPENDANT_MODULE_NAME>
 <!--30F966407A6F4E15965821BAEE34D25B-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--F93CE30003B24F8F8886510B0065EECC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <AD_MODULE_ID><![CDATA[883B5872CA0548F9AF2BBBE7D2DDFA61]]></AD_MODULE_ID>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <AD_DEPENDENT_MODULE_ID><![CDATA[3A3A943684D64DEF9EC39F588A656848]]></AD_DEPENDENT_MODULE_ID>
-<!--F93CE30003B24F8F8886510B0065EECC-->  <STARTVERSION><![CDATA[1.1.33184]]></STARTVERSION>
+<!--F93CE30003B24F8F8886510B0065EECC-->  <STARTVERSION><![CDATA[1.1.33777]]></STARTVERSION>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <DEPENDANT_MODULE_NAME><![CDATA[Orders Awaiting Delivery]]></DEPENDANT_MODULE_NAME>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Wed May 09 04:45:09 2018 +0000
@@ -6,7 +6,7 @@
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <NAME><![CDATA[Openbravo 3.0 Framework]]></NAME>
-<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION><![CDATA[2.1.33184]]></VERSION>
+<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION><![CDATA[2.1.33777]]></VERSION>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <DESCRIPTION><![CDATA[Openbravo 3.0 Framework]]></DESCRIPTION>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <HELP><![CDATA[Contains all the components required to run the Openbravo 3.0 framework]]></HELP>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <URL><![CDATA[http://forge.openbravo.com/projects/openbravov30framework]]></URL>
@@ -24,7 +24,7 @@
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <UPDATEINFO><![CDATA[minor bugfix release to include latest client.application 2.0.1, client.myob 2.0.2 and client.kernel 2.0.1]]></UPDATEINFO>
-<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
+<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION_LABEL><![CDATA[PR18Q2]]></VERSION_LABEL>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--7E48CDD73B7E493A8BED4F7253E7C989--></AD_MODULE>
--- a/model/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed May 09 04:45:09 2018 +0000
@@ -7,7 +7,7 @@
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--01E1BCCEC9114DE0960538DF34E30E6F-->  <STARTVERSION><![CDATA[2.1.33184]]></STARTVERSION>
+<!--01E1BCCEC9114DE0960538DF34E30E6F-->  <STARTVERSION><![CDATA[2.1.33777]]></STARTVERSION>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--025B181F63CA47B48A920F6983242390-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--025B181F63CA47B48A920F6983242390-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--025B181F63CA47B48A920F6983242390-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--025B181F63CA47B48A920F6983242390-->  <STARTVERSION><![CDATA[3.0.33184]]></STARTVERSION>
+<!--025B181F63CA47B48A920F6983242390-->  <STARTVERSION><![CDATA[3.0.33777]]></STARTVERSION>
 <!--025B181F63CA47B48A920F6983242390-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--025B181F63CA47B48A920F6983242390-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--025B181F63CA47B48A920F6983242390-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <AD_DEPENDENT_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_DEPENDENT_MODULE_ID>
-<!--054B4FEAF919478AA3FF27098A46D1D6-->  <STARTVERSION><![CDATA[2.1.33184]]></STARTVERSION>
+<!--054B4FEAF919478AA3FF27098A46D1D6-->  <STARTVERSION><![CDATA[2.1.33777]]></STARTVERSION>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Application]]></DEPENDANT_MODULE_NAME>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_DEPENDENT_MODULE_ID>
-<!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <STARTVERSION><![CDATA[1.0.33184]]></STARTVERSION>
+<!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <STARTVERSION><![CDATA[1.0.33777]]></STARTVERSION>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <DEPENDANT_MODULE_NAME><![CDATA[Query/List Widget]]></DEPENDANT_MODULE_NAME>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -63,7 +63,7 @@
 <!--224754C3EF674C93B0D468F47BAAB824-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID>
-<!--224754C3EF674C93B0D468F47BAAB824-->  <STARTVERSION><![CDATA[2.1.33184]]></STARTVERSION>
+<!--224754C3EF674C93B0D468F47BAAB824-->  <STARTVERSION><![CDATA[2.1.33777]]></STARTVERSION>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Selector]]></DEPENDANT_MODULE_NAME>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -77,7 +77,7 @@
 <!--5B72D24032DD4879A950194139D961B6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--5B72D24032DD4879A950194139D961B6-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--5B72D24032DD4879A950194139D961B6-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID>
-<!--5B72D24032DD4879A950194139D961B6-->  <STARTVERSION><![CDATA[2.1.33184]]></STARTVERSION>
+<!--5B72D24032DD4879A950194139D961B6-->  <STARTVERSION><![CDATA[2.1.33777]]></STARTVERSION>
 <!--5B72D24032DD4879A950194139D961B6-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--5B72D24032DD4879A950194139D961B6-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME>
 <!--5B72D24032DD4879A950194139D961B6-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -91,7 +91,7 @@
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <AD_DEPENDENT_MODULE_ID><![CDATA[D393BE6F22BB44B7B728259B34FC795A]]></AD_DEPENDENT_MODULE_ID>
-<!--8730CA6A4224439D82E0DD31B3806E36-->  <STARTVERSION><![CDATA[1.0.33184]]></STARTVERSION>
+<!--8730CA6A4224439D82E0DD31B3806E36-->  <STARTVERSION><![CDATA[1.0.33777]]></STARTVERSION>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <DEPENDANT_MODULE_NAME><![CDATA[HTML Widget]]></DEPENDANT_MODULE_NAME>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -105,7 +105,7 @@
 <!--98C47FF058F8413B8A2B26036061446E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--98C47FF058F8413B8A2B26036061446E-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--98C47FF058F8413B8A2B26036061446E-->  <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID>
-<!--98C47FF058F8413B8A2B26036061446E-->  <STARTVERSION><![CDATA[8.1.33184]]></STARTVERSION>
+<!--98C47FF058F8413B8A2B26036061446E-->  <STARTVERSION><![CDATA[8.1.33777]]></STARTVERSION>
 <!--98C47FF058F8413B8A2B26036061446E-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--98C47FF058F8413B8A2B26036061446E-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--98C47FF058F8413B8A2B26036061446E-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -119,7 +119,7 @@
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <AD_DEPENDENT_MODULE_ID><![CDATA[96998CBC42744B3DBEE28AC8095C9335]]></AD_DEPENDENT_MODULE_ID>
-<!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <STARTVERSION><![CDATA[2.0.33184]]></STARTVERSION>
+<!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <STARTVERSION><![CDATA[2.0.33777]]></STARTVERSION>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <DEPENDANT_MODULE_NAME><![CDATA[2.50 to 3.00 Compatibility Skin]]></DEPENDANT_MODULE_NAME>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -133,7 +133,7 @@
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--A9CB99330AF34944877F889DD8A0AB3C-->  <STARTVERSION><![CDATA[2.1.33184]]></STARTVERSION>
+<!--A9CB99330AF34944877F889DD8A0AB3C-->  <STARTVERSION><![CDATA[2.1.33777]]></STARTVERSION>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -147,7 +147,7 @@
 <!--E72A053A403C4A98A189C105B850ADB0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--E72A053A403C4A98A189C105B850ADB0-->  <STARTVERSION><![CDATA[1.1.33184]]></STARTVERSION>
+<!--E72A053A403C4A98A189C105B850ADB0-->  <STARTVERSION><![CDATA[1.1.33777]]></STARTVERSION>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -161,7 +161,7 @@
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <AD_DEPENDENT_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_DEPENDENT_MODULE_ID>
-<!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <STARTVERSION><![CDATA[2.0.33184]]></STARTVERSION>
+<!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <STARTVERSION><![CDATA[2.0.33777]]></STARTVERSION>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON REST Webservice]]></DEPENDANT_MODULE_NAME>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Wed May 09 04:45:09 2018 +0000
@@ -6,7 +6,7 @@
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <NAME><![CDATA[Openbravo 3.0]]></NAME>
-<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION><![CDATA[3.0.33184]]></VERSION>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION><![CDATA[3.0.33777]]></VERSION>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <DESCRIPTION><![CDATA[Openbravo 3.0 distribution template]]></DESCRIPTION>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <HELP><![CDATA[Openbravo 3.0 is a collection (distribution) of modules. This template is a container of all the modules and configuration changes that compose Openbravo 3.0.]]></HELP>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <URL><![CDATA[http://forge.openbravo.com/projects/vthree]]></URL>
@@ -20,7 +20,7 @@
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION_LABEL><![CDATA[PR18Q2]]></VERSION_LABEL>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--0138E7A89B5E4DC3932462252801FFBC--></AD_MODULE>
--- a/model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed May 09 04:45:09 2018 +0000
@@ -7,7 +7,7 @@
 <!--48D556894CE54CF998DC97882E904CBD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--48D556894CE54CF998DC97882E904CBD-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--48D556894CE54CF998DC97882E904CBD-->  <AD_DEPENDENT_MODULE_ID><![CDATA[8A098711BB324335A19833286BDB093D]]></AD_DEPENDENT_MODULE_ID>
-<!--48D556894CE54CF998DC97882E904CBD-->  <STARTVERSION><![CDATA[1.0.33184]]></STARTVERSION>
+<!--48D556894CE54CF998DC97882E904CBD-->  <STARTVERSION><![CDATA[1.0.33777]]></STARTVERSION>
 <!--48D556894CE54CF998DC97882E904CBD-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--48D556894CE54CF998DC97882E904CBD-->  <DEPENDANT_MODULE_NAME><![CDATA[Apache External Connection Pool]]></DEPENDANT_MODULE_NAME>
 <!--48D556894CE54CF998DC97882E904CBD-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--4D11E3A70650475381139522373CD191-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--4D11E3A70650475381139522373CD191-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--4D11E3A70650475381139522373CD191-->  <AD_DEPENDENT_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_DEPENDENT_MODULE_ID>
-<!--4D11E3A70650475381139522373CD191-->  <STARTVERSION><![CDATA[2.1.33184]]></STARTVERSION>
+<!--4D11E3A70650475381139522373CD191-->  <STARTVERSION><![CDATA[2.1.33777]]></STARTVERSION>
 <!--4D11E3A70650475381139522373CD191-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--4D11E3A70650475381139522373CD191-->  <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME>
 <!--4D11E3A70650475381139522373CD191-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_DEPENDENT_MODULE_ID>
-<!--52CE523C40634C47A99C6EBBD9C3125C-->  <STARTVERSION><![CDATA[3.0.33184]]></STARTVERSION>
+<!--52CE523C40634C47A99C6EBBD9C3125C-->  <STARTVERSION><![CDATA[3.0.33777]]></STARTVERSION>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <DEPENDANT_MODULE_NAME><![CDATA[Payment Report]]></DEPENDANT_MODULE_NAME>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--60834727BB114764ACEF019F40A34562-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--60834727BB114764ACEF019F40A34562-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--60834727BB114764ACEF019F40A34562-->  <AD_DEPENDENT_MODULE_ID><![CDATA[3A3A943684D64DEF9EC39F588A656848]]></AD_DEPENDENT_MODULE_ID>
-<!--60834727BB114764ACEF019F40A34562-->  <STARTVERSION><![CDATA[1.1.33184]]></STARTVERSION>
+<!--60834727BB114764ACEF019F40A34562-->  <STARTVERSION><![CDATA[1.1.33777]]></STARTVERSION>
 <!--60834727BB114764ACEF019F40A34562-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--60834727BB114764ACEF019F40A34562-->  <DEPENDANT_MODULE_NAME><![CDATA[Orders Awaiting Delivery]]></DEPENDANT_MODULE_NAME>
 <!--60834727BB114764ACEF019F40A34562-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -63,7 +63,7 @@
 <!--8418885E97D643138B6D907671351E3D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8418885E97D643138B6D907671351E3D-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--8418885E97D643138B6D907671351E3D-->  <AD_DEPENDENT_MODULE_ID><![CDATA[883B5872CA0548F9AF2BBBE7D2DDFA61]]></AD_DEPENDENT_MODULE_ID>
-<!--8418885E97D643138B6D907671351E3D-->  <STARTVERSION><![CDATA[3.0.33184]]></STARTVERSION>
+<!--8418885E97D643138B6D907671351E3D-->  <STARTVERSION><![CDATA[3.0.33777]]></STARTVERSION>
 <!--8418885E97D643138B6D907671351E3D-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--8418885E97D643138B6D907671351E3D-->  <DEPENDANT_MODULE_NAME><![CDATA[Standard Roles]]></DEPENDANT_MODULE_NAME>
 <!--8418885E97D643138B6D907671351E3D-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -77,7 +77,7 @@
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--A32F3279B3374FC0A6CFEA2368BB7053-->  <STARTVERSION><![CDATA[3.0.33184]]></STARTVERSION>
+<!--A32F3279B3374FC0A6CFEA2368BB7053-->  <STARTVERSION><![CDATA[3.0.33777]]></STARTVERSION>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MINOR]]></DEPENDENCY_ENFORCEMENT>
@@ -91,7 +91,7 @@
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_DEPENDENT_MODULE_ID>
-<!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <STARTVERSION><![CDATA[3.0.33184]]></STARTVERSION>
+<!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <STARTVERSION><![CDATA[3.0.33777]]></STARTVERSION>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <DEPENDANT_MODULE_NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></DEPENDANT_MODULE_NAME>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -105,7 +105,7 @@
 <!--FEF6E40F244A4061B7C62CB755663712-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FEF6E40F244A4061B7C62CB755663712-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--FEF6E40F244A4061B7C62CB755663712-->  <AD_DEPENDENT_MODULE_ID><![CDATA[8A34B301DC524EA3A07513DF9F42CC90]]></AD_DEPENDENT_MODULE_ID>
-<!--FEF6E40F244A4061B7C62CB755663712-->  <STARTVERSION><![CDATA[1.0.33184]]></STARTVERSION>
+<!--FEF6E40F244A4061B7C62CB755663712-->  <STARTVERSION><![CDATA[1.0.33777]]></STARTVERSION>
 <!--FEF6E40F244A4061B7C62CB755663712-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FEF6E40F244A4061B7C62CB755663712-->  <DEPENDANT_MODULE_NAME><![CDATA[Log Clean Up Utility]]></DEPENDANT_MODULE_NAME>
 <!--FEF6E40F244A4061B7C62CB755663712-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -119,7 +119,7 @@
 <!--FF8080813189932B013189B45B59003A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813189932B013189B45B59003A-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--FF8080813189932B013189B45B59003A-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813189932B013189B45B59003A-->  <STARTVERSION><![CDATA[0.1.33184]]></STARTVERSION>
+<!--FF8080813189932B013189B45B59003A-->  <STARTVERSION><![CDATA[0.1.33777]]></STARTVERSION>
 <!--FF8080813189932B013189B45B59003A-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8080813189932B013189B45B59003A-->  <DEPENDANT_MODULE_NAME><![CDATA[OpenID Service Integration]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813189932B013189B45B59003A-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -133,7 +133,7 @@
 <!--FF8080813189932B013189B4C00F003D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813189932B013189B4C00F003D-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--FF8080813189932B013189B4C00F003D-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813189932B013189B4C00F003D-->  <STARTVERSION><![CDATA[0.1.33184]]></STARTVERSION>
+<!--FF8080813189932B013189B4C00F003D-->  <STARTVERSION><![CDATA[0.1.33777]]></STARTVERSION>
 <!--FF8080813189932B013189B4C00F003D-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8080813189932B013189B4C00F003D-->  <DEPENDANT_MODULE_NAME><![CDATA[Integration with Google APIs]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813189932B013189B4C00F003D-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -147,7 +147,7 @@
 <!--FF8081812E2F6F3C012E2F750109001C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8081812E2F6F3C012E2F750109001C-->  <STARTVERSION><![CDATA[0.0.33184]]></STARTVERSION>
+<!--FF8081812E2F6F3C012E2F750109001C-->  <STARTVERSION><![CDATA[0.0.33777]]></STARTVERSION>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <DEPENDANT_MODULE_NAME><![CDATA[Widgets Collection]]></DEPENDANT_MODULE_NAME>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/src-db/database/model/functions/AD_SYNCHRONIZE.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/functions/AD_SYNCHRONIZE.xml	Wed May 09 04:45:09 2018 +0000
@@ -19,7 +19,7 @@
   * parts created by ComPiere are Copyright (C) ComPiere, Inc.;
   * All Rights Reserved.
   * Contributor(s): Openbravo SLU
-  * Contributions are Copyright (C) 2001-2011 Openbravo, S.L.U.
+  * Contributions are Copyright (C) 2001-2018 Openbravo, S.L.U.
   *
   * Specifically, this derivative work is based upon the following Compiere
   * file and version.
@@ -538,7 +538,7 @@
     DBMS_OUTPUT.PUT_LINE('Synchronize PO Field') ;
    UPDATE AD_FIELD
       SET NAME=
-        (SELECT COALESCE(T.PO_NAME, (CASE WHEN e.PO_NAME='' THEN e.name ELSE COALESCE(e.PO_NAME,e.name) END), t.name, e.name)
+        (SELECT COALESCE(T.PO_NAME, (CASE WHEN e.PO_NAME='' THEN COALESCE(t.name, e.name) ELSE COALESCE(e.PO_NAME, t.name, e.name) END), t.name, e.name)
         FROM AD_COLUMN c,
              AD_MODULE M,
              AD_ELEMENT e, AD_ELEMENT_TRL T
@@ -611,7 +611,7 @@
           AND AD_FIELD.AD_MODULE_ID = M.AD_MODULE_ID
           AND (M.ISINDEVELOPMENT='Y' OR v_TemplateInDev ='Y')
           AND T.AD_LANGUAGE = M.AD_LANGUAGE
-          AND (AD_FIELD.NAME != COALESCE(T.PO_NAME, (CASE WHEN e.PO_NAME='' THEN e.name ELSE COALESCE(e.PO_NAME,e.name) END), t.name, e.name)
+          AND (AD_FIELD.NAME != COALESCE(T.PO_NAME, (CASE WHEN e.PO_NAME='' THEN COALESCE(t.name, e.name) ELSE COALESCE(e.PO_NAME, t.name, e.name) END), t.name, e.name)
              OR COALESCE(TO_CHAR(AD_FIELD.Description), ' ')<>COALESCE(TO_CHAR(T.PO_Description), TO_CHAR(e.PO_Description), to_char(t.description), to_char(e.description), ' ')
              OR COALESCE(TO_CHAR(AD_FIELD.Help), ' ')<>COALESCE(TO_CHAR(T.PO_Help), TO_CHAR(e.PO_Help), to_char(t.help), to_char(e.help), ' '))
           union
--- a/model/src-db/database/model/functions/A_ASSET_CREATE.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/functions/A_ASSET_CREATE.xml	Wed May 09 04:45:09 2018 +0000
@@ -40,7 +40,6 @@
   v_Message VARCHAR2(2000):='';
   v_Result NUMBER:=1; -- 0=failure
   v_Record_ID VARCHAR2(32);
-  v_AD_User_ID VARCHAR2(32);
   -- Parameter
   TYPE RECORD IS REF CURSOR;
     Cur_Parameter RECORD;
@@ -72,7 +71,6 @@
         )
       LOOP
         v_Record_ID:=Cur_Parameter.Record_ID;
-        v_AD_User_ID:=Cur_Parameter.AD_User_ID;
         -- IF (p.ParameterName = 'xx') THEN
         --  p_xx := p.P_String;
         --  DBMS_OUTPUT.PUT_LINE('  xx=' || p_xx);
--- a/model/src-db/database/model/functions/A_ASSET_POST.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/functions/A_ASSET_POST.xml	Wed May 09 04:45:09 2018 +0000
@@ -35,45 +35,33 @@
     --  Record Info
     v_count NUMBER;
     v_Processing A_ASSET.Processing%TYPE;
-    v_Processed A_ASSET.Processed%TYPE;
-    v_ACCTVALUEAMT NUMBER;
     v_AD_CLIENT_ID VARCHAR2(32);
     v_AD_ORG_ID VARCHAR2(32);
-    v_AD_USER_ID VARCHAR2(32);
-    v_AMORTIZATIONENDDATE DATE;
     v_AMORTIZATIONSTARTDATE DATE;
     v_AMORTIZATIONTYPE VARCHAR2(60) ;
     v_AMORTIZATIONVALUEAMT NUMBER;
     v_AMORTIZATIONPERCENTAGE NUMBER;
-    v_ASSETDEPRECIATIONDATE DATE;
-    v_ASSETVALUEAMT NUMBER;
     v_C_CURRENCY_ID VARCHAR2(32);
     v_CREATEDBY varchar2(32);
-    v_ISDEPRECIATED CHAR(1) ;
-    v_RESIDUALASSETVALUEAMT NUMBER;
     v_ORIGUSELIFEMONTHS NUMBER;
     v_USELIFEMONTHS NUMBER;
     V_MONTHS NUMBER;
     v_USELIFEYEARS NUMBER;
     v_ORIGUSELIFEYEARS NUMBER;
     v_ASSETSCHEDULE VARCHAR2(60) ;
-    v_TOTAL_DAYS NUMBER;
     v_BEGINING_DATE DATE;
     v_ENDING_DATE DATE;
-    v_AUXAMT NUMBER;
     v_NEW_AMORTIZATION VARCHAR2(32);
     v_LINE NUMBER;
     v_SEQ_ASSET NUMBER;
     v_AMORTIZATIONLINE varchar2(32);
     v_FIRST_DAY_DATE DATE;
-    v_LAST_DAY_DATE DATE;
     v_PERCENTAGE NUMBER;
     v_AMOUNT NUMBER;
     v_CURRENCY_ID VARCHAR2(32);
     FINISH_PROCESS BOOLEAN:=false;
     v_DepreciatedLines NUMBER;
     v_DepreciatedPlan NUMBER;
-    v_depreciatedValue NUMBER;
     v_Period NUMBER;
     v_DEPRECIATEDPREVIOUSAMT NUMBER;
     v_AMORTIZATIONCALCTYPE VARCHAR2(60) ;
@@ -120,8 +108,8 @@
       WHERE A_asset_ID=v_Record_ID
       )
     WHERE a_Asset_ID=v_Record_ID;
-    SELECT ACCTVALUEAMT, AD_CLIENT_ID, AD_ORG_ID, AD_USER_ID, AMORTIZATIONENDDATE, AMORTIZATIONSTARTDATE, AMORTIZATIONTYPE, AMORTIZATIONVALUEAMT, ANNUALAMORTIZATIONPERCENTAGE, ASSETDEPRECIATIONDATE, ASSETVALUEAMT, C_CURRENCY_ID, CREATEDBY, ISDEPRECIATED, PROCESSING, RESIDUALASSETVALUEAMT, USELIFEMONTHS, USELIFEMONTHS, USELIFEYEARS,USELIFEYEARS, ASSETSCHEDULE, PROCESSED, C_CURRENCY_ID, depreciatedPlan, COALESCE(depreciatedValue,0), COALESCE(DEPRECIATEDPREVIOUSAMT,0), AMORTIZATIONCALCTYPE, C_PROJECT_ID
-    INTO v_ACCTVALUEAMT, v_AD_CLIENT_ID, v_AD_ORG_ID, v_AD_USER_ID, v_AMORTIZATIONENDDATE, v_AMORTIZATIONSTARTDATE, v_AMORTIZATIONTYPE, v_AMORTIZATIONVALUEAMT, v_AMORTIZATIONPERCENTAGE, v_ASSETDEPRECIATIONDATE, v_ASSETVALUEAMT, v_C_CURRENCY_ID, v_CREATEDBY, v_ISDEPRECIATED, v_PROCESSING, v_RESIDUALASSETVALUEAMT, v_USELIFEMONTHS, v_ORIGUSELIFEMONTHS, v_USELIFEYEARS, v_ORIGUSELIFEYEARS, v_ASSETSCHEDULE, v_PROCESSED, v_CURRENCY_ID, v_DepreciatedPlan, v_depreciatedValue, v_DEPRECIATEDPREVIOUSAMT, v_AMORTIZATIONCALCTYPE, v_PROJECT_ID
+    SELECT AD_CLIENT_ID, AD_ORG_ID, AMORTIZATIONSTARTDATE, AMORTIZATIONTYPE, AMORTIZATIONVALUEAMT, ANNUALAMORTIZATIONPERCENTAGE, C_CURRENCY_ID, CREATEDBY, PROCESSING, USELIFEMONTHS, USELIFEMONTHS, USELIFEYEARS,USELIFEYEARS, ASSETSCHEDULE, C_CURRENCY_ID, depreciatedPlan, COALESCE(DEPRECIATEDPREVIOUSAMT,0), AMORTIZATIONCALCTYPE, C_PROJECT_ID
+    INTO v_AD_CLIENT_ID, v_AD_ORG_ID, v_AMORTIZATIONSTARTDATE, v_AMORTIZATIONTYPE, v_AMORTIZATIONVALUEAMT, v_AMORTIZATIONPERCENTAGE, v_C_CURRENCY_ID, v_CREATEDBY, v_PROCESSING, v_USELIFEMONTHS, v_ORIGUSELIFEMONTHS, v_USELIFEYEARS, v_ORIGUSELIFEYEARS, v_ASSETSCHEDULE, v_CURRENCY_ID, v_DepreciatedPlan, v_DEPRECIATEDPREVIOUSAMT, v_AMORTIZATIONCALCTYPE, v_PROJECT_ID
     FROM A_ASSET
     WHERE A_ASSET_ID=v_Record_ID;
     DBMS_OUTPUT.PUT_LINE('A_Asset_ID=' || v_Record_ID || ' - AMORTIZATIONTYPE=' || v_AMORTIZATIONTYPE) ;
@@ -181,7 +169,6 @@
             v_Count:=coalesce(v_depreciatedLines, 0) +1;
             v_BEGINING_DATE:=v_AMORTIZATIONSTARTDATE;
             v_FIRST_DAY_DATE:=TO_DATE('01-01-' || TO_CHAR(v_AMORTIZATIONSTARTDATE, 'YYYY'), 'DD-MM-YYYY') ;
-            v_LAST_DAY_DATE:=TO_DATE('31-12-' || TO_CHAR(v_AMORTIZATIONSTARTDATE, 'YYYY'), 'DD-MM-YYYY') ;
             if v_Count>1 then
               v_BEGINING_DATE:=TO_DATE('31-12-' || to_char(TO_number(to_char(v_BEGINING_DATE, 'yyyy')) +v_Count-1), 'DD-MM-YYYY') ;
 	      v_USELIFEYEARS:=v_USELIFEYEARS+ (1- (to_number(TO_DATE('31-12-' || TO_CHAR(v_AMORTIZATIONSTARTDATE, 'YYYY'), 'DD-MM-YYYY') - v_AMORTIZATIONSTARTDATE) /
@@ -193,13 +180,9 @@
             else
               v_PercentageGeneral := (100-(v_depreciatedPlan*100/(v_AMORTIZATIONVALUEAMT-v_DEPRECIATEDPREVIOUSAMT))) / (v_USELIFEYEARS-v_DepreciatedLines);
               --v_PercentageGeneral:=((v_AMORTIZATIONVALUEAMT-v_DEPRECIATEDPREVIOUSAMT-v_depreciatedPlan) *100/v_AMORTIZATIONVALUEAMT) /(v_USELIFEYEARS-v_DepreciatedLines) ;
-              SELECT to_number(TO_DATE(ADD_MONTHS(v_AMORTIZATIONSTARTDATE, 12*v_USELIFEYEARS)) - v_AMORTIZATIONSTARTDATE)
-              INTO v_TOTAL_DAYS
-              FROM DUAL;
             end if;
             v_AMORTIZATIONVALUEAMT:=v_AMORTIZATIONVALUEAMT-v_DEPRECIATEDPREVIOUSAMT;
             
-            v_AUXAMT:=0;
             v_PERCENTAGE:=0;
             v_TotalAmt:=coalesce(v_DepreciatedPlan, 0) ;
             finish:=false;
@@ -301,7 +284,6 @@
             v_Count:=coalesce(v_depreciatedLines, 0) +1;
             v_BEGINING_DATE:=v_AMORTIZATIONSTARTDATE;
             v_FIRST_DAY_DATE:=TO_DATE('01-'|| TO_CHAR(v_AMORTIZATIONSTARTDATE, 'MM') || '-' || TO_CHAR(v_AMORTIZATIONSTARTDATE, 'YYYY'), 'DD-MM-YYYY') ;
-            v_LAST_DAY_DATE:=TO_DATE('31-12-'|| TO_CHAR(v_AMORTIZATIONSTARTDATE, 'YYYY'), 'DD-MM-YYYY') ;
             if v_Count>1 then
               v_BEGINING_DATE:=TO_DATE(ADD_MONTHS(LAST_DAY(TO_DATE('01-' || TO_CHAR(v_BEGINING_DATE, 'MM') || '-' || TO_CHAR(v_BEGINING_DATE, 'yyyy'), 'DD-MM-YYYY')), v_DepreciatedLines)) ; 
               v_USELIFEMonths:=v_USELIFEMonths + (1- (to_number(last_day(v_AMORTIZATIONSTARTDATE) - v_AMORTIZATIONSTARTDATE) /
@@ -319,11 +301,7 @@
               else
                   v_PercentageGeneral:=(((v_AMORTIZATIONVALUEAMT-v_depreciatedPlan) *100/v_AMORTIZATIONVALUEAMT) /(v_USELIFEYEARS-v_DepreciatedLines)) /12;
               end if;
-              SELECT to_number(TO_DATE(ADD_MONTHS(v_AMORTIZATIONSTARTDATE, 12*v_USELIFEYEARS)) - TO_DATE(v_AMORTIZATIONSTARTDATE))
-              INTO v_TOTAL_DAYS
-              FROM DUAL;
             end if;
-            v_AUXAMT:=0;
             v_PERCENTAGE:=0;
             v_TotalAmt:=coalesce(v_DepreciatedPlan, 0) ;
             finish:=false;
--- a/model/src-db/database/model/functions/C_CHANGEPROJECTSTATUS.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/functions/C_CHANGEPROJECTSTATUS.xml	Wed May 09 04:45:09 2018 +0000
@@ -24,7 +24,6 @@
   v_message           VARCHAR2 (2000) := '';
   v_result NUMBER:= 1;                      -- 0=failure
   v_record_id         varchar2(32);
-  v_ad_user_id        varchar2(32);
 
   TYPE RECORD IS REF CURSOR;
 
@@ -45,7 +44,6 @@
                         ORDER BY p.seqno)
   LOOP
     v_record_id := cur_parameter.record_id;
-    v_ad_user_id := cur_parameter.ad_user_id;
 
     IF (cur_parameter.parametername = 'ChangeProjectStatus')
     THEN
--- a/model/src-db/database/model/functions/C_DEBT_PAYMENT_BALANCING_REP.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/functions/C_DEBT_PAYMENT_BALANCING_REP.xml	Wed May 09 04:45:09 2018 +0000
@@ -25,7 +25,6 @@
   v_Message VARCHAR2(2000):='';
   v_Result NUMBER:=1; -- 0=failure
   v_Record_ID VARCHAR2(32);
-  v_AD_User_ID VARCHAR2(32);
   TYPE RECORD IS REF CURSOR;
     Cur_DebtPaymentBalancing RECORD;
     v_C_Debt_Payment_ID VARCHAR2(32) ;
@@ -44,10 +43,8 @@
     v_ResultStr:='PInstanceNotFound';
     AD_UPDATE_PINSTANCE(p_PInstance_ID, NULL, 'Y', NULL, NULL) ;
   BEGIN --BODY
-    SELECT i.Record_ID,
-      i.AD_User_ID
-    INTO v_Record_ID,
-      v_AD_User_ID
+    SELECT i.Record_ID
+    INTO v_Record_ID
     FROM AD_PINSTANCE i
     WHERE i.AD_PInstance_ID=p_PInstance_ID;
     DBMS_OUTPUT.PUT_LINE('  Record_ID=' || v_Record_ID) ;
--- a/model/src-db/database/model/functions/C_DP_MANAGEMENT_POST.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/functions/C_DP_MANAGEMENT_POST.xml	Wed May 09 04:45:09 2018 +0000
@@ -29,7 +29,6 @@
   v_Result NUMBER:=1; -- 0=failure
   v_Record_ID VARCHAR2(32) ;
   v_AD_User_ID VARCHAR2(32) ;
-  v_AD_Client_ID VARCHAR2(32) ;
   v_AD_Org_ID VARCHAR2(32) ;
   v_PAD_User_ID VARCHAR2(32) ;
   v_Processed VARCHAR2(60) ;
@@ -97,11 +96,9 @@
     END IF;
   BEGIN --BODY
     SELECT UpdatedBy,
-      AD_Client_ID,
       Processed,
       Posted, AD_Org_ID, DateAcct, C_DocType_ID
     INTO v_AD_User_ID,
-      v_AD_Client_ID,
       v_processed,
       v_posted, v_AD_Org_ID, v_Date, v_DocType_ID
     FROM c_DP_Management
--- a/model/src-db/database/model/functions/C_INVOICELINE_TAX.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/functions/C_INVOICELINE_TAX.xml	Wed May 09 04:45:09 2018 +0000
@@ -20,9 +20,7 @@
 * All Rights Reserved.
 * Contributor(s):  _______________________________________.
 ************************************************************************/
-v_INVOICELINE_ID VARCHAR2(32) ;
   v_Tax_ID VARCHAR2(32) ;
-  v_IsTaxIncluded VARCHAR(1);
   v_LineNet NUMBER;
   v_Rate NUMBER;
   xTaxAmt NUMBER:=0;
@@ -36,17 +34,14 @@
   Cur_MultiTax RECORD;
 BEGIN
 --Calculates for each line, its tax info
-SELECT l.C_INVOICELINE_ID, 
+SELECT
   l.C_Tax_ID,
-  i.IsTaxIncluded,
   COALESCE(l.LineNetAmt, 0) + COALESCE(l.ChargeAmt, 0) AS LineNet,
   t.Rate,
   t.IsSummary,
   c.StdPrecision
 INTO
-  v_INVOICELINE_ID,
   v_Tax_ID,
-  v_IsTaxIncluded,
   v_LineNet,
   v_Rate,
   v_IsSummary,
--- a/model/src-db/database/model/functions/C_INVOICE_CANCEL.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/functions/C_INVOICE_CANCEL.xml	Wed May 09 04:45:09 2018 +0000
@@ -33,7 +33,6 @@
   v_ResultStr VARCHAR2(2000):='';
   v_Message VARCHAR2(2000):='';
   v_Record_ID VARCHAR2(32);
-  v_AD_Client_ID VARCHAR2(32);
   -- Parameter
   TYPE RECORD IS REF CURSOR;
     Cur_Parameter RECORD;
@@ -63,7 +62,6 @@
         )
       LOOP
         v_Record_ID:=Cur_Parameter.Record_ID;
-        v_AD_Client_ID:=Cur_Parameter.AD_Client_ID;
       END LOOP; -- Get Parameter
       DBMS_OUTPUT.PUT_LINE('  Record_ID=' || v_Record_ID) ;
     ELSE
--- a/model/src-db/database/model/functions/C_INVOICE_CREATE.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/functions/C_INVOICE_CREATE.xml	Wed May 09 04:45:09 2018 +0000
@@ -44,7 +44,6 @@
   -- Parameter
   TYPE RECORD IS REF CURSOR;
     Cur_Parameter RECORD;
-    v_Record_ID VARCHAR2(32):=NULL;
     v_AD_Org_ID VARCHAR2(32):=NULL;
     v_C_Order_ID VARCHAR2(32):=NULL;
     v_BPartner_ID VARCHAR2(32):=NULL;
@@ -68,7 +67,6 @@
     v_Qty NUMBER;
     --MODIFIED BY F.IRIAZABAL
     v_QtyOrder NUMBER;
-    v_DocSubTypeSO VARCHAR2(60) ;
     --
     v_LineNo NUMBER:=0;
     v_count NUMBER:=0;
@@ -199,7 +197,6 @@
             ORDER BY p.SeqNo
             )
           LOOP
-            v_Record_ID:=Cur_Parameter.Record_ID;
             v_ADUserId:=Cur_Parameter.AD_User_ID;
             IF(Cur_Parameter.ParameterName='DateInvoiced') THEN
               v_DateInvoiced_aux:=Cur_Parameter.P_Date;
@@ -401,10 +398,8 @@
               -- Get Order DocType Info - approved from Invoice DocType
               BEGIN
               v_DocType_ID:=NULL;
-              v_ResultStr:='GetDocTypeInfo - ' || Cur_Order.C_DocType_ID;  SELECT od.C_DocTypeInvoice_ID,
-                od.DocSubTypeSO
-              INTO v_DocType_ID,
-                v_DocSubTypeSO
+              v_ResultStr:='GetDocTypeInfo - ' || Cur_Order.C_DocType_ID;  SELECT od.C_DocTypeInvoice_ID
+              INTO v_DocType_ID
               FROM C_DOCTYPE od,
                 C_DOCTYPE ID
               WHERE od.C_DocType_ID=Cur_Order.C_DocType_ID
--- a/model/src-db/database/model/functions/C_INVOICE_POST.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/functions/C_INVOICE_POST.xml	Wed May 09 04:45:09 2018 +0000
@@ -22,7 +22,7 @@
   * parts created by ComPiere are Copyright (C) ComPiere, Inc.;
   * All Rights Reserved.
   * Contributor(s): Openbravo SLU
-  * Contributions are Copyright (C) 2001-2017 Openbravo, S.L.U.
+  * Contributions are Copyright (C) 2001-2018 Openbravo, S.L.U.
   *
   * Specifically, this derivative work is based upon the following Compiere
   * file and version.
@@ -76,7 +76,6 @@
   v_isreturndoctype CHAR(1);
   v_PaymentRule C_INVOICE.PaymentRule%TYPE;
   v_PaymentTerm C_INVOICE.C_PaymentTerm_ID%TYPE;
-  v_Order_ID VARCHAR2(32);
   v_DateAcct DATE;
   v_DateInvoiced DATE;
   v_DocumentNo C_INVOICE.DocumentNo%TYPE;
@@ -121,7 +120,6 @@
   v_REInOutStatus M_INOUT.DocStatus%TYPE;
   v_REDateInvoiced DATE;
   v_REtotalQtyInvoiced NUMBER:=0;
-  v_REdeliveredQty NUMBER:=0;
   --
   v_CumDiscount NUMBER;
   v_OldCumDiscount NUMBER;
@@ -259,14 +257,14 @@
       i.C_DocType_ID, i.C_DocTypeTarget_ID,
       i.PaymentRule, i.C_PaymentTerm_ID, i.DateAcct, i.DateInvoiced,
       i.AD_Client_ID, i.AD_Org_ID, i.UpdatedBy, i.DocumentNo,
-      i.C_Order_ID, i.IsSOTrx, i.C_BPartner_ID, i.AD_User_ID,
+      i.IsSOTrx, i.C_BPartner_ID, i.AD_User_ID,
       i.C_Currency_ID, i.POReference, i.Posted,
       i.c_Project_Id, i.C_WithHolding_ID, i.IsCashVat, i.prepaymentamt
   INTO v_Processing, v_Processed, v_DocAction, v_DocStatus,
       v_DocType_ID, v_DocTypeTarget_ID,
       v_PaymentRule, v_PaymentTerm, v_DateAcct, v_DateInvoiced,
       v_Client_ID, v_Org_ID, v_UpdatedBy, v_DocumentNo,
-      v_Order_ID, v_IsSOTrx, v_BPartner_ID, v_BPartner_User_ID,
+      v_IsSOTrx, v_BPartner_ID, v_BPartner_User_ID,
       v_Currency_ID, v_POReference, v_Posted,
       v_C_Project_Id, cWithHoldID, v_iscashvat, v_prepaymentamt
   FROM C_INVOICE i
@@ -1004,9 +1002,6 @@
                 AND C_INVOICE.Processed='Y'
                 AND C_INVOICELINE.M_InOutLine_ID=Cur_ReactivateInvoiceLine.M_InOutLine_ID;
               v_REtotalQtyInvoiced:=v_REtotalQtyInvoiced - Cur_ReactivateInvoiceLine.QtyInvoiced;
-              SELECT MovementQty INTO v_REdeliveredQty
-              FROM M_INOUTLINE
-              WHERE M_InOutLine_ID=Cur_ReactivateInvoiceLine.M_InOutLine_ID;
               UPDATE M_INOUTLINE
               SET IsInvoiced=(
                      CASE v_REtotalQtyInvoiced
@@ -1014,6 +1009,13 @@
                         ELSE 'Y'
                      END)
               WHERE M_InOutLine_ID=Cur_ReactivateInvoiceLine.M_InOutLine_ID;
+              -- Update M_Inout isCompletelyInvoiced flag as No when reactivate the invoice.
+              UPDATE M_InOut
+              SET iscompletelyinvoiced = 'N'
+              WHERE iscompletelyinvoiced = 'Y'
+              AND M_INOUT_ID = (SELECT M_INOUT_ID 
+                                FROM M_INOUTLINE
+                                WHERE M_INOUTLINE_ID = Cur_ReactivateInvoiceLine.M_InOutLine_ID);
             END IF;
           END IF;
         END LOOP;
@@ -1462,7 +1464,6 @@
         v_totalQtyInvoiced NUMBER;
         v_ODocumentNo C_ORDER.DocumentNo%TYPE;
         v_NewPendingToInvoice NUMBER;
-        v_deliveredQty NUMBER;
         v_inOutStatus varchar2(60) ;
       BEGIN
         SELECT DateInvoiced
@@ -1506,9 +1507,6 @@
                 AND C_INVOICE.Processed='Y'
                 AND C_INVOICELINE.M_InOutLine_ID=CurLines.M_InOutLine_ID;
               v_totalQtyInvoiced:=v_totalQtyInvoiced + CurLines.QtyInvoiced;
-              SELECT MovementQty INTO v_deliveredQty
-              FROM M_INOUTLINE
-              WHERE M_InOutLine_ID=CurLines.M_InOutLine_ID;
               UPDATE M_INOUTLINE
               SET IsInvoiced=(
                     CASE v_totalQtyInvoiced
@@ -1819,6 +1817,24 @@
         Updated=now(),
         UpdatedBy=v_UpdatedBy
     WHERE C_Invoice_ID=v_Record_ID;
+    -- Update M_Inout isCompletelyInvoiced flag as Yes when m_inoutline
+    -- associated with invoice line is completely invoiced. This flag is
+    -- used only in sales flow and shown in Goods Shipment Header.
+    IF(v_IsSOTrx='Y') THEN
+      UPDATE M_InOut
+      SET iscompletelyinvoiced = 'Y'
+      WHERE iscompletelyinvoiced = 'N'
+      AND NOT EXISTS (SELECT 1 FROM M_INOUTLINE l
+                      LEFT JOIN c_invoiceline il ON l.m_inoutline_id = il.m_inoutline_id
+                      LEFT JOIN c_invoice i ON il.c_invoice_id = i.c_invoice_id
+                      WHERE l.M_INOUT_ID = M_InOut.M_INOUT_ID
+                      GROUP BY l.m_inoutline_id, l.movementqty
+                      HAVING ( l.movementqty >= 0 AND l.movementqty > Sum(COALESCE(CASE WHEN i.docstatus = 'CO' THEN il.qtyinvoiced ELSE 0 END, 0)) )
+                           OR ( l.movementqty < 0 AND l.movementqty < Sum(COALESCE(CASE WHEN i.docstatus = 'CO' THEN il.qtyinvoiced ELSE 0 END, 0)) ) )
+      AND M_InOut.M_INOUT_ID IN (SELECT DISTINCT M_INOUT_ID
+                                 FROM M_INOUTLINE ML JOIN C_INVOICELINE IL ON IL.M_INOUTLINE_ID = ML.M_INOUTLINE_ID
+                                 WHERE IL.C_INVOICE_ID = v_Record_ID);
+    END IF;
   END IF;--FINISH_PROCESS
   IF (NOT FINISH_PROCESS) THEN
     -- End Processing --------------------------------------------------------
--- a/model/src-db/database/model/functions/C_ORDER_POST1.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/functions/C_ORDER_POST1.xml	Wed May 09 04:45:09 2018 +0000
@@ -86,7 +86,6 @@
   v_ISO_Code VARCHAR(10) ;
   v_DocumentNo VARCHAR2(200) ;
   v_GrandTotal NUMBER;
-  v_Multiplier NUMBER:=1;
   v_Date DATE;
   v_WarehouseName VARCHAR2(60) ;
   v_count NUMBER;
@@ -209,6 +208,41 @@
   IF(v_isactive = 'N') THEN
     RAISE_APPLICATION_ERROR(-20000, '@InActiveBusinessPartner@');
   END IF;
+
+  --C_Order_Post - Validation_Process Extension Point
+    SELECT count(*) INTO v_count
+    FROM DUAL
+    where exists (select 1 from ad_ep_procedures where ad_extension_points_id = '7D4A277CEBD74E57A68D8C53BB41C6DC');
+    IF (v_count=1) THEN
+      DECLARE
+        v_ep_instance VARCHAR2(32);
+        v_extension_point_id VARCHAR2(32) := '7D4A277CEBD74E57A68D8C53BB41C6DC';
+      BEGIN
+        v_ep_instance := get_uuid();
+        AD_EP_INSTANCE_PARA_INSERT(v_ep_instance, v_extension_point_id, 'Record_ID',
+          v_record_id, NULL, NULL, NULL, NULL, NULL, NULL);
+        AD_EP_INSTANCE_PARA_INSERT(v_ep_instance, v_extension_point_id, 'DocAction',
+          v_DocAction, NULL, NULL, NULL, NULL, NULL, NULL);
+        AD_EP_INSTANCE_PARA_INSERT(v_ep_instance, v_extension_point_id, 'User',
+          v_User, NULL, NULL, NULL, NULL, NULL, NULL);
+        AD_EP_INSTANCE_PARA_INSERT(v_ep_instance, v_extension_point_id, 'Message',
+          NULL, NULL, NULL, NULL, NULL, NULL, v_Message);
+        AD_EP_INSTANCE_PARA_INSERT(v_ep_instance, v_extension_point_id, 'Result',
+          NULL, NULL, v_result, NULL, NULL, NULL, NULL);
+        AD_EXTENSION_POINT_HANDLER(v_ep_instance, v_extension_point_id);
+        SELECT p_number INTO v_Result
+        FROM ad_ep_instance_para
+        WHERE ad_ep_instance_id = v_ep_instance
+          AND parametername LIKE 'Result';
+        SELECT p_text INTO v_Message
+        FROM ad_ep_instance_para
+        WHERE ad_ep_instance_id = v_ep_instance
+          AND parametername LIKE 'Message';
+
+        DELETE FROM ad_ep_instance_para
+        WHERE ad_ep_instance_id = v_ep_instance;
+      END;
+    END IF;
   
     /**
     * Read Order
@@ -1748,21 +1782,6 @@
               WHEN NO_DATA_FOUND THEN
                 NULL;
             END;
-           /**************************************************************************
-            * Credit Multiplier
-            *************************************************************************/
-            DECLARE
-              v_DocBaseType C_DOCTYPE.DocBaseType%TYPE;
-            BEGIN
-              -- Is it a Credit Memo?
-              SELECT DocBaseType
-                INTO v_DocBaseType
-              FROM C_DOCTYPE
-              WHERE C_DocType_ID=v_DocType_ID;
-              IF (v_DocBaseType IN('ARC', 'API')) THEN
-                v_Multiplier:=-1;
-              END IF;
-            END;
 
             IF (v_Cash_ID IS NULL) THEN
               v_ResultStr:='Create C_Cash';
--- a/model/src-db/database/model/functions/C_SETTLEMENT_POST.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/functions/C_SETTLEMENT_POST.xml	Wed May 09 04:45:09 2018 +0000
@@ -33,7 +33,6 @@
   v_AD_Client_ID VARCHAR2(32) ;
   v_AD_Org_ID VARCHAR2(32) ;
   v_Processed VARCHAR(60) ;
-  v_Type VARCHAR(60);
   v_Currency VARCHAR2(32);
   v_Date DATE;
   v_DateAcct DATE;
@@ -72,7 +71,6 @@
     -- For WithHolding
     v_CanceledNotChargeAmt_WH NUMBER:=0;
     v_GeneratedAmt_WH NUMBER:=0;
-    v_ChargedAmt_WH NUMBER:=0;
     --
     FINISH_PROCESS BOOLEAN:=false;
   BEGIN
@@ -107,11 +105,9 @@
     END IF;
   BEGIN --BODY
     SELECT UpdatedBy, AD_Client_ID, AD_Org_ID, Processed,
-      C_Currency_ID, DATETRX, DateAcct, IsGenerated, C_DocType_ID,
-      settlementtype
+      C_Currency_ID, DATETRX, DateAcct, IsGenerated, C_DocType_ID
     INTO v_AD_User_ID, v_AD_Client_ID, v_AD_Org_ID, v_Processed,
-      v_Currency, v_Date, v_DateAcct, v_IsGenerated, v_DocType_ID,
-      v_Type
+      v_Currency, v_Date, v_DateAcct, v_IsGenerated, v_DocType_ID
     FROM C_SETTLEMENT
     WHERE C_Settlement_ID=v_Record_ID;
     IF(v_PAD_User_ID IS NOT NULL) THEN
@@ -400,9 +396,8 @@
         AND isActive='Y'
         AND isManual='N';
       --Calculating the applied amount
-      SELECT COALESCE(SUM(C_Currency_Round(  C_Currency_Convert((Amount - WriteOffAmt), C_Currency_ID, v_Currency, v_Date, NULL, v_AD_Client_ID, v_AD_Org_ID), v_Currency, NULL)), 0),
-      COALESCE(SUM(C_Currency_Round(  C_Currency_Convert((coalesce(WithHoldingAmount,0) ), C_Currency_ID, v_Currency, v_Date, NULL, v_AD_Client_ID, v_AD_Org_ID), v_Currency, NULL)), 0)
-      INTO v_ChargedAmt,v_ChargedAmt_WH
+      SELECT COALESCE(SUM(C_Currency_Round(  C_Currency_Convert((Amount - WriteOffAmt), C_Currency_ID, v_Currency, v_Date, NULL, v_AD_Client_ID, v_AD_Org_ID), v_Currency, NULL)), 0)
+      INTO v_ChargedAmt
       FROM C_Debt_Payment_V
       WHERE(C_Settlement_Cancel_ID=v_Record_ID
         OR C_Settlement_Generate_ID=v_Record_ID)
--- a/model/src-db/database/model/functions/C_TAXPAYMENT_POST.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/functions/C_TAXPAYMENT_POST.xml	Wed May 09 04:45:09 2018 +0000
@@ -16,7 +16,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2001-2016 Openbravo SLU
+* All portions are Copyright (C) 2001-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -88,7 +88,6 @@
 v_TRTcountN  NUMBER;
 v_dummy VARCHAR2(2000);
 v_count NUMBER:=0;
-v_FIN_PAYMENT_ID VARCHAR2(32);
 
 BEGIN
   --  Update AD_PInstance
@@ -167,8 +166,8 @@
      if v_processed='Y' then
       begin
 
-      select tp.gl_journal_id ,  gljb.gl_journalbatch_id, tp.c_settlement_id, tp.fin_payment_id
-      into v_gl_journalid, v_gl_journalbatchid, v_settlementid, v_FIN_PAYMENT_ID
+      select tp.gl_journal_id ,  gljb.gl_journalbatch_id, tp.c_settlement_id
+      into v_gl_journalid, v_gl_journalbatchid, v_settlementid
       from c_taxpayment tp
       inner join gl_journal glj on tp.gl_journal_id=glj.gl_journal_id
       inner join gl_journalbatch gljb on gljb.gl_journalbatch_id=glj.gl_journalbatch_id
@@ -300,6 +299,7 @@
       from c_taxregister_type tt
       inner join c_glitem_acct gia on gia.c_glitem_id=tt.c_glitem_id
       where tt.isactive='Y' and gia.isactive='Y' and tt.issotrx= case when v_totalcredit - v_totaldebit > 0 then 'N' else 'Y' end
+      and gia.c_acctschema_id = v_acctschema_id
       group by tt.issotrx;
 
       if (v_glitem_acct is null) then
--- a/model/src-db/database/model/functions/C_VALIDCOMBINATION_CLONE.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/functions/C_VALIDCOMBINATION_CLONE.xml	Wed May 09 04:45:09 2018 +0000
@@ -43,8 +43,6 @@
 	v_New_SubAccount_No 		      VARCHAR(32) :=null;
 	v_Default_Account_No 		      VARCHAR(32) :=null;
 	v_Seq_No_For_Subaccount_No	  VARCHAR(32) :=null;
-	v_Default_Account_Name 		    VARCHAR(60) :=null;
-	v_Default_Account_Desc 		    CHARACTER VARYING(255);
 	v_Default_Account_Client_ID 	VARCHAR(32);
 	v_Org_ID			                VARCHAR(32);
 	v_C_AcctSchema_ID		          VARCHAR(32) :=null;
@@ -64,16 +62,12 @@
 	*/
 	SELECT 
 		C_ElementValue.Value, 
-		C_ElementValue.Name, 
-		C_ElementValue.Description, 
 		C_ElementValue.AD_Client_ID,
 		C_ElementValue.C_ElementValue_ID, 
 		C_ValidCombination.C_AcctSchema_ID, 
 		C_ElementValue.AD_Org_ID
 		INTO 
 		v_Default_Account_No,
-		v_Default_Account_Name,
-		v_Default_Account_Desc, 
 		v_Default_Account_Client_ID,
 		v_Node_ID, 
 		v_C_AcctSchema_ID, 
--- a/model/src-db/database/model/functions/FACT_ACCT_RESET.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/functions/FACT_ACCT_RESET.xml	Wed May 09 04:45:09 2018 +0000
@@ -37,8 +37,6 @@
   v_Message VARCHAR2(2000):='';
   v_Result NUMBER:=1; -- 0=failure
   v_Record_ID VARCHAR2(32);
-  v_AD_User_ID VARCHAR2(32);
-  v_DateColumn VARCHAR2(2000):='';
   v_AD_Org_ID VARCHAR2(32);
   v_TableName VARCHAR2(48):='';
   v_AD_Org_CalOwner VARCHAR(32);
@@ -86,7 +84,6 @@
       )
     LOOP
       v_Record_ID:=Cur_Parameter.Record_ID;
-      v_AD_User_ID:=Cur_Parameter.AD_User_ID;
       IF(Cur_Parameter.ParameterName='AD_Client_ID') THEN
         v_AD_Client_ID:=Cur_Parameter.P_String;
         DBMS_OUTPUT.PUT_LINE('  AD_Client_ID=' || v_AD_Client_ID) ;
@@ -270,15 +267,6 @@
                 AND AD_Client_ID = Cur_Clients.AD_Client_ID
               ) LOOP
            IF (v_DeleteFact='Y') THEN
-              IF(Cur_Tables.AD_Table_ID IN('472', '473')) THEN
-                v_DateColumn:='DATETRX';
-              ELSIF(Cur_Tables.AD_Table_ID IN('392')) THEN
-                v_DateColumn:='STATEMENTDATE';
-              ELSIF(Cur_Tables.AD_Table_ID IN('321', '323', '325')) THEN
-                v_DateColumn:='MOVEMENTDATE';
-              ELSE
-                v_DateColumn:='DATEACCT';
-              END IF;
               v_Cmd:='UPDATE ' || Cur_Tables.TableName  || ' SET Posted=''N'', Processing=''N'' WHERE AD_Client_ID='''  || Cur_Clients.AD_Client_ID
         || ''' AND (Posted<>''N'' OR Posted IS NULL OR Processing<>''N'' OR Processing IS NULL) AND '   ||
         Cur_Tables.TableName||'_ID = '''||Cur_Fact_Acct.Record_ID||'''';
--- a/model/src-db/database/model/functions/GL_JOURNAL_POST.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/functions/GL_JOURNAL_POST.xml	Wed May 09 04:45:09 2018 +0000
@@ -43,7 +43,6 @@
   v_AD_Org_ID VARCHAR2(32);
   v_C_Period_ID VARCHAR2(32);
   v_DateAcct DATE;
-  v_DocType_ID VARCHAR2(32);
   v_BatchOrg_ID VARCHAR2(32);
   -- Parameter
   TYPE RECORD IS REF CURSOR;
@@ -106,12 +105,12 @@
     SELECT DocStatus,
       DocAction,
       Processing,
-      Posted, AD_Org_ID, DateAcct, C_DocType_ID,
+      Posted, AD_Org_ID, DateAcct,
       C_Period_ID
     INTO v_DocStatus,
       v_DocAction,
       v_Processing,
-      v_Posted, v_AD_Org_ID, v_DateAcct, v_DocType_ID,
+      v_Posted, v_AD_Org_ID, v_DateAcct,
       v_C_Period_ID
     FROM GL_Journal
     WHERE GL_Journal_ID=v_Record_ID  FOR UPDATE;
--- a/model/src-db/database/model/functions/MA_PRODUCTION_COST.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/functions/MA_PRODUCTION_COST.xml	Wed May 09 04:45:09 2018 +0000
@@ -32,8 +32,6 @@
   -- Parameter
   TYPE RECORD IS REF CURSOR;
 
-  v_Org_ID                              varchar2(32);
-  v_Client_ID                           varchar2(32);
   v_count                               NUMBER;
   v_countAux                            NUMBER;
   v_count2                              NUMBER;
@@ -102,8 +100,8 @@
 
     IF (v_count > 0) THEN
       -- Costing engine migrated
-      SELECT MAX(pr.ad_client_id), MAX(pr.ad_org_id), MAX(pr.movementdate), MAX(trxprocessdate), COUNT (*), MAX(pr.DOCUMENTNO)
-      INTO v_Client_ID, v_Org_ID, v_ProductionDate, v_CostingDate, v_count, v_ProductionNo
+      SELECT MAX(pr.movementdate), MAX(trxprocessdate), COUNT (*), MAX(pr.DOCUMENTNO)
+      INTO v_ProductionDate, v_CostingDate, v_count, v_ProductionNo
       FROM M_PRODUCTION pr, M_PRODUCTIONLINE pl
         LEFT JOIN M_TRANSACTION t ON t.m_productionline_id = pl.m_productionline_id
         , M_PRODUCTIONPLAN pp
@@ -113,8 +111,8 @@
       v_costingdate := COALESCE(v_costingdate, v_productiondate);
     ELSE
       -- Costing engine not migrated
-      SELECT MAX(pr.ad_client_id), MAX(pr.ad_org_id), MAX(movementdate), MAX(movementdate), COUNT (*), MAX(pr.DOCUMENTNO)
-      INTO v_Client_ID, v_Org_ID, v_ProductionDate, v_CostingDate, v_count, v_ProductionNo
+      SELECT MAX(movementdate), MAX(movementdate), COUNT (*), MAX(pr.DOCUMENTNO)
+      INTO v_ProductionDate, v_CostingDate, v_count, v_ProductionNo
       FROM M_PRODUCTION pr, M_PRODUCTIONLINE pl, M_PRODUCTIONPLAN pp
       WHERE pr.m_production_id = p_Production_ID
         AND pr.m_production_id = pp.m_production_id
--- a/model/src-db/database/model/functions/MA_STANDARD_COST_SEQUENCE.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/functions/MA_STANDARD_COST_SEQUENCE.xml	Wed May 09 04:45:09 2018 +0000
@@ -38,7 +38,6 @@
   v_ResultStr             VARCHAR2(2000) := '';
 
   v_CostCenterUse         NUMBER;
-  v_Multiplier            NUMBER;
   v_Outsourced            CHAR(1);
   v_OutsourcingCost       NUMBER;
   v_CostCenter_Version    varchar2(32);
@@ -72,7 +71,7 @@
   DELETE FROM MA_SEQUENCE_EMPLOYEE WHERE MA_SEQUENCE_ID = p_Sequence_ID;
   DELETE FROM MA_SEQUENCE_MACHINE WHERE MA_SEQUENCE_ID = p_Sequence_ID;
 
-  SELECT s.CostCenterUse, s.Multiplier, s.outsourced, s.outsourcingcost, ccv.MA_CostCenter_Version_ID, s.MA_ProcessPlan_Version_ID,
+  SELECT s.CostCenterUse, s.outsourced, s.outsourcingcost, ccv.MA_CostCenter_Version_ID, s.MA_ProcessPlan_Version_ID,
       SUM(CASE sp.productiontype WHEN '+' THEN (pd.weight*sp.quantity*COALESCE(sp.decrease,1)*COALESCE(sp.rejected,1))
           ELSE 0 END),
       SUM(CASE sp.productiontype WHEN '+' THEN (sp.quantity*COALESCE(sp.decrease,1)*COALESCE(sp.rejected,1))
@@ -80,7 +79,7 @@
       SUM(CASE sp.productiontype
           WHEN '+' THEN (CASE WHEN sp.quantity <> 0 THEN COALESCE(sp.ComponentCost,1) ELSE 0 END )
           ELSE 0 END)
-    INTO v_CostCenterUse, v_Multiplier, v_Outsourced, v_OutsourcingCost, v_CostCenter_Version, v_ProcessPlan_Version,
+    INTO v_CostCenterUse, v_Outsourced, v_OutsourcingCost, v_CostCenter_Version, v_ProcessPlan_Version,
       v_ProducedKG, v_ProducedUd, v_CompCostSum
   FROM MA_Sequence s, MA_SequenceProduct sp, M_Product pd,
     MA_Process p LEFT JOIN (SELECT MA_CostCenter_ID, MA_CostCenter_version_ID
--- a/model/src-db/database/model/functions/MA_WORKEFFORT_VALIDATE.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/functions/MA_WORKEFFORT_VALIDATE.xml	Wed May 09 04:45:09 2018 +0000
@@ -34,24 +34,9 @@
     v_Org_ID VARCHAR2(32);
     v_Client_ID VARCHAR2(32);
     v_count NUMBER;
---    v_count2 NUMBER;
---    v_Production_ID VARCHAR2(32);
     v_ProductionDate DATE;
---    v_Name NVARCHAR2(60) ;
-    -- p_ppline            NUMBER;
-    -- p_plline          NUMBER;
---    v_ProductionPlan_ID VARCHAR2(32);
---    v_ProductionLine_ID VARCHAR2(32);
---    v_Quantity NUMBER;
---    v_UOM_ID VARCHAR2(32);
---    v_PInstance NUMBER;
---    v_doneQty NUMBER;
---    v_needQty NUMBER;
-    v_QtyOnHand NUMBER;
     p_Processed CHAR;
-    v_ProductQty NUMBER;
     v_NextNo VARCHAR2(32);
-    Quantity NUMBER:=99999; -- unlimited
     v_Result NUMBER:=1;
 
     CUR_PL_Post RECORD;
@@ -358,24 +343,7 @@
         -- M_ProductionLine_ID, AD_Client_ID, AD_Org_ID, MovementDate, M_Product_ID, MovementQty, M_Locator_ID
         -- DBMS_OUTPUT.PUT_LINE('ProductionLine=' || CUR_PL_Post.M_ProductionLine_ID);
         -- DBMS_OUTPUT.PUT_LINE('  Qty=' || CUR_PL_Post.MovementQty || ', OnHand=' || M_BOM_Qty_OnHand(CUR_PL_Post.M_Product_ID, NULL, CUR_PL_Post.M_Locator_ID));
-        -- Check Stock levels for reductions
-        -- Check, if product exists and if it is stocked
-        -- Unlimited capacity if no item
-        IF(CUR_PL_Post.ProductType<>'I' OR CUR_PL_Post.IsStocked='N') THEN
-          v_QtyOnHand:=Quantity;
-          -- Stocked item
-        ELSIF(CUR_PL_Post.IsStocked='Y') THEN
-          -- Get ProductQty
-          SELECT COALESCE(SUM(QtyOnHand), 0)
-          INTO v_ProductQty
-          FROM M_STORAGE_DETAIL s
-          WHERE M_Product_ID=CUR_PL_Post.M_Product_ID
-            AND EXISTS
-            (SELECT * FROM M_LOCATOR l WHERE s.M_Locator_ID=l.M_Locator_ID)
-            ;
-          --DBMS_OUTPUT.PUT_LINE('Qty=' || ProductQty);
-          v_QtyOnHand:=v_ProductQty;
-        END IF;
+        
         -- Only insert in M_TRANSACTION if MovementQty <> 0
         IF CUR_PL_Post.MovementQty <> 0 THEN
           -- Create Transaction Entry        
@@ -400,6 +368,9 @@
             )
             ;
           END IF;
+          
+        -- Check Stock levels for reductions
+        -- Check, if product exists and if it is stocked
         IF(CUR_PL_Post.IsStocked<>'N') THEN
           M_Check_Stock(CUR_PL_Post.M_Product_ID, v_Client_ID, v_AD_Org_ID, v_Result, v_Message, CUR_PL_Post.M_Locator_ID) ;
           IF (v_Result=0) THEN
--- a/model/src-db/database/model/functions/MA_WORKREQUIREMENT_CLOSE.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/functions/MA_WORKREQUIREMENT_CLOSE.xml	Wed May 09 04:45:09 2018 +0000
@@ -31,7 +31,6 @@
     --  Phases to close
     Cur_Phase RECORD;
     --
-    v_Client_ID VARCHAR2(32);
   BEGIN
     --  Process Parameters
     IF(p_PInstance_ID IS NOT NULL) THEN
@@ -57,7 +56,6 @@
         ORDER BY p.SeqNo
         )
       LOOP
-        v_Client_ID:=Cur_Parameter.AD_Client_ID;
         v_Record_ID:=Cur_Parameter.Record_ID;
       END LOOP; --  Get Parameter
     ELSE
--- a/model/src-db/database/model/functions/MA_WORKREQUIREMENT_PROCESS.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/functions/MA_WORKREQUIREMENT_PROCESS.xml	Wed May 09 04:45:09 2018 +0000
@@ -43,7 +43,6 @@
     v_Processed CHAR;
     v_LaunchDate DATE;
     v_Startdate DATE;
-    v_Enddate DATE;
     -- WRPhases to process
     Cur_WRPhase RECORD;
     --  Sequence Products to process
@@ -92,16 +91,14 @@
       ExplodePhases,
       LaunchDate,
       AD_Org_ID,
-      Startdate,
-      Enddate
+      Startdate
     INTO v_ProcessPlan_ID,
       v_Quantity,
       v_Processed,
       v_ExplodePhases,
       v_LaunchDate,
       v_Org_ID,
-      v_Startdate,
-      v_Enddate
+      v_Startdate
     FROM MA_WorkRequirement
     WHERE MA_WorkRequirement_ID=v_Record_ID;
     --Check if it hasn't already been processed
--- a/model/src-db/database/model/functions/MA_WRPHASE_CLOSE.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/functions/MA_WRPHASE_CLOSE.xml	Wed May 09 04:45:09 2018 +0000
@@ -33,7 +33,6 @@
     v_Record_ID VARCHAR2(32):=NULL;
     v_WorkRequirement_ID VARCHAR2(32);
     v_Count NUMBER;
-    v_Client_ID VARCHAR2(32);
   BEGIN
     --  Process Parameters
     IF(p_PInstance_ID IS NOT NULL) THEN
@@ -60,7 +59,6 @@
         )
       LOOP
         v_Record_ID:=Cur_Parameter.Record_ID;
-        v_Client_ID:=Cur_Parameter.AD_Client_ID;
       END LOOP; --  Get Parameter
     ELSE
       DBMS_OUTPUT.PUT_LINE('--<<MA_WorkRequirement_Close>>') ;
--- a/model/src-db/database/model/functions/M_CREATE_RESERVE_FROM_SOL.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/functions/M_CREATE_RESERVE_FROM_SOL.xml	Wed May 09 04:45:09 2018 +0000
@@ -42,6 +42,7 @@
   v_reservation_id    VARCHAR2(32) := get_uuid();
   v_attributesetinstance_id VARCHAR2(32);
   v_res_stock_id      VARCHAR2(32);
+  v_storage_detail_dummy_id VARCHAR2(32) := NULL;
   
   TYPE RECORD IS REF CURSOR;
   cur_shipments       RECORD;
@@ -74,15 +75,15 @@
     v_reservation_id, v_client_id, v_org_id, 'Y',
     now(), p_user_id, now(), p_user_id,
     p_orderline_id,
-    v_product_id, v_uom_id, v_qtyordered, 0, v_qtydelivered,
+    v_product_id, v_uom_id, v_qtyordered, 0, 0,
     'DR', 'CO', v_attributesetinstance_id
   );
   
   FOR cur_shipments IN (
-      SELECT sd.m_storage_detail_id, iol.movementqty
+      SELECT sd.m_storage_detail_id, iol.movementqty,iol.m_locator_id
       FROM m_inoutline iol
         JOIN m_inout io ON iol.m_inout_id = io.m_inout_id
-        JOIN m_storage_detail sd ON sd.m_product_id = iol.m_product_id
+        LEFT JOIN m_storage_detail sd ON sd.m_product_id = iol.m_product_id
                                     AND sd.c_uom_id = iol.c_uom_id
                                     AND sd.m_product_uom_id IS NULL
                                     AND sd.m_locator_id = iol.m_locator_id
@@ -90,7 +91,31 @@
       WHERE iol.c_orderline_id = p_orderline_id
         AND io.docstatus = 'CO'
   ) LOOP
-    M_RESERVE_STOCK_MANUAL(v_reservation_id, 'SD', cur_shipments.m_storage_detail_id, cur_shipments.movementqty, p_user_id, 'N', v_res_stock_id);
+    IF cur_shipments.m_storage_detail_id IS NULL THEN
+    -- If there is no Storage Detail, because the shipment has removed all the stock from the system, 
+    -- create a Storage Detail with 0 Stock before calling M_Reserve_Stock_Manual, then delete it
+      v_storage_detail_dummy_id := get_uuid();
+      INSERT INTO M_Storage_Detail
+        (
+          M_STORAGE_DETAIL_ID, M_PRODUCT_ID, M_LOCATOR_ID, M_ATTRIBUTESETINSTANCE_ID,
+          C_UOM_ID, M_PRODUCT_UOM_ID, AD_CLIENT_ID, AD_ORG_ID,
+          ISACTIVE, CREATED, CREATEDBY, UPDATED,
+          UPDATEDBY, QTYONHAND, QTYORDERONHAND, PREQTYONHAND,
+          PREQTYORDERONHAND, DATELASTINVENTORY
+        )
+        VALUES
+        (
+          v_storage_detail_dummy_id, v_product_id, cur_shipments.M_Locator_ID, COALESCE(v_attributesetinstance_id, '0'),
+          v_uom_id, NULL, v_client_id, v_org_id,
+          'Y', now(), p_user_id, now(),
+           p_user_id, 0, NULL, 0,
+           NULL, NULL
+        );
+      M_RESERVE_STOCK_MANUAL(v_reservation_id, 'SD', v_storage_detail_dummy_id, cur_shipments.movementqty, p_user_id, 'N', v_res_stock_id);
+      DELETE FROM m_storage_detail WHERE m_storage_detail_id = v_storage_detail_dummy_id;
+    ELSE 
+      M_RESERVE_STOCK_MANUAL(v_reservation_id, 'SD', cur_shipments.m_storage_detail_id, cur_shipments.movementqty, p_user_id, 'N', v_res_stock_id);
+    END IF;
     UPDATE m_reservation_stock
     SET releasedqty = COALESCE(releasedqty, 0) + cur_shipments.movementqty
     WHERE m_reservation_stock_id = v_res_stock_id;
--- a/model/src-db/database/model/functions/M_DISCOUNTSCHEMA_RESEQ.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/functions/M_DISCOUNTSCHEMA_RESEQ.xml	Wed May 09 04:45:09 2018 +0000
@@ -34,7 +34,6 @@
   v_Message VARCHAR2(2000):='';
   v_Result NUMBER:=1; -- 0=failure
   v_Record_ID VARCHAR2(32);
-  v_AD_User_ID VARCHAR2(32);
   -- Parameter
   TYPE RECORD IS REF CURSOR;
     Cur_Parameter RECORD;
@@ -65,7 +64,6 @@
       )
     LOOP
       v_Record_ID:=Cur_Parameter.Record_ID;
-      v_AD_User_ID:=Cur_Parameter.AD_User_ID;
     END LOOP; -- Get Parameter
     DBMS_OUTPUT.PUT_LINE('  Record_ID=' || v_Record_ID) ;
     -- Line
--- a/model/src-db/database/model/functions/M_EXPLODEBOMNOTSTOCK.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/functions/M_EXPLODEBOMNOTSTOCK.xml	Wed May 09 04:45:09 2018 +0000
@@ -19,7 +19,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2013-2017 Openbravo SLU
+* All portions are Copyright (C) 2013-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -193,7 +193,7 @@
             QuantityOrder, M_Product_Uom_ID, PriceStd,
             c_project_id, a_asset_id, c_costcenter_id,
             user1_id, user2_id, bom_parent_id,
-            gross_unit_price, grosspricelist, line_gross_amount,
+            gross_unit_price, grosspricelist, line_gross_amount, grosspricestd,
             c_aum, aumqty
           )
         VALUES
@@ -212,7 +212,8 @@
             CUR_BOM_Line.QuantityOrder, CUR_BOM_Line.M_Product_UOM_ID, M_BOM_PriceStd(CUR_BOM.M_ProductBOM_ID, v_PriceList_Version_ID),
             CUR_BOM_Line.c_project_id, CUR_BOM_Line.a_asset_id, CUR_BOM_Line.c_costcenter_id,
             CUR_BOM_Line.user1_id, CUR_BOM_Line.user2_id, v_Record_ID,
-            v_gross_unit_price, v_gross_price_list, v_line_gross_amount, v_aum, v_aumqty*CUR_BOM.BOMQty
+            v_gross_unit_price, v_gross_price_list, v_line_gross_amount, v_gross_unit_price,
+            v_aum, v_aumqty*CUR_BOM.BOMQty
           );
           SELECT BASEAMOUNT
           INTO v_BaseAmount
--- a/model/src-db/database/model/functions/M_FREIGHT_CALCULATE.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/functions/M_FREIGHT_CALCULATE.xml	Wed May 09 04:45:09 2018 +0000
@@ -31,8 +31,6 @@
   TYPE RECORD IS REF CURSOR;
     Cur_Parameter RECORD;
     --  Record Info
-    v_Client_ID VARCHAR2(32);
-    v_Org_ID VARCHAR2(32);
     v_User_ID VARCHAR2(32);
     v_Shipper_ID VARCHAR2(32);
     v_FreightCategory_ID VARCHAR2(32);
@@ -73,8 +71,6 @@
     LOOP
       v_Record_ID:=Cur_Parameter.Record_ID;
       v_User_ID:=Cur_Parameter.AD_User_ID;
-      v_Org_ID:=Cur_Parameter.AD_Org_ID;
-      v_Client_ID:=Cur_Parameter.AD_Client_ID;
       IF(Cur_Parameter.ParameterName='cheaper') THEN
         v_Cheaper:=Cur_Parameter.P_String;
         DBMS_OUTPUT.PUT_LINE('  Cheaper=' || v_Cheaper) ;
--- a/model/src-db/database/model/functions/M_GENERATE_AVERAGE_COSTS.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/functions/M_GENERATE_AVERAGE_COSTS.xml	Wed May 09 04:45:09 2018 +0000
@@ -25,7 +25,6 @@
   v_Result NUMBER:=1;
   v_Message VARCHAR2(2000):='';
   v_MessageCount NUMBER:=0;
-  v_Record_ID VARCHAR2(32);
   v_Date DATE;
   v_Qty NUMBER;
   v_Cost NUMBER;
@@ -93,7 +92,6 @@
       ORDER BY p.SeqNo
       )
     LOOP
-      v_Record_ID:=Cur_Parameter.Record_ID;
       v_User:=Cur_Parameter.AD_User_ID;
       v_Client:=Cur_Parameter.AD_Client_ID;
       IF (Cur_Parameter.ParameterName = 'IsIncremental') THEN
--- a/model/src-db/database/model/functions/M_GENERATE_STANDARD_COSTS.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/functions/M_GENERATE_STANDARD_COSTS.xml	Wed May 09 04:45:09 2018 +0000
@@ -29,7 +29,6 @@
   -- Logistice
   v_ResultStr VARCHAR2(2000):='';
   v_Message VARCHAR2(2000):='';
-  v_Record_ID VARCHAR2(32);
   v_User VARCHAR2(32);
   v_Deleted NUMBER;
   -- Parameter
@@ -59,7 +58,6 @@
       ORDER BY p.SeqNo
       )
     LOOP
-      v_Record_ID:=Cur_Parameter.Record_ID;
       v_User:=Cur_Parameter.AD_User_ID;
     END LOOP; --  Get Parameter
     DELETE
--- a/model/src-db/database/model/functions/M_GET_STOCK_PARAM.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/functions/M_GET_STOCK_PARAM.xml	Wed May 09 04:45:09 2018 +0000
@@ -603,7 +603,7 @@
         SELECT name INTO v_productname
         FROM m_product
         WHERE m_product_id = v_productid;
-        v_message := '@NotEnoughStockedDueWHRule@';
+        v_message := '@NotEnoughStockedDueWHRule@' || v_productname;
       END IF;
       DBMS_OUTPUT.PUT_LINE( v_message); --OBTG:-20000--
       p_result := 2;
--- a/model/src-db/database/model/functions/M_INOUTEXPLODEBOMNOTSTOCK.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/functions/M_INOUTEXPLODEBOMNOTSTOCK.xml	Wed May 09 04:45:09 2018 +0000
@@ -25,8 +25,6 @@
 ************************************************************************/
   -- Logistice
   v_explode CHAR(1);
-  v_inoutID VARCHAR2(32);
-  v_CBPartner_ID VARCHAR2(32);
   v_Record_ID VARCHAR2(32);
   TYPE RECORD IS REF CURSOR;
   Cur_Parameter RECORD;
@@ -65,8 +63,8 @@
     DBMS_OUTPUT.PUT_LINE('  Record_ID=' || v_Record_ID) ;
   BEGIN --BODY
      
-    SELECT M_INOUT.m_inout_id, M_INOUT.c_bpartner_id, m_inoutline.explode
-      INTO v_inoutID, v_CBPartner_ID, v_explode
+    SELECT m_inoutline.explode
+      INTO v_explode
     FROM M_INOUT
     JOIN m_inoutline ON M_INOUT.m_inout_id = m_inoutline.m_inout_id
     WHERE m_inoutline.m_inoutline_id=v_Record_ID  FOR UPDATE;
--- a/model/src-db/database/model/functions/M_INOUT_CREATE.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/functions/M_INOUT_CREATE.xml	Wed May 09 04:45:09 2018 +0000
@@ -432,7 +432,6 @@
           v_UOM_old varchar2(32);
           v_Attribute_old varchar2(32);
           v_Product_UOM_old varchar2(32);
-          v_orderline_old varchar2(32);
           v_QtyStorage NUMBER:=0;
           v_LocatorQty NUMBER;
           v_IsStocked NUMBER:=0;
@@ -484,7 +483,6 @@
                 v_UOM_old := ol.C_UOM_ID;
                 v_Attribute_old := ol.M_AttributeSetInstance_ID;
                 v_Product_UOM_old := ol.M_Product_UOM_ID;
-                v_orderline_old := ol.c_orderline_id;
                 IF (Cur_Storage_ISOPEN) THEN
                   CLOSE Cur_Storage;
                   Cur_Storage_ISOPEN:=false;
@@ -621,8 +619,8 @@
                 --<<NEXT_PRODUCT>>
                 NEXT_PRODUCT:=false;
                 
-                IF (v_NegStockLocator IS NULL) THEN
-                -- Get Locator with negative Stock that belongs to the same Warehosue      
+                IF (v_NegStockLocator IS NULL AND ((Cur_Order.IsSOTrx = 'Y' AND v_Qty>0) OR (Cur_Order.IsSOTrx = 'N' AND v_Qty<0))) THEN
+                -- Get Locator with negative Stock that belongs to the same Warehosue for Transactions that decrease the stock
                   SELECT MIN(l.m_locator_id)
                   INTO v_NegStockLocator
                   FROM m_locator l
@@ -636,9 +634,22 @@
                                     WHERE l.m_warehouse_id = ol.M_Warehouse_ID
                                     AND invs.overissue = 'Y'
                                     AND l.isactive='Y');
+                ELSIF (v_NegStockLocator IS NULL AND ((Cur_Order.IsSOTrx = 'Y' AND v_Qty<0) OR (Cur_Order.IsSOTrx = 'N' AND v_Qty>0))) THEN
+                -- For Transactions that increase the Stock, pick the Bin with the lowest priority for the Warehouse
+                     SELECT MIN(M_LOCATOR_ID)
+                     INTO v_NegStockLocator
+                     FROM M_LOCATOR
+                     WHERE M_WAREHOUSE_ID=ol.M_Warehouse_ID
+                     AND M_LOCATOR.ISACTIVE = 'Y'
+                     AND priorityno = (SELECT min(priorityno) 
+					                             FROM M_LOCATOR  
+					                             WHERE M_WAREHOUSE_ID=ol.M_Warehouse_ID
+					                             AND M_LOCATOR.ISACTIVE = 'Y');
                 END IF;
 
-                IF (v_Qty<>0 AND (v_ForceDelivery='Y' OR v_NegStockLocator IS NOT NULL)) THEN
+                IF (v_Qty<>0 AND v_ForceDelivery='Y' AND v_NegStockLocator IS NULL) THEN
+                  RAISE_APPLICATION_ERROR(-20000, ' @NotEnoughStocked@ @ForProduct@ ' || ol.name);
+                ELSIF (v_Qty<>0 AND (v_ForceDelivery='Y' OR v_NegStockLocator IS NOT NULL)) THEN
                   -- Create InOut Line
                   Ad_Sequence_Next('M_InOutLine', Cur_Order.C_Order_ID, v_NextNo) ;
                   IF (v_ProductUOM IS NOT NULL) THEN
--- a/model/src-db/database/model/functions/M_INOUT_CREATEINVOICE.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/functions/M_INOUT_CREATEINVOICE.xml	Wed May 09 04:45:09 2018 +0000
@@ -108,7 +108,6 @@
       v_line_gross_amount NUMBER:=0;
       v_grosspricestd NUMBER:=0;
       v_grosspricelist NUMBER:=0;
-      v_priceprecision NUMBER;
       v_stdprecision NUMBER;
       --
       v_taxBaseAmt NUMBER;
@@ -209,8 +208,8 @@
             WHERE c_bpartner_id = CUR_Shipment.C_BPartner_ID;
           END IF;
           
-          SELECT PricePrecision, stdprecision
-            INTO v_priceprecision, v_stdprecision
+          SELECT stdprecision
+            INTO v_stdprecision
           FROM C_CURRENCY
           WHERE C_CURRENCY_ID = v_C_Currency_ID;
           
--- a/model/src-db/database/model/functions/M_INOUT_POST.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/functions/M_INOUT_POST.xml	Wed May 09 04:45:09 2018 +0000
@@ -22,7 +22,7 @@
   * parts created by ComPiere are Copyright (C) ComPiere, Inc.;
   * All Rights Reserved.
   * Contributor(s): Openbravo SLU
-  * Contributions are Copyright (C) 2001-2017 Openbravo, S.L.U.
+  * Contributions are Copyright (C) 2001-2018 Openbravo, S.L.U.
   *
   * Specifically, this derivative work is based upon the following Compiere
   * file and version.
@@ -1040,6 +1040,22 @@
           WHERE M_INOUT.M_INOUT_ID=Cur_InOut.M_INOUT_ID;
           --
           
+          -- Update M_Inout isCompletelyInvoiced flag as Yes when m_inoutline
+          -- associated with invoice line is completely invoiced. This flag is
+          -- used only in sales flow and shown in Goods Shipment Header.
+          IF(Cur_InOut.IsSOTrx='Y') THEN
+            UPDATE M_InOut
+            SET iscompletelyinvoiced = 'Y'
+            WHERE iscompletelyinvoiced = 'N'
+            AND NOT EXISTS (SELECT 1 FROM M_INOUTLINE l
+                            LEFT JOIN c_invoiceline il ON l.m_inoutline_id = il.m_inoutline_id
+                            LEFT JOIN c_invoice i ON il.c_invoice_id = i.c_invoice_id
+                      WHERE l.M_INOUT_ID = M_InOut.M_INOUT_ID
+                      GROUP BY l.m_inoutline_id, l.movementqty
+                      HAVING ( l.movementqty >= 0 AND l.movementqty > Sum(COALESCE(CASE WHEN i.docstatus = 'CO' THEN il.qtyinvoiced ELSE 0 END, 0)) )
+                           OR ( l.movementqty < 0 AND l.movementqty < Sum(COALESCE(CASE WHEN i.docstatus = 'CO' THEN il.qtyinvoiced ELSE 0 END, 0)) ) )
+            AND M_INOUT_ID = Cur_InOut.M_INOUT_ID;
+          END IF;
          
           -- Not Processed + Complete --
           /**
--- a/model/src-db/database/model/functions/M_INOUT_UPDATEQUANTITYES.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/functions/M_INOUT_UPDATEQUANTITYES.xml	Wed May 09 04:45:09 2018 +0000
@@ -23,10 +23,6 @@
   v_ResultStr VARCHAR2(2000):='';
   v_Message VARCHAR2(2000):='';
   v_Record_ID VARCHAR2(32);
-  v_Result NUMBER:=0; -- failure
-  v_AD_User_ID VARCHAR2(32);
-  v_AD_Org_ID VARCHAR2(32);
-  v_AD_Client_ID VARCHAR2(32);
   -- Parameter
   TYPE RECORD IS REF CURSOR;
     Cur_Parameter RECORD;
@@ -59,9 +55,6 @@
       )
     LOOP
       v_Record_ID:=Cur_Parameter.Record_ID;
-      v_AD_User_ID:=Cur_Parameter.AD_User_ID;
-      v_AD_Org_ID:=Cur_Parameter.AD_Org_ID;
-      v_AD_Client_ID:=Cur_Parameter.AD_Client_ID;
       IF(Cur_Parameter.ParameterName='M_InOut_ID') THEN
         v_M_InOut_ID:=Cur_Parameter.P_String;
         DBMS_OUTPUT.PUT_LINE('  M_InOut_ID=' || v_M_InOut_ID) ;
@@ -106,7 +99,6 @@
       A;
     IF(v_Total>0) THEN
       v_Message:='LinesNotMatch';
-      v_Result:=0;
       FINISH_PROCESS:=true;
     END IF;
     IF(NOT FINISH_PROCESS) THEN
--- a/model/src-db/database/model/functions/M_MOVEMENT_POST.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/functions/M_MOVEMENT_POST.xml	Wed May 09 04:45:09 2018 +0000
@@ -19,7 +19,7 @@
   * parts created by ComPiere are Copyright (C) ComPiere, Inc.;
   * All Rights Reserved.
   * Contributor(s): Openbravo SLU
-  * Contributions are Copyright (C) 2001-2017 Openbravo, S.L.U.
+  * Contributions are Copyright (C) 2001-2018 Openbravo, S.L.U.
   *
   * Specifically, this derivative work is based upon the following Compiere
   * file and version.
@@ -39,6 +39,7 @@
   -- Parameter
   TYPE RECORD IS REF CURSOR;
     Cur_Parameter RECORD;
+    cur_refInvByLocatorTo RECORD;
     -- Parameter Variables
     v_IsProcessing CHAR(1) ;
     v_IsProcessed VARCHAR2(60) ;
@@ -57,6 +58,8 @@
     v_productname m_product.name%TYPE;
     v_overIssueFrom m_inventorystatus.overissue%TYPE;
     v_overIssueTo m_inventorystatus.overissue%TYPE;
+    v_refInvValue M_REFINVENTORY.VALUE%TYPE;
+    v_locatorValue M_LOCATOR.VALUE%TYPE;
   BEGIN
     --  Update AD_PInstance
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Processing ' || PInstance_ID) ;
@@ -232,7 +235,7 @@
             FROM m_storage_detail
             WHERE m_product_id = cur_moveline.m_product_id
               AND m_locator_id = cur_moveline.m_locatorto_id
-              AND m_attributesetinstance_id = COALESCE(cur_moveline.m_attributesetinstance_id, '0')
+              AND m_attributesetinstance_id = COALESCE(cur_moveline.m_attributesetinstanceto_id, cur_moveline.m_attributesetinstance_id, '0')
               AND m_product_uom_id IS NULL;
             v_reservedqty := cur_moveline.movementqty;
             FOR cur_res_stock IN (
@@ -300,7 +303,7 @@
             (
               get_uuid(), Cur_MoveLine.AD_Client_ID, Cur_MoveLine.AD_Org_ID, 'Y',
               now(), v_p_User, now(), v_p_User,
-              'M+', Cur_MoveLine.M_LocatorTo_ID, Cur_MoveLine.M_Product_ID, COALESCE(Cur_MoveLine.M_AttributeSetInstance_ID, '0'),
+              'M+', Cur_MoveLine.M_LocatorTo_ID, Cur_MoveLine.M_Product_ID, COALESCE(Cur_MoveLine.M_AttributeSetInstanceTo_ID, Cur_MoveLine.M_AttributeSetInstance_ID, '0'),
               v_MoveDate, Cur_MoveLine.MovementQty, Cur_MoveLine.M_MovementLine_ID, Cur_MoveLine.M_Product_UOM_ID,
               Cur_MoveLine.QuantityOrder, Cur_MoveLine.C_UOM_ID
             )
@@ -309,6 +312,34 @@
           --It has been validated before that the quantity to be moved is positive or that the locator to allows negative stock
           --If the Locator to has already negative stock before this transaction, the goods movement should not be stopped
         END LOOP;
+
+        -- Referenced Inventory: check it is in just one locator
+        FOR cur_refInvByLocatorTo IN (
+          SELECT asi.M_REFINVENTORY_ID, ml.M_LocatorTo_ID
+          FROM M_MOVEMENTLINE ml
+          JOIN M_AttributeSetInstance asi on (asi.M_AttributeSetInstance_ID = COALESCE(ml.M_AttributeSetInstanceTo_ID, ml.M_AttributeSetInstance_ID, '0'))
+          WHERE ml.M_MOVEMENT_ID = v_Record_ID
+          AND asi.M_REFINVENTORY_ID IS NOT NULL
+          GROUP BY asi.M_REFINVENTORY_ID, ml.M_LocatorTo_ID
+        ) 
+        LOOP
+          BEGIN
+            SELECT M_REFINVENTORY.VALUE, M_LOCATOR.VALUE
+            INTO v_refInvValue, v_locatorValue
+            FROM M_STORAGE_DETAIL
+            JOIN M_LOCATOR on (M_STORAGE_DETAIL.M_LOCATOR_ID = M_LOCATOR.M_LOCATOR_ID)
+            JOIN M_REFINVENTORY on (M_STORAGE_DETAIL.M_REFINVENTORY_ID = M_REFINVENTORY.M_REFINVENTORY_ID)
+            WHERE M_STORAGE_DETAIL.M_REFINVENTORY_ID = cur_refInvByLocatorTo.M_REFINVENTORY_ID
+            AND M_STORAGE_DETAIL.QTYONHAND > 0
+            AND M_STORAGE_DETAIL.M_LOCATOR_ID <> cur_refInvByLocatorTo.M_LocatorTo_ID;
+            IF (v_locatorValue IS NOT NULL) THEN
+              RAISE_APPLICATION_ERROR(-20000, v_refInvValue || '@ReferencedInventoryInOtherBin@' || v_locatorValue) ;
+            END IF;
+          EXCEPTION
+          WHEN NO_DATA_FOUND THEN
+            v_locatorValue:=null; -- Hack for Oracle to control exception
+          END;
+        END LOOP;    
       END; -- FOR COMMIT
     END IF;--END_PROCESS
     --M_Movement_Post - Finish_Process Extension Point
--- a/model/src-db/database/model/functions/M_PROMOTION_ADJUSTMENT.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/functions/M_PROMOTION_ADJUSTMENT.xml	Wed May 09 04:45:09 2018 +0000
@@ -44,7 +44,6 @@
   v_qty_From NUMBER;
   v_qty_To NUMBER;
   v_apply_next VARCHAR(1);
-  v_tax VARCHAR(32);
   v_qty NUMBER;
   v_unitPrice NUMBER;
   v_newUnitPrice NUMBER;
@@ -68,16 +67,16 @@
    where m_offer_id = p_rule_id;
 
   if (p_type ='O') then
-		select gross_unit_price, c_tax_id, qtyordered, priceactual,
+		select gross_unit_price, qtyordered, priceactual,
 		       line_gross_amount, linenetamt
-			into v_unitprice, v_tax, v_qty, v_priceactual,
+			into v_unitprice, v_qty, v_priceactual,
 			     v_origGrossAmt, v_origLineNetAmt
 			from c_orderline
 		 where c_orderline_id = p_line_id;
   else 
-	 select gross_unit_price, c_tax_id, qtyinvoiced, priceactual,
+	 select gross_unit_price, qtyinvoiced, priceactual,
 	        line_gross_amount, linenetamt
-		 into v_unitprice, v_tax, v_qty, v_priceactual,
+		 into v_unitprice, v_qty, v_priceactual,
 		      v_origGrossAmt, v_origLineNetAmt
 		 from c_invoiceline
 		where c_invoiceline_id = p_line_id;
--- a/model/src-db/database/model/functions/M_PROMOTION_CALCULATE.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/functions/M_PROMOTION_CALCULATE.xml	Wed May 09 04:45:09 2018 +0000
@@ -22,7 +22,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2012-2017 Openbravo SLU
+* All portions are Copyright (C) 2012-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -149,12 +149,24 @@
 						update c_invoiceline set
 							gross_unit_price = grosspricestd,
 							line_gross_amount = round(grosspricestd * qtyinvoiced, v_stdPrecision)
-						where c_invoiceline_id = Cur_Order.id;
+						where c_invoiceline_id = Cur_Order.id
+						  and c_invoiceline.c_invoice_discount_id is null
+						  and not exists(
+                                                    select 1
+                                                    from c_discount
+                                                    where c_discount.m_product_id = c_invoiceline.m_product_id
+                                                  );
 					else
 						update c_invoiceline
 							 set priceactual = pricestd,
 									 linenetamt = round(pricestd * qtyinvoiced, v_stdPrecision)
-						 where c_invoiceline_id = Cur_Order.id;
+						where c_invoiceline_id = Cur_Order.id
+						  and c_invoiceline.c_invoice_discount_id is null
+						  and not exists(
+                                                    select 1
+                                                    from c_discount
+                                                    where c_discount.m_product_id = c_invoiceline.m_product_id
+                                                  );
 					end if;
 				end if;
 
@@ -210,6 +222,7 @@
         FROM M_OFFER, M_Offer_Type t
         WHERE v_date BETWEEN DATEFROM AND COALESCE(DATETO, TO_DATE('31-12-9999', 'DD-MM-YYYY'))
           AND M_OFFER.AD_Client_ID = Cur_Order.AD_Client_ID
+          AND AD_ISORGINCLUDED(Cur_Order.AD_Org_ID, M_OFFER.AD_ORG_ID, M_OFFER.AD_CLIENT_ID) <> -1
           AND M_OFFER.IsActive = 'Y'
           AND t.M_Offer_Type_ID = M_Offer.M_Offer_Type_ID
           AND ((PRICELIST_SELECTION='Y' AND NOT EXISTS (SELECT 1 FROM M_OFFER_PRICELIST
--- a/model/src-db/database/model/functions/M_REQUISITION_CREATEPO.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/functions/M_REQUISITION_CREATEPO.xml	Wed May 09 04:45:09 2018 +0000
@@ -52,7 +52,6 @@
   v_line_gross_amount NUMBER;
   v_lineNetAmt NUMBER;
   v_stdPre NUMBER;
-  v_priPre NUMBER;
   v_Gross NUMBER;
   v_Description C_OrderLine.Description%TYPE;
 
@@ -257,7 +256,7 @@
       END IF;
       
       
-      SELECT STDPRECISION, PRICEPRECISION INTO v_stdPre, v_priPre FROM C_CURRENCY WHERE C_CURRENCY_ID = v_Currency_ID;
+      SELECT STDPRECISION INTO v_stdPre FROM C_CURRENCY WHERE C_CURRENCY_ID = v_Currency_ID;
     
       v_ResultStr:='Insert order line';
       IF (Cur_Lines.istaxincluded = 'Y') THEN
--- a/model/src-db/database/model/functions/M_RESERVATION_CONSUMPTION.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/functions/M_RESERVATION_CONSUMPTION.xml	Wed May 09 04:45:09 2018 +0000
@@ -59,7 +59,7 @@
   TYPE RECORD IS REF CURSOR;
   cur_reserved_stock    RECORD;
 BEGIN
-  SELECT r.m_product_id, r.c_uom_id, COALESCE(r.quantity, 0) - COALESCE(r.releasedqty, 0),
+  SELECT r.m_product_id, r.c_uom_id, COALESCE(r.reservedqty, 0) - COALESCE(r.releasedqty, 0),
       r.m_warehouse_id, r.m_locator_id, r.m_attributesetinstance_id, r.res_status
     INTO v_product_id, v_uom_id, v_this_pendingqty, 
       v_dim_warehouse_id, v_dim_locator_id, v_dim_asi_id, v_res_status
--- a/model/src-db/database/model/functions/M_RESERVE_STOCK_MANUAL.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/functions/M_RESERVE_STOCK_MANUAL.xml	Wed May 09 04:45:09 2018 +0000
@@ -34,7 +34,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2012-2016 Openbravo SLU
+* All portions are Copyright (C) 2012-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -72,7 +72,7 @@
       JOIN m_reservation res ON res.m_reservation_id = p_reservation_id
     WHERE sd.m_storage_detail_id = p_stock_id
       AND sd.m_product_id = res.m_product_id
-      AND sd.m_attributesetinstance_id = COALESCE(res.m_attributesetinstance_id, sd.m_attributesetinstance_id)
+      AND sd.m_attributesetinstance_id = CASE WHEN sd.M_REFINVENTORY_ID IS NULL THEN COALESCE(res.m_attributesetinstance_id, sd.m_attributesetinstance_id) ELSE sd.m_attributesetinstance_id END
       AND sd.m_locator_id = COALESCE(res.m_locator_id, sd.m_locator_id)
       AND loc.m_warehouse_id = COALESCE(res.m_warehouse_id, loc.m_warehouse_id);
     IF (v_count = 0) THEN
--- a/model/src-db/database/model/functions/M_UNIQUELOCATOR_RULE_PARAM.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/functions/M_UNIQUELOCATOR_RULE_PARAM.xml	Wed May 09 04:45:09 2018 +0000
@@ -87,13 +87,11 @@
   Cur_MStock    RECORD;
 
   v_quantity NUMBER;
-  v_ProductID   VARCHAR2(32);
   v_SelectedLocatorID VARCHAR2(32) ;
 BEGIN
 
   v_ResultStr:='ReadingParameters';
   v_Quantity:=p_quantity;
-  v_ProductID:=p_productid;
 
   FOR Cur_MStock IN (
       SELECT sum(ms.quantity) AS qty, t.m_locator_id, MIN(priority) AS priority
--- a/model/src-db/database/model/functions/M_UPDATE_INVENTORY.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/functions/M_UPDATE_INVENTORY.xml	Wed May 09 04:45:09 2018 +0000
@@ -52,7 +52,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2001-2017 Openbravo SLU
+* All portions are Copyright (C) 2001-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -61,6 +61,7 @@
   v_preqtyorder NUMBER;
   v_Storage_ID VARCHAR2(32);
   v_attributesetinstance VARCHAR2(32);
+  v_refinventoryid M_REFINVENTORY.M_REFINVENTORY_ID%TYPE;
 
 BEGIN
   v_qtyorder:=p_qtyorder;
@@ -84,6 +85,18 @@
       v_preqtyorder:=0;
     END IF;
   END IF;
+  
+  IF (v_attributesetinstance <> '0') THEN -- '0' attribute is never associated to RI
+    BEGIN
+      SELECT M_REFINVENTORY_ID INTO v_refinventoryid 
+      FROM M_ATTRIBUTESETINSTANCE
+      WHERE M_ATTRIBUTESETINSTANCE_ID = v_attributesetinstance;
+    EXCEPTION 
+      WHEN NO_DATA_FOUND THEN
+        v_refinventoryid := NULL;
+    END;
+  END IF;
+  
   IF(v_count = 0) THEN
     INSERT
     INTO M_STORAGE_DETAIL
@@ -92,7 +105,7 @@
         CREATED, CREATEDBY, UPDATED, UPDATEDBY,
         M_PRODUCT_ID, M_LOCATOR_ID, M_ATTRIBUTESETINSTANCE_ID, C_UOM_ID,
         M_PRODUCT_UOM_ID, QTYONHAND, QTYORDERONHAND, DATELASTINVENTORY,
-        PREQTYONHAND, PREQTYORDERONHAND
+        PREQTYONHAND, PREQTYORDERONHAND, M_REFINVENTORY_ID
       )
       VALUES
       (
@@ -100,7 +113,7 @@
         now(), p_user, now(), p_user,
         p_product, p_locator, v_attributesetinstance, p_uom,
         p_product_uom, COALESCE(p_qty, 0), v_qtyorder, p_datelastinventory,
-        COALESCE(p_preqty, 0), v_preqtyorder
+        COALESCE(p_preqty, 0), v_preqtyorder, v_refinventoryid
       )
       ;
   ELSE
--- a/model/src-db/database/model/prescript-PostgreSql.sql	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/prescript-PostgreSql.sql	Wed May 09 04:45:09 2018 +0000
@@ -229,7 +229,9 @@
 (
 text
 )
-RETURNS timestamp AS '
+RETURNS timestamp 
+SET SEARCH_PATH FROM CURRENT
+AS '
 BEGIN
 RETURN to_timestamp($1, dateFormat());
 END;
@@ -240,7 +242,9 @@
 (
  timestamptz
 )
-  RETURNS timestamp AS '
+  RETURNS timestamp
+  SET SEARCH_PATH FROM CURRENT
+  AS '
 BEGIN
   RETURN to_timestamp(to_char($1, dateFormat()||'' HH24:MI:SS''), dateFormat()||'' HH24:MI:SS'');
 END;
@@ -251,7 +255,9 @@
 (
  timestamp, varchar
 )
-  RETURNS timestamp AS '
+  RETURNS timestamp
+  SET SEARCH_PATH FROM CURRENT
+  AS '
 BEGIN
   RETURN to_timestamp(to_char($1), $2);
 END;
@@ -262,7 +268,9 @@
 (
  timestamptz
 )
-  RETURNS timestamp AS '
+  RETURNS timestamp
+  SET SEARCH_PATH FROM CURRENT
+  AS '
 BEGIN
 RETURN to_timestamp(to_char($1, dateFormat()), dateFormat());
 END;
@@ -273,7 +281,9 @@
 (
 integer
 )
-RETURNS  VARCHAR AS '
+RETURNS  VARCHAR
+SET SEARCH_PATH FROM CURRENT
+AS '
 BEGIN
 RETURN to_char($1, ''999999999999D'');
 END;
@@ -296,7 +306,9 @@
 (
 timestamp
 )
-RETURNS  VARCHAR AS '
+RETURNS  VARCHAR
+SET SEARCH_PATH FROM CURRENT
+AS '
 BEGIN
 RETURN to_char($1, dateFormat());
 END;
@@ -307,7 +319,9 @@
 (
 date
 )
-RETURNS  VARCHAR AS '
+RETURNS  VARCHAR
+SET SEARCH_PATH FROM CURRENT
+AS '
 BEGIN
 RETURN to_char(to_date($1), dateFormat());
 END;
@@ -365,7 +379,9 @@
 numeric,
 varchar
 )
-RETURNS VARCHAR AS '
+RETURNS VARCHAR
+SET SEARCH_PATH FROM CURRENT
+AS '
 BEGIN
 return to_char(rpad($1::text,CAST($2 AS INTEGER), $3::text));
 END;
@@ -407,7 +423,9 @@
        timestamptz, 
        integer
 )
-returns timestamptz as '
+returns timestamptz
+SET SEARCH_PATH FROM CURRENT
+as '
 begin
     return $1 + to_interval($2,to_char(''months''));
 
@@ -424,7 +442,9 @@
 date,
 numeric
 )
-RETURNS timestamptz AS '
+RETURNS timestamptz
+SET SEARCH_PATH FROM CURRENT
+AS '
 BEGIN
     return $1 + to_interval($2::INTEGER,to_char(''months''));
 END;
@@ -436,7 +456,9 @@
 timestamp,
 integer
 )
-RETURNS timestamptz AS '
+RETURNS timestamptz 
+SET SEARCH_PATH FROM CURRENT
+AS '
 BEGIN
     return $1 + to_interval($2,to_char(''months''));
 END;
@@ -448,7 +470,9 @@
 timestamp,
 numeric
 )
-RETURNS timestamptz AS '
+RETURNS timestamptz 
+SET SEARCH_PATH FROM CURRENT
+AS '
 BEGIN
     return $1 + to_interval($2::INTEGER,to_char(''months''));
 END;
@@ -647,7 +671,9 @@
 --/-- END
 
 CREATE OR REPLACE FUNCTION lowerequalnumeric(numeric, varchar)
-  RETURNS boolean AS '
+  RETURNS boolean 
+  SET SEARCH_PATH FROM CURRENT
+  AS '
 BEGIN
 RETURN $1 <= TO_NUMBER($2);
 END;
@@ -665,7 +691,9 @@
 /-- END
 
 CREATE OR REPLACE FUNCTION lowerequaltimestamp(timestamp, varchar)
-  RETURNS boolean AS '
+  RETURNS boolean 
+  SET SEARCH_PATH FROM CURRENT
+  AS '
 BEGIN
 RETURN $1 <= TO_DATE($2);
 END;
@@ -683,7 +711,9 @@
 /-- END
 
 CREATE OR REPLACE FUNCTION greaterequal(timestamp, varchar)
-  RETURNS boolean AS '
+  RETURNS boolean 
+  SET SEARCH_PATH FROM CURRENT
+  AS '
 BEGIN
 RETURN $1 >= TO_DATE($2);
 END;
@@ -789,7 +819,9 @@
 /-- END
 
 CREATE OR REPLACE FUNCTION instr(varchar, varchar)
-  RETURNS int4 AS 
+  RETURNS int4 
+  SET SEARCH_PATH FROM CURRENT
+  AS 
 'DECLARE
     pos integer;
 BEGIN
@@ -800,7 +832,9 @@
 /-- END
 
 CREATE OR REPLACE FUNCTION instr(string varchar, string_to_search varchar, beg_index int4)
-  RETURNS int4 AS 
+  RETURNS int4 
+  SET SEARCH_PATH FROM CURRENT
+  AS 
 'DECLARE
     pos integer NOT NULL DEFAULT 0;
     temp_str varchar;
@@ -836,7 +870,9 @@
 /-- END
 
 CREATE OR REPLACE FUNCTION instr(string varchar, string_to_search varchar, beg_index int4, occur_index int4)
-  RETURNS int4 AS 
+  RETURNS int4 
+  SET SEARCH_PATH FROM CURRENT
+  AS 
 'DECLARE
 pos integer NOT NULL DEFAULT 0;
 occur_number integer NOT NULL DEFAULT 0;
@@ -884,12 +920,16 @@
 ' LANGUAGE 'plpgsql'IMMUTABLE
 /-- END
 
-create or replace function last_day(date) returns date as 'select
+create or replace function last_day(date) returns date 
+SET SEARCH_PATH FROM CURRENT
+as 'select
 cast(date_trunc(''month'', $1) + ''1 month''::interval as date) - 1'
 language sql
 /-- END
 
-create or replace function last_day(timestamptz) returns date as 'select
+create or replace function last_day(timestamptz) returns date 
+SET SEARCH_PATH FROM CURRENT
+as 'select
 cast(date_trunc(''month'', cast($1 AS date)) + ''1 month''::interval as date) - 1'
 language sql
 /-- END
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/src-db/database/model/tables/AD_CLUSTER_SERVICE.xml	Wed May 09 04:45:09 2018 +0000
@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+  <database name="TABLE AD_CLUSTER_SERVICE">
+    <table name="AD_CLUSTER_SERVICE" primaryKey="AD_CLUSTER_SRV_KEY">
+      <column name="AD_CLUSTER_SERVICE_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="SERVICE" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="NODE_NAME" primaryKey="false" required="true" type="VARCHAR" size="255" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="NODE_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <foreign-key foreignTable="AD_CLIENT" name="AD_CLUSTER_SRV_AD_CLIENT">
+        <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="AD_CLUSTER_SRV_AD_ORG">
+        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
+      <unique name="AD_CLUSTER_SRV_UNIQUE_SERVICE">
+        <unique-column name="SERVICE"/>
+      </unique>
+      <check name="AD_CLUSTER_SRV_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
+    </table>
+  </database>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/src-db/database/model/tables/AD_CLUSTER_SERVICE_SETTINGS.xml	Wed May 09 04:45:09 2018 +0000
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+  <database name="TABLE AD_CLUSTER_SERVICE_SETTINGS">
+    <table name="AD_CLUSTER_SERVICE_SETTINGS" primaryKey="AD_CLUSTER_SRV_SET_KEY">
+      <column name="AD_CLUSTER_SERVICE_SETTINGS_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="SERVICE" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="TIMEOUT" primaryKey="false" required="true" type="DECIMAL" size="10,0" autoIncrement="false">
+        <default><![CDATA[1]]></default>
+        <onCreateDefault/>
+      </column>
+      <foreign-key foreignTable="AD_CLIENT" name="AD_CLUSTER_SRV_SET_AD_CLIENT">
+        <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="AD_CLUSTER_SRV_SET_AD_ORG">
+        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
+      <unique name="AD_CLUSTER_SRV_SET_UNIQUE_SER">
+        <unique-column name="SERVICE"/>
+      </unique>
+      <check name="AD_CLUSTER_SRV_SET_ACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
+      <check name="AD_CLUSTER_SRV_SET_TIME_CHK"><![CDATA[TIMEOUT > 0]]></check>
+    </table>
+  </database>
--- a/model/src-db/database/model/tables/AD_HEARTBEAT_LOG.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/tables/AD_HEARTBEAT_LOG.xml	Wed May 09 04:45:09 2018 +0000
@@ -113,6 +113,10 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="CODE_REVISION" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false">
+        <default><![CDATA[0]]></default>
+        <onCreateDefault/>
+      </column>
       <column name="BEAT_TYPE" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false">
         <default><![CDATA[U]]></default>
         <onCreateDefault/>
--- a/model/src-db/database/model/tables/AD_MODULE.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/tables/AD_MODULE.xml	Wed May 09 04:45:09 2018 +0000
@@ -133,6 +133,10 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="VERSION_ID" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
       <column name="ISCOMMERCIAL" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
         <default><![CDATA[N]]></default>
         <onCreateDefault><![CDATA['N']]></onCreateDefault>
--- a/model/src-db/database/model/tables/AD_MODULE_INSTALL.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/tables/AD_MODULE_INSTALL.xml	Wed May 09 04:45:09 2018 +0000
@@ -137,6 +137,10 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="VERSION_ID" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
       <column name="ISCOMMERCIAL" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
         <default><![CDATA[N]]></default>
         <onCreateDefault><![CDATA['N']]></onCreateDefault>
--- a/model/src-db/database/model/tables/AD_SYSTEM_INFO.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/tables/AD_SYSTEM_INFO.xml	Wed May 09 04:45:09 2018 +0000
@@ -73,6 +73,10 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="CODE_REVISION" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false">
+        <default><![CDATA[0]]></default>
+        <onCreateDefault/>
+      </column>
       <column name="SERVLET_CONTAINER" primaryKey="false" required="false" type="NVARCHAR" size="20" autoIncrement="false">
         <default/>
         <onCreateDefault/>
--- a/model/src-db/database/model/tables/C_INVOICELINE.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/tables/C_INVOICELINE.xml	Wed May 09 04:45:09 2018 +0000
@@ -304,6 +304,9 @@
       <foreign-key foreignTable="USER2" name="C_INVOICELINE_USER2">
         <reference local="USER2_ID" foreign="USER2_ID"/>
       </foreign-key>
+      <index name="C_INVOICELINE_ACCOUNT" unique="false">
+        <index-column name="ACCOUNT_ID"/>
+      </index>
       <index name="C_INVOICELINE_BOMPARENT_IDX" unique="false">
         <index-column name="BOM_PARENT_ID"/>
         <whereClause><![CDATA[BOM_PARENT_ID IS NOT NULL]]></whereClause>
--- a/model/src-db/database/model/tables/C_ORDERLINE.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/tables/C_ORDERLINE.xml	Wed May 09 04:45:09 2018 +0000
@@ -394,6 +394,11 @@
       </index>
       <index name="C_ORDERLINE_ORDER" unique="false">
         <index-column name="C_ORDER_ID"/>
+        <index-column name="functionBasedColumn" functionExpression="OBEQUALS(QTYORDERED,QTYINVOICED)"/>
+      </index>
+      <index name="C_ORDERLINE_ORDER2" unique="false">
+        <index-column name="C_ORDER_ID"/>
+        <index-column name="functionBasedColumn" functionExpression="OBEQUALS(QTYDELIVERED,QTYINVOICED)"/>
       </index>
       <index name="C_ORDERLINE_PRODUCT" unique="false">
         <index-column name="M_PRODUCT_ID"/>
--- a/model/src-db/database/model/tables/M_ATTRIBUTESETINSTANCE.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/tables/M_ATTRIBUTESETINSTANCE.xml	Wed May 09 04:45:09 2018 +0000
@@ -93,6 +93,7 @@
       </foreign-key>
       <index name="M_ATTRIBUTESETINST_REFINV_IX" unique="false">
         <index-column name="M_REFINVENTORY_ID"/>
+        <index-column name="PARENT_ATTRIBUTESETINSTANCE_ID"/>
         <whereClause><![CDATA[M_REFINVENTORY_ID IS NOT NULL]]></whereClause>
       </index>
       <check name="M_ATTRIBUTESETINST_REFINV_CH"><![CDATA[M_REFINVENTORY_ID IS NULL OR M_REFINVENTORY_ID IS NOT NULL AND PARENT_ATTRIBUTESETINSTANCE_ID IS NOT NULL]]></check>
--- a/model/src-db/database/model/tables/M_INOUT.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/tables/M_INOUT.xml	Wed May 09 04:45:09 2018 +0000
@@ -261,6 +261,10 @@
         <default><![CDATA[N]]></default>
         <onCreateDefault><![CDATA['N']]></onCreateDefault>
       </column>
+      <column name="ISCOMPLETELYINVOICED" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="M_FREIGHTCATEGORY" name="M_FREIGHTCATEGORY_M_INOUT">
         <reference local="M_FREIGHTCATEGORY_ID" foreign="M_FREIGHTCATEGORY_ID"/>
       </foreign-key>
@@ -344,6 +348,9 @@
         <index-column name="C_INVOICE_ID"/>
         <whereClause><![CDATA[C_INVOICE_ID IS NOT NULL]]></whereClause>
       </index>
+      <index name="M_INOUT_ISCOMPLETELYINVOICED" unique="false">
+        <index-column name="ISCOMPLETELYINVOICED"/>
+      </index>
       <index name="M_INOUT_MOVEMENTDATE_ID" unique="false">
         <index-column name="MOVEMENTDATE"/>
         <index-column name="M_INOUT_ID"/>
@@ -363,6 +370,7 @@
       <check name="M_INOUT_GENERATELINES_CHECK"><![CDATA[GENERATELINES IN ('N', 'Y')]]></check>
       <check name="M_INOUT_GENERATETO_CHECK"><![CDATA[GENERATETO IN ('Y', 'N')]]></check>
       <check name="M_INOUT_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
+      <check name="M_INOUT_ISCOMPLETELYINV_CHECK"><![CDATA[ISCOMPLETELYINVOICED IN ('Y', 'N')]]></check>
       <check name="M_INOUT_ISLOGISTIC_CHK"><![CDATA[ISLOGISTIC IN ('N', 'Y')]]></check>
       <check name="M_INOUT_ISNETTINGSHIPMENT_CHK"><![CDATA[ISNETTINGSHIPMENT IN ('Y', 'N')]]></check>
       <check name="M_INOUT_ISPRINTED_CHECK"><![CDATA[ISPRINTED IN ('Y', 'N')]]></check>
--- a/model/src-db/database/model/tables/M_INVENTORYLINE.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/tables/M_INVENTORYLINE.xml	Wed May 09 04:45:09 2018 +0000
@@ -119,6 +119,10 @@
       <index name="M_INVENTORYLINE_INVENTORY" unique="false">
         <index-column name="M_INVENTORY_ID"/>
       </index>
+      <index name="M_INVENTORYLINE_INVENTORYLINE" unique="false">
+        <index-column name="RELATEDINVENTORYLINEID"/>
+        <whereClause><![CDATA[RELATEDINVENTORYLINEID IS NOT NULL]]></whereClause>
+      </index>
       <index name="M_INVENTORYLINE_PRODUCT" unique="false">
         <index-column name="M_PRODUCT_ID"/>
       </index>
--- a/model/src-db/database/model/tables/M_STORAGE_DETAIL.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/tables/M_STORAGE_DETAIL.xml	Wed May 09 04:45:09 2018 +0000
@@ -126,6 +126,7 @@
       </index>
       <index name="M_STORAGEDET_REFINVENTORY" unique="false">
         <index-column name="M_REFINVENTORY_ID"/>
+        <whereClause><![CDATA[M_REFINVENTORY_ID IS NOT NULL]]></whereClause>
       </index>
       <unique name="M_STORAGE_DETAIL_UN">
         <unique-column name="M_PRODUCT_ID"/>
--- a/model/src-db/database/model/triggers/A_ASSET_TRG.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/triggers/A_ASSET_TRG.xml	Wed May 09 04:45:09 2018 +0000
@@ -20,7 +20,6 @@
 ************************************************************************/
 
   TYPE RECORD IS REF CURSOR;
-  v_Acct_ID VARCHAR2(32);
   Cur_Defaults RECORD;
   v_AttrSetValueType M_Product.AttrSetValueType%TYPE;
   v_xTree_ID AD_ClientInfo.AD_Tree_Asset_ID%TYPE;
@@ -48,7 +47,6 @@
             AND d1.AD_CLIENT_ID = :new.AD_Client_ID
 			) LOOP
 
-      Ad_Sequence_Next('A_Asset_Acct', Cur_Defaults.AD_Client_ID, v_Acct_ID) ;
       INSERT
       INTO A_ASSET_ACCT
         (
--- a/model/src-db/database/model/triggers/C_ATTACHMENT_METHOD_MOD_TRG.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/triggers/C_ATTACHMENT_METHOD_MOD_TRG.xml	Wed May 09 04:45:09 2018 +0000
@@ -21,7 +21,6 @@
 ************************************************************************/
   devTemplate NUMBER;
   devModule   CHAR(1);
-  currentID  VARCHAR2(32);
   currentModuleID  VARCHAR2(32);
   vAux NUMBER;
     
@@ -52,10 +51,8 @@
   END IF;
      
   IF (UPDATING OR INSERTING) THEN
-    currentID := :new.C_Attachment_Method_ID;
     currentModuleID := :new.AD_Module_ID;
   ELSE
-    currentID := :old.C_Attachment_Method_ID;
     currentModuleID := :old.AD_Module_ID;
   END IF;
   
--- a/model/src-db/database/model/triggers/C_BPARTNER_TRG.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/triggers/C_BPARTNER_TRG.xml	Wed May 09 04:45:09 2018 +0000
@@ -44,7 +44,6 @@
   v_E_Prepayment_Acct         varchar2(32);
   v_seq_name		              varchar2(32);
   v_Sequence_No		            varchar2(32);
-  v_C_AcctSchema_ID	          VARCHAR2(32);
   v_count 					  NUMBER;
   v_currency_pl							VARCHAR2(32);
   v_currency_credit					VARCHAR2(32);
@@ -57,7 +56,6 @@
 
     --  Default Accounts for all AcctSchema
 	IF (INSERTING) THEN
-        v_C_AcctSchema_ID:=null;
 	FOR Cur_Defaults IN
 	(
 		SELECT AD_IsOrgIncluded(:new.AD_Org_ID, a.AD_Org_ID, :new.AD_Client_ID), AD_IsOrgIncluded(a.AD_Org_ID, :new.AD_Org_ID, :new.AD_Client_ID),
@@ -188,7 +186,6 @@
   END IF;
   END LOOP;
 -- Employee
-  v_C_AcctSchema_ID:=null;
   v_count:=0;
               FOR Cur_Defaults2 IN (
               SELECT AD_IsOrgIncluded(:new.AD_Org_ID, oa.AD_Org_ID, :new.AD_Client_ID), AD_IsOrgIncluded(oa.AD_Org_ID, :new.AD_Org_ID, :new.AD_Client_ID),
@@ -254,7 +251,6 @@
                 Cur_Defaults2.E_Expense_Acct, Cur_Defaults2.E_Prepayment_Acct);
             
             END IF;
-             v_C_AcctSchema_ID:=Cur_Defaults2.C_AcctSchema_ID;
       END IF;
     
      END LOOP;
--- a/model/src-db/database/model/triggers/C_INVLINE_CHK_RESTRICTIONS_TRG.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/triggers/C_INVLINE_CHK_RESTRICTIONS_TRG.xml	Wed May 09 04:45:09 2018 +0000
@@ -123,7 +123,7 @@
       FROM m_product
       WHERE m_product_id = :NEW.m_product_id;
       IF (v_isgeneric = 'Y') THEN
-        RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@');
+        RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@ ' || v_productname);
       END IF;
     END IF;
   END IF;
--- a/model/src-db/database/model/triggers/C_INVOICELINETAX_TRG.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/triggers/C_INVOICELINETAX_TRG.xml	Wed May 09 04:45:09 2018 +0000
@@ -17,7 +17,7 @@
   * parts created by ComPiere are Copyright (C) ComPiere, Inc.;
   * All Rights Reserved.
   * Contributor(s): Openbravo SLU
-  * Contributions are Copyright (C) 2010-2017 Openbravo, S.L.U.
+  * Contributions are Copyright (C) 2010-2018 Openbravo, S.L.U.
   *
   * Specifically, this derivative work is based upon the following Compiere
   * file and version.
@@ -83,7 +83,11 @@
     AND Recalculate = 'Y';
     IF(v_Count>0) THEN
       IF (v_DocTaxAmount = 'D' AND (v_Cascade = 'Y' OR v_BaseAmount IN ('TAX', 'LNATAX', 'TBATAX'))) THEN
-        SELECT COALESCE(CASE WHEN MAX(it.TaxBaseAmt) > 0 THEN MAX(ROUND(it.TaxBaseAmt, v_Prec)) + MAX(it.TaxAmt) ELSE MIN(ROUND(it.TaxBaseAmt, v_Prec)) + MIN(it.TaxAmt) END, 0)
+        SELECT COALESCE(CASE WHEN MAX(it.TaxBaseAmt) > 0 THEN 
+                          MAX(it.TaxAmt) + CASE WHEN v_BaseAmount = 'TAX' THEN 0 ELSE MAX(ROUND(it.TaxBaseAmt, v_Prec)) END
+                        ELSE 
+                          MIN(it.TaxAmt) + CASE WHEN v_BaseAmount = 'TAX' THEN 0 ELSE MIN(ROUND(it.TaxBaseAmt, v_Prec)) END
+                        END, 0)
         INTO v_Increment_Base
         FROM C_InvoiceTax it
         JOIN C_Tax t
@@ -127,7 +131,11 @@
     RAISE_APPLICATION_ERROR(-20000, '@20501@') ;
   ELSE
     IF (v_DocTaxAmount = 'D' AND (v_Cascade = 'Y' OR v_BaseAmount IN ('TAX', 'LNATAX', 'TBATAX'))) THEN
-      SELECT COALESCE(CASE WHEN MAX(it.TaxBaseAmt) > 0 THEN MAX(ROUND(it.TaxBaseAmt, v_Prec)) + MAX(it.TaxAmt) ELSE MIN(ROUND(it.TaxBaseAmt, v_Prec)) + MIN(it.TaxAmt) END, 0)
+              SELECT COALESCE(CASE WHEN MAX(it.TaxBaseAmt) > 0 THEN 
+                          MAX(it.TaxAmt) + CASE WHEN v_BaseAmount = 'TAX' THEN 0 ELSE MAX(ROUND(it.TaxBaseAmt, v_Prec)) END
+                        ELSE 
+                          MIN(it.TaxAmt) + CASE WHEN v_BaseAmount = 'TAX' THEN 0 ELSE MIN(ROUND(it.TaxBaseAmt, v_Prec)) END
+                        END, 0)
       INTO v_Increment_Base
       FROM C_InvoiceTax it
       JOIN C_Tax t
--- a/model/src-db/database/model/triggers/C_INVOICELINE_TRG.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/triggers/C_INVOICELINE_TRG.xml	Wed May 09 04:45:09 2018 +0000
@@ -22,7 +22,6 @@
 
 
 
- v_ID    varchar2(32);
   v_UOM_ID   varchar2(32);
  v_AttrSetValueType M_Product.AttrSetValueType%TYPE;
  v_count NUMBER;
@@ -69,9 +68,6 @@
     END IF;
        END IF;
      END IF;
-  v_ID := :NEW.C_Invoice_ID;
- ELSE
-  v_ID := :OLD.C_Invoice_ID;
  END IF;
  IF (INSERTING OR UPDATING) THEN
   --Does not allow to change the attribute set value
--- a/model/src-db/database/model/triggers/C_INVOICELINE_TRG2.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/triggers/C_INVOICELINE_TRG2.xml	Wed May 09 04:45:09 2018 +0000
@@ -29,7 +29,6 @@
   v_taxBaseAmt C_INVOICETAX.TAXBASEAMT%TYPE;
   v_taxAmt C_INVOICETAX.TAXAMT%TYPE;
   v_Prec C_CURRENCY.STDPRECISION%TYPE;
-  v_PricePrec C_CURRENCY.PRICEPRECISION%TYPE;
   v_DocTaxAmount C_TAX.DocTaxAmount%TYPE;
 
   v_istaxincluded CHAR(1) ;
@@ -56,7 +55,8 @@
   v_CalcLine NUMBER;
           
   TYPE RECORD IS REF CURSOR;
-  Cur_BOM RECORD;          
+  Cur_BOM RECORD;
+  Cur_TAXLINES RECORD;
 BEGIN
     
     IF AD_isTriggerEnabled()='N' THEN RETURN;
@@ -83,8 +83,8 @@
   /**************************************************************************
    * Calculate Tax, etc.
    */
- SELECT processed, stdPrecision, priceprecision, pl.istaxincluded, C_BPARTNER_LOCATION_ID, C_PROJECT_ID, ISSOTRX
-   INTO v_Processed, v_Prec, v_PricePrec, v_istaxincluded, v_Bpartner_Location_ID, v_Project_ID, v_IsSOTRX
+ SELECT processed, stdPrecision, pl.istaxincluded, C_BPARTNER_LOCATION_ID, C_PROJECT_ID, ISSOTRX
+   INTO v_Processed, v_Prec, v_istaxincluded, v_Bpartner_Location_ID, v_Project_ID, v_IsSOTRX
  FROM C_Invoice, C_Currency, m_pricelist pl
  WHERE C_Invoice.C_Currency_ID = C_Currency.C_Currency_ID
  AND C_Invoice.m_pricelist_id = pl.m_pricelist_id
@@ -114,7 +114,15 @@
      IF (:new.AD_Org_ID <> :old.AD_Org_ID OR :new.C_Tax_ID <> :old.C_Tax_ID OR
          v_newLineNetAmt <> v_oldLine OR v_newLineAlternate <> v_oldLineAlternate OR
          :new.line_gross_amount <> :old.line_gross_amount) THEN
-       DELETE FROM C_INVOICELINETAX WHERE C_INVOICELINE_ID = :new.C_InvoiceLine_ID;
+         -- Delete the TaxLines using a Cursor to be able to delete them in the proper order.
+         -- If not, the calculations done in the triggers can be incorrect
+         FOR Cur_TAXLINES IN (SELECT C_INVOICELINETAX_ID
+                              FROM C_INVOICELINETAX
+                              WHERE C_INVOICELINE_ID = :new.C_InvoiceLine_ID
+                              ORDER BY line ASC)
+         LOOP
+           DELETE FROM C_INVOICELINETAX WHERE C_INVOICELINETAX_ID = cur_taxlines.C_INVOICELINETAX_ID;
+         END LOOP;
        v_create := 'Y';
      ELSE
        v_create := 'N';
--- a/model/src-db/database/model/triggers/C_ORDERLINE2_TRG.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/triggers/C_ORDERLINE2_TRG.xml	Wed May 09 04:45:09 2018 +0000
@@ -27,7 +27,6 @@
   v_QtyOrderReserved   NUMBER;
   V_STOCKED            NUMBER;
   v_DocStatus          VARCHAR(60);
-  v_DocAction          VARCHAR(60);
   v_isSOTrx            CHAR(1);
   v_QtyReservedPO      NUMBER;
   v_QtyOrderReservedPO NUMBER;
@@ -101,8 +100,8 @@
 
   IF(UPDATING OR DELETING) THEN
     v_ID:=:old.C_Order_ID;
-    SELECT DocStatus, DocAction, isSOTrx
-    INTO v_DocStatus, v_DocAction, v_isSOTrx
+    SELECT DocStatus, isSOTrx
+    INTO v_DocStatus, v_isSOTrx
     FROM c_Order
     WHERE c_order_id = v_ID;
     IF(v_DocStatus = 'IP') THEN
@@ -131,8 +130,8 @@
 
   IF(INSERTING OR UPDATING) THEN
     v_ID:=:new.C_Order_ID;
-    SELECT DocStatus, DocAction, isSOTrx
-    INTO v_DocStatus, v_DocAction, v_isSOTrx
+    SELECT DocStatus, isSOTrx
+    INTO v_DocStatus, v_isSOTrx
     FROM c_Order
     WHERE c_order_id = v_ID;
     IF(v_DocStatus = 'IP') THEN
--- a/model/src-db/database/model/triggers/C_ORDERLINETAX_TRG.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/triggers/C_ORDERLINETAX_TRG.xml	Wed May 09 04:45:09 2018 +0000
@@ -17,7 +17,7 @@
   * parts created by ComPiere are Copyright (C) ComPiere, Inc.;
   * All Rights Reserved.
   * Contributor(s): Openbravo SLU
-  * Contributions are Copyright (C) 2010-2017 Openbravo, S.L.U.
+  * Contributions are Copyright (C) 2010-2018 Openbravo, S.L.U.
   *
   * Specifically, this derivative work is based upon the following Compiere
   * file and version.
@@ -81,7 +81,11 @@
     AND C_Tax_ID = :new.C_Tax_ID;
     IF(v_Count>0) THEN
       IF (v_DocTaxAmount = 'D' AND (v_Cascade = 'Y' OR v_BaseAmount IN ('TAX', 'LNATAX', 'TBATAX'))) THEN
-        SELECT COALESCE(CASE WHEN MAX(ot.TaxBaseAmt) > 0 THEN MAX(ROUND(ot.TaxBaseAmt, v_Prec)) + MAX(ot.TaxAmt) ELSE MIN(ROUND(ot.TaxBaseAmt, v_Prec)) + MIN(ot.TaxAmt) END, 0)
+        SELECT COALESCE(CASE WHEN MAX(ot.TaxBaseAmt) > 0 THEN 
+                          MAX(ot.TaxAmt) + CASE WHEN v_BaseAmount = 'TAX' THEN 0 ELSE MAX(ROUND(ot.TaxBaseAmt, v_Prec)) END
+                        ELSE 
+                          MIN(ot.TaxAmt) + CASE WHEN v_BaseAmount = 'TAX' THEN 0 ELSE MIN(ROUND(ot.TaxBaseAmt, v_Prec)) END
+                        END, 0)
         INTO v_Increment_Base
         FROM C_OrderTax ot
         JOIN C_Tax t
@@ -130,7 +134,11 @@
 	RAISE_APPLICATION_ERROR(-20000, '@20501@') ;
     END IF;
     IF (v_DocTaxAmount = 'D' AND (v_Cascade = 'Y' OR v_BaseAmount IN ('TAX', 'LNATAX', 'TBATAX'))) THEN
-      SELECT COALESCE(CASE WHEN MAX(ot.TaxBaseAmt) > 0 THEN MAX(ROUND(ot.TaxBaseAmt, v_Prec)) + MAX(ot.TaxAmt) ELSE MIN(ROUND(ot.TaxBaseAmt, v_Prec)) + MIN(ot.TaxAmt) END, 0)
+      SELECT COALESCE(CASE WHEN MAX(ot.TaxBaseAmt) > 0 THEN 
+                          MAX(ot.TaxAmt) + CASE WHEN v_BaseAmount = 'TAX' THEN 0 ELSE MAX(ROUND(ot.TaxBaseAmt, v_Prec)) END
+                        ELSE 
+                          MIN(ot.TaxAmt) + CASE WHEN v_BaseAmount = 'TAX' THEN 0 ELSE MIN(ROUND(ot.TaxBaseAmt, v_Prec)) END
+                        END, 0)
       INTO v_Increment_Base
       FROM C_OrderTax ot
       JOIN C_Tax t
--- a/model/src-db/database/model/triggers/C_ORDERLINE_TRG.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/triggers/C_ORDERLINE_TRG.xml	Wed May 09 04:45:09 2018 +0000
@@ -17,7 +17,7 @@
   * parts created by ComPiere are Copyright (C) ComPiere, Inc.;
   * All Rights Reserved.
   * Contributor(s): Openbravo SLU
-  * Contributions are Copyright (C) 2001-2017 Openbravo, S.L.U.
+  * Contributions are Copyright (C) 2001-2018 Openbravo, S.L.U.
   *
   * Specifically, this derivative work is based upon the following Compiere
   * file and version.
@@ -224,7 +224,11 @@
         v_CalcLine := C_GET_NET_AMOUNT_FROM_GROSS(Cur_BOM.TAX, v_Line, v_Line, v_Prec);
         v_NetActual := v_NetActual + v_CalcLine; -- Acum the net
       END LOOP;    
-      v_PriceActual := ROUND(v_NetActual / :new.qtyordered, v_price_prec);     
+      IF (:new.qtyordered <> 0) THEN
+        v_PriceActual := ROUND(v_NetActual / :new.qtyordered, v_price_prec);
+      ELSE
+        v_PriceActual := 0;
+      END IF;     
     ELSE
       -- Regular taxes
       v_NetActual := C_GET_NET_AMOUNT_FROM_GROSS(:new.c_tax_id, :new.line_gross_amount, :new.taxbaseamt, v_Prec);
--- a/model/src-db/database/model/triggers/C_ORDERLINE_TRG2.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/triggers/C_ORDERLINE_TRG2.xml	Wed May 09 04:45:09 2018 +0000
@@ -25,7 +25,6 @@
     ************************************************************************/
 
   v_istaxincluded CHAR(1) ;
-  v_Processed C_ORDER.PROCESSED%TYPE;
   v_ID C_ORDERLINE.C_ORDER_ID%TYPE;
   v_oldLine NUMBER;
   v_newLineNetAmt NUMBER;
@@ -35,7 +34,6 @@
   v_taxBaseAmt C_ORDERTAX.TAXBASEAMT%TYPE;
   v_taxAmt C_ORDERTAX.TAXAMT%TYPE;
   v_Prec C_CURRENCY.STDPRECISION%TYPE;
-  v_PricePrec C_CURRENCY.PRICEPRECISION%TYPE;
   v_AttrSetValueType M_Product.AttrSetValueType%TYPE;
   v_DocTaxAmount C_TAX.DocTaxAmount%TYPE;
 
@@ -90,8 +88,8 @@
   /**************************************************************************
    * Calculate Tax, etc.
    */
- SELECT processed, stdPrecision, priceprecision, m_pricelist.istaxincluded, M_WAREHOUSE_ID, C_BPARTNER_LOCATION_ID, C_PROJECT_ID, ISSOTRX
-   INTO v_processed, v_prec, v_PricePrec, v_istaxincluded, v_Warehouse_ID, v_Bpartner_Location_ID, v_Project_ID, v_IsSOTRX
+ SELECT stdPrecision, m_pricelist.istaxincluded, M_WAREHOUSE_ID, C_BPARTNER_LOCATION_ID, C_PROJECT_ID, ISSOTRX
+   INTO v_prec, v_istaxincluded, v_Warehouse_ID, v_Bpartner_Location_ID, v_Project_ID, v_IsSOTRX
  FROM c_order
         JOIN c_currency ON c_order.c_currency_id = c_currency.c_currency_id
         JOIN m_pricelist ON c_order.m_pricelist_id = m_pricelist.m_pricelist_id
--- a/model/src-db/database/model/triggers/C_ORDLINE_CHK_RESTRICTIONS_TRG.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/triggers/C_ORDLINE_CHK_RESTRICTIONS_TRG.xml	Wed May 09 04:45:09 2018 +0000
@@ -14,7 +14,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2001-2016 Openbravo SLU
+* All portions are Copyright (C) 2001-2017 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -119,7 +119,7 @@
       FROM m_product
       WHERE m_product_id = :NEW.m_product_id;
       IF (v_isgeneric = 'Y') THEN
-        RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@');
+        RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@ ' || v_productname);
       END IF;
       IF (:NEW.C_AUM IS NOT NULL AND :NEW.AUMQTY IS NOT NULL AND :NEW.M_PRODUCT_UOM_ID IS NOT NULL AND :NEW.QUANTITYORDER IS NOT NULL) THEN
         RAISE_APPLICATION_ERROR(-20000, '@CannotUseAUMandSecondUOM@');
--- a/model/src-db/database/model/triggers/C_PROJECTLINE_TRG.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/triggers/C_PROJECTLINE_TRG.xml	Wed May 09 04:45:09 2018 +0000
@@ -29,7 +29,6 @@
     *      Set Line PlannedAmt, PlannedMarginAmt
     ************************************************************************/
     v_PriceLimit NUMBER:=NULL;
-  v_PriceStd NUMBER:=NULL;
   v_PlannedMargin NUMBER:=NULL;
     
 BEGIN
@@ -44,10 +43,8 @@
   END IF;
   -- Get Margin from Product
   IF(:new.M_Product_ID IS NOT NULL AND :new.PlannedPrice <> 0) THEN
-    SELECT COALESCE(MAX(PriceLimit), 0),
-      COALESCE(MAX(PriceStd), 0)
-    INTO v_PriceLimit,
-      v_PriceStd
+    SELECT COALESCE(MAX(PriceLimit), 0)
+    INTO v_PriceLimit
     FROM M_ProductPrice
     WHERE M_Product_ID=:new.M_Product_ID
       AND M_PriceList_Version_ID=
--- a/model/src-db/database/model/triggers/C_PROJECT_TRG3.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/triggers/C_PROJECT_TRG3.xml	Wed May 09 04:45:09 2018 +0000
@@ -24,7 +24,6 @@
     ************************************************************************/
   
   v_Tree_ID   varchar2(32);
-  v_Parent_ID VARCHAR2(32);
   v_count NUMBER;
     
 BEGIN
@@ -34,10 +33,8 @@
 
  IF(DELETING) THEN
 
-  SELECT c.AD_Tree_Project_ID,
-    n.Node_ID
-  INTO v_Tree_ID,
-    v_Parent_ID
+  SELECT c.AD_Tree_Project_ID
+  INTO v_Tree_ID
   FROM AD_ClientInfo c,
     AD_TreeNode n
   WHERE c.AD_Tree_Project_ID=n.AD_Tree_ID
--- a/model/src-db/database/model/triggers/MA_GLOBALUSE_TRG.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/triggers/MA_GLOBALUSE_TRG.xml	Wed May 09 04:45:09 2018 +0000
@@ -15,7 +15,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2010-2013 Openbravo SLU
+* All portions are Copyright (C) 2010-2017 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -46,7 +46,7 @@
       FROM m_product
       WHERE m_product_id = :NEW.m_product_id;
       IF (v_isgeneric = 'Y') THEN
-        RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@');
+        RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@ ' || v_productname);
       END IF;
     END IF;
   END IF;
--- a/model/src-db/database/model/triggers/M_COSTADJUSTMENTLINE_CHK_TRG.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/triggers/M_COSTADJUSTMENTLINE_CHK_TRG.xml	Wed May 09 04:45:09 2018 +0000
@@ -24,7 +24,6 @@
 * Contributor(s):  ______________________________________.
 ************************************************************************/
   v_Processed VARCHAR(60) ;
-  v_DocStatus VARCHAR(60) ;
   v_m_costadjustment_ID VARCHAR2(32) ;
   v_Posted VARCHAR(60) ;
   v_DateNull DATE := TO_DATE('01-01-1900', 'DD-MM-YYYY');
@@ -40,7 +39,7 @@
   ELSE
     v_M_costadjustment_ID:=:old.M_costadjustment_ID;
   END IF;
-  SELECT PROCESSED, DOCSTATUS, POSTED INTO v_Processed, v_DocStatus, v_Posted FROM M_costadjustment WHERE M_costadjustment_ID=v_M_costadjustment_ID;
+  SELECT PROCESSED, POSTED INTO v_Processed, v_Posted FROM M_costadjustment WHERE M_costadjustment_ID=v_M_costadjustment_ID;
   IF UPDATING THEN
     IF(v_Processed='Y' AND ((COALESCE(:old.LINE, 0) <> COALESCE(:new.LINE, 0))
    OR (COALESCE(:old.m_costadjustment_id, '0') <> COALESCE(:new.m_costadjustment_id, '0'))
--- a/model/src-db/database/model/triggers/M_INTERNAL_CONSUMPTIONLINE_TRG.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/triggers/M_INTERNAL_CONSUMPTIONLINE_TRG.xml	Wed May 09 04:45:09 2018 +0000
@@ -14,7 +14,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2001-2014 Openbravo SLU
+* All portions are Copyright (C) 2001-2017 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -93,7 +93,7 @@
       FROM m_product
       WHERE m_product_id = :NEW.m_product_id;
       IF (v_isgeneric = 'Y') THEN
-        RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@');
+        RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@ ' || v_productname);
       END IF;
     END IF;
     -- Do not allow internal consumption lines with quantity 0
--- a/model/src-db/database/model/triggers/M_INVENTORYLINE2_TRG.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/triggers/M_INVENTORYLINE2_TRG.xml	Wed May 09 04:45:09 2018 +0000
@@ -18,7 +18,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2001-2013 Openbravo SLU
+* All portions are Copyright (C) 2001-2017 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -49,7 +49,7 @@
       FROM m_product
       WHERE m_product_id = :NEW.m_product_id;
       IF (v_isgeneric = 'Y') THEN
-        RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@');
+        RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@ ' || v_productname);
       END IF;
     END IF;
   END IF;END M_INVENTORYLINE2_TRG
--- a/model/src-db/database/model/triggers/M_IOLINE_CHK_RESTRICTIONS_TRG.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/triggers/M_IOLINE_CHK_RESTRICTIONS_TRG.xml	Wed May 09 04:45:09 2018 +0000
@@ -19,7 +19,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2001-2016 Openbravo SLU
+* All portions are Copyright (C) 2001-2017 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -78,7 +78,7 @@
       FROM m_product
       WHERE m_product_id = :NEW.m_product_id;
       IF (v_isgeneric = 'Y') THEN
-        RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@');
+        RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@ ' || v_productname);
       END IF;
     END IF;
   END IF;
--- a/model/src-db/database/model/triggers/M_MOVEMENTLINE_TRG.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/triggers/M_MOVEMENTLINE_TRG.xml	Wed May 09 04:45:09 2018 +0000
@@ -24,7 +24,7 @@
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke, parts
   * created by ComPiere are Copyright (C) ComPiere, Inc.;   All Rights Reserved.
   * Contributor(s): Openbravo SLU
-  * Contributions are Copyright (C) 2001-2015 Openbravo S.L.U.
+  * Contributions are Copyright (C) 2001-2018 Openbravo S.L.U.
   ******************************************************************************/
     
 BEGIN
@@ -36,7 +36,8 @@
   -- Get ID
   IF(UPDATING OR INSERTING) THEN
 		-- Check if locator and locator_to are diferents
-		IF  (:NEW.M_LOCATOR_ID = :NEW.M_LOCATORTO_ID) THEN
+		IF  (:NEW.M_LOCATOR_ID = :NEW.M_LOCATORTO_ID 
+             AND COALESCE(:NEW.M_ATTRIBUTESETINSTANCE_ID, 'X') = COALESCE(:NEW.M_ATTRIBUTESETINSTANCETO_ID, 'X')) THEN
 		  RAISE_APPLICATION_ERROR(-20000, '@MovementLineLocators@');
 		END IF;
     v_ID:=:new.M_Movement_ID;
@@ -62,8 +63,8 @@
       AND IsStocked='Y'
       AND ProductType='I';
     IF V_STOCKED > 0 THEN
-      M_UPDATE_INVENTORY(:OLD.AD_CLIENT_ID, :OLD.AD_ORG_ID, :OLD.UPDATEDBY, :OLD.M_PRODUCT_ID, :OLD.M_LOCATOR_ID, :OLD.M_ATTRIBUTESETINSTANCE_ID, :OLD.C_UOM_ID, :OLD.M_PRODUCT_UOM_ID, NULL, NULL, NULL, :OLD.MOVEMENTQTY, :OLD.QUANTITYORDER) ;
-      M_UPDATE_INVENTORY(:OLD.AD_CLIENT_ID, :OLD.AD_ORG_ID, :OLD.UPDATEDBY, :OLD.M_PRODUCT_ID, :OLD.M_LOCATORTO_ID, :OLD.M_ATTRIBUTESETINSTANCE_ID, :OLD.C_UOM_ID, :OLD.M_PRODUCT_UOM_ID, NULL, NULL, NULL, -:OLD.MOVEMENTQTY, -:OLD.QUANTITYORDER) ;
+      M_UPDATE_INVENTORY(:OLD.AD_CLIENT_ID, :OLD.AD_ORG_ID, :OLD.UPDATEDBY, :OLD.M_PRODUCT_ID, :OLD.M_LOCATOR_ID,  :OLD.M_ATTRIBUTESETINSTANCE_ID, :OLD.C_UOM_ID, :OLD.M_PRODUCT_UOM_ID, NULL, NULL, NULL, :OLD.MOVEMENTQTY, :OLD.QUANTITYORDER) ;
+      M_UPDATE_INVENTORY(:OLD.AD_CLIENT_ID, :OLD.AD_ORG_ID, :OLD.UPDATEDBY, :OLD.M_PRODUCT_ID, :OLD.M_LOCATORTO_ID, COALESCE(:OLD.M_ATTRIBUTESETINSTANCETO_ID, :OLD.M_ATTRIBUTESETINSTANCE_ID), :OLD.C_UOM_ID, :OLD.M_PRODUCT_UOM_ID, NULL, NULL, NULL, -:OLD.MOVEMENTQTY, -:OLD.QUANTITYORDER) ;
     END IF;
   END IF;
   IF INSERTING THEN
@@ -75,7 +76,7 @@
       AND ProductType='I';
     IF V_STOCKED > 0 THEN
       M_UPDATE_INVENTORY(:NEW.AD_CLIENT_ID, :NEW.AD_ORG_ID, :NEW.UPDATEDBY, :NEW.M_PRODUCT_ID, :NEW.M_LOCATOR_ID, :NEW.M_ATTRIBUTESETINSTANCE_ID, :NEW.C_UOM_ID, :NEW.M_PRODUCT_UOM_ID, NULL, NULL, NULL, -:NEW.MOVEMENTQTY, -:NEW.QUANTITYORDER) ;
-      M_UPDATE_INVENTORY(:NEW.AD_CLIENT_ID, :NEW.AD_ORG_ID, :NEW.UPDATEDBY, :NEW.M_PRODUCT_ID, :NEW.M_LOCATORTO_ID, :NEW.M_ATTRIBUTESETINSTANCE_ID, :NEW.C_UOM_ID, :NEW.M_PRODUCT_UOM_ID, NULL, NULL, NULL, :NEW.MOVEMENTQTY, :NEW.QUANTITYORDER) ;
+      M_UPDATE_INVENTORY(:NEW.AD_CLIENT_ID, :NEW.AD_ORG_ID, :NEW.UPDATEDBY, :NEW.M_PRODUCT_ID, :NEW.M_LOCATORTO_ID, COALESCE(:NEW.M_ATTRIBUTESETINSTANCETO_ID, :NEW.M_ATTRIBUTESETINSTANCE_ID), :NEW.C_UOM_ID, :NEW.M_PRODUCT_UOM_ID, NULL, NULL, NULL, :NEW.MOVEMENTQTY, :NEW.QUANTITYORDER) ;
     END IF;
   END IF;
   IF UPDATING THEN
@@ -124,7 +125,7 @@
       FROM m_product
       WHERE m_product_id = :NEW.m_product_id;
       IF (v_isgeneric = 'Y') THEN
-        RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@');
+        RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@ ' || v_productname);
       END IF;
     END IF;
   END IF;
--- a/model/src-db/database/model/triggers/M_OFFER_TYPE_MOD_TRG.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/triggers/M_OFFER_TYPE_MOD_TRG.xml	Wed May 09 04:45:09 2018 +0000
@@ -21,7 +21,6 @@
 ************************************************************************/
   devTemplate NUMBER;
   devModule   CHAR(1);
-  cuerrentID  VARCHAR2(32);
   cuerrentModuleID  VARCHAR2(32);
   vAux NUMBER;
     
@@ -51,10 +50,8 @@
      AND Type = 'T';
      
   IF (UPDATING OR INSERTING) THEN
-    cuerrentID := :new.m_offer_type_ID;
     cuerrentModuleID := :new.AD_Module_ID;
   ELSE
-    cuerrentID := :old.m_offer_type_ID;
     cuerrentModuleID := :old.AD_Module_ID;
   END IF;
   
--- a/model/src-db/database/model/triggers/M_PRODUCTIONLINE_TRG.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/triggers/M_PRODUCTIONLINE_TRG.xml	Wed May 09 04:45:09 2018 +0000
@@ -31,7 +31,7 @@
   * parts created by ComPiere are Copyright (C) ComPiere, Inc.;
   * All Rights Reserved.
   * Contributor(s): Openbravo SLU
-  * Contributions are Copyright (C) 2001-2013 Openbravo, S.L.U.
+  * Contributions are Copyright (C) 2001-2017 Openbravo, S.L.U.
   *
   * Specifically, this derivative work is based upon the following Compiere
   * file and version.
@@ -146,7 +146,7 @@
       FROM m_product
       WHERE m_product_id = :NEW.m_product_id;
       IF (v_isgeneric = 'Y') THEN
-        RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@');
+        RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@ ' || v_productname);
       END IF;
     END IF;
   END IF;
--- a/model/src-db/database/model/triggers/M_REQUISITIONLINE_TRG.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/triggers/M_REQUISITIONLINE_TRG.xml	Wed May 09 04:45:09 2018 +0000
@@ -14,7 +14,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2008-2016 Openbravo SLU
+* All portions are Copyright (C) 2008-2017 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -96,7 +96,7 @@
       FROM m_product
       WHERE m_product_id = :NEW.m_product_id;
       IF (v_isgeneric = 'Y') THEN
-        RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@');
+        RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@ ' || v_productname);
       END IF;
       IF (:NEW.C_AUM IS NOT NULL AND :NEW.AUMQTY IS NOT NULL AND :NEW.M_PRODUCT_UOM_ID IS NOT NULL AND :NEW.QUANTITYORDER IS NOT NULL) THEN
         RAISE_APPLICATION_ERROR(-20000, '@CannotUseAUMandSecondUOM@');
--- a/model/src-db/database/model/triggers/M_RESERVATION_TRG.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/triggers/M_RESERVATION_TRG.xml	Wed May 09 04:45:09 2018 +0000
@@ -15,7 +15,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2012-2016 Openbravo SLU
+* All portions are Copyright (C) 2012-2017 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -163,7 +163,7 @@
       FROM m_product
       WHERE m_product_id = :NEW.m_product_id;
       IF (v_isgeneric = 'Y') THEN
-        RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@');
+        RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@ ' || v_productname);
       END IF;
     END IF;
   END IF;
--- a/model/src-db/database/model/triggers/M_STORAGE_DETAIL_TRG.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/triggers/M_STORAGE_DETAIL_TRG.xml	Wed May 09 04:45:09 2018 +0000
@@ -15,7 +15,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2010-2013 Openbravo SLU
+* All portions are Copyright (C) 2010-2017 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -46,7 +46,7 @@
       FROM m_product
       WHERE m_product_id = :NEW.m_product_id;
       IF (v_isgeneric = 'Y') THEN
-        RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@');
+        RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@ ' || v_productname);
       END IF;
     END IF;
   END IF;
--- a/model/src-db/database/model/triggers/M_TRANSACTION_TRG2.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/triggers/M_TRANSACTION_TRG2.xml	Wed May 09 04:45:09 2018 +0000
@@ -15,7 +15,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2012-2016 Openbravo SLU
+* All portions are Copyright (C) 2012-2017 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -98,7 +98,7 @@
       FROM m_product
       WHERE m_product_id = :NEW.m_product_id;
       IF (v_isgeneric = 'Y') THEN
-        RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@');
+        RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@ ' || v_productname);
       END IF;
     END IF;
   END IF;
--- a/model/src-db/database/model/triggers/S_TIMEEXPENSELINE_TRG.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/triggers/S_TIMEEXPENSELINE_TRG.xml	Wed May 09 04:45:09 2018 +0000
@@ -14,7 +14,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2001-2013 Openbravo SLU
+* All portions are Copyright (C) 2001-2017 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -156,7 +156,7 @@
       FROM m_product
       WHERE m_product_id = :NEW.m_product_id;
       IF (v_isgeneric = 'Y') THEN
-        RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@');
+        RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@ ' || v_productname);
       END IF;
     END IF;
   END IF;
--- a/model/src-db/database/model/views/C_INVOICE_CANDIDATE_V.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/views/C_INVOICE_CANDIDATE_V.xml	Wed May 09 04:45:09 2018 +0000
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
   <database name="VIEW C_INVOICE_CANDIDATE_V">
-    <view name="C_INVOICE_CANDIDATE_V"><![CDATA[SELECT o.ad_client_id, o.ad_org_id, o.c_bpartner_id, o.c_order_id, o.documentno, o.dateordered, o.c_doctype_id, o.totallines AS amountlines, o.grandtotal AS amountlinesgross, sum(round((l.qtyordered - l.qtyinvoiced) * l.priceactual, c.stdprecision)) AS notinvoicedlines, round(sum(round((l.qtyordered - l.qtyinvoiced) * l.priceactual, c.stdprecision) * (1 + t.rate / 100)), c.stdprecision) AS notinvoicedlinesgross, o.invoicerule AS term, sum(round((l.qtydelivered - l.qtyinvoiced) * l.priceactual, c.stdprecision)) AS pendinglines, round(sum(round((l.qtydelivered - l.qtyinvoiced) * l.priceactual, c.stdprecision) * (1 + t.rate / 100)), c.stdprecision) AS pendinglinesgross, sum(abs(l.qtyordered)) AS qtyordered, sum(abs(l.qtydelivered)) AS qtydelivered FROM c_order o JOIN c_doctype dt ON o.c_doctype_id = dt.c_doctype_id JOIN c_bpartner bp ON o.c_bpartner_id = bp.c_bpartner_id JOIN c_currency c ON o.c_currency_id = c.c_currency_id JOIN c_orderline l ON o.c_order_id = l.c_order_id JOIN c_tax t ON t.c_tax_id = l.c_tax_id LEFT JOIN c_invoiceschedule si ON bp.c_invoiceschedule_id = si.c_invoiceschedule_id WHERE (o.docstatus IN ('CO', 'CL', 'IP')) AND dt.docbasetype = 'SOO' AND (dt.docsubtypeso NOT IN ('ON', 'OB', 'WR')) AND (o.invoicerule = 'I' OR o.invoicerule = 'O' OR o.invoicerule = 'D' OR o.invoicerule = 'S' AND (si.invoicefrequency IS NULL OR si.invoicefrequency = 'D' OR si.invoicefrequency = 'W' OR si.invoicefrequency = 'T' AND trunc(o.dateordered) <= (trunc(now(), 'MM') + si.invoicedaycutoff - 1) AND trunc(now()) >= (trunc(o.dateordered, 'MM') + si.invoiceday - 1) OR trunc(o.dateordered) <= (trunc(now(), 'MM') + si.invoicedaycutoff + 14) AND trunc(now()) >= (trunc(o.dateordered, 'MM') + si.invoiceday + 14) OR si.invoicefrequency = 'M' AND trunc(o.dateordered) <= (trunc(now(), 'MM') + si.invoicedaycutoff - 1) AND trunc(now()) >= (trunc(o.dateordered, 'MM') + si.invoiceday - 1))) AND (abs(l.qtyordered - l.qtyinvoiced) <> 0 OR abs(l.qtydelivered - l.qtyinvoiced) <> 0) GROUP BY o.ad_client_id, o.ad_org_id, o.c_bpartner_id, o.c_order_id, o.documentno, o.dateordered, o.c_doctype_id, o.totallines, o.grandtotal, o.invoicerule, c.c_currency_id, c.stdprecision]]></view>
+    <view name="C_INVOICE_CANDIDATE_V"><![CDATA[SELECT o.ad_client_id, o.ad_org_id, o.c_bpartner_id, o.c_order_id, o.documentno, o.dateordered, o.c_doctype_id, o.totallines AS amountlines, o.grandtotal AS amountlinesgross, sum(round((l.qtyordered - l.qtyinvoiced) * l.priceactual, c.stdprecision)) AS notinvoicedlines, round(sum(round((l.qtyordered - l.qtyinvoiced) * l.priceactual, c.stdprecision) * (1 + t.rate / 100)), c.stdprecision) AS notinvoicedlinesgross, o.invoicerule AS term, sum(round((l.qtydelivered - l.qtyinvoiced) * l.priceactual, c.stdprecision)) AS pendinglines, round(sum(round((l.qtydelivered - l.qtyinvoiced) * l.priceactual, c.stdprecision) * (1 + t.rate / 100)), c.stdprecision) AS pendinglinesgross, sum(abs(l.qtyordered)) AS qtyordered, sum(abs(l.qtydelivered)) AS qtydelivered FROM c_order o JOIN c_doctype dt ON o.c_doctype_id = dt.c_doctype_id JOIN c_bpartner bp ON o.c_bpartner_id = bp.c_bpartner_id JOIN c_currency c ON o.c_currency_id = c.c_currency_id JOIN c_orderline l ON o.c_order_id = l.c_order_id JOIN c_tax t ON t.c_tax_id = l.c_tax_id LEFT JOIN c_invoiceschedule si ON bp.c_invoiceschedule_id = si.c_invoiceschedule_id WHERE (o.docstatus IN ('CO', 'CL', 'IP')) AND dt.docbasetype = 'SOO' AND (dt.docsubtypeso NOT IN ('ON', 'OB', 'WR')) AND (o.invoicerule = 'I' OR o.invoicerule = 'O' OR o.invoicerule = 'D' OR o.invoicerule = 'S' AND (si.invoicefrequency IS NULL OR si.invoicefrequency = 'D' OR si.invoicefrequency = 'W' OR si.invoicefrequency = 'T' AND trunc(o.dateordered) <= (trunc(now(), 'MM') + si.invoicedaycutoff - 1) AND trunc(now()) >= (trunc(o.dateordered, 'MM') + si.invoiceday - 1) OR trunc(o.dateordered) <= (trunc(now(), 'MM') + si.invoicedaycutoff + 14) AND trunc(now()) >= (trunc(o.dateordered, 'MM') + si.invoiceday + 14) OR si.invoicefrequency = 'M' AND trunc(o.dateordered) <= (trunc(now(), 'MM') + si.invoicedaycutoff - 1) AND trunc(now()) >= (trunc(o.dateordered, 'MM') + si.invoiceday - 1))) AND (obequals(l.qtyordered, l.qtyinvoiced) = 'N' OR obequals(l.qtydelivered, l.qtyinvoiced) = 'N') GROUP BY o.ad_client_id, o.ad_org_id, o.c_bpartner_id, o.c_order_id, o.documentno, o.dateordered, o.c_doctype_id, o.totallines, o.grandtotal, o.invoicerule, c.c_currency_id, c.stdprecision]]></view>
   </database>
--- a/model/src-db/database/model/views/M_PRODUCT_STOCK_V.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/model/views/M_PRODUCT_STOCK_V.xml	Wed May 09 04:45:09 2018 +0000
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
   <database name="VIEW M_PRODUCT_STOCK_V">
-    <view name="M_PRODUCT_STOCK_V"><![CDATA[SELECT p.m_product_id || sd.m_storage_detail_id AS m_product_stock_v_id, l.ad_client_id, l.ad_org_id, l.isactive, sd.created, sd.createdby, sd.updated, sd.updatedby, sd.m_product_id, sd.qtyonhand, sd.qtyorderonhand, sd.preqtyonhand, sd.preqtyorderonhand, sd.c_uom_id, sd.m_product_uom_id, sd.m_attributesetinstance_id, sd.m_locator_id, 'Y' AS stocked, l.m_warehouse_id FROM m_storage_detail sd JOIN m_locator l ON sd.m_locator_id = l.m_locator_id JOIN m_product p ON sd.m_product_id = p.m_product_id AND p.isactive = 'Y' WHERE sd.qtyonhand <> 0 OR COALESCE(sd.qtyorderonhand, 0) <> 0 UNION ALL SELECT p.m_product_id AS m_product_stock_v_id, p.ad_client_id, p.ad_org_id, p.isactive, p.created, p.createdby, p.updated, p.updatedby, p.m_product_id, 0 AS qtyonhand, NULL AS qtyorderonhand, 0 AS preqtyonhand, NULL AS preqtyorderonhand, p.c_uom_id, NULL AS m_product_uom_id, CASE p.attrsetvaluetype WHEN 'D' THEN p.m_attributesetinstance_id ELSE NULL END AS m_attributesetinstance_id, NULL AS m_locator_id, 'N' AS stocked, NULL AS m_warehouse_id FROM m_product p WHERE p.isgeneric = 'N']]></view>
+    <view name="M_PRODUCT_STOCK_V"><![CDATA[SELECT p.m_product_id || sd.m_storage_detail_id AS m_product_stock_v_id, l.ad_client_id, l.ad_org_id, l.isactive, sd.created, sd.createdby, sd.updated, sd.updatedby, sd.m_product_id, sd.qtyonhand, sd.qtyorderonhand, sd.preqtyonhand, sd.preqtyorderonhand, sd.c_uom_id, sd.m_product_uom_id, sd.m_attributesetinstance_id, sd.m_locator_id, 'Y' AS stocked, l.m_warehouse_id, sd.m_refinventory_id FROM m_storage_detail sd JOIN m_locator l ON sd.m_locator_id = l.m_locator_id JOIN m_product p ON sd.m_product_id = p.m_product_id AND p.isactive = 'Y' WHERE sd.qtyonhand <> 0 OR COALESCE(sd.qtyorderonhand, 0) <> 0 UNION ALL SELECT p.m_product_id AS m_product_stock_v_id, p.ad_client_id, p.ad_org_id, p.isactive, p.created, p.createdby, p.updated, p.updatedby, p.m_product_id, 0 AS qtyonhand, NULL AS qtyorderonhand, 0 AS preqtyonhand, NULL AS preqtyorderonhand, p.c_uom_id, NULL AS m_product_uom_id, CASE p.attrsetvaluetype WHEN 'D' THEN p.m_attributesetinstance_id ELSE NULL END AS m_attributesetinstance_id, NULL AS m_locator_id, 'N' AS stocked, NULL AS m_warehouse_id, NULL AS m_refinventory_id FROM m_product p WHERE p.isgeneric = 'N']]></view>
   </database>
--- a/model/src-db/database/sourcedata/AD_AUXILIARINPUT.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/sourcedata/AD_AUXILIARINPUT.xml	Wed May 09 04:45:09 2018 +0000
@@ -1430,6 +1430,18 @@
 <!--2F68ED80A1824966845A6CED4A2B5B45-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--2F68ED80A1824966845A6CED4A2B5B45--></AD_AUXILIARINPUT>
 
+<!--2FD1AE5689D342FF94A2704690CEE517--><AD_AUXILIARINPUT>
+<!--2FD1AE5689D342FF94A2704690CEE517-->  <AD_AUXILIARINPUT_ID><![CDATA[2FD1AE5689D342FF94A2704690CEE517]]></AD_AUXILIARINPUT_ID>
+<!--2FD1AE5689D342FF94A2704690CEE517-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2FD1AE5689D342FF94A2704690CEE517-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2FD1AE5689D342FF94A2704690CEE517-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2FD1AE5689D342FF94A2704690CEE517-->  <AD_TAB_ID><![CDATA[263]]></AD_TAB_ID>
+<!--2FD1AE5689D342FF94A2704690CEE517-->  <NAME><![CDATA[IsReversalDocument]]></NAME>
+<!--2FD1AE5689D342FF94A2704690CEE517-->  <CODE><![CDATA[@SQL=select isreversal
+from c_doctype where c_doctype_id = @c_doctypetarget_id@]]></CODE>
+<!--2FD1AE5689D342FF94A2704690CEE517-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--2FD1AE5689D342FF94A2704690CEE517--></AD_AUXILIARINPUT>
+
 <!--311BE34CB1684926877B28AFE1939C26--><AD_AUXILIARINPUT>
 <!--311BE34CB1684926877B28AFE1939C26-->  <AD_AUXILIARINPUT_ID><![CDATA[311BE34CB1684926877B28AFE1939C26]]></AD_AUXILIARINPUT_ID>
 <!--311BE34CB1684926877B28AFE1939C26-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2293,6 +2305,18 @@
 <!--5C17038A0D494AF591B907104586C9B6-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--5C17038A0D494AF591B907104586C9B6--></AD_AUXILIARINPUT>
 
+<!--5D10E446E9ED4DB7B94A83792C9F42CC--><AD_AUXILIARINPUT>
+<!--5D10E446E9ED4DB7B94A83792C9F42CC-->  <AD_AUXILIARINPUT_ID><![CDATA[5D10E446E9ED4DB7B94A83792C9F42CC]]></AD_AUXILIARINPUT_ID>
+<!--5D10E446E9ED4DB7B94A83792C9F42CC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5D10E446E9ED4DB7B94A83792C9F42CC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5D10E446E9ED4DB7B94A83792C9F42CC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5D10E446E9ED4DB7B94A83792C9F42CC-->  <AD_TAB_ID><![CDATA[290]]></AD_TAB_ID>
+<!--5D10E446E9ED4DB7B94A83792C9F42CC-->  <NAME><![CDATA[IsReversalDocument]]></NAME>
+<!--5D10E446E9ED4DB7B94A83792C9F42CC-->  <CODE><![CDATA[@SQL=select isreversal
+from c_doctype where c_doctype_id = @c_doctypetarget_id@]]></CODE>
+<!--5D10E446E9ED4DB7B94A83792C9F42CC-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--5D10E446E9ED4DB7B94A83792C9F42CC--></AD_AUXILIARINPUT>
+
 <!--5EE498F6C1484535A77A8CE36D96C77B--><AD_AUXILIARINPUT>
 <!--5EE498F6C1484535A77A8CE36D96C77B-->  <AD_AUXILIARINPUT_ID><![CDATA[5EE498F6C1484535A77A8CE36D96C77B]]></AD_AUXILIARINPUT_ID>
 <!--5EE498F6C1484535A77A8CE36D96C77B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2875,6 +2899,17 @@
 <!--873024A63FD6429D8B1A64F63E0CBA00-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--873024A63FD6429D8B1A64F63E0CBA00--></AD_AUXILIARINPUT>
 
+<!--87B7050EA8FE4107A196292344363AB4--><AD_AUXILIARINPUT>
+<!--87B7050EA8FE4107A196292344363AB4-->  <AD_AUXILIARINPUT_ID><![CDATA[87B7050EA8FE4107A196292344363AB4]]></AD_AUXILIARINPUT_ID>
+<!--87B7050EA8FE4107A196292344363AB4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--87B7050EA8FE4107A196292344363AB4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--87B7050EA8FE4107A196292344363AB4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--87B7050EA8FE4107A196292344363AB4-->  <AD_TAB_ID><![CDATA[1C05058D61AC4B69A7E550F32F9F2873]]></AD_TAB_ID>
+<!--87B7050EA8FE4107A196292344363AB4-->  <NAME><![CDATA[LCC_Account_ID]]></NAME>
+<!--87B7050EA8FE4107A196292344363AB4-->  <CODE><![CDATA[@SQL=SELECT ACCOUNT_ID FROM M_LC_TYPE WHERE M_LC_TYPE_ID = @M_LC_TYPE_ID@]]></CODE>
+<!--87B7050EA8FE4107A196292344363AB4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--87B7050EA8FE4107A196292344363AB4--></AD_AUXILIARINPUT>
+
 <!--87EA26BD00A04638B556D52621D46131--><AD_AUXILIARINPUT>
 <!--87EA26BD00A04638B556D52621D46131-->  <AD_AUXILIARINPUT_ID><![CDATA[87EA26BD00A04638B556D52621D46131]]></AD_AUXILIARINPUT_ID>
 <!--87EA26BD00A04638B556D52621D46131-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -3985,6 +4020,17 @@
 <!--D65958E069304E5F942AA839A6B457AD-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--D65958E069304E5F942AA839A6B457AD--></AD_AUXILIARINPUT>
 
+<!--D6975C5C8F6B4F0F93C0ED903163D470--><AD_AUXILIARINPUT>
+<!--D6975C5C8F6B4F0F93C0ED903163D470-->  <AD_AUXILIARINPUT_ID><![CDATA[D6975C5C8F6B4F0F93C0ED903163D470]]></AD_AUXILIARINPUT_ID>
+<!--D6975C5C8F6B4F0F93C0ED903163D470-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D6975C5C8F6B4F0F93C0ED903163D470-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D6975C5C8F6B4F0F93C0ED903163D470-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D6975C5C8F6B4F0F93C0ED903163D470-->  <AD_TAB_ID><![CDATA[1C05058D61AC4B69A7E550F32F9F2873]]></AD_TAB_ID>
+<!--D6975C5C8F6B4F0F93C0ED903163D470-->  <NAME><![CDATA[LCC_Product_ID]]></NAME>
+<!--D6975C5C8F6B4F0F93C0ED903163D470-->  <CODE><![CDATA[@SQL=SELECT M_PRODUCT_ID FROM M_LC_TYPE WHERE M_LC_TYPE_ID = @M_LC_TYPE_ID@]]></CODE>
+<!--D6975C5C8F6B4F0F93C0ED903163D470-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D6975C5C8F6B4F0F93C0ED903163D470--></AD_AUXILIARINPUT>
+
 <!--D8E241A6762D4BB48CB3172F447D6306--><AD_AUXILIARINPUT>
 <!--D8E241A6762D4BB48CB3172F447D6306-->  <AD_AUXILIARINPUT_ID><![CDATA[D8E241A6762D4BB48CB3172F447D6306]]></AD_AUXILIARINPUT_ID>
 <!--D8E241A6762D4BB48CB3172F447D6306-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/src-db/database/sourcedata/AD_CALLOUT.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/sourcedata/AD_CALLOUT.xml	Wed May 09 04:45:09 2018 +0000
@@ -1156,6 +1156,16 @@
 <!--8D7D52080CF3467093DDE410B7BB0A2F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--8D7D52080CF3467093DDE410B7BB0A2F--></AD_CALLOUT>
 
+<!--945D318D80ED4920A789C5F5E402A648--><AD_CALLOUT>
+<!--945D318D80ED4920A789C5F5E402A648-->  <AD_CALLOUT_ID><![CDATA[945D318D80ED4920A789C5F5E402A648]]></AD_CALLOUT_ID>
+<!--945D318D80ED4920A789C5F5E402A648-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--945D318D80ED4920A789C5F5E402A648-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--945D318D80ED4920A789C5F5E402A648-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--945D318D80ED4920A789C5F5E402A648-->  <NAME><![CDATA[SL_LandedCost_Cost_Type]]></NAME>
+<!--945D318D80ED4920A789C5F5E402A648-->  <DESCRIPTION><![CDATA[This callout clear the invoice line value so the selector can be recalculated again ]]></DESCRIPTION>
+<!--945D318D80ED4920A789C5F5E402A648-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--945D318D80ED4920A789C5F5E402A648--></AD_CALLOUT>
+
 <!--A03EA0C76BB847E7AC3545168FDAF2E9--><AD_CALLOUT>
 <!--A03EA0C76BB847E7AC3545168FDAF2E9-->  <AD_CALLOUT_ID><![CDATA[A03EA0C76BB847E7AC3545168FDAF2E9]]></AD_CALLOUT_ID>
 <!--A03EA0C76BB847E7AC3545168FDAF2E9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1193,6 +1203,16 @@
 <!--AE1F6503340441ABBF1BC89FD46DEF13-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--AE1F6503340441ABBF1BC89FD46DEF13--></AD_CALLOUT>
 
+<!--B05A954309334F5282E8A56617821F22--><AD_CALLOUT>
+<!--B05A954309334F5282E8A56617821F22-->  <AD_CALLOUT_ID><![CDATA[B05A954309334F5282E8A56617821F22]]></AD_CALLOUT_ID>
+<!--B05A954309334F5282E8A56617821F22-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B05A954309334F5282E8A56617821F22-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B05A954309334F5282E8A56617821F22-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B05A954309334F5282E8A56617821F22-->  <NAME><![CDATA[SE_RefInventory_RefInvType]]></NAME>
+<!--B05A954309334F5282E8A56617821F22-->  <DESCRIPTION><![CDATA[Sets the proposed value from the sequence associated to the referenced inventory type. The sequence is not updated yet.]]></DESCRIPTION>
+<!--B05A954309334F5282E8A56617821F22-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--B05A954309334F5282E8A56617821F22--></AD_CALLOUT>
+
 <!--B21CED81B17544D09C608BB9EEEC51F6--><AD_CALLOUT>
 <!--B21CED81B17544D09C608BB9EEEC51F6-->  <AD_CALLOUT_ID><![CDATA[B21CED81B17544D09C608BB9EEEC51F6]]></AD_CALLOUT_ID>
 <!--B21CED81B17544D09C608BB9EEEC51F6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/src-db/database/sourcedata/AD_COLUMN.xml	Thu Apr 26 13:11:27 2018 +0200
+++ b/model/src-db/database/sourcedata/AD_COLUMN.xml	Wed May 09 04:45:09 2018 +0000
@@ -69516,7 +69516,7 @@
 <!--3916-->  <AD_TABLE_ID><![CDATA[217]]></AD_TABLE_ID>
 <!--3916-->  <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID>
 <!--3916-->  <AD_REFERENCE_VALUE_ID><![CDATA[170]]></AD_REFERENCE_VALUE_ID>
-<!--3916-->  <AD_VAL_RULE_ID><![CDATA[124]]></AD_VAL_RULE_ID>
+<!--3916-->  <AD_VAL_RULE_ID><![CDATA[CBA25061F3834619B0401E0834F43B2D]]></AD_VAL_RULE_ID>
 <!--3916-->  <FIELDLENGTH><![CDATA[22]]></FIELDLENGTH>
 <!--3916-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--3916-->  <ISPARENT><![CDATA[N]]></ISPARENT>
@@ -146590,8 +146590,8 @@
 <!--800634-->  <HELP><![CDATA[The Locator ID indicates where in a Warehouse a product is located.]]></HELP>
 <!--800634-->  <COLUMNNAME><![CDATA[M_Locator_ID]]></COLUMNNAME>
 <!--800634-->  <AD_TABLE_ID><![CDATA[800036]]></AD_TABLE_ID>
-<!--800634-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
-<!--800634-->  <AD_REFERENCE_VALUE_ID><![CDATA[31]]></AD_REFERENCE_VALUE_ID>
+<!--800634-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--800634-->  <AD_REFERENCE_VALUE_ID><![CDATA[8B85C08F7B3847C8A61E51EAAE87CE61]]></AD_REFERENCE_VALUE_ID>
 <!--800634-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
 <!--800634-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--800634-->  <ISPARENT><![CDATA[N]]></ISPARENT>
@@ -236401,6 +236401,45 @@
 <!--1005400275-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--1005400275--></AD_COLUMN>
 
+<!--1005400290--><AD_COLUMN>
+<!--1005400290-->  <AD_COLUMN_ID><![CDATA[1005400290]]></AD_COLUMN_ID>
+<!--1005400290-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1005400290-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1005400290-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1005400290-->  <NAME><![CDATA[Code Revision]]></NAME>
+<!--1005400290-->  <DESCRIPTION><![CDATA[The code revision of the installed system]]></DESCRIPTION>
+<!--1005400290-->  <HELP><![CDATA[The code revision of the installed system]]></HELP>
+<!--1005400290-->  <COLUMNNAME><![CDATA[Code_Revision]]></COLUMNNAME>
+<!--1005400290-->  <AD_TABLE_ID><![CDATA[1005400006]]></AD_TABLE_ID>
+<!--1005400290-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--1005400290-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--1005400290-->  <DEFAULTVALUE><![CDATA[0]]></DEFAULTVALUE>
+<!--1005400290-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--1005400290-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--1005400290-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--1005400290-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--1005400290-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--1005400290-->  <SEQNO><![CDATA[290]]></SEQNO>
+<!--1005400290-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--1005400290-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--1005400290-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--1005400290-->  <AD_ELEMENT_ID><![CDATA[1005400043]]></AD_ELEMENT_ID>
+<!--1005400290-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--1005400290-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--1005400290-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--1005400290-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--1005400290-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--1005400290-->  <POSITION><![CDATA[29]]></POSITION>
+<!--1005400290-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--1005400290-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--1005400290-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--1005400290-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--1005400290-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--1005400290-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--1005400290-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--1005400290-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--1005400290--></AD_COLUMN>
+
 <!--1005500000--><AD_COLUMN>
 <!--1005500000-->  <AD_COLUMN_ID><![CDATA[1005500000]]></AD_COLUMN_ID>
 <!--1005500000-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -240486,6 +240525,7 @@
 <!--00568254CB698733E050007F01000513-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--00568254CB698733E050007F01000513-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--00568254CB698733E050007F01000513-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--00568254CB698733E050007F01000513-->  <AD_CALLOUT_ID><![CDATA[945D318D80ED4920A789C5F5E402A648]]></AD_CALLOUT_ID>
 <!--00568254CB698733E050007F01000513-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--00568254CB698733E050007F01000513-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--00568254CB698733E050007F01000513-->  <POSITION><![CDATA[11]]></POSITION>
@@ -245434,6 +245474,45 @@
 <!--0985D02FC21740678D30D0B1E6B2EE1A-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--0985D02FC21740678D30D0B1E6B2EE1A--></AD_COLUMN>
 
+<!--09A1B49BEF9241FBBAF935A896DAE1CB--><AD_COLUMN>
+<!--09A1B49BEF9241FBBAF935A896DAE1CB-->  <AD_COLUMN_ID><![CDATA[09A1B49BEF9241FBBAF935A896DAE1CB]]></AD_COLUMN_ID>
+<!--09A1B49BEF9241FBBAF935A896DAE1CB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--09A1B49BEF9241FBBAF935A896DAE1CB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--09A1B49BEF9241FBBAF935A896DAE1CB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--09A1B49BEF9241FBBAF935A896DAE1CB-->  <NAME><![CDATA[Updated]]></NAME>
+<!--09A1B49BEF9241FBBAF935A896DAE1CB-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
+<!--09A1B49BEF9241FBBAF935A896DAE1CB-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
+<!--09A1B49BEF9241FBBAF935A896DAE1CB-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
+<!--09A1B49BEF9241FBBAF935A896DAE1CB-->  <AD_TABLE_ID><![CDATA[25A3F31FD66945008C11C2C94272B20B]]></AD_TABLE_ID>
+<!--09A1B49BEF9241FBBAF935A896DAE1CB-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
+<!--09A1B49BEF9241FBBAF935A896DAE1CB-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--09A1B49BEF9241FBBAF935A896DAE1CB-->  <DEFAULTVALUE><![CDATA[@#Date@]]></DEFAULTVALUE>
+<!--09A1B49BEF9241FBBAF935A896DAE1CB-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--09A1B49BEF9241FBBAF935A896DAE1CB-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--09A1B49BEF9241FBBAF935A896DAE1CB-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--09A1B49BEF9241FBBAF935A896DAE1CB-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--09A1B49BEF9241FBBAF935A896DAE1CB-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--09A1B49BEF9241FBBAF935A896DAE1CB-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--09A1B49BEF9241FBBAF935A896DAE1CB-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--09A1B49BEF9241FBBAF935A896DAE1CB-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--09A1B49BEF9241FBBAF935A896DAE1CB-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--09A1B49BEF9241FBBAF935A896DAE1CB-->  <AD_ELEMENT_ID><![CDATA[607]]></AD_ELEMENT_ID>
+<!--09A1B49BEF9241FBBAF935A896DAE1CB-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--09A1B49BEF9241FBBAF935A896DAE1CB-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--09A1B49BEF9241FBBAF935A896DAE1CB-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--09A1B49BEF9241FBBAF935A896DAE1CB-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--09A1B49BEF9241FBBAF935A896DAE1CB-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--09A1B49BEF9241FBBAF935A896DAE1CB-->  <POSITION><![CDATA[7]]></POSITION>
+<!--09A1B49BEF9241FBBAF935A896DAE1CB-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--09A1B49BEF9241FBBAF935A896DAE1CB-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--09A1B49BEF9241FBBAF935A896DAE1CB-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--09A1B49BEF9241FBBAF935A896DAE1CB-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--09A1B49BEF9241FBBAF935A896DAE1CB-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--09A1B49BEF9241FBBAF935A896DAE1CB-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--09A1B49BEF9241FBBAF935A896DAE1CB-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--09A1B49BEF9241FBBAF935A896DAE1CB-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--09A1B49BEF9241FBBAF935A896DAE1CB--></AD_COLUMN>
+
 <!--09A651EB04074B3781FFC9BA21EAAEDD--><AD_COLUMN>
 <!--09A651EB04074B3781FFC9BA21EAAEDD-->  <AD_COLUMN_ID><![CDATA[09A651EB04074B3781FFC9BA21EAAEDD]]></AD_COLUMN_ID>
 <!--09A651EB04074B3781FFC9BA21EAAEDD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -246127,6 +246206,44 @@
 <!--0BB5330F2A474D9490091C2EB56C53FD-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--0BB5330F2A474D9490091C2EB56C53FD--></AD_COLUMN>
 
+<!--0BCE2363223D447A8E8DE986DB6EBFAA--><AD_COLUMN>
+<!--0BCE2363223D447A8E8DE986DB6EBFAA-->  <AD_COLUMN_ID><![CDATA[0BCE2363223D447A8E8DE986DB6EBFAA]]></AD_COLUMN_ID>
+<!--0BCE2363223D447A8E8DE986DB6EBFAA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0BCE2363223D447A8E8DE986DB6EBFAA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0BCE2363223D447A8E8DE986DB6EBFAA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0BCE2363223D447A8E8DE986DB6EBFAA-->  <NAME><![CDATA[Description]]></NAME>
+<!--0BCE2363223D447A8E8DE986DB6EBFAA-->  <DESCRIPTION><![CDATA[A space to write additional related information.]]></DESCRIPTION>
+<!--0BCE2363223D447A8E8DE986DB6EBFAA-->  <HELP><![CDATA[A description is limited to 255 characters.]]></HELP>
+<!--0BCE2363223D447A8E8DE986DB6EBFAA-->  <COLUMNNAME><![CDATA[Description]]></COLUMNNAME>
+<!--0BCE2363223D447A8E8DE986DB6EBFAA-->  <AD_TABLE_ID><![CDATA[24733E0ACF73466898137EDD27BA464B]]></AD_TABLE_ID>
+<!--0BCE2363223D447A8E8DE986DB6EBFAA-->  <AD_REFERENCE_ID><![CDATA[14]]></AD_REFERENCE_ID>
+<!--0BCE2363223D447A8E8DE986DB6EBFAA-->  <FIELDLENGTH><![CDATA[255]]></FIELDLENGTH>
+<!--0BCE2363223D447A8E8DE986DB6EBFAA-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--0BCE2363223D447A8E8DE986DB6EBFAA-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--0BCE2363223D447A8E8DE986DB6EBFAA-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--0BCE2363223D447A8E8DE986DB6EBFAA-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--0BCE2363223D447A8E8DE986DB6EBFAA-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--0BCE2363223D447A8E8DE986DB6EBFAA-->  <SEQNO><![CDATA[100]]></SEQNO>
+<!--0BCE2363223D447A8E8DE986DB6EBFAA-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--0BCE2363223D447A8E8DE986DB6EBFAA-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--0BCE2363223D447A8E8DE986DB6EBFAA-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--0BCE2363223D447A8E8DE986DB6EBFAA-->  <AD_ELEMENT_ID><![CDATA[275]]></AD_ELEMENT_ID>
+<!--0BCE2363223D447A8E8DE986DB6EBFAA-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--0BCE2363223D447A8E8DE986DB6EBFAA-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--0BCE2363223D447A8E8DE986DB6EBFAA-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--0BCE2363223D447A8E8DE986DB6EBFAA-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--0BCE2363223D447A8E8DE986DB6EBFAA-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--0BCE2363223D447A8E8DE986DB6EBFAA-->  <POSITION><![CDATA[10]]></POSITION>
+<!--0BCE2363223D447A8E8DE986DB6EBFAA-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--0BCE2363223D447A8E8DE986DB6EBFAA-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--0BCE2363223D447A8E8DE986DB6EBFAA-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--0BCE2363223D447A8E8DE986DB6EBFAA-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--0BCE2363223D447A8E8DE986DB6EBFAA-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--0BCE2363223D447A8E8DE986DB6EBFAA-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--0BCE2363223D447A8E8DE986DB6EBFAA-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--0BCE2363223D447A8E8DE986DB6EBFAA-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--0BCE2363223D447A8E8DE986DB6EBFAA--></AD_COLUMN>
+
 <!--0BD260C46B9547BDB318DEBBDAB70536--><AD_COLUMN>
 <!--0BD260C46B9547BDB318DEBBDAB70536-->  <AD_COLUMN_ID><![CDATA[0BD260C46B9547BDB318DEBBDAB70536]]></AD_COLUMN_ID>
 <!--0BD260C46B9547BDB318DEBBDAB70536-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -248595,6 +248712,45 @@
 <!--141F54DBCEDE4F18BC55A8B30220745E-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--141F54DBCEDE4F18BC55A8B30220745E--></AD_COLUMN>
 
+<!--142B9752A5A74134AE7B93033CE9A1B5--><AD_COLUMN>
+<!--142B9752A5A74134AE7B93033CE9A1B5-->  <AD_COLUMN_ID><![CDATA[142B9752A5A74134AE7B93033CE9A1B5]]></AD_COLUMN_ID>
+<!--142B9752A5A74134AE7B93033CE9A1B5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--142B9752A5A74134AE7B93033CE9A1B5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--142B9752A5A74134AE7B93033CE9A1B5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--142B9752A5A74134AE7B93033CE9A1B5-->  <NAME><![CDATA[Organization]]></NAME>
+<!--142B9752A5A74134AE7B93033CE9A1B5-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
+<!--142B9752A5A74134AE7B93033CE9A1B5-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
+<!--142B9752A5A74134AE7B93033CE9A1B5-->  <COLUMNNAME><![CDATA[AD_Org_ID]]></COLUMNNAME>
+<!--142B9752A5A74134AE7B93033CE9A1B5-->  <AD_TABLE_ID><![CDATA[24733E0ACF73466898137EDD27BA464B]]></AD_TABLE_ID>
+<!--142B9752A5A74134AE7B93033CE9A1B5-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--142B9752A5A74134AE7B93033CE9A1B5-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--142B9752A5A74134AE7B93033CE9A1B5-->  <DEFAULTVALUE><![CDATA[@AD_ORG_ID@]]></DEFAULTVALUE>
+<!--142B9752A5A74134AE7B93033CE9A1B5-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--142B9752A5A74134AE7B93033CE9A1B5-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--142B9752A5A74134AE7B93033CE9A1B5-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--142B9752A5A74134AE7B93033CE9A1B5-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--142B9752A5A74134AE7B93033CE9A1B5-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--142B9752A5A74134AE7B93033CE9A1B5-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--142B9752A5A74134AE7B93033CE9A1B5-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--142B9752A5A74134AE7B93033CE9A1B5-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--142B9752A5A74134AE7B93033CE9A1B5-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--142B9752A5A74134AE7B93033CE9A1B5-->  <AD_ELEMENT_ID><![CDATA[113]]></AD_ELEMENT_ID>
+<!--142B9752A5A74134AE7B93033CE9A1B5-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--142B9752A5A74134AE7B93033CE9A1B5-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--142B9752A5A74134AE7B93033CE9A1B5-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--142B9752A5A74134AE7B93033CE9A1B5-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--142B9752A5A74134AE7B93033CE9A1B5-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--142B9752A5A74134AE7B93033CE9A1B5-->  <POSITION><![CDATA[3]]></POSITION>
+<!--142B9752A5A74134AE7B93033CE9A1B5-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--142B9752A5A74134AE7B93033CE9A1B5-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--142B9752A5A74134AE7B93033CE9A1B5-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--142B9752A5A74134AE7B93033CE9A1B5-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--142B9752A5A74134AE7B93033CE9A1B5-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--142B9752A5A74134AE7B93033CE9A1B5-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--142B9752A5A74134AE7B93033CE9A1B5-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--142B9752A5A74134AE7B93033CE9A1B5-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--142B9752A5A74134AE7B93033CE9A1B5--></AD_COLUMN>
+
 <!--14561DD2B91C4C2191931AC7C8C49579--><AD_COLUMN>
 <!--14561DD2B91C4C2191931AC7C8C49579-->  <AD_COLUMN_ID><![CDATA[14561DD2B91C4C2191931AC7C8C49579]]></AD_COLUMN_ID>
 <!--14561DD2B91C4C2191931AC7C8C49579-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -251427,6 +251583,46 @@
 <!--1CAC3B0E859D46CC89EA50EF40E66AC9-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--1CAC3B0E859D46CC89EA50EF40E66AC9--></AD_COLUMN>
 
+<!--1CAF83DB7B0B425BABDA9E1216F5BB2C--><AD_COLUMN>
+<!--1CAF83DB7B0B425BABDA9E1216F5BB2C-->  <AD_COLUMN_ID><![CDATA[1CAF83DB7B0B425BABDA9E1216F5BB2C]]></AD_COLUMN_ID>
+<!--1CAF83DB7B0B425BABDA9E1216F5BB2C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1CAF83DB7B0B425BABDA9E1216F5BB2C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1CAF83DB7B0B425BABDA9E1216F5BB2C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1CAF83DB7B0B425BABDA9E1216F5BB2C-->  <NAME><![CDATA[Shared]]></NAME>
+<!--1CAF83DB7B0B425BABDA9E1216F5BB2C-->  <DESCRIPTION><![CDATA[Shared or Unique References]]></DESCRIPTION>
+<!--1CAF83DB7B0B425BABDA9E1216F5BB2C-->  <HELP><![CDATA[Shared References: Multiple Storage Details can have a Reference number that is shared with other Storage Details.
+Unique References: A Storage Detail can (optionally) have a reference number, and this reference number is not re-used in other storage details.]]></HELP>
+<!--1CAF83DB7B0B425BABDA9E1216F5BB2C-->  <COLUMNNAME><![CDATA[IsShared]]></COLUMNNAME>
+<!--1CAF83DB7B0B425BABDA9E1216F5BB2C-->  <AD_TABLE_ID><![CDATA[24733E0ACF73466898137EDD27BA464B]]></AD_TABLE_ID>
+<!--1CAF83DB7B0B425BABDA9E1216F5BB2C-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--1CAF83DB7B0B425BABDA9E1216F5BB2C-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--1CAF83DB7B0B425BABDA9E1216F5BB2C-->  <DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE>
+<!--1CAF83DB7B0B425BABDA9E1216F5BB2C-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--1CAF83DB7B0B425BABDA9E1216F5BB2C-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--1CAF83DB7B0B425BABDA9E1216F5BB2C-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--1CAF83DB7B0B425BABDA9E1216F5BB2C-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--1CAF83DB7B0B425BABDA9E1216F5BB2C-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--1CAF83DB7B0B425BABDA9E1216F5BB2C-->  <SEQNO><![CDATA[110]]></SEQNO>
+<!--1CAF83DB7B0B425BABDA9E1216F5BB2C-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--1CAF83DB7B0B425BABDA9E1216F5BB2C-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--1CAF83DB7B0B425BABDA9E1216F5BB2C-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--1CAF83DB7B0B425BABDA9E1216F5BB2C-->  <AD_ELEMENT_ID><![CDATA[96D76874A3144BE394E6C255A32DA3F2]]></AD_ELEMENT_ID>
+<!--1CAF83DB7B0B425BABDA9E1216F5BB2C-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--1CAF83DB7B0B425BABDA9E1216F5BB2C-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--1CAF83DB7B0B425BABDA9E1216F5BB2C-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--1CAF83DB7B0B425BABDA9E1216F5BB2C-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--1CAF83DB7B0B425BABDA9E1216F5BB2C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--1CAF83DB7B0B425BABDA9E1216F5BB2C-->  <POSITION><![CDATA[11]]></POSITION>
+<!--1CAF83DB7B0B425BABDA9E1216F5BB2C-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--1CAF83DB7B0B425BABDA9E1216F5BB2C-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--1CAF83DB7B0B425BABDA9E1216F5BB2C-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--1CAF83DB7B0B425BABDA9E1216F5BB2C-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--1CAF83DB7B0B425BABDA9E1216F5BB2C-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--1CAF83DB7B0B425BABDA9E1216F5BB2C-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--1CAF83DB7B0B425BABDA9E1216F5BB2C-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--1CAF83DB7B0B425BABDA9E1216F5BB2C-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--1CAF83DB7B0B425BABDA9E1216F5BB2C--></AD_COLUMN>
+
 <!--1CDF40211C394B5CA2376ECDC2081870--><AD_COLUMN>
 <!--1CDF40211C394B5CA2376ECDC2081870-->  <AD_COLUMN_ID><![CDATA[1CDF40211C394B5CA2376ECDC2081870]]></AD_COLUMN_ID>
 <!--1CDF40211C394B5CA2376ECDC2081870-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -252857,6 +253053,45 @@
 <!--1F13F0F08BC54946A505388B9BF82315-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--1F13F0F08BC54946A505388B9BF82315--></AD_COLUMN>
 
+<!--1F79ED7DDB3246529C1DC8A9FCFA452B--><AD_COLUMN>
+<!--1F79ED7DDB3246529C1DC8A9FCFA452B-->  <AD_COLUMN_ID><![CDATA[1F79ED7DDB3246529C1DC8A9FCFA452B]]></AD_COLUMN_ID>
+<!--1F79ED7DDB3246529C1DC8A9FCFA452B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1F79ED7DDB3246529C1DC8A9FCFA452B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1F79ED7DDB3246529C1DC8A9FCFA452B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1F79ED7DDB3246529C1DC8A9FCFA452B-->  <NAME><![CDATA[Updated]]></NAME>
+<!--1F79ED7DDB3246529C1DC8A9FCFA452B-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
+<!--1F79ED7DDB3246529C1DC8A9FCFA452B-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
+<!--1F79ED7DDB3246529C1DC8A9FCFA452B-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
+<!--1F79ED7DDB3246529C1DC8A9FCFA452B-->  <AD_TABLE_ID><![CDATA[24733E0ACF73466898137EDD27BA464B]]></AD_TABLE_ID>
+<!--1F79ED7DDB3246529C1DC8A9FCFA452B-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
+<!--1F79ED7DDB3246529C1DC8A9FCFA452B-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--1F79ED7DDB3246529C1DC8A9FCFA452B-->  <DEFAULTVALUE><![CDATA[@#Date@]]></DEFAULTVALUE>
+<!--1F79ED7DDB3246529C1DC8A9FCFA452B-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--1F79ED7DDB3246529C1DC8A9FCFA452B-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--1F79ED7DDB3246529C1DC8A9FCFA452B-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--1F79ED7DDB3246529C1DC8A9FCFA452B-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--1F79ED7DDB3246529C1DC8A9FCFA452B-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--1F79ED7DDB3246529C1DC8A9FCFA452B-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--1F79ED7DDB3246529C1DC8A9FCFA452B-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--1F79ED7DDB3246529C1DC8A9FCFA452B-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--1F79ED7DDB3246529C1DC8A9FCFA452B-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--1F79ED7DDB3246529C1DC8A9FCFA452B-->  <AD_ELEMENT_ID><![CDATA[607]]></AD_ELEMENT_ID>
+<!--1F79ED7DDB3246529C1DC8A9FCFA452B-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--1F79ED7DDB3246529C1DC8A9FCFA452B-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--1F79ED7DDB3246529C1DC8A9FCFA452B-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--1F79ED7DDB3246529C1DC8A9FCFA452B-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--1F79ED7DDB3246529C1DC8A9FCFA452B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--1F79ED7DDB3246529C1DC8A9FCFA452B-->  <POSITION><![CDATA[7]]></POSITION>
+<!--1F79ED7DDB3246529C1DC8A9FCFA452B-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--1F79ED7DDB3246529C1DC8A9FCFA452B-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--1F79ED7DDB3246529C1DC8A9FCFA452B-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--1F79ED7DDB3246529C1DC8A9FCFA452B-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--1F79ED7DDB3246529C1DC8A9FCFA452B-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--1F79ED7DDB3246529C1DC8A9FCFA452B-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--1F79ED7DDB3246529C1DC8A9FCFA452B-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--1F79ED7DDB3246529C1DC8A9FCFA452B-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--1F79ED7DDB3246529C1DC8A9FCFA452B--></AD_COLUMN>
+
 <!--1F8F97956B7B490489D1AA41E5A674AE--><AD_COLUMN>
 <!--1F8F97956B7B490489D1AA41E5A674AE-->  <AD_COLUMN_ID><![CDATA[1F8F97956B7B490489D1AA41E5A674AE]]></AD_COLUMN_ID>
 <!--1F8F97956B7B490489D1AA41E5A674AE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -254635,6 +254870,45 @@
 <!--260EE985DD8947758FEDE7F00BEEC1B5-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--260EE985DD8947758FEDE7F00BEEC1B5--></AD_COLUMN>
 
+<!--2610EDD5683F436E9F9D947F064D32E5--><AD_COLUMN>
+<!--2610EDD5683F436E9F9D947F064D32E5-->  <AD_COLUMN_ID><![CDATA[2610EDD5683F436E9F9D947F064D32E5]]></AD_COLUMN_ID>
+<!--2610EDD5683F436E9F9D947F064D32E5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2610EDD5683F436E9F9D947F064D32E5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2610EDD5683F436E9F9D947F064D32E5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2610EDD5683F436E9F9D947F064D32E5-->  <NAME><![CDATA[Client]]></NAME>
+<!--2610EDD5683F436E9F9D947F064D32E5-->  <DESCRIPTION><![CDATA[Client for this installation.]]></DESCRIPTION>
+<!--2610EDD5683F436E9F9D947F064D32E5-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
+<!--2610EDD5683F436E9F9D947F064D32E5-->  <COLUMNNAME><![CDATA[AD_Client_ID]]></COLUMNNAME>
+<!--2610EDD5683F436E9F9D947F064D32E5-->  <AD_TABLE_ID><![CDATA[08B79658F8B745BD998E12DB1BCB0282]]></AD_TABLE_ID>
+<!--2610EDD5683F436E9F9D947F064D32E5-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--2610EDD5683F436E9F9D947F064D32E5-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--2610EDD5683F436E9F9D947F064D32E5-->  <DEFAULTVALUE><![CDATA[@AD_CLIENT_ID@]]></DEFAULTVALUE>
+<!--2610EDD5683F436E9F9D947F064D32E5-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--2610EDD5683F436E9F9D947F064D32E5-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--2610EDD5683F436E9F9D947F064D32E5-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--2610EDD5683F436E9F9D947F064D32E5-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--2610EDD5683F436E9F9D947F064D32E5-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--2610EDD5683F436E9F9D947F064D32E5-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--2610EDD5683F436E9F9D947F064D32E5-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--2610EDD5683F436E9F9D947F064D32E5-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--2610EDD5683F436E9F9D947F064D32E5-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--2610EDD5683F436E9F9D947F064D32E5-->  <AD_ELEMENT_ID><![CDATA[102]]></AD_ELEMENT_ID>
+<!--2610EDD5683F436E9F9D947F064D32E5-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--2610EDD5683F436E9F9D947F064D32E5-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--2610EDD5683F436E9F9D947F064D32E5-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--2610EDD5683F436E9F9D947F064D32E5-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--2610EDD5683F436E9F9D947F064D32E5-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--2610EDD5683F436E9F9D947F064D32E5-->  <POSITION><![CDATA[2]]></POSITION>
+<!--2610EDD5683F436E9F9D947F064D32E5-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--2610EDD5683F436E9F9D947F064D32E5-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--2610EDD5683F436E9F9D947F064D32E5-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--2610EDD5683F436E9F9D947F064D32E5-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--2610EDD5683F436E9F9D947F064D32E5-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--2610EDD5683F436E9F9D947F064D32E5-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--2610EDD5683F436E9F9D947F064D32E5-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--2610EDD5683F436E9F9D947F064D32E5-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--2610EDD5683F436E9F9D947F064D32E5--></AD_COLUMN>
+
 <!--261A54A9170242A6893802E26A5F34D2--><AD_COLUMN>
 <!--261A54A9170242A6893802E26A5F34D2-->  <AD_COLUMN_ID><![CDATA[261A54A9170242A6893802E26A5F34D2]]></AD_COLUMN_ID>
 <!--261A54A9170242A6893802E26A5F34D2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -255134,6 +255408,45 @@
 <!--2741577E82DD47CEBAE9C3FCBC9AC0A3-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--2741577E82DD47CEBAE9C3FCBC9AC0A3--></AD_COLUMN>
 
+<!--274382AA29DC4D499D9737821FA371FE--><AD_COLUMN>
+<!--274382AA29DC4D499D9737821FA371FE-->  <AD_COLUMN_ID><![CDATA[274382AA29DC4D499D9737821FA371FE]]></AD_COLUMN_ID>
+<!--274382AA29DC4D499D9737821FA371FE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--274382AA29DC4D499D9737821FA371FE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--274382AA29DC4D499D9737821FA371FE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--274382AA29DC4D499D9737821FA371FE-->  <NAME><![CDATA[Creation Date]]></NAME>
+<!--274382AA29DC4D499D9737821FA371FE-->  <DESCRIPTION><![CDATA[The date that this record is completed.]]></DESCRIPTION>
+<!--274382AA29DC4D499D9737821FA371FE-->  <HELP><![CDATA[The Created field indicates the date that this record was created.]]></HELP>
+<!--274382AA29DC4D499D9737821FA371FE-->  <COLUMNNAME><![CDATA[Created]]></COLUMNNAME>
+<!--274382AA29DC4D499D9737821FA371FE-->  <AD_TABLE_ID><![CDATA[25A3F31FD66945008C11C2C94272B20B]]></AD_TABLE_ID>
+<!--274382AA29DC4D499D9737821FA371FE-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
+<!--274382AA29DC4D499D9737821FA371FE-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--274382AA29DC4D499D9737821FA371FE-->  <DEFAULTVALUE><![CDATA[@#Date@]]></DEFAULTVALUE>
+<!--274382AA29DC4D499D9737821FA371FE-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--274382AA29DC4D499D9737821FA371FE-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--274382AA29DC4D499D9737821FA371FE-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--274382AA29DC4D499D9737821FA371FE-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--274382AA29DC4D499D9737821FA371FE-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--274382AA29DC4D499D9737821FA371FE-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--274382AA29DC4D499D9737821FA371FE-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--274382AA29DC4D499D9737821FA371FE-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--274382AA29DC4D499D9737821FA371FE-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--274382AA29DC4D499D9737821FA371FE-->  <AD_ELEMENT_ID><![CDATA[245]]></AD_ELEMENT_ID>
+<!--274382AA29DC4D499D9737821FA371FE-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--274382AA29DC4D499D9737821FA371FE-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--274382AA29DC4D499D9737821FA371FE-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--274382AA29DC4D499D9737821FA371FE-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--274382AA29DC4D499D9737821FA371FE-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--274382AA29DC4D499D9737821FA371FE-->  <POSITION><![CDATA[5]]></POSITION>
+<!--274382AA29DC4D499D9737821FA371FE-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--274382AA29DC4D499D9737821FA371FE-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--274382AA29DC4D499D9737821FA371FE-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--274382AA29DC4D499D9737821FA371FE-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--274382AA29DC4D499D9737821FA371FE-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--274382AA29DC4D499D9737821FA371FE-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--274382AA29DC4D499D9737821FA371FE-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--274382AA29DC4D499D9737821FA371FE-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--274382AA29DC4D499D9737821FA371FE--></AD_COLUMN>
+
 <!--2776DAF2F3EA4D3989DDEAAE2EEA6326--><AD_COLUMN>
 <!--2776DAF2F3EA4D3989DDEAAE2EEA6326-->  <AD_COLUMN_ID><![CDATA[2776DAF2F3EA4D3989DDEAAE2EEA6326]]></AD_COLUMN_ID>
 <!--2776DAF2F3EA4D3989DDEAAE2EEA6326-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -257414,6 +257727,46 @@
 <!--2E364C63F41C4E53B7856099CB9C2C4F-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--2E364C63F41C4E53B7856099CB9C2C4F--></AD_COLUMN>
 
+<!--2E6135EAC85F4663A1D2EAD7189DB32F--><AD_COLUMN>
+<!--2E6135EAC85F4663A1D2EAD7189DB32F-->  <AD_COLUMN_ID><![CDATA[2E6135EAC85F4663A1D2EAD7189DB32F]]></AD_COLUMN_ID>
+<!--2E6135EAC85F4663A1D2EAD7189DB32F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2E6135EAC85F4663A1D2EAD7189DB32F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2E6135EAC85F4663A1D2EAD7189DB32F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2E6135EAC85F4663A1D2EAD7189DB32F-->  <NAME><![CDATA[AD_Cluster_Service_ID]]></NAME>
+<!--2E6135EAC85F4663A1D2EAD7189DB32F-->  <DESCRIPTION><![CDATA[A table used to identify the cluster node responsible of handling a service in particular.]]></DESCRIPTION>
+<!--2E6135EAC85F4663A1D2EAD7189DB32F-->  <HELP><![CDATA[A table used to identify the cluster node responsible of handling a service in particular, i.e., it stores the leader of every cluster service. It also keeps the date of the last ping done by the leader of each service. This information is used:
+  - By the leader, to ensure that it is the one that executes the cluster service.
+  - By the rest of the nodes in the cluster in order to identify if the leader must be replaced (because they discover that it is no longer alive). ]]></HELP>
+<!--2E6135EAC85F4663A1D2EAD7189DB32F-->  <COLUMNNAME><![CDATA[AD_Cluster_Service_ID]]></COLUMNNAME>
+<!--2E6135EAC85F4663A1D2EAD7189DB32F-->  <AD_TABLE_ID><![CDATA[9F856359FD5E4CC4B4461EF897F8436F]]></AD_TABLE_ID>
+<!--2E6135EAC85F4663A1D2EAD7189DB32F-->  <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
+<!--2E6135EAC85F4663A1D2EAD7189DB32F-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--2E6135EAC85F4663A1D2EAD7189DB32F-->  <ISKEY><![CDATA[Y]]></ISKEY>
+<!--2E6135EAC85F4663A1D2EAD7189DB32F-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--2E6135EAC85F4663A1D2EAD7189DB32F-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--2E6135EAC85F4663A1D2EAD7189DB32F-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--2E6135EAC85F4663A1D2EAD7189DB32F-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--2E6135EAC85F4663A1D2EAD7189DB32F-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--2E6135EAC85F4663A1D2EAD7189DB32F-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--2E6135EAC85F4663A1D2EAD7189DB32F-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--2E6135EAC85F4663A1D2EAD7189DB32F-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--2E6135EAC85F4663A1D2EAD7189DB32F-->  <AD_ELEMENT_ID><![CDATA[EEDA722DA9E0425596F650043CA05D1B]]></AD_ELEMENT_ID>
+<!--2E6135EAC85F4663A1D2EAD7189DB32F-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--2E6135EAC85F4663A1D2EAD7189DB32F-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--2E6135EAC85F4663A1D2EAD7189DB32F-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--2E6135EAC85F4663A1D2EAD7189DB32F-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--2E6135EAC85F4663A1D2EAD7189DB32F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--2E6135EAC85F4663A1D2EAD7189DB32F-->  <POSITION><![CDATA[1]]></POSITION>
+<!--2E6135EAC85F4663A1D2EAD7189DB32F-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--2E6135EAC85F4663A1D2EAD7189DB32F-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--2E6135EAC85F4663A1D2EAD7189DB32F-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--2E6135EAC85F4663A1D2EAD7189DB32F-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--2E6135EAC85F4663A1D2EAD7189DB32F-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--2E6135EAC85F4663A1D2EAD7189DB32F-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--2E6135EAC85F4663A1D2EAD7189DB32F-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--2E6135EAC85F4663A1D2EAD7189DB32F-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--2E6135EAC85F4663A1D2EAD7189DB32F--></AD_COLUMN>
+
 <!--2EB409FE29174F31AD2C5AF5C3694DE5--><AD_COLUMN>
 <!--2EB409FE29174F31AD2C5AF5C3694DE5-->  <AD_COLUMN_ID><![CDATA[2EB409FE29174F31AD2C5AF5C3694DE5]]></AD_COLUMN_ID>
 <!--2EB409FE29174F31AD2C5AF5C3694DE5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -257530,6 +257883,44 @@
 <!--2F1DFDFD6D144F078FB37B5C881F0F87-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--2F1DFDFD6D144F078FB37B5C881F0F87--></AD_COLUMN>
 
+<!--2F54DD6589BA42BABF3BFE7858828DBB--><AD_COLUMN>
+<!--2F54DD6589BA42BABF3BFE7858828DBB-->  <AD_COLUMN_ID><![CDATA[2F54DD6589BA42BABF3BFE7858828DBB]]></AD_COLUMN_ID>
+<!--2F54DD6589BA42BABF3BFE7858828DBB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2F54DD6589BA42BABF3BFE7858828DBB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2F54DD6589BA42BABF3BFE7858828DBB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2F54DD6589BA42BABF3BFE7858828DBB-->  <NAME><![CDATA[Updated By]]></NAME>
+<!--2F54DD6589BA42BABF3BFE7858828DBB-->  <DESCRIPTION><![CDATA[User who updated this records]]></DESCRIPTION>
+<!--2F54DD6589BA42BABF3BFE7858828DBB-->  <HELP><![CDATA[The Updated By field indicates the user who updated this record.]]></HELP>
+<!--2F54DD6589BA42BABF3BFE7858828DBB-->  <COLUMNNAME><![CDATA[Updatedby]]></COLUMNNAME>
+<!--2F54DD6589BA42BABF3BFE7858828DBB-->  <AD_TABLE_ID><![CDATA[25A3F31FD66945008C11C2C94272B20B]]></AD_TABLE_ID>
+<!--2F54DD6589BA42BABF3BFE7858828DBB-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--2F54DD6589BA42BABF3BFE7858828DBB-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--2F54DD6589BA42BABF3BFE7858828DBB-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--2F54DD6589BA42BABF3BFE7858828DBB-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--2F54DD6589BA42BABF3BFE7858828DBB-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--2F54DD6589BA42BABF3BFE7858828DBB-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--2F54DD6589BA42BABF3BFE7858828DBB-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--2F54DD6589BA42BABF3BFE7858828DBB-->  <SEQNO><![CDATA[80]]></SEQNO>
+<!--2F54DD6589BA42BABF3BFE7858828DBB-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--2F54DD6589BA42BABF3BFE7858828DBB-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--2F54DD6589BA42BABF3BFE7858828DBB-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--2F54DD6589BA42BABF3BFE7858828DBB-->  <AD_ELEMENT_ID><![CDATA[608]]></AD_ELEMENT_ID>
+<!--2F54DD6589BA42BABF3BFE7858828DBB-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--2F54DD6589BA42BABF3BFE7858828DBB-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--2F54DD6589BA42BABF3BFE7858828DBB-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--2F54DD6589BA42BABF3BFE7858828DBB-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--2F54DD6589BA42BABF3BFE7858828DBB-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--2F54DD6589BA42BABF3BFE7858828DBB-->  <POSITION><![CDATA[8]]></POSITION>
+<!--2F54DD6589BA42BABF3BFE7858828DBB-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--2F54DD6589BA42BABF3BFE7858828DBB-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--2F54DD6589BA42BABF3BFE7858828DBB-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--2F54DD6589BA42BABF3BFE7858828DBB-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--2F54DD6589BA42BABF3BFE7858828DBB-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--2F54DD6589BA42BABF3BFE7858828DBB-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--2F54DD6589BA42BABF3BFE7858828DBB-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--2F54DD6589BA42BABF3BFE7858828DBB-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--2F54DD6589BA42BABF3BFE7858828DBB--></AD_COLUMN>
+
 <!--2F682DC6DBA541CB8DDDEA54D4FC9A11--><AD_COLUMN>
 <!--2F682DC6DBA541CB8DDDEA54D4FC9A11-->  <AD_COLUMN_ID><![CDATA[2F682DC6DBA541CB8DDDEA54D4FC9A11]]></AD_COLUMN_ID>
 <!--2F682DC6DBA541CB8DDDEA54D4FC9A11-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -258575,6 +258966,45 @@
 <!--330A666232BE4F35B365929633437498-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--330A666232BE4F35B365929633437498--></AD_COLUMN>
 
+<!--3326C418F0954C2BBE556327C397F832--><AD_COLUMN>
+<!--3326C418F0954C2BBE556327C397F832-->  <AD_COLUMN_ID><![CDATA[3326C418F0954C2BBE556327C397F832]]></AD_COLUMN_ID>
+<!--3326C418F0954C2BBE556327C397F832-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3326C418F0954C2BBE556327C397F832-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3326C418F0954C2BBE556327C397F832-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3326C418F0954C2BBE556327C397F832-->  <NAME><![CDATA[Creation Date]]></NAME>
+<!--3326C418F0954C2BBE556327C397F832-->  <DESCRIPTION><![CDATA[The date that this record is completed.]]></DESCRIPTION>
+<!--3326C418F0954C2BBE556327C397F832-->  <HELP><![CDATA[The Created field indicates the date that this record was created.]]></HELP>
+<!--3326C418F0954C2BBE556327C397F832-->  <COLUMNNAME><![CDATA[Created]]></COLUMNNAME>
+<!--3326C418F0954C2BBE556327C397F832-->  <AD_TABLE_ID><![CDATA[24733E0ACF73466898137EDD27BA464B]]></AD_TABLE_ID>
+<!--3326C418F0954C2BBE556327C397F832-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
+<!--3326C418F0954C2BBE556327C397F832-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--3326C418F0954C2BBE556327C397F832-->  <DEFAULTVALUE><![CDATA[@#Date@]]></DEFAULTVALUE>
+<!--3326C418F0954C2BBE556327C397F832-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--3326C418F0954C2BBE556327C397F832-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--3326C418F0954C2BBE556327C397F832-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--3326C418F0954C2BBE556327C397F832-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--3326C418F0954C2BBE556327C397F832-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--3326C418F0954C2BBE556327C397F832-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--3326C418F0954C2BBE556327C397F832-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--3326C418F0954C2BBE556327C397F832-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--3326C418F0954C2BBE556327C397F832-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--3326C418F0954C2BBE556327C397F832-->  <AD_ELEMENT_ID><![CDATA[245]]></AD_ELEMENT_ID>
+<!--3326C418F0954C2BBE556327C397F832-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--3326C418F0954C2BBE556327C397F832-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--3326C418F0954C2BBE556327C397F832-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--3326C418F0954C2BBE556327C397F832-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--3326C418F0954C2BBE556327C397F832-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--3326C418F0954C2BBE556327C397F832-->  <POSITION><![CDATA[5]]></POSITION>
+<!--3326C418F0954C2BBE556327C397F832-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--3326C418F0954C2BBE556327C397F832-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--3326C418F0954C2BBE556327C397F832-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--3326C418F0954C2BBE556327C397F832-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--3326C418F0954C2BBE556327C397F832-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--3326C418F0954C2BBE556327C397F832-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--3326C418F0954C2BBE556327C397F832-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--3326C418F0954C2BBE556327C397F832-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--3326C418F0954C2BBE556327C397F832--></AD_COLUMN>
+
 <!--33313B1A70F246599068F2E08BF30CAB--><AD_COLUMN>
 <!--33313B1A70F246599068F2E08BF30CAB-->  <AD_COLUMN_ID><![CDATA[33313B1A70F246599068F2E08BF30CAB]]></AD_COLUMN_ID>
 <!--33313B1A70F246599068F2E08BF30CAB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -259724,6 +260154,45 @@
 <!--36EFD16DCDE148C5AE42895FD64F58FD-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--36EFD16DCDE148C5AE42895FD64F58FD--></AD_COLUMN>
 
+<!--36FDBAE3A1CF445DBA4B2C6633FA130B--><AD_COLUMN>
+<!--36FDBAE3A1CF445DBA4B2C6633FA130B-->  <AD_COLUMN_ID><![CDATA[36FDBAE3A1CF445DBA4B2C6633FA130B]]></AD_COLUMN_ID>
+<!--36FDBAE3A1CF445DBA4B2C6633FA130B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--36FDBAE3A1CF445DBA4B2C6633FA130B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--36FDBAE3A1CF445DBA4B2C6633FA130B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--36FDBAE3A1CF445DBA4B2C6633FA130B-->  <NAME><![CDATA[Updated]]></NAME>
+<!--36FDBAE3A1CF445DBA4B2C6633FA130B-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
+<!--36FDBAE3A1CF445DBA4B2C6633FA130B-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
+<!--36FDBAE3A1CF445DBA4B2C6633FA130B-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
+<!--36FDBAE3A1CF445DBA4B2C6633FA130B-->  <AD_TABLE_ID><![CDATA[9F856359FD5E4CC4B4461EF897F8436F]]></AD_TABLE_ID>
+<!--36FDBAE3A1CF445DBA4B2C6633FA130B-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
+<!--36FDBAE3A1CF445DBA4B2C6633FA130B-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--36FDBAE3A1CF445DBA4B2C6633FA130B-->  <DEFAULTVALUE><![CDATA[@#Date@]]></DEFAULTVALUE>
+<!--36FDBAE3A1CF445DBA4B2C6633FA130B-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--36FDBAE3A1CF445DBA4B2C6633FA130B-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--36FDBAE3A1CF445DBA4B2C6633FA130B-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--36FDBAE3A1CF445DBA4B2C6633FA130B-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--36FDBAE3A1CF445DBA4B2C6633FA130B-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--36FDBAE3A1CF445DBA4B2C6633FA130B-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--36FDBAE3A1CF445DBA4B2C6633FA130B-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--36FDBAE3A1CF445DBA4B2C6633FA130B-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--36FDBAE3A1CF445DBA4B2C6633FA130B-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--36FDBAE3A1CF445DBA4B2C6633FA130B-->  <AD_ELEMENT_ID><![CDATA[607]]></AD_ELEMENT_ID>
+<!--36FDBAE3A1CF445DBA4B2C6633FA130B-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--36FDBAE3A1CF445DBA4B2C6633FA130B-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--36FDBAE3A1CF445DBA4B2C6633FA130B-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--36FDBAE3A1CF445DBA4B2C6633FA130B-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--36FDBAE3A1CF445DBA4B2C6633FA130B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--36FDBAE3A1CF445DBA4B2C6633FA130B-->  <POSITION><![CDATA[7]]></POSITION>
+<!--36FDBAE3A1CF445DBA4B2C6633FA130B-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--36FDBAE3A1CF445DBA4B2C6633FA130B-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--36FDBAE3A1CF445DBA4B2C6633FA130B-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--36FDBAE3A1CF445DBA4B2C6633FA130B-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--36FDBAE3A1CF445DBA4B2C6633FA130B-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--36FDBAE3A1CF445DBA4B2C6633FA130B-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--36FDBAE3A1CF445DBA4B2C6633FA130B-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--36FDBAE3A1CF445DBA4B2C6633FA130B-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--36FDBAE3A1CF445DBA4B2C6633FA130B--></AD_COLUMN>
+
 <!--3751D2030B554E19B2D10ADB4A0CB4E3--><AD_COLUMN>
 <!--3751D2030B554E19B2D10ADB4A0CB4E3-->  <AD_COLUMN_ID><![CDATA[3751D2030B554E19B2D10ADB4A0CB4E3]]></AD_COLUMN_ID>
 <!--3751D2030B554E19B2D10ADB4A0CB4E3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -261179,6 +261648,45 @@
 <!--3B1EBA6AF78F4455A317020150D8AD08-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--3B1EBA6AF78F4455A317020150D8AD08--></AD_COLUMN>
 
+<!--3B60B750D5F54B5A8B04AAE7207681D9--><AD_COLUMN>
+<!--3B60B750D5F54B5A8B04AAE7207681D9-->  <AD_COLUMN_ID><![CDATA[3B60B750D5F54B5A8B04AAE7207681D9]]></AD_COLUMN_ID>
+<!--3B60B750D5F54B5A8B04AAE7207681D9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3B60B750D5F54B5A8B04AAE7207681D9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3B60B750D5F54B5A8B04AAE7207681D9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3B60B750D5F54B5A8B04AAE7207681D9-->  <NAME><![CDATA[Organization]]></NAME>
+<!--3B60B750D5F54B5A8B04AAE7207681D9-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
+<!--3B60B750D5F54B5A8B04AAE7207681D9-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
+<!--3B60B750D5F54B5A8B04AAE7207681D9-->  <COLUMNNAME><![CDATA[AD_Org_ID]]></COLUMNNAME>
+<!--3B60B750D5F54B5A8B04AAE7207681D9-->  <AD_TABLE_ID><![CDATA[9F856359FD5E4CC4B4461EF897F8436F]]></AD_TABLE_ID>
+<!--3B60B750D5F54B5A8B04AAE7207681D9-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--3B60B750D5F54B5A8B04AAE7207681D9-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--3B60B750D5F54B5A8B04AAE7207681D9-->  <DEFAULTVALUE><![CDATA[@AD_ORG_ID@]]></DEFAULTVALUE>
+<!--3B60B750D5F54B5A8B04AAE7207681D9-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--3B60B750D5F54B5A8B04AAE7207681D9-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--3B60B750D5F54B5A8B04AAE7207681D9-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--3B60B750D5F54B5A8B04AAE7207681D9-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--3B60B750D5F54B5A8B04AAE7207681D9-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--3B60B750D5F54B5A8B04AAE7207681D9-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--3B60B750D5F54B5A8B04AAE7207681D9-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--3B60B750D5F54B5A8B04AAE7207681D9-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--3B60B750D5F54B5A8B04AAE7207681D9-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--3B60B750D5F54B5A8B04AAE7207681D9-->  <AD_ELEMENT_ID><![CDATA[113]]></AD_ELEMENT_ID>
+<!--3B60B750D5F54B5A8B04AAE7207681D9-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--3B60B750D5F54B5A8B04AAE7207681D9-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--3B60B750D5F54B5A8B04AAE7207681D9-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--3B60B750D5F54B5A8B04AAE7207681D9-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--3B60B750D5F54B5A8B04AAE7207681D9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--3B60B750D5F54B5A8B04AAE7207681D9-->  <POSITION><![CDATA[3]]></POSITION>
+<!--3B60B750D5F54B5A8B04AAE7207681D9-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--3B60B750D5F54B5A8B04AAE7207681D9-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--3B60B750D5F54B5A8B04AAE7207681D9-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--3B60B750D5F54B5A8B04AAE7207681D9-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--3B60B750D5F54B5A8B04AAE7207681D9-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--3B60B750D5F54B5A8B04AAE7207681D9-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--3B60B750D5F54B5A8B04AAE7207681D9-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--3B60B750D5F54B5A8B04AAE7207681D9-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--3B60B750D5F54B5A8B04AAE7207681D9--></AD_COLUMN>
+
 <!--3B6E268A64E443388C239520EC3F953C--><AD_COLUMN>
 <!--3B6E268A64E443388C239520EC3F953C-->  <AD_COLUMN_ID><![CDATA[3B6E268A64E443388C239520EC3F953C]]></AD_COLUMN_ID>
 <!--3B6E268A64E443388C239520EC3F953C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -263640,6 +264148,44 @@
 <!--44FEB17954664DC7B481BC04BEE13E29-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--44FEB17954664DC7B481BC04BEE13E29--></AD_COLUMN>
 
+<!--4509937BC4E14DAB92243642948EFC23--><AD_COLUMN>
+<!--4509937BC4E14DAB92243642948EFC23-->  <AD_COLUMN_ID><![CDATA[4509937BC4E14DAB92243642948EFC23]]></AD_COLUMN_ID>
+<!--4509937BC4E14DAB92243642948EFC23-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4509937BC4E14DAB92243642948EFC23-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4509937BC4E14DAB92243642948EFC23-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4509937BC4E14DAB92243642948EFC23-->  <NAME><![CDATA[M_AttributeSetInstanceTo_ID]]></NAME>
+<!--4509937BC4E14DAB92243642948EFC23-->  <DESCRIPTION><![CDATA[The attribute set instance that will be associated to the storage detail when the transaction is processed]]></DESCRIPTION>
+<!--4509937BC4E14DAB92243642948EFC23-->  <HELP><![CDATA[The attribute set instance that will be associated to the storage detail when the transaction is processed]]></HELP>
+<!--4509937BC4E14DAB92243642948EFC23-->  <COLUMNNAME><![CDATA[M_AttributeSetInstanceTo_ID]]></COLUMNNAME>
+<!--4509937BC4E14DAB92243642948EFC23-->  <AD_TABLE_ID><![CDATA[324]]></AD_TABLE_ID>
+<!--4509937BC4E14DAB92243642948EFC23-->  <AD_REFERENCE_ID><![CDATA[35]]></AD_REFERENCE_ID>
+<!--4509937BC4E14DAB92243642948EFC23-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--4509937BC4E14DAB92243642948EFC23-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--4509937BC4E14DAB92243642948EFC23-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--4509937BC4E14DAB92243642948EFC23-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--4509937BC4E14DAB92243642948EFC23-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--4509937BC4E14DAB92243642948EFC23-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--4509937BC4E14DAB92243642948EFC23-->  <SEQNO><![CDATA[63]]></SEQNO>
+<!--4509937BC4E14DAB92243642948EFC23-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--4509937BC4E14DAB92243642948EFC23-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--4509937BC4E14DAB92243642948EFC23-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--4509937BC4E14DAB92243642948EFC23-->  <AD_ELEMENT_ID><![CDATA[93984567DE494419ABCA0E9768D6E0B2]]></AD_ELEMENT_ID>
+<!--4509937BC4E14DAB92243642948EFC23-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--4509937BC4E14DAB92243642948EFC23-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--4509937BC4E14DAB92243642948EFC23-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--4509937BC4E14DAB92243642948EFC23-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--4509937BC4E14DAB92243642948EFC23-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--4509937BC4E14DAB92243642948EFC23-->  <POSITION><![CDATA[23]]></POSITION>
+<!--4509937BC4E14DAB92243642948EFC23-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--4509937BC4E14DAB92243642948EFC23-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--4509937BC4E14DAB92243642948EFC23-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--4509937BC4E14DAB92243642948EFC23-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--4509937BC4E14DAB92243642948EFC23-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--4509937BC4E14DAB92243642948EFC23-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--4509937BC4E14DAB92243642948EFC23-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--4509937BC4E14DAB92243642948EFC23-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--4509937BC4E14DAB92243642948EFC23--></AD_COLUMN>
+
 <!--4550A3041DE842B7848EACD684AA5E7A--><AD_COLUMN>
 <!--4550A3041DE842B7848EACD684AA5E7A-->  <AD_COLUMN_ID><![CDATA[4550A3041DE842B7848EACD684AA5E7A]]></AD_COLUMN_ID>
 <!--4550A3041DE842B7848EACD684AA5E7A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -264409,6 +264955,45 @@
 <!--46DAE178799A4016AC3871EB67A60AD8-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--46DAE178799A4016AC3871EB67A60AD8--></AD_COLUMN>
 
+<!--46F57A406BA4498F8B0DF3550F4F98FF--><AD_COLUMN>
+<!--46F57A406BA4498F8B0DF3550F4F98FF-->  <AD_COLUMN_ID><![CDATA[46F57A406BA4498F8B0DF3550F4F98FF]]></AD_COLUMN_ID>
+<!--46F57A406BA4498F8B0DF3550F4F98FF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--46F57A406BA4498F8B0DF3550F4F98FF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--46F57A406BA4498F8B0DF3550F4F98FF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--46F57A406BA4498F8B0DF3550F4F98FF-->  <NAME><![CDATA[Completely Invoiced]]></NAME>
+<!--46F57A406BA4498F8B0DF3550F4F98FF-->  <DESCRIPTION><![CDATA[The IsCompletelyInvoiced checkbox indicates if this document is completely invoiced or not. This flag is used only in sales flow and shown in the Goods Shipment Header.]]></DESCRIPTION>
+<!--46F57A406BA4498F8B0DF3550F4F98FF-->  <HELP><![CDATA[The IsCompletelyInvoiced checkbox indicates if this document is completely invoiced or not. This flag is used only in sales flow and shown in the Goods Shipment Header.]]></HELP>
+<!--46F57A406BA4498F8B0DF3550F4F98FF-->  <COLUMNNAME><![CDATA[Iscompletelyinvoiced]]></COLUMNNAME>
+<!--46F57A406BA4498F8B0DF3550F4F98FF-->  <AD_TABLE_ID><![CDATA[319]]></AD_TABLE_ID>
+<!--46F57A406BA4498F8B0DF3550F4F98FF-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--46F57A406BA4498F8B0DF3550F4F98FF-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--46F57A406BA4498F8B0DF3550F4F98FF-->  <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE>
+<!--46F57A406BA4498F8B0DF3550F4F98FF-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--46F57A406BA4498F8B0DF3550F4F98FF-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--46F57A406BA4498F8B0DF3550F4F98FF-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--46F57A406BA4498F8B0DF3550F4F98FF-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--46F57A406BA4498F8B0DF3550F4F98FF-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--46F57A406BA4498F8B0DF3550F4F98FF-->  <SEQNO><![CDATA[490]]></SEQNO>
+<!--46F57A406BA4498F8B0DF3550F4F98FF-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--46F57A406BA4498F8B0DF3550F4F98FF-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--46F57A406BA4498F8B0DF3550F4F98FF-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--46F57A406BA4498F8B0DF3550F4F98FF-->  <AD_ELEMENT_ID><![CDATA[0C8A533A80214372BA5C7D7295F59D92]]></AD_ELEMENT_ID>
+<!--46F57A406BA4498F8B0DF3550F4F98FF-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--46F57A406BA4498F8B0DF3550F4F98FF-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--46F57A406BA4498F8B0DF3550F4F98FF-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--46F57A406BA4498F8B0DF3550F4F98FF-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--46F57A406BA4498F8B0DF3550F4F98FF-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--46F57A406BA4498F8B0DF3550F4F98FF-->  <POSITION><![CDATA[66]]></POSITION>
+<!--46F57A406BA4498F8B0DF3550F4F98FF-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--46F57A406BA4498F8B0DF3550F4F98FF-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--46F57A406BA4498F8B0DF3550F4F98FF-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--46F57A406BA4498F8B0DF3550F4F98FF-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--46F57A406BA4498F8B0DF3550F4F98FF-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--46F57A406BA4498F8B0DF3550F4F98FF-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--46F57A406BA4498F8B0DF3550F4F98FF-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--46F57A406BA4498F8B0DF3550F4F98FF-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--46F57A406BA4498F8B0DF3550F4F98FF--></AD_COLUMN>
+
 <!--47254BD6EF8D4F4D97DE902FDEC55DAC--><AD_COLUMN>
 <!--47254BD6EF8D4F4D97DE902FDEC55DAC-->  <AD_COLUMN_ID><![CDATA[47254BD6EF8D4F4D97DE902FDEC55DAC]]></AD_COLUMN_ID>
 <!--47254BD6EF8D4F4D97DE902FDEC55DAC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -265142,6 +265727,44 @@
 <!--4953249092574A05A0DA5DB1484887B9-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--4953249092574A05A0DA5DB1484887B9--></AD_COLUMN>
 
+<!--49648AB62D0E4F7BBA79F8A951125A38--><AD_COLUMN>
+<!--49648AB62D0E4F7BBA79F8A951125A38-->  <AD_COLUMN_ID><![CDATA[49648AB62D0E4F7BBA79F8A951125A38]]></AD_COLUMN_ID>
+<!--49648AB62D0E4F7BBA79F8A951125A38-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--49648AB62D0E4F7BBA79F8A951125A38-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--49648AB62D0E4F7BBA79F8A951125A38-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--49648AB62D0E4F7BBA79F8A951125A38-->  <NAME><![CDATA[Updated By]]></NAME>
+<!--49648AB62D0E4F7BBA79F8A951125A38-->  <DESCRIPTION><![CDATA[User who updated this records]]></DESCRIPTION>
+<!--49648AB62D0E4F7BBA79F8A951125A38-->  <HELP><![CDATA[The Updated By field indicates the user who updated this record.]]></HELP>
+<!--49648AB62D0E4F7BBA79F8A951125A38-->  <COLUMNNAME><![CDATA[Updatedby]]></COLUMNNAME>
+<!--49648AB62D0E4F7BBA79F8A951125A38-->  <AD_TABLE_ID><![CDATA[08B79658F8B745BD998E12DB1BCB0282]]></AD_TABLE_ID>
+<!--49648AB62D0E4F7BBA79F8A951125A38-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--49648AB62D0E4F7BBA79F8A951125A38-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--49648AB62D0E4F7BBA79F8A951125A38-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--49648AB62D0E4F7BBA79F8A951125A38-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--49648AB62D0E4F7BBA79F8A951125A38-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--49648AB62D0E4F7BBA79F8A951125A38-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--49648AB62D0E4F7BBA79F8A951125A38-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--49648AB62D0E4F7BBA79F8A951125A38-->  <SEQNO><![CDATA[80]]></SEQNO>
+<!--49648AB62D0E4F7BBA79F8A951125A38-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--49648AB62D0E4F7BBA79F8A951125A38-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--49648AB62D0E4F7BBA79F8A951125A38-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--49648AB62D0E4F7BBA79F8A951125A38-->  <AD_ELEMENT_ID><![CDATA[608]]></AD_ELEMENT_ID>
+<!--49648AB62D0E4F7BBA79F8A951125A38-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--49648AB62D0E4F7BBA79F8A951125A38-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--49648AB62D0E4F7BBA79F8A951125A38-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--49648AB62D0E4F7BBA79F8A951125A38-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--49648AB62D0E4F7BBA79F8A951125A38-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--49648AB62D0E4F7BBA79F8A951125A38-->  <POSITION><![CDATA[8]]></POSITION>
+<!--49648AB62D0E4F7BBA79F8A951125A38-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--49648AB62D0E4F7BBA79F8A951125A38-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--49648AB62D0E4F7BBA79F8A951125A38-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--49648AB62D0E4F7BBA79F8A951125A38-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--49648AB62D0E4F7BBA79F8A951125A38-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--49648AB62D0E4F7BBA79F8A951125A38-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--49648AB62D0E4F7BBA79F8A951125A38-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--49648AB62D0E4F7BBA79F8A951125A38-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--49648AB62D0E4F7BBA79F8A951125A38--></AD_COLUMN>
+
 <!--4984138305874F4AB969D223D121827E--><AD_COLUMN>
 <!--4984138305874F4AB969D223D121827E-->  <AD_COLUMN_ID><![CDATA[4984138305874F4AB969D223D121827E]]></AD_COLUMN_ID>
 <!--4984138305874F4AB969D223D121827E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -265533,6 +266156,45 @@
 <!--4B14565F516A4C8CB62009B79DAA8C88-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--4B14565F516A4C8CB62009B79DAA8C88--></AD_COLUMN>
 
+<!--4B5B84E2AF274D239F2C3FA4A148AB66--><AD_COLUMN>
+<!--4B5B84E2AF274D239F2C3FA4A148AB66-->  <AD_COLUMN_ID><![CDATA[4B5B84E2AF274D239F2C3FA4A148AB66]]></AD_COLUMN_ID>
+<!--4B5B84E2AF274D239F2C3FA4A148AB66-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4B5B84E2AF274D239F2C3FA4A148AB66-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4B5B84E2AF274D239F2C3FA4A148AB66-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4B5B84E2AF274D239F2C3FA4A148AB66-->  <NAME><![CDATA[Service]]></NAME>
+<!--4B5B84E2AF274D239F2C3FA4A148AB66-->  <DESCRIPTION><![CDATA[A service that is able to work in a clustered environment]]></DESCRIPTION>
+<!--4B5B84E2AF274D239F2C3FA4A148AB66-->  <HELP><![CDATA[A service that supports working in a clustered environment.]]></HELP>
+<!--4B5B84E2AF274D239F2C3FA4A148AB66-->  <COLUMNNAME><![CDATA[Service]]></COLUMNNAME>
+<!--4B5B84E2AF274D239F2C3FA4A148AB66-->  <AD_TABLE_ID><![CDATA[08B79658F8B745BD998E12DB1BCB0282]]></AD_TABLE_ID>
+<!--4B5B84E2AF274D239F2C3FA4A148AB66-->  <AD_REFERENCE_ID><![CDATA[17]]></AD_REFERENCE_ID>
+<!--4B5B84E2AF274D239F2C3FA4A148AB66-->  <AD_REFERENCE_VALUE_ID><![CDATA[895ED0FCCA6145AE8657E4C3EB31BF4A]]></AD_REFERENCE_VALUE_ID>
+<!--4B5B84E2AF274D239F2C3FA4A148AB66-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--4B5B84E2AF274D239F2C3FA4A148AB66-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--4B5B84E2AF274D239F2C3FA4A148AB66-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--4B5B84E2AF274D239F2C3FA4A148AB66-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--4B5B84E2AF274D239F2C3FA4A148AB66-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--4B5B84E2AF274D239F2C3FA4A148AB66-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
+<!--4B5B84E2AF274D239F2C3FA4A148AB66-->  <SEQNO><![CDATA[90]]></SEQNO>
+<!--4B5B84E2AF274D239F2C3FA4A148AB66-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--4B5B84E2AF274D239F2C3FA4A148AB66-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--4B5B84E2AF274D239F2C3FA4A148AB66-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--4B5B84E2AF274D239F2C3FA4A148AB66-->  <AD_ELEMENT_ID><![CDATA[CCD8CCC00C1B4FE2A14B0EB1775A2966]]></AD_ELEMENT_ID>
+<!--4B5B84E2AF274D239F2C3FA4A148AB66-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--4B5B84E2AF274D239F2C3FA4A148AB66-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--4B5B84E2AF274D239F2C3FA4A148AB66-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--4B5B84E2AF274D239F2C3FA4A148AB66-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--4B5B84E2AF274D239F2C3FA4A148AB66-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--4B5B84E2AF274D239F2C3FA4A148AB66-->  <POSITION><![CDATA[9]]></POSITION>
+<!--4B5B84E2AF274D239F2C3FA4A148AB66-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--4B5B84E2AF274D239F2C3FA4A148AB66-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--4B5B84E2AF274D239F2C3FA4A148AB66-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--4B5B84E2AF274D239F2C3FA4A148AB66-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--4B5B84E2AF274D239F2C3FA4A148AB66-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--4B5B84E2AF274D239F2C3FA4A148AB66-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--4B5B84E2AF274D239F2C3FA4A148AB66-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--4B5B84E2AF274D239F2C3FA4A148AB66-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--4B5B84E2AF274D239F2C3FA4A148AB66--></AD_COLUMN>
+
 <!--4B5F942C49634A9B8507A6DD4F66750B--><AD_COLUMN>
 <!--4B5F942C49634A9B8507A6DD4F66750B-->  <AD_COLUMN_ID><![CDATA[4B5F942C49634A9B8507A6DD4F66750B]]></AD_COLUMN_ID>
 <!--4B5F942C49634A9B8507A6DD4F66750B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -266106,6 +266768,47 @@
 <!--4D413EE93F2F43B6BCF5B9B8AD95025D-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--4D413EE93F2F43B6BCF5B9B8AD95025D--></AD_COLUMN>
 
+<!--4D70F19769BF49C280421E5D2465CC3B--><AD_COLUMN>
+<!--4D70F19769BF49C280421E5D2465CC3B-->  <AD_COLUMN_ID><![CDATA[4D70F19769BF49C280421E5D2465CC3B]]></AD_COLUMN_ID>
+<!--4D70F19769BF49C280421E5D2465CC3B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4D70F19769BF49C280421E5D2465CC3B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4D70F19769BF49C280421E5D2465CC3B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4D70F19769BF49C280421E5D2465CC3B-->  <NAME><![CDATA[Active]]></NAME>
+<!--4D70F19769BF49C280421E5D2465CC3B-->  <DESCRIPTION><![CDATA[A flag indicating whether this record is available for use or de-activated.]]></DESCRIPTION>
+<!--4D70F19769BF49C280421E5D2465CC3B-->  <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>
+<!--4D70F19769BF49C280421E5D2465CC3B-->  <COLUMNNAME><![CDATA[Isactive]]></COLUMNNAME>
+<!--4D70F19769BF49C280421E5D2465CC3B-->  <AD_TABLE_ID><![CDATA[24733E0ACF73466898137EDD27BA464B]]></AD_TABLE_ID>
+<!--4D70F19769BF49C280421E5D2465CC3B-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--4D70F19769BF49C280421E5D2465CC3B-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--4D70F19769BF49C280421E5D2465CC3B-->  <DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE>
+<!--4D70F19769BF49C280421E5D2465CC3B-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--4D70F19769BF49C280421E5D2465CC3B-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--4D70F19769BF49C280421E5D2465CC3B-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--4D70F19769BF49C280421E5D2465CC3B-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--4D70F19769BF49C280421E5D2465CC3B-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--4D70F19769BF49C280421E5D2465CC3B-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--4D70F19769BF49C280421E5D2465CC3B-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--4D70F19769BF49C280421E5D2465CC3B-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--4D70F19769BF49C280421E5D2465CC3B-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--4D70F19769BF49C280421E5D2465CC3B-->  <AD_ELEMENT_ID><![CDATA[348]]></AD_ELEMENT_ID>
+<!--4D70F19769BF49C280421E5D2465CC3B-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--4D70F19769BF49C280421E5D2465CC3B-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--4D70F19769BF49C280421E5D2465CC3B-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--4D70F19769BF49C280421E5D2465CC3B-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--4D70F19769BF49C280421E5D2465CC3B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--4D70F19769BF49C280421E5D2465CC3B-->  <POSITION><![CDATA[4]]></POSITION>
+<!--4D70F19769BF49C280421E5D2465CC3B-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--4D70F19769BF49C280421E5D2465CC3B-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--4D70F19769BF49C280421E5D2465CC3B-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--4D70F19769BF49C280421E5D2465CC3B-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--4D70F19769BF49C280421E5D2465CC3B-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--4D70F19769BF49C280421E5D2465CC3B-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--4D70F19769BF49C280421E5D2465CC3B-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--4D70F19769BF49C280421E5D2465CC3B-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--4D70F19769BF49C280421E5D2465CC3B--></AD_COLUMN>
+
 <!--4DC486F035E44F98B3BC21904E46834B--><AD_COLUMN>
 <!--4DC486F035E44F98B3BC21904E46834B-->  <AD_COLUMN_ID><![CDATA[4DC486F035E44F98B3BC21904E46834B]]></AD_COLUMN_ID>
 <!--4DC486F035E44F98B3BC21904E46834B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -267263,6 +267966,44 @@
 <!--5198CDCA0D104187AC593A5E1968B66B-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--5198CDCA0D104187AC593A5E1968B66B--></AD_COLUMN>
 
+<!--51B817CD68EA4FB6A845532CC33431FE--><AD_COLUMN>
+<!--51B817CD68EA4FB6A845532CC33431FE-->  <AD_COLUMN_ID><![CDATA[51B817CD68EA4FB6A845532CC33431FE]]></AD_COLUMN_ID>
+<!--51B817CD68EA4FB6A845532CC33431FE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--51B817CD68EA4FB6A845532CC33431FE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--51B817CD68EA4FB6A845532CC33431FE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--51B817CD68EA4FB6A845532CC33431FE-->  <NAME><![CDATA[Created By]]></NAME>
+<!--51B817CD68EA4FB6A845532CC33431FE-->  <DESCRIPTION><![CDATA[User who created this records]]></DESCRIPTION>
+<!--51B817CD68EA4FB6A845532CC33431FE-->  <HELP><![CDATA[The Created By field indicates the user who created this record.]]></HELP>
+<!--51B817CD68EA4FB6A845532CC33431FE-->  <COLUMNNAME><![CDATA[Createdby]]></COLUMNNAME>
+<!--51B817CD68EA4FB6A845532CC33431FE-->  <AD_TABLE_ID><![CDATA[08B79658F8B745BD998E12DB1BCB0282]]></AD_TABLE_ID>
+<!--51B817CD68EA4FB6A845532CC33431FE-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--51B817CD68EA4FB6A845532CC33431FE-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--51B817CD68EA4FB6A845532CC33431FE-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--51B817CD68EA4FB6A845532CC33431FE-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--51B817CD68EA4FB6A845532CC33431FE-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--51B817CD68EA4FB6A845532CC33431FE-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--51B817CD68EA4FB6A845532CC33431FE-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--51B817CD68EA4FB6A845532CC33431FE-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--51B817CD68EA4FB6A845532CC33431FE-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--51B817CD68EA4FB6A845532CC33431FE-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--51B817CD68EA4FB6A845532CC33431FE-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--51B817CD68EA4FB6A845532CC33431FE-->  <AD_ELEMENT_ID><![CDATA[246]]></AD_ELEMENT_ID>
+<!--51B817CD68EA4FB6A845532CC33431FE-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--51B817CD68EA4FB6A845532CC33431FE-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--51B817CD68EA4FB6A845532CC33431FE-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--51B817CD68EA4FB6A845532CC33431FE-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--51B817CD68EA4FB6A845532CC33431FE-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--51B817CD68EA4FB6A845532CC33431FE-->  <POSITION><![CDATA[6]]></POSITION>
+<!--51B817CD68EA4FB6A845532CC33431FE-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--51B817CD68EA4FB6A845532CC33431FE-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--51B817CD68EA4FB6A845532CC33431FE-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--51B817CD68EA4FB6A845532CC33431FE-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--51B817CD68EA4FB6A845532CC33431FE-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--51B817CD68EA4FB6A845532CC33431FE-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--51B817CD68EA4FB6A845532CC33431FE-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--51B817CD68EA4FB6A845532CC33431FE-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--51B817CD68EA4FB6A845532CC33431FE--></AD_COLUMN>
+
 <!--51C9656E43E6464FB6AA62A1E40B0411--><AD_COLUMN>
 <!--51C9656E43E6464FB6AA62A1E40B0411-->  <AD_COLUMN_ID><![CDATA[51C9656E43E6464FB6AA62A1E40B0411]]></AD_COLUMN_ID>
 <!--51C9656E43E6464FB6AA62A1E40B0411-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -267339,6 +268080,44 @@
 <!--51E299D6B5824EC480B524E1ED726985-->  <EM_OBUIAPP_PROCESS_ID><![CDATA[0C2AFAEFB67B4CB8A1429195EB119A49]]></EM_OBUIAPP_PROCESS_ID>
 <!--51E299D6B5824EC480B524E1ED726985--></AD_COLUMN>
 
+<!--52194FD582BB4AD49386738BE9C5B113--><AD_COLUMN>
+<!--52194FD582BB4AD49386738BE9C5B113-->  <AD_COLUMN_ID><![CDATA[52194FD582BB4AD49386738BE9C5B113]]></AD_COLUMN_ID>
+<!--52194FD582BB4AD49386738BE9C5B113-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--52194FD582BB4AD49386738BE9C5B113-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--52194FD582BB4AD49386738BE9C5B113-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--52194FD582BB4AD49386738BE9C5B113-->  <NAME><![CDATA[Created By]]></NAME>
+<!--52194FD582BB4AD49386738BE9C5B113-->  <DESCRIPTION><![CDATA[User who created this records]]></DESCRIPTION>
+<!--52194FD582BB4AD49386738BE9C5B113-->  <HELP><![CDATA[The Created By field indicates the user who created this record.]]></HELP>
+<!--52194FD582BB4AD49386738BE9C5B113-->  <COLUMNNAME><![CDATA[Createdby]]></COLUMNNAME>
+<!--52194FD582BB4AD49386738BE9C5B113-->  <AD_TABLE_ID><![CDATA[9F856359FD5E4CC4B4461EF897F8436F]]></AD_TABLE_ID>
+<!--52194FD582BB4AD49386738BE9C5B113-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--52194FD582BB4AD49386738BE9C5B113-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--52194FD582BB4AD49386738BE9C5B113-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--52194FD582BB4AD49386738BE9C5B113-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--52194FD582BB4AD49386738BE9C5B113-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--52194FD582BB4AD49386738BE9C5B113-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--52194FD582BB4AD49386738BE9C5B113-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--52194FD582BB4AD49386738BE9C5B113-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--52194FD582BB4AD49386738BE9C5B113-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--52194FD582BB4AD49386738BE9C5B113-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--52194FD582BB4AD49386738BE9C5B113-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--52194FD582BB4AD49386738BE9C5B113-->  <AD_ELEMENT_ID><![CDATA[246]]></AD_ELEMENT_ID>
+<!--52194FD582BB4AD49386738BE9C5B113-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--52194FD582BB4AD49386738BE9C5B113-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--52194FD582BB4AD49386738BE9C5B113-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--52194FD582BB4AD49386738BE9C5B113-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--52194FD582BB4AD49386738BE9C5B113-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--52194FD582BB4AD49386738BE9C5B113-->  <POSITION><![CDATA[6]]></POSITION>
+<!--52194FD582BB4AD49386738BE9C5B113-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--52194FD582BB4AD49386738BE9C5B113-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--52194FD582BB4AD49386738BE9C5B113-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--52194FD582BB4AD49386738BE9C5B113-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--52194FD582BB4AD49386738BE9C5B113-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--52194FD582BB4AD49386738BE9C5B113-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--52194FD582BB4AD49386738BE9C5B113-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--52194FD582BB4AD49386738BE9C5B113-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--52194FD582BB4AD49386738BE9C5B113--></AD_COLUMN>
+
 <!--521EA21E6E7577ABE040007F010016C0--><AD_COLUMN>
 <!--521EA21E6E7577ABE040007F010016C0-->  <AD_COLUMN_ID><![CDATA[521EA21E6E7577ABE040007F010016C0]]></AD_COLUMN_ID>
 <!--521EA21E6E7577ABE040007F010016C0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -269401,6 +270180,44 @@
 <!--5282EDD140D442C89325DC7651FB7A64-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--5282EDD140D442C89325DC7651FB7A64--></AD_COLUMN>
 
+<!--529DAAEEF63A4A68A377CA24E6E3476B--><AD_COLUMN>
+<!--529DAAEEF63A4A68A377CA24E6E3476B-->  <AD_COLUMN_ID><![CDATA[529DAAEEF63A4A68A377CA24E6E3476B]]></AD_COLUMN_ID>
+<!--529DAAEEF63A4A68A377CA24E6E3476B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--529DAAEEF63A4A68A377CA24E6E3476B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--529DAAEEF63A4A68A377CA24E6E3476B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--529DAAEEF63A4A68A377CA24E6E3476B-->  <NAME><![CDATA[Created By]]></NAME>
+<!--529DAAEEF63A4A68A377CA24E6E3476B-->  <DESCRIPTION><![CDATA[User who created this records]]></DESCRIPTION>
+<!--529DAAEEF63A4A68A377CA24E6E3476B-->  <HELP><![CDATA[The Created By field indicates the user who created this record.]]></HELP>
+<!--529DAAEEF63A4A68A377CA24E6E3476B-->  <COLUMNNAME><![CDATA[Createdby]]></COLUMNNAME>
+<!--529DAAEEF63A4A68A377CA24E6E3476B-->  <AD_TABLE_ID><![CDATA[25A3F31FD66945008C11C2C94272B20B]]></AD_TABLE_ID>
+<!--529DAAEEF63A4A68A377CA24E6E3476B-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--529DAAEEF63A4A68A377CA24E6E3476B-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--529DAAEEF63A4A68A377CA24E6E3476B-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--529DAAEEF63A4A68A377CA24E6E3476B-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--529DAAEEF63A4A68A377CA24E6E3476B-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--529DAAEEF63A4A68A377CA24E6E3476B-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--529DAAEEF63A4A68A377CA24E6E3476B-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--529DAAEEF63A4A68A377CA24E6E3476B-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--529DAAEEF63A4A68A377CA24E6E3476B-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--529DAAEEF63A4A68A377CA24E6E3476B-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--529DAAEEF63A4A68A377CA24E6E3476B-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--529DAAEEF63A4A68A377CA24E6E3476B-->  <AD_ELEMENT_ID><![CDATA[246]]></AD_ELEMENT_ID>
+<!--529DAAEEF63A4A68A377CA24E6E3476B-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--529DAAEEF63A4A68A377CA24E6E3476B-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--529DAAEEF63A4A68A377CA24E6E3476B-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--529DAAEEF63A4A68A377CA24E6E3476B-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--529DAAEEF63A4A68A377CA24E6E3476B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--529DAAEEF63A4A68A377CA24E6E3476B-->  <POSITION><![CDATA[6]]></POSITION>
+<!--529DAAEEF63A4A68A377CA24E6E3476B-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--529DAAEEF63A4A68A377CA24E6E3476B-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--529DAAEEF63A4A68A377CA24E6E3476B-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--529DAAEEF63A4A68A377CA24E6E3476B-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--529DAAEEF63A4A68A377CA24E6E3476B-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--529DAAEEF63A4A68A377CA24E6E3476B-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--529DAAEEF63A4A68A377CA24E6E3476B-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--529DAAEEF63A4A68A377CA24E6E3476B-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--529DAAEEF63A4A68A377CA24E6E3476B--></AD_COLUMN>
+
 <!--52BF77F95DB74254BD4AEF9299C0AD92--><AD_COLUMN>
 <!--52BF77F95DB74254BD4AEF9299C0AD92-->  <AD_COLUMN_ID><![CDATA[52BF77F95DB74254BD4AEF9299C0AD92]]></AD_COLUMN_ID>
 <!--52BF77F95DB74254BD4AEF9299C0AD92-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -269973,6 +270790,47 @@
 <!--5459C41AB49A4C07BA5C27FA0599C156-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--5459C41AB49A4C07BA5C27FA0599C156--></AD_COLUMN>
 
+<!--548552457AB94C74BE5E3B6DE5EF658D--><AD_COLUMN>
+<!--548552457AB94C74BE5E3B6DE5EF658D-->  <AD_COLUMN_ID><![CDATA[548552457AB94C74BE5E3B6DE5EF658D]]></AD_COLUMN_ID>
+<!--548552457AB94C74BE5E3B6DE5EF658D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--548552457AB94C74BE5E3B6DE5EF658D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--548552457AB94C74BE5E3B6DE5EF658D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--548552457AB94C74BE5E3B6DE5EF658D-->  <NAME><![CDATA[Active]]></NAME>
+<!--548552457AB94C74BE5E3B6DE5EF658D-->  <DESCRIPTION><![CDATA[A flag indicating whether this record is available for use or de-activated.]]></DESCRIPTION>
+<!--548552457AB94C74BE5E3B6DE5EF658D-->  <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>
+<!--548552457AB94C74BE5E3B6DE5EF658D-->  <COLUMNNAME><![CDATA[Isactive]]></COLUMNNAME>
+<!--548552457AB94C74BE5E3B6DE5EF658D-->  <AD_TABLE_ID><![CDATA[08B79658F8B745BD998E12DB1BCB0282]]></AD_TABLE_ID>
+<!--548552457AB94C74BE5E3B6DE5EF658D-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--548552457AB94C74BE5E3B6DE5EF658D-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--548552457AB94C74BE5E3B6DE5EF658D-->  <DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE>
+<!--548552457AB94C74BE5E3B6DE5EF658D-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--548552457AB94C74BE5E3B6DE5EF658D-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--548552457AB94C74BE5E3B6DE5EF658D-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--548552457AB94C74BE5E3B6DE5EF658D-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--548552457AB94C74BE5E3B6DE5EF658D-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--548552457AB94C74BE5E3B6DE5EF658D-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--548552457AB94C74BE5E3B6DE5EF658D-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--548552457AB94C74BE5E3B6DE5EF658D-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--548552457AB94C74BE5E3B6DE5EF658D-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--548552457AB94C74BE5E3B6DE5EF658D-->  <AD_ELEMENT_ID><![CDATA[348]]></AD_ELEMENT_ID>
+<!--548552457AB94C74BE5E3B6DE5EF658D-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--548552457AB94C74BE5E3B6DE5EF658D-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--548552457AB94C74BE5E3B6DE5EF658D-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--548552457AB94C74BE5E3B6DE5EF658D-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--548552457AB94C74BE5E3B6DE5EF658D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--548552457AB94C74BE5E3B6DE5EF658D-->  <POSITION><![CDATA[4]]></POSITION>
+<!--548552457AB94C74BE5E3B6DE5EF658D-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--548552457AB94C74BE5E3B6DE5EF658D-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--548552457AB94C74BE5E3B6DE5EF658D-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--548552457AB94C74BE5E3B6DE5EF658D-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--548552457AB94C74BE5E3B6DE5EF658D-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--548552457AB94C74BE5E3B6DE5EF658D-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--548552457AB94C74BE5E3B6DE5EF658D-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--548552457AB94C74BE5E3B6DE5EF658D-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--548552457AB94C74BE5E3B6DE5EF658D--></AD_COLUMN>
+
 <!--54ABAC909CAA4222B53CC04D22FD4F83--><AD_COLUMN>
 <!--54ABAC909CAA4222B53CC04D22FD4F83-->  <AD_COLUMN_ID><![CDATA[54ABAC909CAA4222B53CC04D22FD4F83]]></AD_COLUMN_ID>
 <!--54ABAC909CAA4222B53CC04D22FD4F83-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -276720,7 +277578,7 @@
 <!--57B98D879415A967E040007F01013153-->  <COLUMNNAME><![CDATA[Log]]></COLUMNNAME>
 <!--57B98D879415A967E040007F01013153-->  <AD_TABLE_ID><![CDATA[7F900CBEF00C45D2833F897E12BAE86E]]></AD_TABLE_ID>
 <!--57B98D879415A967E040007F01013153-->  <AD_REFERENCE_ID><![CDATA[14]]></AD_REFERENCE_ID>
-<!--57B98D879415A967E040007F01013153-->  <FIELDLENGTH><![CDATA[10000]]></FIELDLENGTH>
+<!--57B98D879415A967E040007F01013153-->  <FIELDLENGTH><![CDATA[999999999]]></FIELDLENGTH>
 <!--57B98D879415A967E040007F01013153-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--57B98D879415A967E040007F01013153-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--57B98D879415A967E040007F01013153-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
@@ -279817,6 +280675,45 @@
 <!--5854D61EEF933B11E040007F01002D1D-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--5854D61EEF933B11E040007F01002D1D--></AD_COLUMN>
 
+<!--58596AC09DBB7310E040007F01006523--><AD_COLUMN>
+<!--58596AC09DBB7310E040007F01006523-->  <AD_COLUMN_ID><![CDATA[58596AC09DBB7310E040007F01006523]]></AD_COLUMN_ID>
+<!--58596AC09DBB7310E040007F01006523-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--58596AC09DBB7310E040007F01006523-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--58596AC09DBB7310E040007F01006523-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--58596AC09DBB7310E040007F01006523-->  <NAME><![CDATA[Code Revision]]></NAME>
+<!--58596AC09DBB7310E040007F01006523-->  <DESCRIPTION><![CDATA[The code revision of the installed system]]></DESCRIPTION>
+<!--58596AC09DBB7310E040007F01006523-->  <HELP><![CDATA[The code revision of the installed system]]></HELP>
+<!--58596AC09DBB7310E040007F01006523-->  <COLUMNNAME><![CDATA[Code_Revision]]></COLUMNNAME>
+<!--58596AC09DBB7310E040007F01006523-->  <AD_TABLE_ID><![CDATA[1005400005]]></AD_TABLE_ID>
+<!--58596AC09DBB7310E040007F01006523-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--58596AC09DBB7310E040007F01006523-->  <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--58596AC09DBB7310E040007F01006523-->  <DEFAULTVALUE><![CDATA[0]]></DEFAULTVALUE>
+<!--58596AC09DBB7310E040007F01006523-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--58596AC09DBB7310E040007F01006523-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--58596AC09DBB7310E040007F01006523-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--58596AC09DBB7310E040007F01006523-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--58596AC09DBB7310E040007F01006523-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--58596AC09DBB7310E040007F01006523-->  <SEQNO><![CDATA[230]]></SEQNO>
+<!--58596AC09DBB7310E040007F01006523-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--58596AC09DBB7310E040007F01006523-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--58596AC09DBB7310E040007F01006523-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--58596AC09DBB7310E040007F01006523-->  <AD_ELEMENT_ID><![CDATA[1005400043]]></AD_ELEMENT_ID>
+<!--58596AC09DBB7310E040007F01006523-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--58596AC09DBB7310E040007F01006523-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--58596AC09DBB7310E040007F01006523-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--58596AC09DBB7310E040007F01006523-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--58596AC09DBB7310E040007F01006523-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--58596AC09DBB7310E040007F01006523-->  <POSITION><![CDATA[19]]></POSITION>
+<!--58596AC09DBB7310E040007F01006523-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--58596AC09DBB7310E040007F01006523-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--58596AC09DBB7310E040007F01006523-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--58596AC09DBB7310E040007F01006523-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--58596AC09DBB7310E040007F01006523-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--58596AC09DBB7310E040007F01006523-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--58596AC09DBB7310E040007F01006523-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--58596AC09DBB7310E040007F01006523-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--58596AC09DBB7310E040007F01006523--></AD_COLUMN>
+
 <!--58596AC09DBC7310E040007F01006523--><AD_COLUMN>
 <!--58596AC09DBC7310E040007F01006523-->  <AD_COLUMN_ID><![CDATA[58596AC09DBC7310E040007F01006523]]></AD_COLUMN_ID>
 <!--58596AC09DBC7310E040007F01006523-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -287042,6 +287939,44 @@
 <!--60E4EC36E3F54BE4BE98D7370B167641-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--60E4EC36E3F54BE4BE98D7370B167641--></AD_COLUMN>
 
+<!--60EAEBB2412B430197BDE44760F1E663--><AD_COLUMN>
+<!--60EAEBB2412B430197BDE44760F1E663-->  <AD_COLUMN_ID><![CDATA[60EAEBB2412B430197BDE44760F1E663]]></AD_COLUMN_ID>
+<!--60EAEBB2412B430197BDE44760F1E663-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--60EAEBB2412B430197BDE44760F1E663-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--60EAEBB2412B430197BDE44760F1E663-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--60EAEBB2412B430197BDE44760F1E663-->  <NAME><![CDATA[Version ID]]></NAME>
+<!--60EAEBB2412B430197BDE44760F1E663-->  <DESCRIPTION><![CDATA[Version identifier]]></DESCRIPTION>
+<!--60EAEBB2412B430197BDE44760F1E663-->  <HELP><![CDATA[It is an identifier for the version. In core module this is automatically calculated when it is build in a mercurial working copy, being in this case the last changeset in the working copy.]]></HELP>
+<!--60EAEBB2412B430197BDE44760F1E663-->  <COLUMNNAME><![CDATA[Version_ID]]></COLUMNNAME>
+<!--60EAEBB2412B430197BDE44760F1E663-->  <AD_TABLE_ID><![CDATA[8FD3DEA921D74CAFB5D4296A0375E958]]></AD_TABLE_ID>
+<!--60EAEBB2412B430197BDE44760F1E663-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--60EAEBB2412B430197BDE44760F1E663-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--60EAEBB2412B430197BDE44760F1E663-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--60EAEBB2412B430197BDE44760F1E663-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--60EAEBB2412B430197BDE44760F1E663-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--60EAEBB2412B430197BDE44760F1E663-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--60EAEBB2412B430197BDE44760F1E663-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--60EAEBB2412B430197BDE44760F1E663-->  <SEQNO><![CDATA[350]]></SEQNO>
+<!--60EAEBB2412B430197BDE44760F1E663-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--60EAEBB2412B430197BDE44760F1E663-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--60EAEBB2412B430197BDE44760F1E663-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--60EAEBB2412B430197BDE44760F1E663-->  <AD_ELEMENT_ID><![CDATA[6DC905999D48BFC7E040007F01012E68]]></AD_ELEMENT_ID>
+<!--60EAEBB2412B430197BDE44760F1E663-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--60EAEBB2412B430197BDE44760F1E663-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--60EAEBB2412B430197BDE44760F1E663-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--60EAEBB2412B430197BDE44760F1E663-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--60EAEBB2412B430197BDE44760F1E663-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--60EAEBB2412B430197BDE44760F1E663-->  <POSITION><![CDATA[35]]></POSITION>
+<!--60EAEBB2412B430197BDE44760F1E663-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--60EAEBB2412B430197BDE44760F1E663-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--60EAEBB2412B430197BDE44760F1E663-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--60EAEBB2412B430197BDE44760F1E663-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--60EAEBB2412B430197BDE44760F1E663-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--60EAEBB2412B430197BDE44760F1E663-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--60EAEBB2412B430197BDE44760F1E663-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--60EAEBB2412B430197BDE44760F1E663-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--60EAEBB2412B430197BDE44760F1E663--></AD_COLUMN>
+
 <!--60FCCD631EA2EDF8E040007F01013AD4--><AD_COLUMN>
 <!--60FCCD631EA2EDF8E040007F01013AD4-->  <AD_COLUMN_ID><![CDATA[60FCCD631EA2EDF8E040007F01013AD4]]></AD_COLUMN_ID>
 <!--60FCCD631EA2EDF8E040007F01013AD4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -288440,7 +289375,7 @@
 <!--6162397BD0FC4953E040007F0101559D-->  <COLUMNNAME><![CDATA[Log]]></COLUMNNAME>
 <!--6162397BD0FC4953E040007F0101559D-->  <AD_TABLE_ID><![CDATA[6567DD0C6715472CAE04255A4BEC4654]]></AD_TABLE_ID>
 <!--6162397BD0FC4953E040007F0101559D-->  <AD_REFERENCE_ID><![CDATA[14]]></AD_REFERENCE_ID>
-<!--6162397BD0FC4953E040007F0101559D-->  <FIELDLENGTH><![CDATA[4000]]></FIELDLENGTH>
+<!--6162397BD0FC4953E040007F0101559D-->  <FIELDLENGTH><![CDATA[999999999]]></FIELDLENGTH>
 <!--6162397BD0FC4953E040007F0101559D-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--6162397BD0FC4953E040007F0101559D-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--6162397BD0FC4953E040007F0101559D-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
@@ -288896,6 +289831,44 @@
 <!--625C7DD9360D4544A2391648B958A67A-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--625C7DD9360D4544A2391648B958A67A--></AD_COLUMN>
 
+<!--629E2D88D75641E6AF1B922E4319E758--><AD_COLUMN>
+<!--629E2D88D75641E6AF1B922E4319E758-->  <AD_COLUMN_ID><![CDATA[629E2D88D75641E6AF1B922E4319E758]]></AD_COLUMN_ID>
+<!--629E2D88D75641E6AF1B922E4319E758-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--629E2D88D75641E6AF1B922E4319E758-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--629E2D88D75641E6AF1B922E4319E758-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--629E2D88D75641E6AF1B922E4319E758-->  <NAME><![CDATA[Box]]></NAME>
+<!--629E2D88D75641E6AF1B922E4319E758-->  <COLUMNNAME><![CDATA[Box]]></COLUMNNAME>
+<!--629E2D88D75641E6AF1B922E4319E758-->  <AD_TABLE_ID><![CDATA[25A3F31FD66945008C11C2C94272B20B]]></AD_TABLE_ID>
+<!--629E2D88D75641E6AF1B922E4319E758-->  <AD_REFERENCE_ID><![CDATA[28]]></AD_REFERENCE_ID>
+<!--629E2D88D75641E6AF1B922E4319E758-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--629E2D88D75641E6AF1B922E4319E758-->  <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE>
+<!--629E2D88D75641E6AF1B922E4319E758-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--629E2D88D75641E6AF1B922E4319E758-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--629E2D88D75641E6AF1B922E4319E758-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--629E2D88D75641E6AF1B922E4319E758-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--629E2D88D75641E6AF1B922E4319E758-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--629E2D88D75641E6AF1B922E4319E758-->  <SEQNO><![CDATA[110]]></SEQNO>
+<!--629E2D88D75641E6AF1B922E4319E758-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--629E2D88D75641E6AF1B922E4319E758-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--629E2D88D75641E6AF1B922E4319E758-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--629E2D88D75641E6AF1B922E4319E758-->  <AD_ELEMENT_ID><![CDATA[FF167EDFE0234FBCBB754935A437F751]]></AD_ELEMENT_ID>
+<!--629E2D88D75641E6AF1B922E4319E758-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--629E2D88D75641E6AF1B922E4319E758-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--629E2D88D75641E6AF1B922E4319E758-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--629E2D88D75641E6AF1B922E4319E758-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--629E2D88D75641E6AF1B922E4319E758-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--629E2D88D75641E6AF1B922E4319E758-->  <POSITION><![CDATA[12]]></POSITION>
+<!--629E2D88D75641E6AF1B922E4319E758-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--629E2D88D75641E6AF1B922E4319E758-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--629E2D88D75641E6AF1B922E4319E758-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--629E2D88D75641E6AF1B922E4319E758-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--629E2D88D75641E6AF1B922E4319E758-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--629E2D88D75641E6AF1B922E4319E758-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--629E2D88D75641E6AF1B922E4319E758-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--629E2D88D75641E6AF1B922E4319E758-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--629E2D88D75641E6AF1B922E4319E758-->  <EM_OBUIAPP_PROCESS_ID><![CDATA[0B90883A379A4736B7016B8D5E8E75DB]]></EM_OBUIAPP_PROCESS_ID>
+<!--629E2D88D75641E6AF1B922E4319E758--></AD_COLUMN>
+
 <!--62D58DE741344625BB85B770C2007281--><AD_COLUMN>
 <!--62D58DE741344625BB85B770C2007281-->  <AD_COLUMN_ID><![CDATA[62D58DE741344625BB85B770C2007281]]></AD_COLUMN_ID>
 <!--62D58DE741344625BB85B770C2007281-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -292913,6 +293886,43 @@
 <!--688D3458869D4383938E39F3381D5F17-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--688D3458869D4383938E39F3381D5F17--></AD_COLUMN>
 
+<!--68C425E6260A423DB47645713D3D455D--><AD_COLUMN>
+<!--68C425E6260A423DB47645713D3D455D-->  <AD_COLUMN_ID><![CDATA[68C425E6260A423DB47645713D3D455D]]></AD_COLUMN_ID>
+<!--68C425E6260A423DB47645713D3D455D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--68C425E6260A423DB47645713D3D455D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--68C425E6260A423DB47645713D3D455D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--68C425E6260A423DB47645713D3D455D-->  <NAME><![CDATA[Referenced Inventory]]></NAME>
+<!--68C425E6260A423DB47645713D3D455D-->  <HELP><![CDATA[ID for a Referenced Inventory]]></HELP>
+<!--68C425E6260A423DB47645713D3D455D-->  <COLUMNNAME><![CDATA[M_RefInventory_ID]]></COLUMNNAME>
+<!--68C425E6260A423DB47645713D3D455D-->  <AD_TABLE_ID><![CDATA[559]]></AD_TABLE_ID>
+<!--68C425E6260A423DB47645713D3D455D-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--68C425E6260A423DB47645713D3D455D-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--68C425E6260A423DB47645713D3D455D-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--68C425E6260A423DB47645713D3D455D-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--68C425E6260A423DB47645713D3D455D-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--68C425E6260A423DB47645713D3D455D-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--68C425E6260A423DB47645713D3D455D-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--68C425E6260A423DB47645713D3D455D-->  <SEQNO><![CDATA[31]]></SEQNO>
+<!--68C425E6260A423DB47645713D3D455D-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--68C425E6260A423DB47645713D3D455D-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--68C425E6260A423DB47645713D3D455D-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--68C425E6260A423DB47645713D3D455D-->  <AD_ELEMENT_ID><![CDATA[E13E9A85932B43B58C569625C5662AE3]]></AD_ELEMENT_ID>
+<!--68C425E6260A423DB47645713D3D455D-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--68C425E6260A423DB47645713D3D455D-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--68C425E6260A423DB47645713D3D455D-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--68C425E6260A423DB47645713D3D455D-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--68C425E6260A423DB47645713D3D455D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--68C425E6260A423DB47645713D3D455D-->  <POSITION><![CDATA[17]]></POSITION>
+<!--68C425E6260A423DB47645713D3D455D-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--68C425E6260A423DB47645713D3D455D-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--68C425E6260A423DB47645713D3D455D-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--68C425E6260A423DB47645713D3D455D-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--68C425E6260A423DB47645713D3D455D-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--68C425E6260A423DB47645713D3D455D-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--68C425E6260A423DB47645713D3D455D-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--68C425E6260A423DB47645713D3D455D-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--68C425E6260A423DB47645713D3D455D--></AD_COLUMN>
+
 <!--68CC47B1AD4F45F68002BF9241C633DC--><AD_COLUMN>
 <!--68CC47B1AD4F45F68002BF9241C633DC-->  <AD_COLUMN_ID><![CDATA[68CC47B1AD4F45F68002BF9241C633DC]]></AD_COLUMN_ID>
 <!--68CC47B1AD4F45F68002BF9241C633DC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -293489,6 +294499,44 @@
 <!--6A3CB5BD5F694BEBB65AA154DDEBD433-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--6A3CB5BD5F694BEBB65AA154DDEBD433--></AD_COLUMN>
 
+<!--6A4B9C93E51745CE9C38D3ED61E2425F--><AD_COLUMN>
+<!--6A4B9C93E51745CE9C38D3ED61E2425F-->  <AD_COLUMN_ID><![CDATA[6A4B9C93E51745CE9C38D3ED61E2425F]]></AD_COLUMN_ID>
+<!--6A4B9C93E51745CE9C38D3ED61E2425F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6A4B9C93E51745CE9C38D3ED61E2425F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6A4B9C93E51745CE9C38D3ED61E2425F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6A4B9C93E51745CE9C38D3ED61E2425F-->  <NAME><![CDATA[Sequence]]></NAME>
+<!--6A4B9C93E51745CE9C38D3ED61E2425F-->  <DESCRIPTION><![CDATA[The order of records in a specified document.]]></DESCRIPTION>
+<!--6A4B9C93E51745CE9C38D3ED61E2425F-->  <HELP><![CDATA[The Sequence defines the numbering sequence to be used for documents.]]></HELP>
+<!--6A4B9C93E51745CE9C38D3ED61E2425F-->  <COLUMNNAME><![CDATA[AD_Sequence_ID]]></COLUMNNAME>
+<!--6A4B9C93E51745CE9C38D3ED61E2425F-->  <AD_TABLE_ID><![CDATA[24733E0ACF73466898137EDD27BA464B]]></AD_TABLE_ID>
+<!--6A4B9C93E51745CE9C38D3ED61E2425F-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--6A4B9C93E51745CE9C38D3ED61E2425F-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--6A4B9C93E51745CE9C38D3ED61E2425F-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--6A4B9C93E51745CE9C38D3ED61E2425F-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--6A4B9C93E51745CE9C38D3ED61E2425F-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--6A4B9C93E51745CE9C38D3ED61E2425F-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--6A4B9C93E51745CE9C38D3ED61E2425F-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--6A4B9C93E51745CE9C38D3ED61E2425F-->  <SEQNO><![CDATA[120]]></SEQNO>
+<!--6A4B9C93E51745CE9C38D3ED61E2425F-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--6A4B9C93E51745CE9C38D3ED61E2425F-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--6A4B9C93E51745CE9C38D3ED61E2425F-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--6A4B9C93E51745CE9C38D3ED61E2425F-->  <AD_ELEMENT_ID><![CDATA[124]]></AD_ELEMENT_ID>
+<!--6A4B9C93E51745CE9C38D3ED61E2425F-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--6A4B9C93E51745CE9C38D3ED61E2425F-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--6A4B9C93E51745CE9C38D3ED61E2425F-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--6A4B9C93E51745CE9C38D3ED61E2425F-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--6A4B9C93E51745CE9C38D3ED61E2425F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--6A4B9C93E51745CE9C38D3ED61E2425F-->  <POSITION><![CDATA[12]]></POSITION>
+<!--6A4B9C93E51745CE9C38D3ED61E2425F-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--6A4B9C93E51745CE9C38D3ED61E2425F-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--6A4B9C93E51745CE9C38D3ED61E2425F-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--6A4B9C93E51745CE9C38D3ED61E2425F-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--6A4B9C93E51745CE9C38D3ED61E2425F-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--6A4B9C93E51745CE9C38D3ED61E2425F-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--6A4B9C93E51745CE9C38D3ED61E2425F-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--6A4B9C93E51745CE9C38D3ED61E2425F-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--6A4B9C93E51745CE9C38D3ED61E2425F--></AD_COLUMN>
+
 <!--6A69C6E317E14BFCB8D5408D57CEE0B4--><AD_COLUMN>
 <!--6A69C6E317E14BFCB8D5408D57CEE0B4-->  <AD_COLUMN_ID><![CDATA[6A69C6E317E14BFCB8D5408D57CEE0B4]]></AD_COLUMN_ID>
 <!--6A69C6E317E14BFCB8D5408D57CEE0B4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -294684,6 +295732,44 @@
 <!--6DC905999D45BFC7E040007F01012E68-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--6DC905999D45BFC7E040007F01012E68--></AD_COLUMN>
 
+<!--6DC905999D46BFC7E040007F01012E68--><AD_COLUMN>
+<!--6DC905999D46BFC7E040007F01012E68-->  <AD_COLUMN_ID><![CDATA[6DC905999D46BFC7E040007F01012E68]]></AD_COLUMN_ID>
+<!--6DC905999D46BFC7E040007F01012E68-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6DC905999D46BFC7E040007F01012E68-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6DC905999D46BFC7E040007F01012E68-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6DC905999D46BFC7E040007F01012E68-->  <NAME><![CDATA[VersionID]]></NAME>
+<!--6DC905999D46BFC7E040007F01012E68-->  <DESCRIPTION><![CDATA[Version identifier]]></DESCRIPTION>
+<!--6DC905999D46BFC7E040007F01012E68-->  <HELP><![CDATA[It is an identifier for the version. In core module this is automatically calculated when it is build in a mercurial working copy, being in this case the last changeset in the working copy.]]></HELP>
+<!--6DC905999D46BFC7E040007F01012E68-->  <COLUMNNAME><![CDATA[Version_ID]]></COLUMNNAME>
+<!--6DC905999D46BFC7E040007F01012E68-->  <AD_TABLE_ID><![CDATA[9D36D488605044F5A0264D7C8B916657]]></AD_TABLE_ID>
+<!--6DC905999D46BFC7E040007F01012E68-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--6DC905999D46BFC7E040007F01012E68-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--6DC905999D46BFC7E040007F01012E68-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--6DC905999D46BFC7E040007F01012E68-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--6DC905999D46BFC7E040007F01012E68-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--6DC905999D46BFC7E040007F01012E68-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--6DC905999D46BFC7E040007F01012E68-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--6DC905999D46BFC7E040007F01012E68-->  <SEQNO><![CDATA[370]]></SEQNO>
+<!--6DC905999D46BFC7E040007F01012E68-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--6DC905999D46BFC7E040007F01012E68-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--6DC905999D46BFC7E040007F01012E68-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--6DC905999D46BFC7E040007F01012E68-->  <AD_ELEMENT_ID><![CDATA[6DC905999D48BFC7E040007F01012E68]]></AD_ELEMENT_ID>
+<!--6DC905999D46BFC7E040007F01012E68-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--6DC905999D46BFC7E040007F01012E68-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--6DC905999D46BFC7E040007F01012E68-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--6DC905999D46BFC7E040007F01012E68-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--6DC905999D46BFC7E040007F01012E68-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--6DC905999D46BFC7E040007F01012E68-->  <POSITION><![CDATA[34]]></POSITION>
+<!--6DC905999D46BFC7E040007F01012E68-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--6DC905999D46BFC7E040007F01012E68-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--6DC905999D46BFC7E040007F01012E68-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--6DC905999D46BFC7E040007F01012E68-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--6DC905999D46BFC7E040007F01012E68-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--6DC905999D46BFC7E040007F01012E68-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--6DC905999D46BFC7E040007F01012E68-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--6DC905999D46BFC7E040007F01012E68-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--6DC905999D46BFC7E040007F01012E68--></AD_COLUMN>
+
 <!--6DCAC7C506E85087E040007F01014948--><AD_COLUMN>
 <!--6DCAC7C506E85087E040007F01014948-->  <AD_COLUMN_ID><![CDATA[6DCAC7C506E85087E040007F01014948]]></AD_COLUMN_ID>
 <!--6DCAC7C506E85087E040007F01014948-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -304731,6 +305817,45 @@
 <!--799D89B4CE8742B7AEF3277892A68AA6-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--799D89B4CE8742B7AEF3277892A68AA6--></AD_COLUMN>
 
+<!--79E018F7BB0E46269688CD5073B8A139--><AD_COLUMN>
+<!--79E018F7BB0E46269688CD5073B8A139-->  <AD_COLUMN_ID><![CDATA[79E018F7BB0E46269688CD5073B8A139]]></AD_COLUMN_ID>
+<!--79E018F7BB0E46269688CD5073B8A139-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--79E018F7BB0E46269688CD5073B8A139-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--79E018F7BB0E46269688CD5073B8A139-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--79E018F7BB0E46269688CD5073B8A139-->  <NAME><![CDATA[Client]]></NAME>
+<!--79E018F7BB0E46269688CD5073B8A139-->  <DESCRIPTION><![CDATA[Client for this installation.]]></DESCRIPTION>
+<!--79E018F7BB0E46269688CD5073B8A139-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
+<!--79E018F7BB0E46269688CD5073B8A139-->  <COLUMNNAME><![CDATA[AD_Client_ID]]></COLUMNNAME>
+<!--79E018F7BB0E46269688CD5073B8A139-->  <AD_TABLE_ID><![CDATA[25A3F31FD66945008C11C2C94272B20B]]></AD_TABLE_ID>
+<!--79E018F7BB0E46269688CD5073B8A139-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--79E018F7BB0E46269688CD5073B8A139-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--79E018F7BB0E46269688CD5073B8A139-->  <DEFAULTVALUE><![CDATA[@AD_CLIENT_ID@]]></DEFAULTVALUE>
+<!--79E018F7BB0E46269688CD5073B8A139-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--79E018F7BB0E46269688CD5073B8A139-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--79E018F7BB0E46269688CD5073B8A139-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--79E018F7BB0E46269688CD5073B8A139-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--79E018F7BB0E46269688CD5073B8A139-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--79E018F7BB0E46269688CD5073B8A139-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--79E018F7BB0E46269688CD5073B8A139-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--79E018F7BB0E46269688CD5073B8A139-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--79E018F7BB0E46269688CD5073B8A139-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--79E018F7BB0E46269688CD5073B8A139-->  <AD_ELEMENT_ID><![CDATA[102]]></AD_ELEMENT_ID>
+<!--79E018F7BB0E46269688CD5073B8A139-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--79E018F7BB0E46269688CD5073B8A139-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--79E018F7BB0E46269688CD5073B8A139-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--79E018F7BB0E46269688CD5073B8A139-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--79E018F7BB0E46269688CD5073B8A139-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--79E018F7BB0E46269688CD5073B8A139-->  <POSITION><![CDATA[2]]></POSITION>
+<!--79E018F7BB0E46269688CD5073B8A139-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--79E018F7BB0E46269688CD5073B8A139-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--79E018F7BB0E46269688CD5073B8A139-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--79E018F7BB0E46269688CD5073B8A139-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--79E018F7BB0E46269688CD5073B8A139-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--79E018F7BB0E46269688CD5073B8A139-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--79E018F7BB0E46269688CD5073B8A139-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--79E018F7BB0E46269688CD5073B8A139-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--79E018F7BB0E46269688CD5073B8A139--></AD_COLUMN>
+
 <!--7A36095500164169893D3D48DAB2FD2F--><AD_COLUMN>
 <!--7A36095500164169893D3D48DAB2FD2F-->  <AD_COLUMN_ID><![CDATA[7A36095500164169893D3D48DAB2FD2F]]></AD_COLUMN_ID>
 <!--7A36095500164169893D3D48DAB2FD2F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -315359,6 +316484,44 @@
 <!--821C2ABBBEF440CBB97CA03DB83D9883-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--821C2ABBBEF440CBB97CA03DB83D9883--></AD_COLUMN>
 
+<!--824DEA3F6C4A4792A5D2AE8643BD15DC--><AD_COLUMN>
+<!--824DEA3F6C4A4792A5D2AE8643BD15DC-->  <AD_COLUMN_ID><![CDATA[824DEA3F6C4A4792A5D2AE8643BD15DC]]></AD_COLUMN_ID>
+<!--824DEA3F6C4A4792A5D2AE8643BD15DC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--824DEA3F6C4A4792A5D2AE8643BD15DC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--824DEA3F6C4A4792A5D2AE8643BD15DC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--824DEA3F6C4A4792A5D2AE8643BD15DC-->  <NAME><![CDATA[Node ID]]></NAME>
+<!--824DEA3F6C4A4792A5D2AE8643BD15DC-->  <DESCRIPTION><![CDATA[Identifies uniquely the node of a clustered environment which is currently in charge of handling a particular service.]]></DESCRIPTION>
+<!--824DEA3F6C4A4792A5D2AE8643BD15DC-->  <HELP><![CDATA[Identifies uniquely the node of a clustered environment which is currently in charge of handling a particular service.]]></HELP>
+<!--824DEA3F6C4A4792A5D2AE8643BD15DC-->  <COLUMNNAME><![CDATA[Node_ID]]></COLUMNNAME>
+<!--824DEA3F6C4A4792A5D2AE8643BD15DC-->  <AD_TABLE_ID><![CDATA[9F856359FD5E4CC4B4461EF897F8436F]]></AD_TABLE_ID>
+<!--824DEA3F6C4A4792A5D2AE8643BD15DC-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--824DEA3F6C4A4792A5D2AE8643BD15DC-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--824DEA3F6C4A4792A5D2AE8643BD15DC-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--824DEA3F6C4A4792A5D2AE8643BD15DC-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--824DEA3F6C4A4792A5D2AE8643BD15DC-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--824DEA3F6C4A4792A5D2AE8643BD15DC-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--824DEA3F6C4A4792A5D2AE8643BD15DC-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--824DEA3F6C4A4792A5D2AE8643BD15DC-->  <SEQNO><![CDATA[130]]></SEQNO>
+<!--824DEA3F6C4A4792A5D2AE8643BD15DC-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--824DEA3F6C4A4792A5D2AE8643BD15DC-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--824DEA3F6C4A4792A5D2AE8643BD15DC-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--824DEA3F6C4A4792A5D2AE8643BD15DC-->  <AD_ELEMENT_ID><![CDATA[16912D109DF5456892AC8D606148A405]]></AD_ELEMENT_ID>
+<!--824DEA3F6C4A4792A5D2AE8643BD15DC-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--824DEA3F6C4A4792A5D2AE8643BD15DC-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--824DEA3F6C4A4792A5D2AE8643BD15DC-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--824DEA3F6C4A4792A5D2AE8643BD15DC-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--824DEA3F6C4A4792A5D2AE8643BD15DC-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--824DEA3F6C4A4792A5D2AE8643BD15DC-->  <POSITION><![CDATA[16]]></POSITION>
+<!--824DEA3F6C4A4792A5D2AE8643BD15DC-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--824DEA3F6C4A4792A5D2AE8643BD15DC-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--824DEA3F6C4A4792A5D2AE8643BD15DC-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--824DEA3F6C4A4792A5D2AE8643BD15DC-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--824DEA3F6C4A4792A5D2AE8643BD15DC-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--824DEA3F6C4A4792A5D2AE8643BD15DC-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--824DEA3F6C4A4792A5D2AE8643BD15DC-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--824DEA3F6C4A4792A5D2AE8643BD15DC-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--824DEA3F6C4A4792A5D2AE8643BD15DC--></AD_COLUMN>
+
 <!--828EE0AE7FCD5FA1E040007F010067C7--><AD_COLUMN>
 <!--828EE0AE7FCD5FA1E040007F010067C7-->  <AD_COLUMN_ID><![CDATA[828EE0AE7FCD5FA1E040007F010067C7]]></AD_COLUMN_ID>
 <!--828EE0AE7FCD5FA1E040007F010067C7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -319751,6 +320914,43 @@
 <!--858BF5EDF0D34353939952BFFA618F1F-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--858BF5EDF0D34353939952BFFA618F1F--></AD_COLUMN>
 
+<!--860AB1226756473D859DB281EDC23723--><AD_COLUMN>
+<!--860AB1226756473D859DB281EDC23723-->  <AD_COLUMN_ID><![CDATA[860AB1226756473D859DB281EDC23723]]></AD_COLUMN_ID>
+<!--860AB1226756473D859DB281EDC23723-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--860AB1226756473D859DB281EDC23723-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--860AB1226756473D859DB281EDC23723-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--860AB1226756473D859DB281EDC23723-->  <NAME><![CDATA[M_RefInventory_Type_ID]]></NAME>
+<!--860AB1226756473D859DB281EDC23723-->  <HELP><![CDATA[ID for a Referenced Inventory Type]]></HELP>
+<!--860AB1226756473D859DB281EDC23723-->  <COLUMNNAME><![CDATA[M_RefInventory_Type_ID]]></COLUMNNAME>
+<!--860AB1226756473D859DB281EDC23723-->  <AD_TABLE_ID><![CDATA[24733E0ACF73466898137EDD27BA464B]]></AD_TABLE_ID>
+<!--860AB1226756473D859DB281EDC23723-->  <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
+<!--860AB1226756473D859DB281EDC23723-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--860AB1226756473D859DB281EDC23723-->  <ISKEY><![CDATA[Y]]></ISKEY>
+<!--860AB1226756473D859DB281EDC23723-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--860AB1226756473D859DB281EDC23723-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--860AB1226756473D859DB281EDC23723-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--860AB1226756473D859DB281EDC23723-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--860AB1226756473D859DB281EDC23723-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--860AB1226756473D859DB281EDC23723-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--860AB1226756473D859DB281EDC23723-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--860AB1226756473D859DB281EDC23723-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--860AB1226756473D859DB281EDC23723-->  <AD_ELEMENT_ID><![CDATA[33DC4723BA7E493FB6C1ECCF9AADB34C]]></AD_ELEMENT_ID>
+<!--860AB1226756473D859DB281EDC23723-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--860AB1226756473D859DB281EDC23723-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--860AB1226756473D859DB281EDC23723-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--860AB1226756473D859DB281EDC23723-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--860AB1226756473D859DB281EDC23723-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--860AB1226756473D859DB281EDC23723-->  <POSITION><![CDATA[1]]></POSITION>
+<!--860AB1226756473D859DB281EDC23723-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--860AB1226756473D859DB281EDC23723-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--860AB1226756473D859DB281EDC23723-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--860AB1226756473D859DB281EDC23723-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--860AB1226756473D859DB281EDC23723-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--860AB1226756473D859DB281EDC23723-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--860AB1226756473D859DB281EDC23723-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--860AB1226756473D859DB281EDC23723-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--860AB1226756473D859DB281EDC23723--></AD_COLUMN>
+
 <!--860C49EAB8D44C8693ADEA903154030F--><AD_COLUMN>
 <!--860C49EAB8D44C8693ADEA903154030F-->  <AD_COLUMN_ID><![CDATA[860C49EAB8D44C8693ADEA903154030F]]></AD_COLUMN_ID>
 <!--860C49EAB8D44C8693ADEA903154030F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -326973,6 +328173,45 @@
 <!--8E9F151AC731431FB1183BFA6C2E86D8-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--8E9F151AC731431FB1183BFA6C2E86D8--></AD_COLUMN>
 
+<!--8ED2AD8FBDC544DD82C49ADF6347518E--><AD_COLUMN>
+<!--8ED2AD8FBDC544DD82C49ADF6347518E-->  <AD_COLUMN_ID><![CDATA[8ED2AD8FBDC544DD82C49ADF6347518E]]></AD_COLUMN_ID>
+<!--8ED2AD8FBDC544DD82C49ADF6347518E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8ED2AD8FBDC544DD82C49ADF6347518E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8ED2AD8FBDC544DD82C49ADF6347518E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8ED2AD8FBDC544DD82C49ADF6347518E-->  <NAME><![CDATA[Service]]></NAME>
+<!--8ED2AD8FBDC544DD82C49ADF6347518E-->  <DESCRIPTION><![CDATA[A service that is able to work in a clustered environment]]></DESCRIPTION>
+<!--8ED2AD8FBDC544DD82C49ADF6347518E-->  <HELP><![CDATA[A service that supports working in a clustered environment.]]></HELP>
+<!--8ED2AD8FBDC544DD82C49ADF6347518E-->  <COLUMNNAME><![CDATA[Service]]></COLUMNNAME>
+<!--8ED2AD8FBDC544DD82C49ADF6347518E-->  <AD_TABLE_ID><![CDATA[9F856359FD5E4CC4B4461EF897F8436F]]></AD_TABLE_ID>
+<!--8ED2AD8FBDC544DD82C49ADF6347518E-->  <AD_REFERENCE_ID><![CDATA[17]]></AD_REFERENCE_ID>
+<!--8ED2AD8FBDC544DD82C49ADF6347518E-->  <AD_REFERENCE_VALUE_ID><![CDATA[895ED0FCCA6145AE8657E4C3EB31BF4A]]></AD_REFERENCE_VALUE_ID>
+<!--8ED2AD8FBDC544DD82C49ADF6347518E-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--8ED2AD8FBDC544DD82C49ADF6347518E-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--8ED2AD8FBDC544DD82C49ADF6347518E-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--8ED2AD8FBDC544DD82C49ADF6347518E-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--8ED2AD8FBDC544DD82C49ADF6347518E-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--8ED2AD8FBDC544DD82C49ADF6347518E-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
+<!--8ED2AD8FBDC544DD82C49ADF6347518E-->  <SEQNO><![CDATA[110]]></SEQNO>
+<!--8ED2AD8FBDC544DD82C49ADF6347518E-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--8ED2AD8FBDC544DD82C49ADF6347518E-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--8ED2AD8FBDC544DD82C49ADF6347518E-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--8ED2AD8FBDC544DD82C49ADF6347518E-->  <AD_ELEMENT_ID><![CDATA[CCD8CCC00C1B4FE2A14B0EB1775A2966]]></AD_ELEMENT_ID>
+<!--8ED2AD8FBDC544DD82C49ADF6347518E-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--8ED2AD8FBDC544DD82C49ADF6347518E-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--8ED2AD8FBDC544DD82C49ADF6347518E-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--8ED2AD8FBDC544DD82C49ADF6347518E-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--8ED2AD8FBDC544DD82C49ADF6347518E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--8ED2AD8FBDC544DD82C49ADF6347518E-->  <POSITION><![CDATA[10]]></POSITION>
+<!--8ED2AD8FBDC544DD82C49ADF6347518E-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--8ED2AD8FBDC544DD82C49ADF6347518E-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--8ED2AD8FBDC544DD82C49ADF6347518E-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--8ED2AD8FBDC544DD82C49ADF6347518E-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--8ED2AD8FBDC544DD82C49ADF6347518E-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--8ED2AD8FBDC544DD82C49ADF6347518E-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--8ED2AD8FBDC544DD82C49ADF6347518E-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--8ED2AD8FBDC544DD82C49ADF6347518E-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--8ED2AD8FBDC544DD82C49ADF6347518E--></AD_COLUMN>
+
 <!--8ED54FC840C842FA890DF717CE8C3492--><AD_COLUMN>
 <!--8ED54FC840C842FA890DF717CE8C3492-->  <AD_COLUMN_ID><![CDATA[8ED54FC840C842FA890DF717CE8C3492]]></AD_COLUMN_ID>
 <!--8ED54FC840C842FA890DF717CE8C3492-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -327166,6 +328405,44 @@
 <!--8FC0CB65155742F3B573208FF53B9E5B-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--8FC0CB65155742F3B573208FF53B9E5B--></AD_COLUMN>
 
+<!--8FCE9DFBCD6C4B6BBB9C8F98540C9119--><AD_COLUMN>
+<!--8FCE9DFBCD6C4B6BBB9C8F98540C9119-->  <AD_COLUMN_ID><![CDATA[8FCE9DFBCD6C4B6BBB9C8F98540C9119]]></AD_COLUMN_ID>
+<!--8FCE9DFBCD6C4B6BBB9C8F98540C9119-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8FCE9DFBCD6C4B6BBB9C8F98540C9119-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8FCE9DFBCD6C4B6BBB9C8F98540C9119-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8FCE9DFBCD6C4B6BBB9C8F98540C9119-->  <NAME><![CDATA[Updated By]]></NAME>
+<!--8FCE9DFBCD6C4B6BBB9C8F98540C9119-->  <DESCRIPTION><![CDATA[User who updated this records]]></DESCRIPTION>
+<!--8FCE9DFBCD6C4B6BBB9C8F98540C9119-->  <HELP><![CDATA[The Updated By field indicates the user who updated this record.]]></HELP>
+<!--8FCE9DFBCD6C4B6BBB9C8F98540C9119-->  <COLUMNNAME><![CDATA[Updatedby]]></COLUMNNAME>
+<!--8FCE9DFBCD6C4B6BBB9C8F98540C9119-->  <AD_TABLE_ID><![CDATA[9F856359FD5E4CC4B4461EF897F8436F]]></AD_TABLE_ID>
+<!--8FCE9DFBCD6C4B6BBB9C8F98540C9119-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--8FCE9DFBCD6C4B6BBB9C8F98540C9119-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--8FCE9DFBCD6C4B6BBB9C8F98540C9119-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--8FCE9DFBCD6C4B6BBB9C8F98540C9119-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--8FCE9DFBCD6C4B6BBB9C8F98540C9119-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--8FCE9DFBCD6C4B6BBB9C8F98540C9119-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--8FCE9DFBCD6C4B6BBB9C8F98540C9119-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--8FCE9DFBCD6C4B6BBB9C8F98540C9119-->  <SEQNO><![CDATA[80]]></SEQNO>
+<!--8FCE9DFBCD6C4B6BBB9C8F98540C9119-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--8FCE9DFBCD6C4B6BBB9C8F98540C9119-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--8FCE9DFBCD6C4B6BBB9C8F98540C9119-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--8FCE9DFBCD6C4B6BBB9C8F98540C9119-->  <AD_ELEMENT_ID><![CDATA[608]]></AD_ELEMENT_ID>
+<!--8FCE9DFBCD6C4B6BBB9C8F98540C9119-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--8FCE9DFBCD6C4B6BBB9C8F98540C9119-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--8FCE9DFBCD6C4B6BBB9C8F98540C9119-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--8FCE9DFBCD6C4B6BBB9C8F98540C9119-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--8FCE9DFBCD6C4B6BBB9C8F98540C9119-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--8FCE9DFBCD6C4B6BBB9C8F98540C9119-->  <POSITION><![CDATA[8]]></POSITION>
+<!--8FCE9DFBCD6C4B6BBB9C8F98540C9119-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--8FCE9DFBCD6C4B6BBB9C8F98540C9119-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--8FCE9DFBCD6C4B6BBB9C8F98540C9119-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--8FCE9DFBCD6C4B6BBB9C8F98540C9119-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--8FCE9DFBCD6C4B6BBB9C8F98540C9119-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--8FCE9DFBCD6C4B6BBB9C8F98540C9119-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--8FCE9DFBCD6C4B6BBB9C8F98540C9119-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--8FCE9DFBCD6C4B6BBB9C8F98540C9119-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--8FCE9DFBCD6C4B6BBB9C8F98540C9119--></AD_COLUMN>
+
 <!--8FD40CE9BD88DC33E040007F01013D42--><AD_COLUMN>
 <!--8FD40CE9BD88DC33E040007F01013D42-->  <AD_COLUMN_ID><![CDATA[8FD40CE9BD88DC33E040007F01013D42]]></AD_COLUMN_ID>
 <!--8FD40CE9BD88DC33E040007F01013D42-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -333154,6 +334431,45 @@
 <!--98ADA80EF26D40C6A8FDB4FD9AFA6763-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--98ADA80EF26D40C6A8FDB4FD9AFA6763--></AD_COLUMN>
 
+<!--98C07CAFB7A94296A3B3F7DFE4785428--><AD_COLUMN>
+<!--98C07CAFB7A94296A3B3F7DFE4785428-->  <AD_COLUMN_ID><![CDATA[98C07CAFB7A94296A3B3F7DFE4785428]]></AD_COLUMN_ID>
+<!--98C07CAFB7A94296A3B3F7DFE4785428-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--98C07CAFB7A94296A3B3F7DFE4785428-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--98C07CAFB7A94296A3B3F7DFE4785428-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--98C07CAFB7A94296A3B3F7DFE4785428-->  <NAME><![CDATA[Client]]></NAME>
+<!--98C07CAFB7A94296A3B3F7DFE4785428-->  <DESCRIPTION><![CDATA[Client for this installation.]]></DESCRIPTION>
+<!--98C07CAFB7A94296A3B3F7DFE4785428-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
+<!--98C07CAFB7A94296A3B3F7DFE4785428-->  <COLUMNNAME><![CDATA[AD_Client_ID]]></COLUMNNAME>
+<!--98C07CAFB7A94296A3B3F7DFE4785428-->  <AD_TABLE_ID><![CDATA[9F856359FD5E4CC4B4461EF897F8436F]]></AD_TABLE_ID>
+<!--98C07CAFB7A94296A3B3F7DFE4785428-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--98C07CAFB7A94296A3B3F7DFE4785428-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--98C07CAFB7A94296A3B3F7DFE4785428-->  <DEFAULTVALUE><![CDATA[@AD_CLIENT_ID@]]></DEFAULTVALUE>
+<!--98C07CAFB7A94296A3B3F7DFE4785428-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--98C07CAFB7A94296A3B3F7DFE4785428-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--98C07CAFB7A94296A3B3F7DFE4785428-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--98C07CAFB7A94296A3B3F7DFE4785428-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--98C07CAFB7A94296A3B3F7DFE4785428-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--98C07CAFB7A94296A3B3F7DFE4785428-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--98C07CAFB7A94296A3B3F7DFE4785428-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--98C07CAFB7A94296A3B3F7DFE4785428-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--98C07CAFB7A94296A3B3F7DFE4785428-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--98C07CAFB7A94296A3B3F7DFE4785428-->  <AD_ELEMENT_ID><![CDATA[102]]></AD_ELEMENT_ID>
+<!--98C07CAFB7A94296A3B3F7DFE4785428-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--98C07CAFB7A94296A3B3F7DFE4785428-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--98C07CAFB7A94296A3B3F7DFE4785428-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--98C07CAFB7A94296A3B3F7DFE4785428-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--98C07CAFB7A94296A3B3F7DFE4785428-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--98C07CAFB7A94296A3B3F7DFE4785428-->  <POSITION><![CDATA[2]]></POSITION>
+<!--98C07CAFB7A94296A3B3F7DFE4785428-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--98C07CAFB7A94296A3B3F7DFE4785428-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--98C07CAFB7A94296A3B3F7DFE4785428-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--98C07CAFB7A94296A3B3F7DFE4785428-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--98C07CAFB7A94296A3B3F7DFE4785428-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--98C07CAFB7A94296A3B3F7DFE4785428-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--98C07CAFB7A94296A3B3F7DFE4785428-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--98C07CAFB7A94296A3B3F7DFE4785428-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--98C07CAFB7A94296A3B3F7DFE4785428--></AD_COLUMN>
+
 <!--98CDB8AA58504478BFA11F4DC41E2D84--><AD_COLUMN>
 <!--98CDB8AA58504478BFA11F4DC41E2D84-->  <AD_COLUMN_ID><![CDATA[98CDB8AA58504478BFA11F4DC41E2D84]]></AD_COLUMN_ID>
 <!--98CDB8AA58504478BFA11F4DC41E2D84-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -334038,6 +335354,45 @@
 <!--9B55D1FE53254F48BB71C80B04E4C785-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--9B55D1FE53254F48BB71C80B04E4C785--></AD_COLUMN>
 
+<!--9B815B64B1F1439AA969D3AEDD4F2AEF--><AD_COLUMN>
+<!--9B815B64B1F1439AA969D3AEDD4F2AEF-->  <AD_COLUMN_ID><![CDATA[9B815B64B1F1439AA969D3AEDD4F2AEF]]></AD_COLUMN_ID>
+<!--9B815B64B1F1439AA969D3AEDD4F2AEF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9B815B64B1F1439AA969D3AEDD4F2AEF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9B815B64B1F1439AA969D3AEDD4F2AEF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9B815B64B1F1439AA969D3AEDD4F2AEF-->  <NAME><![CDATA[Timeout]]></NAME>
+<!--9B815B64B1F1439AA969D3AEDD4F2AEF-->  <DESCRIPTION><![CDATA[The timeout is the frequency (in seconds) which the ping for a cluster service is done.]]></DESCRIPTION>
+<!--9B815B64B1F1439AA969D3AEDD4F2AEF-->  <HELP><![CDATA[The timeout is the frequency (in seconds) which the ping for a cluster service is done, i.e., it represents the amount of time that should pass for the cluster node in charge of a cluster service to reaffirm itself as the leader. It is also used as a reference for the rest of the nodes in the cluster to determine if the leader is no longer alive and therefore if a new node should be promoted as the leader of the cluster service. Please note that it will be required to restart all the nodes in the cluster if this value is changed in order to make the new value visible for the entire cluster.]]></HELP>
+<!--9B815B64B1F1439AA969D3AEDD4F2AEF-->  <COLUMNNAME><![CDATA[Timeout]]></COLUMNNAME>
+<!--9B815B64B1F1439AA969D3AEDD4F2AEF-->  <AD_TABLE_ID><![CDATA[08B79658F8B745BD998E12DB1BCB0282]]></AD_TABLE_ID>
+<!--9B815B64B1F1439AA969D3AEDD4F2AEF-->  <AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID>
+<!--9B815B64B1F1439AA969D3AEDD4F2AEF-->  <FIELDLENGTH><![CDATA[2]]></FIELDLENGTH>
+<!--9B815B64B1F1439AA969D3AEDD4F2AEF-->  <DEFAULTVALUE><![CDATA[1]]></DEFAULTVALUE>
+<!--9B815B64B1F1439AA969D3AEDD4F2AEF-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--9B815B64B1F1439AA969D3AEDD4F2AEF-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--9B815B64B1F1439AA969D3AEDD4F2AEF-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--9B815B64B1F1439AA969D3AEDD4F2AEF-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--9B815B64B1F1439AA969D3AEDD4F2AEF-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--9B815B64B1F1439AA969D3AEDD4F2AEF-->  <SEQNO><![CDATA[100]]></SEQNO>
+<!--9B815B64B1F1439AA969D3AEDD4F2AEF-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--9B815B64B1F1439AA969D3AEDD4F2AEF-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--9B815B64B1F1439AA969D3AEDD4F2AEF-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--9B815B64B1F1439AA969D3AEDD4F2AEF-->  <AD_ELEMENT_ID><![CDATA[C8711193BC124202BF68C1A501D1C39B]]></AD_ELEMENT_ID>
+<!--9B815B64B1F1439AA969D3AEDD4F2AEF-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--9B815B64B1F1439AA969D3AEDD4F2AEF-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--9B815B64B1F1439AA969D3AEDD4F2AEF-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--9B815B64B1F1439AA969D3AEDD4F2AEF-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--9B815B64B1F1439AA969D3AEDD4F2AEF-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--9B815B64B1F1439AA969D3AEDD4F2AEF-->  <POSITION><![CDATA[10]]></POSITION>
+<!--9B815B64B1F1439AA969D3AEDD4F2AEF-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--9B815B64B1F1439AA969D3AEDD4F2AEF-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--9B815B64B1F1439AA969D3AEDD4F2AEF-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--9B815B64B1F1439AA969D3AEDD4F2AEF-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--9B815B64B1F1439AA969D3AEDD4F2AEF-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--9B815B64B1F1439AA969D3AEDD4F2AEF-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--9B815B64B1F1439AA969D3AEDD4F2AEF-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--9B815B64B1F1439AA969D3AEDD4F2AEF-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--9B815B64B1F1439AA969D3AEDD4F2AEF--></AD_COLUMN>
+
 <!--9B974FE6EBF8448FB03DDE3E0A0A371E--><AD_COLUMN>
 <!--9B974FE6EBF8448FB03DDE3E0A0A371E-->  <AD_COLUMN_ID><![CDATA[9B974FE6EBF8448FB03DDE3E0A0A371E]]></AD_COLUMN_ID>
 <!--9B974FE6EBF8448FB03DDE3E0A0A371E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -335672,6 +337027,44 @@
 <!--9CC0EC6D13F74D3CBFCE1E17215ABC02-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--9CC0EC6D13F74D3CBFCE1E17215ABC02--></AD_COLUMN>
 
+<!--9CC81BC5D1264F55BE07E1027D59B651--><AD_COLUMN>
+<!--9CC81BC5D1264F55BE07E1027D59B651-->  <AD_COLUMN_ID><![CDATA[9CC81BC5D1264F55BE07E1027D59B651]]></AD_COLUMN_ID>
+<!--9CC81BC5D1264F55BE07E1027D59B651-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9CC81BC5D1264F55BE07E1027D59B651-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9CC81BC5D1264F55BE07E1027D59B651-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9CC81BC5D1264F55BE07E1027D59B651-->  <NAME><![CDATA[Created By]]></NAME>
+<!--9CC81BC5D1264F55BE07E1027D59B651-->  <DESCRIPTION><![CDATA[User who created this records]]></DESCRIPTION>
+<!--9CC81BC5D1264F55BE07E1027D59B651-->  <HELP><![CDATA[The Created By field indicates the user who created this record.]]></HELP>
+<!--9CC81BC5D1264F55BE07E1027D59B651-->  <COLUMNNAME><![CDATA[Createdby]]></COLUMNNAME>
+<!--9CC81BC5D1264F55BE07E1027D59B651-->  <AD_TABLE_ID><![CDATA[24733E0ACF73466898137EDD27BA464B]]></AD_TABLE_ID>
+<!--9CC81BC5D1264F55BE07E1027D59B651-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--9CC81BC5D1264F55BE07E1027D59B651-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--9CC81BC5D1264F55BE07E1027D59B651-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--9CC81BC5D1264F55BE07E1027D59B651-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--9CC81BC5D1264F55BE07E1027D59B651-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--9CC81BC5D1264F55BE07E1027D59B651-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--9CC81BC5D1264F55BE07E1027D59B651-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--9CC81BC5D1264F55BE07E1027D59B651-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--9CC81BC5D1264F55BE07E1027D59B651-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--9CC81BC5D1264F55BE07E1027D59B651-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--9CC81BC5D1264F55BE07E1027D59B651-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--9CC81BC5D1264F55BE07E1027D59B651-->  <AD_ELEMENT_ID><![CDATA[246]]></AD_ELEMENT_ID>
+<!--9CC81BC5D1264F55BE07E1027D59B651-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--9CC81BC5D1264F55BE07E1027D59B651-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--9CC81BC5D1264F55BE07E1027D59B651-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--9CC81BC5D1264F55BE07E1027D59B651-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--9CC81BC5D1264F55BE07E1027D59B651-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--9CC81BC5D1264F55BE07E1027D59B651-->  <POSITION><![CDATA[6]]></POSITION>
+<!--9CC81BC5D1264F55BE07E1027D59B651-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--9CC81BC5D1264F55BE07E1027D59B651-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--9CC81BC5D1264F55BE07E1027D59B651-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--9CC81BC5D1264F55BE07E1027D59B651-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--9CC81BC5D1264F55BE07E1027D59B651-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--9CC81BC5D1264F55BE07E1027D59B651-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--9CC81BC5D1264F55BE07E1027D59B651-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--9CC81BC5D1264F55BE07E1027D59B651-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--9CC81BC5D1264F55BE07E1027D59B651--></AD_COLUMN>
+
 <!--9D092C673B3F439993CAC0ABFAAECAE5--><AD_COLUMN>
 <!--9D092C673B3F439993CAC0ABFAAECAE5-->  <AD_COLUMN_ID><![CDATA[9D092C673B3F439993CAC0ABFAAECAE5]]></AD_COLUMN_ID>
 <!--9D092C673B3F439993CAC0ABFAAECAE5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -336944,6 +338337,44 @@
 <!--A02DA83008D04A67AA299179F6E00E50-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A02DA83008D04A67AA299179F6E00E50--></AD_COLUMN>
 
+<!--A0328D5A08524C8DA9C0A7C725E7C9C6--><AD_COLUMN>
+<!--A0328D5A08524C8DA9C0A7C725E7C9C6-->  <AD_COLUMN_ID><![CDATA[A0328D5A08524C8DA9C0A7C725E7C9C6]]></AD_COLUMN_ID>
+<!--A0328D5A08524C8DA9C0A7C725E7C9C6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A0328D5A08524C8DA9C0A7C725E7C9C6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A0328D5A08524C8DA9C0A7C725E7C9C6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A0328D5A08524C8DA9C0A7C725E7C9C6-->  <NAME><![CDATA[Name]]></NAME>
+<!--A0328D5A08524C8DA9C0A7C725E7C9C6-->  <DESCRIPTION><![CDATA[A non-unique identifier for a record/document often used as a search tool.]]></DESCRIPTION>
+<!--A0328D5A08524C8DA9C0A7C725E7C9C6-->  <HELP><![CDATA[A more descriptive identifier (that does need to be unique) of a record/document that is used as a default search option along with the search key (that is unique and mostly shorter). It is up to 60 characters in length.]]></HELP>
+<!--A0328D5A08524C8DA9C0A7C725E7C9C6-->  <COLUMNNAME><![CDATA[Name]]></COLUMNNAME>
+<!--A0328D5A08524C8DA9C0A7C725E7C9C6-->  <AD_TABLE_ID><![CDATA[24733E0ACF73466898137EDD27BA464B]]></AD_TABLE_ID>
+<!--A0328D5A08524C8DA9C0A7C725E7C9C6-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--A0328D5A08524C8DA9C0A7C725E7C9C6-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--A0328D5A08524C8DA9C0A7C725E7C9C6-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--A0328D5A08524C8DA9C0A7C725E7C9C6-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--A0328D5A08524C8DA9C0A7C725E7C9C6-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--A0328D5A08524C8DA9C0A7C725E7C9C6-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--A0328D5A08524C8DA9C0A7C725E7C9C6-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
+<!--A0328D5A08524C8DA9C0A7C725E7C9C6-->  <SEQNO><![CDATA[90]]></SEQNO>
+<!--A0328D5A08524C8DA9C0A7C725E7C9C6-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--A0328D5A08524C8DA9C0A7C725E7C9C6-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--A0328D5A08524C8DA9C0A7C725E7C9C6-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--A0328D5A08524C8DA9C0A7C725E7C9C6-->  <AD_ELEMENT_ID><![CDATA[469]]></AD_ELEMENT_ID>
+<!--A0328D5A08524C8DA9C0A7C725E7C9C6-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--A0328D5A08524C8DA9C0A7C725E7C9C6-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--A0328D5A08524C8DA9C0A7C725E7C9C6-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--A0328D5A08524C8DA9C0A7C725E7C9C6-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--A0328D5A08524C8DA9C0A7C725E7C9C6-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--A0328D5A08524C8DA9C0A7C725E7C9C6-->  <POSITION><![CDATA[9]]></POSITION>
+<!--A0328D5A08524C8DA9C0A7C725E7C9C6-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--A0328D5A08524C8DA9C0A7C725E7C9C6-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--A0328D5A08524C8DA9C0A7C725E7C9C6-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--A0328D5A08524C8DA9C0A7C725E7C9C6-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--A0328D5A08524C8DA9C0A7C725E7C9C6-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--A0328D5A08524C8DA9C0A7C725E7C9C6-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--A0328D5A08524C8DA9C0A7C725E7C9C6-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A0328D5A08524C8DA9C0A7C725E7C9C6-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--A0328D5A08524C8DA9C0A7C725E7C9C6--></AD_COLUMN>
+
 <!--A03A83F49B5011DDBB0200014A62838F--><AD_COLUMN>
 <!--A03A83F49B5011DDBB0200014A62838F-->  <AD_COLUMN_ID><![CDATA[A03A83F49B5011DDBB0200014A62838F]]></AD_COLUMN_ID>
 <!--A03A83F49B5011DDBB0200014A62838F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -340220,6 +341651,44 @@
 <!--A7E134B04D60D632E040007F010037B3-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A7E134B04D60D632E040007F010037B3--></AD_COLUMN>
 
+<!--A7EF6625DBB541389309A8C622E05920--><AD_COLUMN>
+<!--A7EF6625DBB541389309A8C622E05920-->  <AD_COLUMN_ID><![CDATA[A7EF6625DBB541389309A8C622E05920]]></AD_COLUMN_ID>
+<!--A7EF6625DBB541389309A8C622E05920-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A7EF6625DBB541389309A8C622E05920-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A7EF6625DBB541389309A8C622E05920-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A7EF6625DBB541389309A8C622E05920-->  <NAME><![CDATA[Referenced Inventory Type]]></NAME>
+<!--A7EF6625DBB541389309A8C622E05920-->  <HELP><![CDATA[ID for a Referenced Inventory Type]]></HELP>
+<!--A7EF6625DBB541389309A8C622E05920-->  <COLUMNNAME><![CDATA[M_RefInventory_Type_ID]]></COLUMNNAME>
+<!--A7EF6625DBB541389309A8C622E05920-->  <AD_TABLE_ID><![CDATA[25A3F31FD66945008C11C2C94272B20B]]></AD_TABLE_ID>
+<!--A7EF6625DBB541389309A8C622E05920-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--A7EF6625DBB541389309A8C622E05920-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--A7EF6625DBB541389309A8C622E05920-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--A7EF6625DBB541389309A8C622E05920-->  <ISPARENT><![CDATA[Y]]></ISPARENT>
+<!--A7EF6625DBB541389309A8C622E05920-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--A7EF6625DBB541389309A8C622E05920-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--A7EF6625DBB541389309A8C622E05920-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
+<!--A7EF6625DBB541389309A8C622E05920-->  <SEQNO><![CDATA[100]]></SEQNO>
+<!--A7EF6625DBB541389309A8C622E05920-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--A7EF6625DBB541389309A8C622E05920-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--A7EF6625DBB541389309A8C622E05920-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--A7EF6625DBB541389309A8C622E05920-->  <AD_ELEMENT_ID><![CDATA[33DC4723BA7E493FB6C1ECCF9AADB34C]]></AD_ELEMENT_ID>
+<!--A7EF6625DBB541389309A8C622E05920-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--A7EF6625DBB541389309A8C622E05920-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--A7EF6625DBB541389309A8C622E05920-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--A7EF6625DBB541389309A8C622E05920-->  <AD_CALLOUT_ID><![CDATA[B05A954309334F5282E8A56617821F22]]></AD_CALLOUT_ID>
+<!--A7EF6625DBB541389309A8C622E05920-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--A7EF6625DBB541389309A8C622E05920-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--A7EF6625DBB541389309A8C622E05920-->  <POSITION><![CDATA[9]]></POSITION>
+<!--A7EF6625DBB541389309A8C622E05920-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--A7EF6625DBB541389309A8C622E05920-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--A7EF6625DBB541389309A8C622E05920-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--A7EF6625DBB541389309A8C622E05920-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--A7EF6625DBB541389309A8C622E05920-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--A7EF6625DBB541389309A8C622E05920-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--A7EF6625DBB541389309A8C622E05920-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A7EF6625DBB541389309A8C622E05920-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--A7EF6625DBB541389309A8C622E05920--></AD_COLUMN>
+
 <!--A7F1531510434244E040007F010064A6--><AD_COLUMN>
 <!--A7F1531510434244E040007F010064A6-->  <AD_COLUMN_ID><![CDATA[A7F1531510434244E040007F010064A6]]></AD_COLUMN_ID>
 <!--A7F1531510434244E040007F010064A6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -346324,6 +347793,43 @@
 <!--B22C83F80E9748D0B2E096984736918E-->  <EM_OBUIAPP_PROCESS_ID><![CDATA[A2C19D0EF6594D14A64BC62E99A89CC3]]></EM_OBUIAPP_PROCESS_ID>
 <!--B22C83F80E9748D0B2E096984736918E--></AD_COLUMN>
 
+<!--B24838F17F1F46CCA7091E97A1A92E19--><AD_COLUMN>
+<!--B24838F17F1F46CCA7091E97A1A92E19-->  <AD_COLUMN_ID><![CDATA[B24838F17F1F46CCA7091E97A1A92E19]]></AD_COLUMN_ID>
+<!--B24838F17F1F46CCA7091E97A1A92E19-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B24838F17F1F46CCA7091E97A1A92E19-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B24838F17F1F46CCA7091E97A1A92E19-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B24838F17F1F46CCA7091E97A1A92E19-->  <NAME><![CDATA[Referenced Inventory]]></NAME>
+<!--B24838F17F1F46CCA7091E97A1A92E19-->  <HELP><![CDATA[ID for a Referenced Inventory]]></HELP>
+<!--B24838F17F1F46CCA7091E97A1A92E19-->  <COLUMNNAME><![CDATA[M_Refinventory_ID]]></COLUMNNAME>
+<!--B24838F17F1F46CCA7091E97A1A92E19-->  <AD_TABLE_ID><![CDATA[FF8080812E381D1E012E3898C5DD0010]]></AD_TABLE_ID>
+<!--B24838F17F1F46CCA7091E97A1A92E19-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--B24838F17F1F46CCA7091E97A1A92E19-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--B24838F17F1F46CCA7091E97A1A92E19-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--B24838F17F1F46CCA7091E97A1A92E19-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--B24838F17F1F46CCA7091E97A1A92E19-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--B24838F17F1F46CCA7091E97A1A92E19-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--B24838F17F1F46CCA7091E97A1A92E19-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--B24838F17F1F46CCA7091E97A1A92E19-->  <SEQNO><![CDATA[200]]></SEQNO>
+<!--B24838F17F1F46CCA7091E97A1A92E19-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--B24838F17F1F46CCA7091E97A1A92E19-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--B24838F17F1F46CCA7091E97A1A92E19-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--B24838F17F1F46CCA7091E97A1A92E19-->  <AD_ELEMENT_ID><![CDATA[E13E9A85932B43B58C569625C5662AE3]]></AD_ELEMENT_ID>
+<!--B24838F17F1F46CCA7091E97A1A92E19-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--B24838F17F1F46CCA7091E97A1A92E19-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--B24838F17F1F46CCA7091E97A1A92E19-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--B24838F17F1F46CCA7091E97A1A92E19-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--B24838F17F1F46CCA7091E97A1A92E19-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--B24838F17F1F46CCA7091E97A1A92E19-->  <POSITION><![CDATA[20]]></POSITION>
+<!--B24838F17F1F46CCA7091E97A1A92E19-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--B24838F17F1F46CCA7091E97A1A92E19-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--B24838F17F1F46CCA7091E97A1A92E19-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--B24838F17F1F46CCA7091E97A1A92E19-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--B24838F17F1F46CCA7091E97A1A92E19-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--B24838F17F1F46CCA7091E97A1A92E19-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--B24838F17F1F46CCA7091E97A1A92E19-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--B24838F17F1F46CCA7091E97A1A92E19-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--B24838F17F1F46CCA7091E97A1A92E19--></AD_COLUMN>
+
 <!--B2A4D134FC224A4A91826B7B096A2A8C--><AD_COLUMN>
 <!--B2A4D134FC224A4A91826B7B096A2A8C-->  <AD_COLUMN_ID><![CDATA[B2A4D134FC224A4A91826B7B096A2A8C]]></AD_COLUMN_ID>
 <!--B2A4D134FC224A4A91826B7B096A2A8C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -353471,6 +354977,46 @@
 <!--BF04DD653CA1489DABA8CB2BBD788C78-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--BF04DD653CA1489DABA8CB2BBD788C78--></AD_COLUMN>
 
+<!--BFBEE2DFA3B848B8BD1042574909CD88--><AD_COLUMN>
+<!--BFBEE2DFA3B848B8BD1042574909CD88-->  <AD_COLUMN_ID><![CDATA[BFBEE2DFA3B848B8BD1042574909CD88]]></AD_COLUMN_ID>
+<!--BFBEE2DFA3B848B8BD1042574909CD88-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BFBEE2DFA3B848B8BD1042574909CD88-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BFBEE2DFA3B848B8BD1042574909CD88-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BFBEE2DFA3B848B8BD1042574909CD88-->  <NAME><![CDATA[Search Key]]></NAME>
+<!--BFBEE2DFA3B848B8BD1042574909CD88-->  <DESCRIPTION><![CDATA[A fast method for finding a particular record.]]></DESCRIPTION>
+<!--BFBEE2DFA3B848B8BD1042574909CD88-->  <HELP><![CDATA[A search key allows for a fast method of finding a particular record. If you leave the search key empty, the system automatically creates a numeric number originating from a document sequence defined in the  "Document Sequence" window. The sequence naming convention follows a rule "DocumentNo_TableName", where TableName is the actual name of the database table (e.g. C_Order).
+
+Usually, company's internal identifiers for various records (products, customers, etc) are stored here.]]></HELP>
+<!--BFBEE2DFA3B848B8BD1042574909CD88-->  <COLUMNNAME><![CDATA[Value]]></COLUMNNAME>
+<!--BFBEE2DFA3B848B8BD1042574909CD88-->  <AD_TABLE_ID><![CDATA[25A3F31FD66945008C11C2C94272B20B]]></AD_TABLE_ID>
+<!--BFBEE2DFA3B848B8BD1042574909CD88-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--BFBEE2DFA3B848B8BD1042574909CD88-->  <FIELDLENGTH><![CDATA[30]]></FIELDLENGTH>
+<!--BFBEE2DFA3B848B8BD1042574909CD88-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--BFBEE2DFA3B848B8BD1042574909CD88-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--BFBEE2DFA3B848B8BD1042574909CD88-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--BFBEE2DFA3B848B8BD1042574909CD88-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--BFBEE2DFA3B848B8BD1042574909CD88-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
+<!--BFBEE2DFA3B848B8BD1042574909CD88-->  <SEQNO><![CDATA[90]]></SE