Update to 3.0PR16Q4 3.0PR16Q4
authorRM packaging bot <staff.rm@openbravo.com>
Fri, 16 Dec 2016 06:35:23 +0000
changeset 706 cd6c1bd91b22
parent 705 f33ba63830fb
child 707 123ff4c29b76
Update to 3.0PR16Q4
java/reference/java.japi.gz
js/cancelAndReplace.js.details
model/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINACC_TRANSACTION.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINANCIAL_ACCOUNT.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_PMT_CHECK_TRG.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_MESSAGE.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_REFERENCE.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.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.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.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/model/tables/OBUIAPP_REPORT.xml
model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml
model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml
model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml
model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.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.application/src-db/database/sourcedata/AD_REF_LIST.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_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_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/C_INVOICE_POST.xml
model/src-db/database/model/functions/C_ORDER_POST1.xml
model/src-db/database/model/functions/M_INOUT_POST.xml
model/src-db/database/model/functions/M_PROMOTION_ADJUSTMENT.xml
model/src-db/database/model/functions/M_UPDATE_STOCK_VALUATION.xml
model/src-db/database/model/postscript-Oracle.sql
model/src-db/database/model/prescript-PostgreSql.sql
model/src-db/database/model/tables/AD_ROLE.xml
model/src-db/database/model/tables/C_BPARTNER_LOCATION.xml
model/src-db/database/model/tables/C_CONVERSION_RATE.xml
model/src-db/database/model/tables/C_ORDER.xml
model/src-db/database/model/tables/C_ORDERLINE.xml
model/src-db/database/model/tables/C_POC_DOCTYPE_TEMPLATE.xml
model/src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml
model/src-db/database/model/tables/FIN_PAYMENT_SCHEDULEDETAIL.xml
model/src-db/database/model/tables/M_TRANSACTION.xml
model/src-db/database/model/tables/M_TRANSACTION_LAST.xml
model/src-db/database/model/triggers/C_ACCTSCHEMA_TRG.xml
model/src-db/database/model/triggers/C_ACTIVITY_TRG.xml
model/src-db/database/model/triggers/C_BANKSTATEMENTLINE_TRG.xml
model/src-db/database/model/triggers/C_BPARTNER_TRG.xml
model/src-db/database/model/triggers/C_CASHLINE_TRG.xml
model/src-db/database/model/triggers/C_ELEMENTVALUE_TRG.xml
model/src-db/database/model/triggers/C_INVOICELINETAX_TRG.xml
model/src-db/database/model/triggers/C_INVOICELINE_BEFORE_TRG.xml
model/src-db/database/model/triggers/C_INVOICELINE_TRG.xml
model/src-db/database/model/triggers/C_INVOICE_REVERSE_TRG.xml
model/src-db/database/model/triggers/C_ORDERLINE_TRG.xml
model/src-db/database/model/triggers/C_ORDERTAX_TRG.xml
model/src-db/database/model/triggers/C_ORDER_CHK_RESTRINCTIONS_TRG.xml
model/src-db/database/model/triggers/C_ORDLINE_CHK_RESTRICTIONS_TRG.xml
model/src-db/database/model/triggers/C_PERIOD_TRG2.xml
model/src-db/database/model/triggers/C_POC_DOCTYPE_TEMPLATE_TRG.xml
model/src-db/database/model/triggers/C_REMITTANCELINE_TRG.xml
model/src-db/database/model/triggers/C_TAX_REPORT_TRG.xml
model/src-db/database/model/triggers/GL_JL_CHK_RESTRICTIONS_TRG.xml
model/src-db/database/model/triggers/M_ATTRIBUTEVALUE_TRG.xml
model/src-db/database/model/triggers/M_CH_VALUE_TRG.xml
model/src-db/database/model/triggers/M_CH_VALUE_TRG2.xml
model/src-db/database/model/triggers/M_COSTING_TRG.xml
model/src-db/database/model/triggers/M_PRODUCT_TRG.xml
model/src-db/database/model/triggers/M_RESERVATION_TRG.xml
model/src-db/database/model/triggers/M_TRANSACTION_TRG.xml
model/src-db/database/model/triggers/M_TRANSACTION_TRG2.xml
model/src-db/database/model/triggers/S_TIMEEXPENSE_TRG.xml
model/src-db/database/model/views/C_INVOICETAX_CASHVAT_V.xml
model/src-db/database/model/views/FIN_PAYMENT_DETAIL_V.xml
model/src-db/database/sourcedata/AD_COLUMN.xml
model/src-db/database/sourcedata/AD_ELEMENT.xml
model/src-db/database/sourcedata/AD_FIELD.xml
model/src-db/database/sourcedata/AD_MESSAGE.xml
model/src-db/database/sourcedata/AD_MODEL_OBJECT.xml
model/src-db/database/sourcedata/AD_MODULE.xml
model/src-db/database/sourcedata/AD_REF_LIST.xml
model/src-db/database/sourcedata/AD_REF_TREE.xml
model/src-db/database/sourcedata/AD_TAB.xml
model/src-db/database/sourcedata/AD_TABLE.xml
model/src-db/database/sourcedata/AD_TEXTINTERFACES.xml
model/src-db/database/sourcedata/OBUIAPP_PROCESS.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	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -226,16 +226,19 @@
              fin_payment_scheduledetail.fin_payment_detail_id,
              fin_payment_scheduledetail.isinvoicepaid AS paid,
              CASE WHEN fin_payment_scheduledetail.fin_payment_detail_id is not null THEN 0 ELSE 1 END AS priority
-      FROM c_invoiceline, c_orderline, fin_payment_schedule,
+      FROM c_invoice, c_doctype, c_invoiceline, c_orderline, fin_payment_schedule,
         fin_payment_scheduledetail LEFT JOIN fin_payment_detail ON fin_payment_scheduledetail.fin_payment_detail_id = fin_payment_detail.fin_payment_detail_id
                                    LEFT JOIN fin_payment ON fin_payment_detail.fin_payment_id = fin_payment.fin_payment_id
-      WHERE c_invoiceline.c_orderline_id = c_orderline.c_orderline_id
+      WHERE c_invoice.c_doctype_id = c_doctype.c_doctype_id
+        AND c_invoice.c_invoice_id = c_invoiceline.c_invoice_id
+        AND c_invoiceline.c_orderline_id = c_orderline.c_orderline_id
         AND c_orderline.c_order_id = fin_payment_schedule.c_order_id
         AND fin_payment_schedule.fin_payment_schedule_id = fin_payment_scheduledetail.fin_payment_schedule_order
         AND fin_payment_scheduledetail.fin_payment_schedule_invoice is null
         AND fin_payment_scheduledetail.ISCANCELED <> 'Y'
-        AND c_invoiceline.c_invoice_id = invoice_id
-        AND sign(c_invoiceline.qtyinvoiced) = sign(c_orderline.qtyordered)
+        AND c_invoice.c_invoice_id = invoice_id
+        AND ((c_doctype.isreversal='N' AND sign(c_invoiceline.qtyinvoiced) = sign(c_orderline.qtyordered))
+        OR (c_doctype.isreversal='Y' AND sign(-c_invoiceline.qtyinvoiced) = sign(c_orderline.qtyordered)))
       ORDER BY CASE WHEN fin_payment_scheduledetail.fin_payment_detail_id is not null THEN 0 ELSE 1 END, c_orderline.c_order_id;
       order_schdet cur_order_schdet%ROWTYPE;
 
@@ -332,7 +335,7 @@
           END IF;
           v_pendingamount := v_pendingamount - v_paymentamount;
           v_scheduledamount := C_Currency_Round((v_paymentamount * v_multiplierarc), v_currency_id, NULL);
-          IF (v_scheduledamount < 0) THEN
+          IF (v_scheduledamount < 0 OR v_MultiplierARC = -1) THEN
             v_negativeps := -1;
           ELSE
             v_negativeps := 1;
@@ -388,7 +391,7 @@
               IF (v_IsSOTrx = 'Y') THEN
                 SELECT COALESCE(COUNT(*),0) INTO v_Count
                 FROM c_orderline
-                WHERE qtyinvoiced<>qtyordered
+                WHERE qtyordered <> (qtyinvoiced*v_MultiplierARC)
                   AND c_order_id = order_schdet.order_id;
               ELSE
                 SELECT count(*) INTO v_count
@@ -399,7 +402,7 @@
                                                   AND mpo.c_invoiceline_id IS NOT NULL
                   WHERE ol.c_order_id = order_schdet.order_id
                   GROUP BY ol.c_orderline_id, ol.qtyordered) a
-                WHERE a.matchedqty != a.qtyordered;
+                WHERE a.qtyordered != (a.matchedqty*v_MultiplierARC);
               END IF;
             END IF;
 
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINACC_TRANSACTION.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINACC_TRANSACTION.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -13,5 +13,12 @@
         <default><![CDATA[P]]></default>
         <onCreateDefault><![CDATA['R']]></onCreateDefault>
       </column>
+      <column name="EM_APRM_FINACC_TRANS_ORIGIN" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <foreign-key foreignTable="FIN_FINACC_TRANSACTION" name="EM_APRM_FINACC_TRANS_ORIGIN_FK">
+        <reference local="EM_APRM_FINACC_TRANS_ORIGIN" foreign="FIN_FINACC_TRANSACTION_ID"/>
+      </foreign-key>
     </table>
   </database>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINANCIAL_ACCOUNT.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINANCIAL_ACCOUNT.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -33,5 +33,9 @@
         <default><![CDATA[N]]></default>
         <onCreateDefault/>
       </column>
+      <column name="EM_APRM_FUNDS_TRANS" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
     </table>
   </database>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_PMT_CHECK_TRG.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_PMT_CHECK_TRG.xml	Fri Dec 16 06:35:23 2016 +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-2011 Openbravo SLU
+* All portions are Copyright (C) 2010-2016 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 *************************************************************************/
@@ -28,7 +28,7 @@
   END IF;
 
   IF (UPDATING) THEN
-    IF(:OLD.PROCESSED='Y' AND ((COALESCE(:OLD.AD_ORG_ID, '0') <> COALESCE(:NEW.AD_ORG_ID, '0'))
+    IF(:OLD.PROCESSED='Y' AND :NEW.PROCESSED='Y' AND ((COALESCE(:OLD.AD_ORG_ID, '0') <> COALESCE(:NEW.AD_ORG_ID, '0'))
       OR(COALESCE(:OLD.DOCUMENTNO, '0') <> COALESCE(:NEW.DOCUMENTNO, '0'))
       OR(COALESCE(:OLD.C_CURRENCY_ID, '0') <> COALESCE(:NEW.C_CURRENCY_ID, '0'))
       OR(COALESCE(:OLD.C_BPARTNER_ID, '0') <> COALESCE(:NEW.C_BPARTNER_ID, '0'))
@@ -46,6 +46,7 @@
       OR((COALESCE(:OLD.AMOUNT, 0) <> COALESCE(:NEW.AMOUNT, 0)
           AND COALESCE(:OLD.STATUS, '0') <> TO_CHAR('RPAE'))
           OR (COALESCE(:OLD.STATUS, '0') = TO_CHAR('RPAE')
+              AND COALESCE(:NEW.STATUS, '0') <> TO_CHAR('RPVOID')
               AND (COALESCE(:NEW.AMOUNT, 0) - COALESCE(:OLD.AMOUNT, 0))  <> (COALESCE(:NEW.GENERATED_CREDIT, 0) - COALESCE(:OLD.GENERATED_CREDIT, 0))))
       )) THEN
       RAISE_APPLICATION_ERROR(-20000, '@20501@');
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -111,6 +111,52 @@
 <!--038E6E9140CB4924B22060672E2847A2-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--038E6E9140CB4924B22060672E2847A2--></AD_COLUMN>
 
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--><AD_COLUMN>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <AD_COLUMN_ID><![CDATA[03EBACA2EF974E3F9E58A6FE8EF8AECB]]></AD_COLUMN_ID>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <NAME><![CDATA[EM_APRM_FinancialAccount]]></NAME>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <DESCRIPTION><![CDATA[Financial Account in sales invoice details]]></DESCRIPTION>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <HELP><![CDATA[Financial Account in sales invoice details]]></HELP>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <COLUMNNAME><![CDATA[EM_APRM_FinancialAccount]]></COLUMNNAME>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <AD_TABLE_ID><![CDATA[C0233061EA504EFEAB0483E836BBAF31]]></AD_TABLE_ID>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <AD_REFERENCE_VALUE_ID><![CDATA[03D336BF39A7455C8FD64CBCCFB4FC1C]]></AD_REFERENCE_VALUE_ID>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <SEQNO><![CDATA[290]]></SEQNO>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <AD_ELEMENT_ID><![CDATA[D62D89A819A840B3978E4434C9B66C86]]></AD_ELEMENT_ID>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <SQLLOGIC><![CDATA[(select
+   case p.amount
+     when 0 then null
+     else p.fin_financial_account_id
+   end
+ from fin_payment_detail pd
+   join fin_payment p on p.fin_payment_id=pd.fin_payment_id
+ where pd.fin_payment_detail_id=fin_payment_detail_id)]]></SQLLOGIC>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--></AD_COLUMN>
+
 <!--046498C716474A6EAAEA0CA26E09C69D--><AD_COLUMN>
 <!--046498C716474A6EAAEA0CA26E09C69D-->  <AD_COLUMN_ID><![CDATA[046498C716474A6EAAEA0CA26E09C69D]]></AD_COLUMN_ID>
 <!--046498C716474A6EAAEA0CA26E09C69D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1022,7 +1068,7 @@
 <!--2295DC7A28FE4F9DA842F453E2FF2F41-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
 <!--2295DC7A28FE4F9DA842F453E2FF2F41-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
 <!--2295DC7A28FE4F9DA842F453E2FF2F41-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--2295DC7A28FE4F9DA842F453E2FF2F41-->  <ENTITY_ALIAS><![CDATA[COALESCE(invbp.name, ordbp.name)]]></ENTITY_ALIAS>
+<!--2295DC7A28FE4F9DA842F453E2FF2F41-->  <ENTITY_ALIAS><![CDATA[bp.name]]></ENTITY_ALIAS>
 <!--2295DC7A28FE4F9DA842F453E2FF2F41-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--2295DC7A28FE4F9DA842F453E2FF2F41-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
 <!--2295DC7A28FE4F9DA842F453E2FF2F41-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
@@ -2645,6 +2691,45 @@
 <!--46BDDEB8C59C4ADA9C4C9D837A10CD45-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--46BDDEB8C59C4ADA9C4C9D837A10CD45--></AD_COLUMN>
 
+<!--47DC39551EA14F5E861296054B731B26--><AD_COLUMN>
+<!--47DC39551EA14F5E861296054B731B26-->  <AD_COLUMN_ID><![CDATA[47DC39551EA14F5E861296054B731B26]]></AD_COLUMN_ID>
+<!--47DC39551EA14F5E861296054B731B26-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--47DC39551EA14F5E861296054B731B26-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--47DC39551EA14F5E861296054B731B26-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--47DC39551EA14F5E861296054B731B26-->  <NAME><![CDATA[EM_APRM_Displayed_Acc_ID]]></NAME>
+<!--47DC39551EA14F5E861296054B731B26-->  <DESCRIPTION><![CDATA[Displayed Financial Account field in Sales Order Payment Schedule Details tab. For netting payments the value displayed will be empty.]]></DESCRIPTION>
+<!--47DC39551EA14F5E861296054B731B26-->  <HELP><![CDATA[Displayed Financial Account field in Sales Order Payment Schedule Details tab. For netting payments the value displayed will be empty.]]></HELP>
+<!--47DC39551EA14F5E861296054B731B26-->  <COLUMNNAME><![CDATA[EM_APRM_Displayed_Acc_ID]]></COLUMNNAME>
+<!--47DC39551EA14F5E861296054B731B26-->  <AD_TABLE_ID><![CDATA[DC63963AB3F1489BAAB5A9A7EFD1B407]]></AD_TABLE_ID>
+<!--47DC39551EA14F5E861296054B731B26-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--47DC39551EA14F5E861296054B731B26-->  <AD_REFERENCE_VALUE_ID><![CDATA[03D336BF39A7455C8FD64CBCCFB4FC1C]]></AD_REFERENCE_VALUE_ID>
+<!--47DC39551EA14F5E861296054B731B26-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--47DC39551EA14F5E861296054B731B26-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--47DC39551EA14F5E861296054B731B26-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--47DC39551EA14F5E861296054B731B26-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--47DC39551EA14F5E861296054B731B26-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--47DC39551EA14F5E861296054B731B26-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--47DC39551EA14F5E861296054B731B26-->  <SEQNO><![CDATA[470]]></SEQNO>
+<!--47DC39551EA14F5E861296054B731B26-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--47DC39551EA14F5E861296054B731B26-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--47DC39551EA14F5E861296054B731B26-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--47DC39551EA14F5E861296054B731B26-->  <AD_ELEMENT_ID><![CDATA[124C4AAA06BA4D939D862BEE389AB4DA]]></AD_ELEMENT_ID>
+<!--47DC39551EA14F5E861296054B731B26-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--47DC39551EA14F5E861296054B731B26-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--47DC39551EA14F5E861296054B731B26-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--47DC39551EA14F5E861296054B731B26-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--47DC39551EA14F5E861296054B731B26-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--47DC39551EA14F5E861296054B731B26-->  <POSITION><![CDATA[41]]></POSITION>
+<!--47DC39551EA14F5E861296054B731B26-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--47DC39551EA14F5E861296054B731B26-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--47DC39551EA14F5E861296054B731B26-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--47DC39551EA14F5E861296054B731B26-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--47DC39551EA14F5E861296054B731B26-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--47DC39551EA14F5E861296054B731B26-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--47DC39551EA14F5E861296054B731B26-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--47DC39551EA14F5E861296054B731B26-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--47DC39551EA14F5E861296054B731B26--></AD_COLUMN>
+
 <!--49BEE6AEC60D4C61922B2B2DB42D7918--><AD_COLUMN>
 <!--49BEE6AEC60D4C61922B2B2DB42D7918-->  <AD_COLUMN_ID><![CDATA[49BEE6AEC60D4C61922B2B2DB42D7918]]></AD_COLUMN_ID>
 <!--49BEE6AEC60D4C61922B2B2DB42D7918-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -7315,7 +7400,7 @@
 <!--986B657361F64EB59F7991710E6CBD71-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--986B657361F64EB59F7991710E6CBD71-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--986B657361F64EB59F7991710E6CBD71-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--986B657361F64EB59F7991710E6CBD71-->  <POSITION><![CDATA[41]]></POSITION>
+<!--986B657361F64EB59F7991710E6CBD71-->  <POSITION><![CDATA[40]]></POSITION>
 <!--986B657361F64EB59F7991710E6CBD71-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--986B657361F64EB59F7991710E6CBD71-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--986B657361F64EB59F7991710E6CBD71-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -9824,6 +9909,45 @@
 <!--AEF30836571D49FB96C42D7DD85FDDED-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--AEF30836571D49FB96C42D7DD85FDDED--></AD_COLUMN>
 
+<!--AFFEB1DBCEFF4A63871F1E214E01071C--><AD_COLUMN>
+<!--AFFEB1DBCEFF4A63871F1E214E01071C-->  <AD_COLUMN_ID><![CDATA[AFFEB1DBCEFF4A63871F1E214E01071C]]></AD_COLUMN_ID>
+<!--AFFEB1DBCEFF4A63871F1E214E01071C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--AFFEB1DBCEFF4A63871F1E214E01071C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--AFFEB1DBCEFF4A63871F1E214E01071C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--AFFEB1DBCEFF4A63871F1E214E01071C-->  <NAME><![CDATA[EM_Aprm_Funds_Trans]]></NAME>
+<!--AFFEB1DBCEFF4A63871F1E214E01071C-->  <DESCRIPTION><![CDATA[Transfer funds between Financial Accounts]]></DESCRIPTION>
+<!--AFFEB1DBCEFF4A63871F1E214E01071C-->  <HELP><![CDATA[Transfer funds between Financial Accounts]]></HELP>
+<!--AFFEB1DBCEFF4A63871F1E214E01071C-->  <COLUMNNAME><![CDATA[EM_Aprm_Funds_Trans]]></COLUMNNAME>
+<!--AFFEB1DBCEFF4A63871F1E214E01071C-->  <AD_TABLE_ID><![CDATA[B129E53BC0E747879F7BA17F0AECEC32]]></AD_TABLE_ID>
+<!--AFFEB1DBCEFF4A63871F1E214E01071C-->  <AD_REFERENCE_ID><![CDATA[28]]></AD_REFERENCE_ID>
+<!--AFFEB1DBCEFF4A63871F1E214E01071C-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--AFFEB1DBCEFF4A63871F1E214E01071C-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--AFFEB1DBCEFF4A63871F1E214E01071C-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--AFFEB1DBCEFF4A63871F1E214E01071C-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--AFFEB1DBCEFF4A63871F1E214E01071C-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--AFFEB1DBCEFF4A63871F1E214E01071C-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--AFFEB1DBCEFF4A63871F1E214E01071C-->  <SEQNO><![CDATA[510]]></SEQNO>
+<!--AFFEB1DBCEFF4A63871F1E214E01071C-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--AFFEB1DBCEFF4A63871F1E214E01071C-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--AFFEB1DBCEFF4A63871F1E214E01071C-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--AFFEB1DBCEFF4A63871F1E214E01071C-->  <AD_ELEMENT_ID><![CDATA[614DA3D0232C447CAB525FB9BFCB8709]]></AD_ELEMENT_ID>
+<!--AFFEB1DBCEFF4A63871F1E214E01071C-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--AFFEB1DBCEFF4A63871F1E214E01071C-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--AFFEB1DBCEFF4A63871F1E214E01071C-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--AFFEB1DBCEFF4A63871F1E214E01071C-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--AFFEB1DBCEFF4A63871F1E214E01071C-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--AFFEB1DBCEFF4A63871F1E214E01071C-->  <POSITION><![CDATA[43]]></POSITION>
+<!--AFFEB1DBCEFF4A63871F1E214E01071C-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--AFFEB1DBCEFF4A63871F1E214E01071C-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--AFFEB1DBCEFF4A63871F1E214E01071C-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--AFFEB1DBCEFF4A63871F1E214E01071C-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--AFFEB1DBCEFF4A63871F1E214E01071C-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--AFFEB1DBCEFF4A63871F1E214E01071C-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--AFFEB1DBCEFF4A63871F1E214E01071C-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--AFFEB1DBCEFF4A63871F1E214E01071C-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--AFFEB1DBCEFF4A63871F1E214E01071C-->  <EM_OBUIAPP_PROCESS_ID><![CDATA[CC73C4845CDC487395804946EACB225F]]></EM_OBUIAPP_PROCESS_ID>
+<!--AFFEB1DBCEFF4A63871F1E214E01071C--></AD_COLUMN>
+
 <!--B01D6A5AF6F14FD6947BDEEF22C35CF8--><AD_COLUMN>
 <!--B01D6A5AF6F14FD6947BDEEF22C35CF8-->  <AD_COLUMN_ID><![CDATA[B01D6A5AF6F14FD6947BDEEF22C35CF8]]></AD_COLUMN_ID>
 <!--B01D6A5AF6F14FD6947BDEEF22C35CF8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -10967,6 +11091,45 @@
 <!--C72EC790B2EF4BEEA2A843D30770B85D-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--C72EC790B2EF4BEEA2A843D30770B85D--></AD_COLUMN>
 
+<!--C8B98FF8B51C43F7B12E8C448B0A2725--><AD_COLUMN>
+<!--C8B98FF8B51C43F7B12E8C448B0A2725-->  <AD_COLUMN_ID><![CDATA[C8B98FF8B51C43F7B12E8C448B0A2725]]></AD_COLUMN_ID>
+<!--C8B98FF8B51C43F7B12E8C448B0A2725-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C8B98FF8B51C43F7B12E8C448B0A2725-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C8B98FF8B51C43F7B12E8C448B0A2725-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C8B98FF8B51C43F7B12E8C448B0A2725-->  <NAME><![CDATA[EM_APRM_Displayed_Paymmeth_ID]]></NAME>
+<!--C8B98FF8B51C43F7B12E8C448B0A2725-->  <DESCRIPTION><![CDATA[Displayed Payment Method field in Sales Order Payment Schedule Details tab. For netting payments the value displayed will be empty.]]></DESCRIPTION>
+<!--C8B98FF8B51C43F7B12E8C448B0A2725-->  <HELP><![CDATA[Displayed Payment Method field in Sales Order Payment Schedule Details tab. For netting payments the value displayed will be empty.]]></HELP>
+<!--C8B98FF8B51C43F7B12E8C448B0A2725-->  <COLUMNNAME><![CDATA[EM_APRM_Displayed_Paymmeth_ID]]></COLUMNNAME>
+<!--C8B98FF8B51C43F7B12E8C448B0A2725-->  <AD_TABLE_ID><![CDATA[DC63963AB3F1489BAAB5A9A7EFD1B407]]></AD_TABLE_ID>
+<!--C8B98FF8B51C43F7B12E8C448B0A2725-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--C8B98FF8B51C43F7B12E8C448B0A2725-->  <AD_REFERENCE_VALUE_ID><![CDATA[F378D8FAEF9441F29D3974ADE211BF98]]></AD_REFERENCE_VALUE_ID>
+<!--C8B98FF8B51C43F7B12E8C448B0A2725-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--C8B98FF8B51C43F7B12E8C448B0A2725-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--C8B98FF8B51C43F7B12E8C448B0A2725-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--C8B98FF8B51C43F7B12E8C448B0A2725-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--C8B98FF8B51C43F7B12E8C448B0A2725-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--C8B98FF8B51C43F7B12E8C448B0A2725-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--C8B98FF8B51C43F7B12E8C448B0A2725-->  <SEQNO><![CDATA[460]]></SEQNO>
+<!--C8B98FF8B51C43F7B12E8C448B0A2725-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--C8B98FF8B51C43F7B12E8C448B0A2725-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--C8B98FF8B51C43F7B12E8C448B0A2725-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--C8B98FF8B51C43F7B12E8C448B0A2725-->  <AD_ELEMENT_ID><![CDATA[D0F4319D572E49398FD01216BA9DE4EF]]></AD_ELEMENT_ID>
+<!--C8B98FF8B51C43F7B12E8C448B0A2725-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--C8B98FF8B51C43F7B12E8C448B0A2725-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--C8B98FF8B51C43F7B12E8C448B0A2725-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--C8B98FF8B51C43F7B12E8C448B0A2725-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--C8B98FF8B51C43F7B12E8C448B0A2725-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--C8B98FF8B51C43F7B12E8C448B0A2725-->  <POSITION><![CDATA[40]]></POSITION>
+<!--C8B98FF8B51C43F7B12E8C448B0A2725-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--C8B98FF8B51C43F7B12E8C448B0A2725-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--C8B98FF8B51C43F7B12E8C448B0A2725-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--C8B98FF8B51C43F7B12E8C448B0A2725-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--C8B98FF8B51C43F7B12E8C448B0A2725-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--C8B98FF8B51C43F7B12E8C448B0A2725-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--C8B98FF8B51C43F7B12E8C448B0A2725-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--C8B98FF8B51C43F7B12E8C448B0A2725-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--C8B98FF8B51C43F7B12E8C448B0A2725--></AD_COLUMN>
+
 <!--C9FD369BECE545828033CC49CAB85D9D--><AD_COLUMN>
 <!--C9FD369BECE545828033CC49CAB85D9D-->  <AD_COLUMN_ID><![CDATA[C9FD369BECE545828033CC49CAB85D9D]]></AD_COLUMN_ID>
 <!--C9FD369BECE545828033CC49CAB85D9D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -11156,6 +11319,46 @@
 <!--D4C27D211DF9416DA498EEFB6C008B7B-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--D4C27D211DF9416DA498EEFB6C008B7B--></AD_COLUMN>
 
+<!--D5B4BD05344C4B44AB7ED2F6CF9C86F6--><AD_COLUMN>
+<!--D5B4BD05344C4B44AB7ED2F6CF9C86F6-->  <AD_COLUMN_ID><![CDATA[D5B4BD05344C4B44AB7ED2F6CF9C86F6]]></AD_COLUMN_ID>
+<!--D5B4BD05344C4B44AB7ED2F6CF9C86F6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D5B4BD05344C4B44AB7ED2F6CF9C86F6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D5B4BD05344C4B44AB7ED2F6CF9C86F6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D5B4BD05344C4B44AB7ED2F6CF9C86F6-->  <NAME><![CDATA[EM_Aprm_Finacc_Trans_Origin]]></NAME>
+<!--D5B4BD05344C4B44AB7ED2F6CF9C86F6-->  <DESCRIPTION><![CDATA[Financial Account from where the funds were transferred]]></DESCRIPTION>
+<!--D5B4BD05344C4B44AB7ED2F6CF9C86F6-->  <HELP><![CDATA[Financial Account from where the funds were transferred]]></HELP>
+<!--D5B4BD05344C4B44AB7ED2F6CF9C86F6-->  <COLUMNNAME><![CDATA[EM_Aprm_Finacc_Trans_Origin]]></COLUMNNAME>
+<!--D5B4BD05344C4B44AB7ED2F6CF9C86F6-->  <AD_TABLE_ID><![CDATA[4D8C3B3C31D1410DA046140C9F024D17]]></AD_TABLE_ID>
+<!--D5B4BD05344C4B44AB7ED2F6CF9C86F6-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--D5B4BD05344C4B44AB7ED2F6CF9C86F6-->  <AD_REFERENCE_VALUE_ID><![CDATA[98E0BF0783E44EFABE2F2BDDE866D6AE]]></AD_REFERENCE_VALUE_ID>
+<!--D5B4BD05344C4B44AB7ED2F6CF9C86F6-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--D5B4BD05344C4B44AB7ED2F6CF9C86F6-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--D5B4BD05344C4B44AB7ED2F6CF9C86F6-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--D5B4BD05344C4B44AB7ED2F6CF9C86F6-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--D5B4BD05344C4B44AB7ED2F6CF9C86F6-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--D5B4BD05344C4B44AB7ED2F6CF9C86F6-->  <READONLYLOGIC><![CDATA['Y']]></READONLYLOGIC>
+<!--D5B4BD05344C4B44AB7ED2F6CF9C86F6-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--D5B4BD05344C4B44AB7ED2F6CF9C86F6-->  <SEQNO><![CDATA[410]]></SEQNO>
+<!--D5B4BD05344C4B44AB7ED2F6CF9C86F6-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--D5B4BD05344C4B44AB7ED2F6CF9C86F6-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--D5B4BD05344C4B44AB7ED2F6CF9C86F6-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--D5B4BD05344C4B44AB7ED2F6CF9C86F6-->  <AD_ELEMENT_ID><![CDATA[5EC0293D0A0A48E086D239D216947A1D]]></AD_ELEMENT_ID>
+<!--D5B4BD05344C4B44AB7ED2F6CF9C86F6-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--D5B4BD05344C4B44AB7ED2F6CF9C86F6-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--D5B4BD05344C4B44AB7ED2F6CF9C86F6-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--D5B4BD05344C4B44AB7ED2F6CF9C86F6-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--D5B4BD05344C4B44AB7ED2F6CF9C86F6-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--D5B4BD05344C4B44AB7ED2F6CF9C86F6-->  <POSITION><![CDATA[41]]></POSITION>
+<!--D5B4BD05344C4B44AB7ED2F6CF9C86F6-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--D5B4BD05344C4B44AB7ED2F6CF9C86F6-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--D5B4BD05344C4B44AB7ED2F6CF9C86F6-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--D5B4BD05344C4B44AB7ED2F6CF9C86F6-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--D5B4BD05344C4B44AB7ED2F6CF9C86F6-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--D5B4BD05344C4B44AB7ED2F6CF9C86F6-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--D5B4BD05344C4B44AB7ED2F6CF9C86F6-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--D5B4BD05344C4B44AB7ED2F6CF9C86F6-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--D5B4BD05344C4B44AB7ED2F6CF9C86F6--></AD_COLUMN>
+
 <!--D6A01A3BA0674CC49C7F17FA2251E7C6--><AD_COLUMN>
 <!--D6A01A3BA0674CC49C7F17FA2251E7C6-->  <AD_COLUMN_ID><![CDATA[D6A01A3BA0674CC49C7F17FA2251E7C6]]></AD_COLUMN_ID>
 <!--D6A01A3BA0674CC49C7F17FA2251E7C6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -11578,6 +11781,52 @@
 <!--E6DB13E1516947B7A8DC5741D58A7AB2-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--E6DB13E1516947B7A8DC5741D58A7AB2--></AD_COLUMN>
 
+<!--E73D535A7F9D4494AF132A66AE861168--><AD_COLUMN>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <AD_COLUMN_ID><![CDATA[E73D535A7F9D4494AF132A66AE861168]]></AD_COLUMN_ID>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <NAME><![CDATA[EM_APRM_PaymentMethod]]></NAME>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <DESCRIPTION><![CDATA[Payment Method in Sales Invoice]]></DESCRIPTION>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <HELP><![CDATA[Payment Method in Sales Invoice]]></HELP>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <COLUMNNAME><![CDATA[EM_APRM_PaymentMethod]]></COLUMNNAME>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <AD_TABLE_ID><![CDATA[C0233061EA504EFEAB0483E836BBAF31]]></AD_TABLE_ID>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <AD_REFERENCE_VALUE_ID><![CDATA[E664E415582A483DBBC91DEF256FB9E6]]></AD_REFERENCE_VALUE_ID>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <SEQNO><![CDATA[300]]></SEQNO>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <AD_ELEMENT_ID><![CDATA[2622EC9C32614ED692A415EC3F3DC3EF]]></AD_ELEMENT_ID>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <SQLLOGIC><![CDATA[(select
+   case p.amount
+     when 0 then null
+     else p.fin_paymentmethod_id
+   end
+ from fin_payment_detail pd
+   join fin_payment p on p.fin_payment_id = pd.fin_payment_id
+ where pd.fin_payment_detail_id = fin_payment_detail_id)]]></SQLLOGIC>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--E73D535A7F9D4494AF132A66AE861168--></AD_COLUMN>
+
 <!--E88F9871B4184489A5B188A589FB8543--><AD_COLUMN>
 <!--E88F9871B4184489A5B188A589FB8543-->  <AD_COLUMN_ID><![CDATA[E88F9871B4184489A5B188A589FB8543]]></AD_COLUMN_ID>
 <!--E88F9871B4184489A5B188A589FB8543-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -50,6 +50,20 @@
 <!--0CF797887AC9494F9C250A6B6EB5D60D-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--0CF797887AC9494F9C250A6B6EB5D60D--></AD_ELEMENT>
 
+<!--124C4AAA06BA4D939D862BEE389AB4DA--><AD_ELEMENT>
+<!--124C4AAA06BA4D939D862BEE389AB4DA-->  <AD_ELEMENT_ID><![CDATA[124C4AAA06BA4D939D862BEE389AB4DA]]></AD_ELEMENT_ID>
+<!--124C4AAA06BA4D939D862BEE389AB4DA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--124C4AAA06BA4D939D862BEE389AB4DA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--124C4AAA06BA4D939D862BEE389AB4DA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--124C4AAA06BA4D939D862BEE389AB4DA-->  <COLUMNNAME><![CDATA[EM_APRM_Displayed_Acc_ID]]></COLUMNNAME>
+<!--124C4AAA06BA4D939D862BEE389AB4DA-->  <NAME><![CDATA[Financial Account]]></NAME>
+<!--124C4AAA06BA4D939D862BEE389AB4DA-->  <PRINTNAME><![CDATA[Financial Account]]></PRINTNAME>
+<!--124C4AAA06BA4D939D862BEE389AB4DA-->  <DESCRIPTION><![CDATA[Displayed Financial Account field in Sales Order Payment Schedule Details tab. For netting payments the value displayed will be empty.]]></DESCRIPTION>
+<!--124C4AAA06BA4D939D862BEE389AB4DA-->  <HELP><![CDATA[Displayed Financial Account field in Sales Order Payment Schedule Details tab. For netting payments the value displayed will be empty.]]></HELP>
+<!--124C4AAA06BA4D939D862BEE389AB4DA-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--124C4AAA06BA4D939D862BEE389AB4DA-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--124C4AAA06BA4D939D862BEE389AB4DA--></AD_ELEMENT>
+
 <!--1C8028555014460F81C6ACC811CA74E2--><AD_ELEMENT>
 <!--1C8028555014460F81C6ACC811CA74E2-->  <AD_ELEMENT_ID><![CDATA[1C8028555014460F81C6ACC811CA74E2]]></AD_ELEMENT_ID>
 <!--1C8028555014460F81C6ACC811CA74E2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -86,6 +100,20 @@
 <!--256AB5C3D6144B2C9884CF0FA4D81911-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--256AB5C3D6144B2C9884CF0FA4D81911--></AD_ELEMENT>
 
+<!--2622EC9C32614ED692A415EC3F3DC3EF--><AD_ELEMENT>
+<!--2622EC9C32614ED692A415EC3F3DC3EF-->  <AD_ELEMENT_ID><![CDATA[2622EC9C32614ED692A415EC3F3DC3EF]]></AD_ELEMENT_ID>
+<!--2622EC9C32614ED692A415EC3F3DC3EF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2622EC9C32614ED692A415EC3F3DC3EF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2622EC9C32614ED692A415EC3F3DC3EF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2622EC9C32614ED692A415EC3F3DC3EF-->  <COLUMNNAME><![CDATA[EM_APRM_PaymentMethod]]></COLUMNNAME>
+<!--2622EC9C32614ED692A415EC3F3DC3EF-->  <NAME><![CDATA[Payment Method]]></NAME>
+<!--2622EC9C32614ED692A415EC3F3DC3EF-->  <PRINTNAME><![CDATA[Payment Method]]></PRINTNAME>
+<!--2622EC9C32614ED692A415EC3F3DC3EF-->  <DESCRIPTION><![CDATA[Payment Method in Sales Invoice]]></DESCRIPTION>
+<!--2622EC9C32614ED692A415EC3F3DC3EF-->  <HELP><![CDATA[Payment Method in Sales Invoice]]></HELP>
+<!--2622EC9C32614ED692A415EC3F3DC3EF-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--2622EC9C32614ED692A415EC3F3DC3EF-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--2622EC9C32614ED692A415EC3F3DC3EF--></AD_ELEMENT>
+
 <!--2C70D5BAFED340D68C564DA5C3F15A7E--><AD_ELEMENT>
 <!--2C70D5BAFED340D68C564DA5C3F15A7E-->  <AD_ELEMENT_ID><![CDATA[2C70D5BAFED340D68C564DA5C3F15A7E]]></AD_ELEMENT_ID>
 <!--2C70D5BAFED340D68C564DA5C3F15A7E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -123,7 +151,7 @@
 <!--2D1363BA8FFD443D89B0F2C92FD2BBC4-->  <NAME><![CDATA[Currency To]]></NAME>
 <!--2D1363BA8FFD443D89B0F2C92FD2BBC4-->  <PRINTNAME><![CDATA[Currency To]]></PRINTNAME>
 <!--2D1363BA8FFD443D89B0F2C92FD2BBC4-->  <DESCRIPTION><![CDATA[Target currency]]></DESCRIPTION>
-<!--2D1363BA8FFD443D89B0F2C92FD2BBC4-->  <HELP><![CDATA[The Currency To defines the target currency for this conversion rate.]]></HELP>
+<!--2D1363BA8FFD443D89B0F2C92FD2BBC4-->  <HELP><![CDATA[The Currency To defines the target currency for this conversion rate]]></HELP>
 <!--2D1363BA8FFD443D89B0F2C92FD2BBC4-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--2D1363BA8FFD443D89B0F2C92FD2BBC4-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--2D1363BA8FFD443D89B0F2C92FD2BBC4--></AD_ELEMENT>
@@ -182,6 +210,20 @@
 <!--3D4B985F137B47DCA7723991D1668C46-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--3D4B985F137B47DCA7723991D1668C46--></AD_ELEMENT>
 
+<!--3FD7BEBC464E44469550B39D5C48AE2C--><AD_ELEMENT>
+<!--3FD7BEBC464E44469550B39D5C48AE2C-->  <AD_ELEMENT_ID><![CDATA[3FD7BEBC464E44469550B39D5C48AE2C]]></AD_ELEMENT_ID>
+<!--3FD7BEBC464E44469550B39D5C48AE2C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3FD7BEBC464E44469550B39D5C48AE2C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3FD7BEBC464E44469550B39D5C48AE2C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3FD7BEBC464E44469550B39D5C48AE2C-->  <COLUMNNAME><![CDATA[trxdate]]></COLUMNNAME>
+<!--3FD7BEBC464E44469550B39D5C48AE2C-->  <NAME><![CDATA[Transaction Date]]></NAME>
+<!--3FD7BEBC464E44469550B39D5C48AE2C-->  <PRINTNAME><![CDATA[Transaction Date]]></PRINTNAME>
+<!--3FD7BEBC464E44469550B39D5C48AE2C-->  <DESCRIPTION><![CDATA[Date for the generated transactions]]></DESCRIPTION>
+<!--3FD7BEBC464E44469550B39D5C48AE2C-->  <HELP><![CDATA[Date for the generated transactions]]></HELP>
+<!--3FD7BEBC464E44469550B39D5C48AE2C-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--3FD7BEBC464E44469550B39D5C48AE2C-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--3FD7BEBC464E44469550B39D5C48AE2C--></AD_ELEMENT>
+
 <!--429B447E4FE9420287E1EEB75DC341E9--><AD_ELEMENT>
 <!--429B447E4FE9420287E1EEB75DC341E9-->  <AD_ELEMENT_ID><![CDATA[429B447E4FE9420287E1EEB75DC341E9]]></AD_ELEMENT_ID>
 <!--429B447E4FE9420287E1EEB75DC341E9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -236,6 +278,20 @@
 <!--4BFB1532D2684F2B9997BF3B5555BFCB-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--4BFB1532D2684F2B9997BF3B5555BFCB--></AD_ELEMENT>
 
+<!--4E2A12CBEE07461DAA355A0E0B81AA3B--><AD_ELEMENT>
+<!--4E2A12CBEE07461DAA355A0E0B81AA3B-->  <AD_ELEMENT_ID><![CDATA[4E2A12CBEE07461DAA355A0E0B81AA3B]]></AD_ELEMENT_ID>
+<!--4E2A12CBEE07461DAA355A0E0B81AA3B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4E2A12CBEE07461DAA355A0E0B81AA3B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4E2A12CBEE07461DAA355A0E0B81AA3B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4E2A12CBEE07461DAA355A0E0B81AA3B-->  <COLUMNNAME><![CDATA[bank_fee_to]]></COLUMNNAME>
+<!--4E2A12CBEE07461DAA355A0E0B81AA3B-->  <NAME><![CDATA[Bank Fee To]]></NAME>
+<!--4E2A12CBEE07461DAA355A0E0B81AA3B-->  <PRINTNAME><![CDATA[Bank Fee To]]></PRINTNAME>
+<!--4E2A12CBEE07461DAA355A0E0B81AA3B-->  <DESCRIPTION><![CDATA[Fee at the target Bank]]></DESCRIPTION>
+<!--4E2A12CBEE07461DAA355A0E0B81AA3B-->  <HELP><![CDATA[Fee at the target Bank]]></HELP>
+<!--4E2A12CBEE07461DAA355A0E0B81AA3B-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--4E2A12CBEE07461DAA355A0E0B81AA3B-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--4E2A12CBEE07461DAA355A0E0B81AA3B--></AD_ELEMENT>
+
 <!--51261A2D20064858BC608E7468B148D4--><AD_ELEMENT>
 <!--51261A2D20064858BC608E7468B148D4-->  <AD_ELEMENT_ID><![CDATA[51261A2D20064858BC608E7468B148D4]]></AD_ELEMENT_ID>
 <!--51261A2D20064858BC608E7468B148D4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -376,6 +432,20 @@
 <!--5D3526B2FC0F4BB2BE7FE13C5E9C009A-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--5D3526B2FC0F4BB2BE7FE13C5E9C009A--></AD_ELEMENT>
 
+<!--5EC0293D0A0A48E086D239D216947A1D--><AD_ELEMENT>
+<!--5EC0293D0A0A48E086D239D216947A1D-->  <AD_ELEMENT_ID><![CDATA[5EC0293D0A0A48E086D239D216947A1D]]></AD_ELEMENT_ID>
+<!--5EC0293D0A0A48E086D239D216947A1D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5EC0293D0A0A48E086D239D216947A1D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5EC0293D0A0A48E086D239D216947A1D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5EC0293D0A0A48E086D239D216947A1D-->  <COLUMNNAME><![CDATA[EM_Aprm_Finacc_Trans_Origin]]></COLUMNNAME>
+<!--5EC0293D0A0A48E086D239D216947A1D-->  <NAME><![CDATA[Origin Financial Account]]></NAME>
+<!--5EC0293D0A0A48E086D239D216947A1D-->  <PRINTNAME><![CDATA[Origin Financial Account]]></PRINTNAME>
+<!--5EC0293D0A0A48E086D239D216947A1D-->  <DESCRIPTION><![CDATA[Financial Account from where the funds were transferred]]></DESCRIPTION>
+<!--5EC0293D0A0A48E086D239D216947A1D-->  <HELP><![CDATA[Financial Account from where the funds were transferred]]></HELP>
+<!--5EC0293D0A0A48E086D239D216947A1D-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--5EC0293D0A0A48E086D239D216947A1D-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--5EC0293D0A0A48E086D239D216947A1D--></AD_ELEMENT>
+
 <!--5EE957873DEE4461A57BA8CAEAF50943--><AD_ELEMENT>
 <!--5EE957873DEE4461A57BA8CAEAF50943-->  <AD_ELEMENT_ID><![CDATA[5EE957873DEE4461A57BA8CAEAF50943]]></AD_ELEMENT_ID>
 <!--5EE957873DEE4461A57BA8CAEAF50943-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -416,6 +486,20 @@
 <!--6037A140C2664B6991BFD4EC7561A662-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--6037A140C2664B6991BFD4EC7561A662--></AD_ELEMENT>
 
+<!--614DA3D0232C447CAB525FB9BFCB8709--><AD_ELEMENT>
+<!--614DA3D0232C447CAB525FB9BFCB8709-->  <AD_ELEMENT_ID><![CDATA[614DA3D0232C447CAB525FB9BFCB8709]]></AD_ELEMENT_ID>
+<!--614DA3D0232C447CAB525FB9BFCB8709-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--614DA3D0232C447CAB525FB9BFCB8709-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--614DA3D0232C447CAB525FB9BFCB8709-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--614DA3D0232C447CAB525FB9BFCB8709-->  <COLUMNNAME><![CDATA[EM_Aprm_Funds_Trans]]></COLUMNNAME>
+<!--614DA3D0232C447CAB525FB9BFCB8709-->  <NAME><![CDATA[Funds Transfer]]></NAME>
+<!--614DA3D0232C447CAB525FB9BFCB8709-->  <PRINTNAME><![CDATA[Funds Transfer]]></PRINTNAME>
+<!--614DA3D0232C447CAB525FB9BFCB8709-->  <DESCRIPTION><![CDATA[Transfer funds between Financial Accounts]]></DESCRIPTION>
+<!--614DA3D0232C447CAB525FB9BFCB8709-->  <HELP><![CDATA[Transfer funds between Financial Accounts]]></HELP>
+<!--614DA3D0232C447CAB525FB9BFCB8709-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--614DA3D0232C447CAB525FB9BFCB8709-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--614DA3D0232C447CAB525FB9BFCB8709--></AD_ELEMENT>
+
 <!--646F81BD290C4A168217769FCE9E1E59--><AD_ELEMENT>
 <!--646F81BD290C4A168217769FCE9E1E59-->  <AD_ELEMENT_ID><![CDATA[646F81BD290C4A168217769FCE9E1E59]]></AD_ELEMENT_ID>
 <!--646F81BD290C4A168217769FCE9E1E59-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1024,6 +1108,20 @@
 <!--A0417A0E924ECA28E040007F01003C18-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--A0417A0E924ECA28E040007F01003C18--></AD_ELEMENT>
 
+<!--A0CEAF4259424F31B5E8751CBFBCCF26--><AD_ELEMENT>
+<!--A0CEAF4259424F31B5E8751CBFBCCF26-->  <AD_ELEMENT_ID><![CDATA[A0CEAF4259424F31B5E8751CBFBCCF26]]></AD_ELEMENT_ID>
+<!--A0CEAF4259424F31B5E8751CBFBCCF26-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A0CEAF4259424F31B5E8751CBFBCCF26-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A0CEAF4259424F31B5E8751CBFBCCF26-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A0CEAF4259424F31B5E8751CBFBCCF26-->  <COLUMNNAME><![CDATA[bank_fee]]></COLUMNNAME>
+<!--A0CEAF4259424F31B5E8751CBFBCCF26-->  <NAME><![CDATA[Bank Fee]]></NAME>
+<!--A0CEAF4259424F31B5E8751CBFBCCF26-->  <PRINTNAME><![CDATA[Bank Fee]]></PRINTNAME>
+<!--A0CEAF4259424F31B5E8751CBFBCCF26-->  <DESCRIPTION><![CDATA[This transaction is subject to a Bank Fee]]></DESCRIPTION>
+<!--A0CEAF4259424F31B5E8751CBFBCCF26-->  <HELP><![CDATA[This transaction is subject to a Bank Fee]]></HELP>
+<!--A0CEAF4259424F31B5E8751CBFBCCF26-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--A0CEAF4259424F31B5E8751CBFBCCF26-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--A0CEAF4259424F31B5E8751CBFBCCF26--></AD_ELEMENT>
+
 <!--A28B183E6A9B34C0E040007F010067F9--><AD_ELEMENT>
 <!--A28B183E6A9B34C0E040007F010067F9-->  <AD_ELEMENT_ID><![CDATA[A28B183E6A9B34C0E040007F010067F9]]></AD_ELEMENT_ID>
 <!--A28B183E6A9B34C0E040007F010067F9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1202,6 +1300,32 @@
 <!--B40C938A247779EFE040A8C0916618AE-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--B40C938A247779EFE040A8C0916618AE--></AD_ELEMENT>
 
+<!--B4F49C74A5FE40A48F023D34C6BE3837--><AD_ELEMENT>
+<!--B4F49C74A5FE40A48F023D34C6BE3837-->  <AD_ELEMENT_ID><![CDATA[B4F49C74A5FE40A48F023D34C6BE3837]]></AD_ELEMENT_ID>
+<!--B4F49C74A5FE40A48F023D34C6BE3837-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B4F49C74A5FE40A48F023D34C6BE3837-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B4F49C74A5FE40A48F023D34C6BE3837-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B4F49C74A5FE40A48F023D34C6BE3837-->  <COLUMNNAME><![CDATA[deposit_amount]]></COLUMNNAME>
+<!--B4F49C74A5FE40A48F023D34C6BE3837-->  <NAME><![CDATA[Deposit Amount]]></NAME>
+<!--B4F49C74A5FE40A48F023D34C6BE3837-->  <PRINTNAME><![CDATA[Deposit Amount]]></PRINTNAME>
+<!--B4F49C74A5FE40A48F023D34C6BE3837-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--B4F49C74A5FE40A48F023D34C6BE3837-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--B4F49C74A5FE40A48F023D34C6BE3837--></AD_ELEMENT>
+
+<!--B8DABAF351464FA1A0F3C4C91515BDE5--><AD_ELEMENT>
+<!--B8DABAF351464FA1A0F3C4C91515BDE5-->  <AD_ELEMENT_ID><![CDATA[B8DABAF351464FA1A0F3C4C91515BDE5]]></AD_ELEMENT_ID>
+<!--B8DABAF351464FA1A0F3C4C91515BDE5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B8DABAF351464FA1A0F3C4C91515BDE5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B8DABAF351464FA1A0F3C4C91515BDE5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B8DABAF351464FA1A0F3C4C91515BDE5-->  <COLUMNNAME><![CDATA[bank_fee_from]]></COLUMNNAME>
+<!--B8DABAF351464FA1A0F3C4C91515BDE5-->  <NAME><![CDATA[Bank Fee From]]></NAME>
+<!--B8DABAF351464FA1A0F3C4C91515BDE5-->  <PRINTNAME><![CDATA[Bank Fee From]]></PRINTNAME>
+<!--B8DABAF351464FA1A0F3C4C91515BDE5-->  <DESCRIPTION><![CDATA[Fee at the origin Bank]]></DESCRIPTION>
+<!--B8DABAF351464FA1A0F3C4C91515BDE5-->  <HELP><![CDATA[Fee at the origin Bank]]></HELP>
+<!--B8DABAF351464FA1A0F3C4C91515BDE5-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--B8DABAF351464FA1A0F3C4C91515BDE5-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--B8DABAF351464FA1A0F3C4C91515BDE5--></AD_ELEMENT>
+
 <!--BB0EF19322AC4CFF9777A049BEC77887--><AD_ELEMENT>
 <!--BB0EF19322AC4CFF9777A049BEC77887-->  <AD_ELEMENT_ID><![CDATA[BB0EF19322AC4CFF9777A049BEC77887]]></AD_ELEMENT_ID>
 <!--BB0EF19322AC4CFF9777A049BEC77887-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1324,6 +1448,20 @@
 <!--CCB29A49EE4048A2BF99EBF2FC0C0241-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--CCB29A49EE4048A2BF99EBF2FC0C0241--></AD_ELEMENT>
 
+<!--D0F4319D572E49398FD01216BA9DE4EF--><AD_ELEMENT>
+<!--D0F4319D572E49398FD01216BA9DE4EF-->  <AD_ELEMENT_ID><![CDATA[D0F4319D572E49398FD01216BA9DE4EF]]></AD_ELEMENT_ID>
+<!--D0F4319D572E49398FD01216BA9DE4EF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D0F4319D572E49398FD01216BA9DE4EF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D0F4319D572E49398FD01216BA9DE4EF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D0F4319D572E49398FD01216BA9DE4EF-->  <COLUMNNAME><![CDATA[EM_APRM_Displayed_Paymmeth_ID]]></COLUMNNAME>
+<!--D0F4319D572E49398FD01216BA9DE4EF-->  <NAME><![CDATA[Payment Method]]></NAME>
+<!--D0F4319D572E49398FD01216BA9DE4EF-->  <PRINTNAME><![CDATA[Payment Method]]></PRINTNAME>
+<!--D0F4319D572E49398FD01216BA9DE4EF-->  <DESCRIPTION><![CDATA[Displayed Payment Method field in Sales Order Payment Schedule Details tab. For netting payments the value displayed will be empty.]]></DESCRIPTION>
+<!--D0F4319D572E49398FD01216BA9DE4EF-->  <HELP><![CDATA[Displayed Payment Method field in Sales Order Payment Schedule Details tab. For netting payments the value displayed will be empty.]]></HELP>
+<!--D0F4319D572E49398FD01216BA9DE4EF-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--D0F4319D572E49398FD01216BA9DE4EF-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--D0F4319D572E49398FD01216BA9DE4EF--></AD_ELEMENT>
+
 <!--D2AC3F75FCDC4BC187A1F492C46D68D1--><AD_ELEMENT>
 <!--D2AC3F75FCDC4BC187A1F492C46D68D1-->  <AD_ELEMENT_ID><![CDATA[D2AC3F75FCDC4BC187A1F492C46D68D1]]></AD_ELEMENT_ID>
 <!--D2AC3F75FCDC4BC187A1F492C46D68D1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1364,6 +1502,34 @@
 <!--D51BEAD64B9C4D5FBC097873933ACEB3-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--D51BEAD64B9C4D5FBC097873933ACEB3--></AD_ELEMENT>
 
+<!--D521B46D67FA4014B71B52EE04B0492A--><AD_ELEMENT>
+<!--D521B46D67FA4014B71B52EE04B0492A-->  <AD_ELEMENT_ID><![CDATA[D521B46D67FA4014B71B52EE04B0492A]]></AD_ELEMENT_ID>
+<!--D521B46D67FA4014B71B52EE04B0492A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D521B46D67FA4014B71B52EE04B0492A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D521B46D67FA4014B71B52EE04B0492A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D521B46D67FA4014B71B52EE04B0492A-->  <COLUMNNAME><![CDATA[c_currency_from_id]]></COLUMNNAME>
+<!--D521B46D67FA4014B71B52EE04B0492A-->  <NAME><![CDATA[Currency From]]></NAME>
+<!--D521B46D67FA4014B71B52EE04B0492A-->  <PRINTNAME><![CDATA[Currency From]]></PRINTNAME>
+<!--D521B46D67FA4014B71B52EE04B0492A-->  <DESCRIPTION><![CDATA[The Currency From defines the source currency]]></DESCRIPTION>
+<!--D521B46D67FA4014B71B52EE04B0492A-->  <HELP><![CDATA[The Currency From defines the source currency]]></HELP>
+<!--D521B46D67FA4014B71B52EE04B0492A-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--D521B46D67FA4014B71B52EE04B0492A-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--D521B46D67FA4014B71B52EE04B0492A--></AD_ELEMENT>
+
+<!--D62D89A819A840B3978E4434C9B66C86--><AD_ELEMENT>
+<!--D62D89A819A840B3978E4434C9B66C86-->  <AD_ELEMENT_ID><![CDATA[D62D89A819A840B3978E4434C9B66C86]]></AD_ELEMENT_ID>
+<!--D62D89A819A840B3978E4434C9B66C86-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D62D89A819A840B3978E4434C9B66C86-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D62D89A819A840B3978E4434C9B66C86-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D62D89A819A840B3978E4434C9B66C86-->  <COLUMNNAME><![CDATA[EM_APRM_FinancialAccount]]></COLUMNNAME>
+<!--D62D89A819A840B3978E4434C9B66C86-->  <NAME><![CDATA[Financial Account]]></NAME>
+<!--D62D89A819A840B3978E4434C9B66C86-->  <PRINTNAME><![CDATA[Financial Account]]></PRINTNAME>
+<!--D62D89A819A840B3978E4434C9B66C86-->  <DESCRIPTION><![CDATA[Financial Account in sales invoice details]]></DESCRIPTION>
+<!--D62D89A819A840B3978E4434C9B66C86-->  <HELP><![CDATA[Financial Account in sales invoice details]]></HELP>
+<!--D62D89A819A840B3978E4434C9B66C86-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--D62D89A819A840B3978E4434C9B66C86-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--D62D89A819A840B3978E4434C9B66C86--></AD_ELEMENT>
+
 <!--D85187ABF8434C39A9A11EE8EFCF3DDE--><AD_ELEMENT>
 <!--D85187ABF8434C39A9A11EE8EFCF3DDE-->  <AD_ELEMENT_ID><![CDATA[D85187ABF8434C39A9A11EE8EFCF3DDE]]></AD_ELEMENT_ID>
 <!--D85187ABF8434C39A9A11EE8EFCF3DDE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -864,6 +864,35 @@
 <!--0A23152718D54E99B941D9AA1BF33734-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--0A23152718D54E99B941D9AA1BF33734--></AD_FIELD>
 
+<!--0A650E8E8BD944018FD4FD6866AF1481--><AD_FIELD>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <AD_FIELD_ID><![CDATA[0A650E8E8BD944018FD4FD6866AF1481]]></AD_FIELD_ID>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <NAME><![CDATA[Funds Transfer]]></NAME>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <DESCRIPTION><![CDATA[Transfer funds between Financial Accounts]]></DESCRIPTION>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <HELP><![CDATA[Transfer funds between Financial Accounts]]></HELP>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <AD_TAB_ID><![CDATA[2845D761A8394468BD3BA4710AA888D4]]></AD_TAB_ID>
+<!--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-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <SEQNO><![CDATA[440]]></SEQNO>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <GRID_SEQNO><![CDATA[100]]></GRID_SEQNO>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--0A650E8E8BD944018FD4FD6866AF1481--></AD_FIELD>
+
 <!--0A6ECDB2025440518983B3B14BF1697B--><AD_FIELD>
 <!--0A6ECDB2025440518983B3B14BF1697B-->  <AD_FIELD_ID><![CDATA[0A6ECDB2025440518983B3B14BF1697B]]></AD_FIELD_ID>
 <!--0A6ECDB2025440518983B3B14BF1697B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -3718,6 +3747,35 @@
 <!--36A419B53C97486EAFE5FF25654058E4-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--36A419B53C97486EAFE5FF25654058E4--></AD_FIELD>
 
+<!--36B58B2BEF8448CA9D384A70E08B9E0E--><AD_FIELD>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <AD_FIELD_ID><![CDATA[36B58B2BEF8448CA9D384A70E08B9E0E]]></AD_FIELD_ID>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <NAME><![CDATA[Financial Account]]></NAME>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <DESCRIPTION><![CDATA[Displayed Financial Account field in Sales Order Payment Schedule Details tab. For netting payments the value displayed will be empty.]]></DESCRIPTION>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <HELP><![CDATA[Displayed Financial Account field in Sales Order Payment Schedule Details tab. For netting payments the value displayed will be empty.]]></HELP>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <AD_TAB_ID><![CDATA[B82C02920AA84E8DB57D553185BD2F06]]></AD_TAB_ID>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <AD_COLUMN_ID><![CDATA[47DC39551EA14F5E861296054B731B26]]></AD_COLUMN_ID>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <SEQNO><![CDATA[55]]></SEQNO>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <GRID_SEQNO><![CDATA[85]]></GRID_SEQNO>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <STARTNEWLINE><![CDATA[Y]]></STARTNEWLINE>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E--></AD_FIELD>
+
 <!--36C4188FB51E4D608C0F6538C8C29199--><AD_FIELD>
 <!--36C4188FB51E4D608C0F6538C8C29199-->  <AD_FIELD_ID><![CDATA[36C4188FB51E4D608C0F6538C8C29199]]></AD_FIELD_ID>
 <!--36C4188FB51E4D608C0F6538C8C29199-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -12558,14 +12616,14 @@
 <!--8C43882A0A404DA29F4C6DA95802CA1B-->  <AD_TAB_ID><![CDATA[B82C02920AA84E8DB57D553185BD2F06]]></AD_TAB_ID>
 <!--8C43882A0A404DA29F4C6DA95802CA1B-->  <AD_COLUMN_ID><![CDATA[7FF2234748F2844FE040007F01003861]]></AD_COLUMN_ID>
 <!--8C43882A0A404DA29F4C6DA95802CA1B-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--8C43882A0A404DA29F4C6DA95802CA1B-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--8C43882A0A404DA29F4C6DA95802CA1B-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
 <!--8C43882A0A404DA29F4C6DA95802CA1B-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
 <!--8C43882A0A404DA29F4C6DA95802CA1B-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--8C43882A0A404DA29F4C6DA95802CA1B-->  <SEQNO><![CDATA[50]]></SEQNO>
 <!--8C43882A0A404DA29F4C6DA95802CA1B-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--8C43882A0A404DA29F4C6DA95802CA1B-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--8C43882A0A404DA29F4C6DA95802CA1B-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--8C43882A0A404DA29F4C6DA95802CA1B-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--8C43882A0A404DA29F4C6DA95802CA1B-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--8C43882A0A404DA29F4C6DA95802CA1B-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--8C43882A0A404DA29F4C6DA95802CA1B-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--8C43882A0A404DA29F4C6DA95802CA1B-->  <GRID_SEQNO><![CDATA[80]]></GRID_SEQNO>
@@ -14001,6 +14059,35 @@
 <!--A19EFBCD4CEE48ADA318EB734806CFC5-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--A19EFBCD4CEE48ADA318EB734806CFC5--></AD_FIELD>
 
+<!--A27C0C1F043945BBAC61B8B8CB79098D--><AD_FIELD>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <AD_FIELD_ID><![CDATA[A27C0C1F043945BBAC61B8B8CB79098D]]></AD_FIELD_ID>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <NAME><![CDATA[Financial Account]]></NAME>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <DESCRIPTION><![CDATA[Financial Account in sales invoice details]]></DESCRIPTION>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <HELP><![CDATA[Financial Account in sales invoice details]]></HELP>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <AD_TAB_ID><![CDATA[F6C2283A21314407BBBB23FF14B85ED4]]></AD_TAB_ID>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <AD_COLUMN_ID><![CDATA[03EBACA2EF974E3F9E58A6FE8EF8AECB]]></AD_COLUMN_ID>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <IGNOREINWAD><![CDATA[Y]]></IGNOREINWAD>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <SEQNO><![CDATA[205]]></SEQNO>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <GRID_SEQNO><![CDATA[8]]></GRID_SEQNO>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--A27C0C1F043945BBAC61B8B8CB79098D--></AD_FIELD>
+
 <!--A28B0A82995D87F5E040007F010067A0--><AD_FIELD>
 <!--A28B0A82995D87F5E040007F010067A0-->  <AD_FIELD_ID><![CDATA[A28B0A82995D87F5E040007F010067A0]]></AD_FIELD_ID>
 <!--A28B0A82995D87F5E040007F010067A0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -15541,6 +15628,35 @@
 <!--A95A4F99B6CA47D48D8E430B5E6EF85B-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--A95A4F99B6CA47D48D8E430B5E6EF85B--></AD_FIELD>
 
+<!--A9FFD31F45874125989D273B69D76419--><AD_FIELD>
+<!--A9FFD31F45874125989D273B69D76419-->  <AD_FIELD_ID><![CDATA[A9FFD31F45874125989D273B69D76419]]></AD_FIELD_ID>
+<!--A9FFD31F45874125989D273B69D76419-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A9FFD31F45874125989D273B69D76419-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A9FFD31F45874125989D273B69D76419-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A9FFD31F45874125989D273B69D76419-->  <NAME><![CDATA[Payment Method]]></NAME>
+<!--A9FFD31F45874125989D273B69D76419-->  <DESCRIPTION><![CDATA[Payment Method in Sales Invoice]]></DESCRIPTION>
+<!--A9FFD31F45874125989D273B69D76419-->  <HELP><![CDATA[Payment Method in Sales Invoice]]></HELP>
+<!--A9FFD31F45874125989D273B69D76419-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--A9FFD31F45874125989D273B69D76419-->  <AD_TAB_ID><![CDATA[F6C2283A21314407BBBB23FF14B85ED4]]></AD_TAB_ID>
+<!--A9FFD31F45874125989D273B69D76419-->  <AD_COLUMN_ID><![CDATA[E73D535A7F9D4494AF132A66AE861168]]></AD_COLUMN_ID>
+<!--A9FFD31F45874125989D273B69D76419-->  <IGNOREINWAD><![CDATA[Y]]></IGNOREINWAD>
+<!--A9FFD31F45874125989D273B69D76419-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--A9FFD31F45874125989D273B69D76419-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--A9FFD31F45874125989D273B69D76419-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--A9FFD31F45874125989D273B69D76419-->  <SEQNO><![CDATA[185]]></SEQNO>
+<!--A9FFD31F45874125989D273B69D76419-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--A9FFD31F45874125989D273B69D76419-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--A9FFD31F45874125989D273B69D76419-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--A9FFD31F45874125989D273B69D76419-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--A9FFD31F45874125989D273B69D76419-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--A9FFD31F45874125989D273B69D76419-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--A9FFD31F45874125989D273B69D76419-->  <GRID_SEQNO><![CDATA[4]]></GRID_SEQNO>
+<!--A9FFD31F45874125989D273B69D76419-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--A9FFD31F45874125989D273B69D76419-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--A9FFD31F45874125989D273B69D76419-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--A9FFD31F45874125989D273B69D76419-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--A9FFD31F45874125989D273B69D76419--></AD_FIELD>
+
 <!--AA2A1A994B4B430EB0E4B1592A07D4EC--><AD_FIELD>
 <!--AA2A1A994B4B430EB0E4B1592A07D4EC-->  <AD_FIELD_ID><![CDATA[AA2A1A994B4B430EB0E4B1592A07D4EC]]></AD_FIELD_ID>
 <!--AA2A1A994B4B430EB0E4B1592A07D4EC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -17460,17 +17576,16 @@
 <!--B712FAD6A5C843A6A8204FDFB4435580-->  <AD_COLUMN_ID><![CDATA[7DC34559B3F1B45BE040007F0100784A]]></AD_COLUMN_ID>
 <!--B712FAD6A5C843A6A8204FDFB4435580-->  <PROPERTY><![CDATA[paymentDetails.finPayment.paymentMethod]]></PROPERTY>
 <!--B712FAD6A5C843A6A8204FDFB4435580-->  <IGNOREINWAD><![CDATA[Y]]></IGNOREINWAD>
-<!--B712FAD6A5C843A6A8204FDFB4435580-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--B712FAD6A5C843A6A8204FDFB4435580-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
 <!--B712FAD6A5C843A6A8204FDFB4435580-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--B712FAD6A5C843A6A8204FDFB4435580-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--B712FAD6A5C843A6A8204FDFB4435580-->  <SEQNO><![CDATA[180]]></SEQNO>
 <!--B712FAD6A5C843A6A8204FDFB4435580-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--B712FAD6A5C843A6A8204FDFB4435580-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--B712FAD6A5C843A6A8204FDFB4435580-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--B712FAD6A5C843A6A8204FDFB4435580-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--B712FAD6A5C843A6A8204FDFB4435580-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--B712FAD6A5C843A6A8204FDFB4435580-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--B712FAD6A5C843A6A8204FDFB4435580-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--B712FAD6A5C843A6A8204FDFB4435580-->  <GRID_SEQNO><![CDATA[4]]></GRID_SEQNO>
 <!--B712FAD6A5C843A6A8204FDFB4435580-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--B712FAD6A5C843A6A8204FDFB4435580-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--B712FAD6A5C843A6A8204FDFB4435580-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -20762,14 +20877,14 @@
 <!--E5F642615018457ABD72FB6C4957A3C8-->  <AD_TAB_ID><![CDATA[B82C02920AA84E8DB57D553185BD2F06]]></AD_TAB_ID>
 <!--E5F642615018457ABD72FB6C4957A3C8-->  <AD_COLUMN_ID><![CDATA[7DC34559B3F7B45BE040007F0100784A]]></AD_COLUMN_ID>
 <!--E5F642615018457ABD72FB6C4957A3C8-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--E5F642615018457ABD72FB6C4957A3C8-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--E5F642615018457ABD72FB6C4957A3C8-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
 <!--E5F642615018457ABD72FB6C4957A3C8-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
 <!--E5F642615018457ABD72FB6C4957A3C8-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--E5F642615018457ABD72FB6C4957A3C8-->  <SEQNO><![CDATA[40]]></SEQNO>
 <!--E5F642615018457ABD72FB6C4957A3C8-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--E5F642615018457ABD72FB6C4957A3C8-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--E5F642615018457ABD72FB6C4957A3C8-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--E5F642615018457ABD72FB6C4957A3C8-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--E5F642615018457ABD72FB6C4957A3C8-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--E5F642615018457ABD72FB6C4957A3C8-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--E5F642615018457ABD72FB6C4957A3C8-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--E5F642615018457ABD72FB6C4957A3C8-->  <GRID_SEQNO><![CDATA[40]]></GRID_SEQNO>
@@ -21040,17 +21155,16 @@
 <!--E8276CA9F9DA475CA56ABE47A470ABB2-->  <AD_COLUMN_ID><![CDATA[03276FB53CC54CC1829E0AA6EC0F2EE6]]></AD_COLUMN_ID>
 <!--E8276CA9F9DA475CA56ABE47A470ABB2-->  <PROPERTY><![CDATA[paymentDetails.finPayment.account]]></PROPERTY>
 <!--E8276CA9F9DA475CA56ABE47A470ABB2-->  <IGNOREINWAD><![CDATA[Y]]></IGNOREINWAD>
-<!--E8276CA9F9DA475CA56ABE47A470ABB2-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--E8276CA9F9DA475CA56ABE47A470ABB2-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
 <!--E8276CA9F9DA475CA56ABE47A470ABB2-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--E8276CA9F9DA475CA56ABE47A470ABB2-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--E8276CA9F9DA475CA56ABE47A470ABB2-->  <SEQNO><![CDATA[200]]></SEQNO>
 <!--E8276CA9F9DA475CA56ABE47A470ABB2-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--E8276CA9F9DA475CA56ABE47A470ABB2-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--E8276CA9F9DA475CA56ABE47A470ABB2-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--E8276CA9F9DA475CA56ABE47A470ABB2-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--E8276CA9F9DA475CA56ABE47A470ABB2-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--E8276CA9F9DA475CA56ABE47A470ABB2-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--E8276CA9F9DA475CA56ABE47A470ABB2-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--E8276CA9F9DA475CA56ABE47A470ABB2-->  <GRID_SEQNO><![CDATA[8]]></GRID_SEQNO>
 <!--E8276CA9F9DA475CA56ABE47A470ABB2-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--E8276CA9F9DA475CA56ABE47A470ABB2-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--E8276CA9F9DA475CA56ABE47A470ABB2-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -21534,6 +21648,35 @@
 <!--F195EACFC9FD47C6BA15B51B6A10F25E-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--F195EACFC9FD47C6BA15B51B6A10F25E--></AD_FIELD>
 
+<!--F2650368C73341B0B6794287FA5C23C2--><AD_FIELD>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <AD_FIELD_ID><![CDATA[F2650368C73341B0B6794287FA5C23C2]]></AD_FIELD_ID>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <NAME><![CDATA[Payment Method]]></NAME>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <DESCRIPTION><![CDATA[Displayed Payment Method field in Sales Order Payment Schedule Details tab. For netting payments the value displayed will be empty.]]></DESCRIPTION>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <HELP><![CDATA[Displayed Payment Method field in Sales Order Payment Schedule Details tab. For netting payments the value displayed will be empty.]]></HELP>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <AD_TAB_ID><![CDATA[B82C02920AA84E8DB57D553185BD2F06]]></AD_TAB_ID>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <AD_COLUMN_ID><![CDATA[C8B98FF8B51C43F7B12E8C448B0A2725]]></AD_COLUMN_ID>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <SEQNO><![CDATA[45]]></SEQNO>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <GRID_SEQNO><![CDATA[45]]></GRID_SEQNO>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--F2650368C73341B0B6794287FA5C23C2--></AD_FIELD>
+
 <!--F26956BDA9F147249DDC8195C303BAA2--><AD_FIELD>
 <!--F26956BDA9F147249DDC8195C303BAA2-->  <AD_FIELD_ID><![CDATA[F26956BDA9F147249DDC8195C303BAA2]]></AD_FIELD_ID>
 <!--F26956BDA9F147249DDC8195C303BAA2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -22347,6 +22490,35 @@
 <!--FBB3EED14BE0419CA1B33A0944486071-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--FBB3EED14BE0419CA1B33A0944486071--></AD_FIELD>
 
+<!--FBEA6835AE0543FE8821B907BD5D0F0B--><AD_FIELD>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <AD_FIELD_ID><![CDATA[FBEA6835AE0543FE8821B907BD5D0F0B]]></AD_FIELD_ID>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <NAME><![CDATA[Origin Financial Account]]></NAME>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <DESCRIPTION><![CDATA[Financial Account from where the funds were transferred]]></DESCRIPTION>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <HELP><![CDATA[Financial Account from where the funds were transferred]]></HELP>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <AD_TAB_ID><![CDATA[23691259D1BD4496BCC5F32645BCA4B9]]></AD_TAB_ID>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <AD_COLUMN_ID><![CDATA[D5B4BD05344C4B44AB7ED2F6CF9C86F6]]></AD_COLUMN_ID>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <DISPLAYLOGIC><![CDATA[@EM_Aprm_Finacc_Trans_Origin@!'']]></DISPLAYLOGIC>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <SEQNO><![CDATA[80]]></SEQNO>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B--></AD_FIELD>
+
 <!--FBED2B2835ED4230B93D4792FBAB4CC3--><AD_FIELD>
 <!--FBED2B2835ED4230B93D4792FBAB4CC3-->  <AD_FIELD_ID><![CDATA[FBED2B2835ED4230B93D4792FBAB4CC3]]></AD_FIELD_ID>
 <!--FBED2B2835ED4230B93D4792FBAB4CC3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -96,6 +96,18 @@
 <!--12A17D39C7664BDE8B1A0F079D44591E-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--12A17D39C7664BDE8B1A0F079D44591E--></AD_MESSAGE>
 
+<!--12FBA6D054F04E6BA11C7CB00A0B70BA--><AD_MESSAGE>
+<!--12FBA6D054F04E6BA11C7CB00A0B70BA-->  <AD_MESSAGE_ID><![CDATA[12FBA6D054F04E6BA11C7CB00A0B70BA]]></AD_MESSAGE_ID>
+<!--12FBA6D054F04E6BA11C7CB00A0B70BA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--12FBA6D054F04E6BA11C7CB00A0B70BA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--12FBA6D054F04E6BA11C7CB00A0B70BA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--12FBA6D054F04E6BA11C7CB00A0B70BA-->  <VALUE><![CDATA[APRM_remline_finpayschdet]]></VALUE>
+<!--12FBA6D054F04E6BA11C7CB00A0B70BA-->  <MSGTEXT><![CDATA[The invoice is already included in a Remittance.]]></MSGTEXT>
+<!--12FBA6D054F04E6BA11C7CB00A0B70BA-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--12FBA6D054F04E6BA11C7CB00A0B70BA-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--12FBA6D054F04E6BA11C7CB00A0B70BA-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--12FBA6D054F04E6BA11C7CB00A0B70BA--></AD_MESSAGE>
+
 <!--1405C086998B431D80615A4FB8EC783B--><AD_MESSAGE>
 <!--1405C086998B431D80615A4FB8EC783B-->  <AD_MESSAGE_ID><![CDATA[1405C086998B431D80615A4FB8EC783B]]></AD_MESSAGE_ID>
 <!--1405C086998B431D80615A4FB8EC783B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -228,6 +240,18 @@
 <!--2118F382AC3646CA8D8F2EAE6504B876-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--2118F382AC3646CA8D8F2EAE6504B876--></AD_MESSAGE>
 
+<!--241C4E48E3E74768952D73702771DA9C--><AD_MESSAGE>
+<!--241C4E48E3E74768952D73702771DA9C-->  <AD_MESSAGE_ID><![CDATA[241C4E48E3E74768952D73702771DA9C]]></AD_MESSAGE_ID>
+<!--241C4E48E3E74768952D73702771DA9C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--241C4E48E3E74768952D73702771DA9C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--241C4E48E3E74768952D73702771DA9C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--241C4E48E3E74768952D73702771DA9C-->  <VALUE><![CDATA[APRM_UnknownError]]></VALUE>
+<!--241C4E48E3E74768952D73702771DA9C-->  <MSGTEXT><![CDATA[An unknown error has occurred.]]></MSGTEXT>
+<!--241C4E48E3E74768952D73702771DA9C-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--241C4E48E3E74768952D73702771DA9C-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--241C4E48E3E74768952D73702771DA9C-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--241C4E48E3E74768952D73702771DA9C--></AD_MESSAGE>
+
 <!--247F96A9D1AB44C2B24CD06B4B05068B--><AD_MESSAGE>
 <!--247F96A9D1AB44C2B24CD06B4B05068B-->  <AD_MESSAGE_ID><![CDATA[247F96A9D1AB44C2B24CD06B4B05068B]]></AD_MESSAGE_ID>
 <!--247F96A9D1AB44C2B24CD06B4B05068B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1405,6 +1429,18 @@
 <!--DB89900B5F2848128B2BC885FD0E49AD-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--DB89900B5F2848128B2BC885FD0E49AD--></AD_MESSAGE>
 
+<!--DC575CB06B2B40D3BB4B23069C2C72CA--><AD_MESSAGE>
+<!--DC575CB06B2B40D3BB4B23069C2C72CA-->  <AD_MESSAGE_ID><![CDATA[DC575CB06B2B40D3BB4B23069C2C72CA]]></AD_MESSAGE_ID>
+<!--DC575CB06B2B40D3BB4B23069C2C72CA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--DC575CB06B2B40D3BB4B23069C2C72CA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--DC575CB06B2B40D3BB4B23069C2C72CA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--DC575CB06B2B40D3BB4B23069C2C72CA-->  <VALUE><![CDATA[APRM_TransferFundsSuccess]]></VALUE>
+<!--DC575CB06B2B40D3BB4B23069C2C72CA-->  <MSGTEXT><![CDATA[Transfer Funds process completed successfully]]></MSGTEXT>
+<!--DC575CB06B2B40D3BB4B23069C2C72CA-->  <MSGTYPE><![CDATA[S]]></MSGTYPE>
+<!--DC575CB06B2B40D3BB4B23069C2C72CA-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--DC575CB06B2B40D3BB4B23069C2C72CA-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--DC575CB06B2B40D3BB4B23069C2C72CA--></AD_MESSAGE>
+
 <!--DF6BD33E986149C0ADE4D0CC45D7394C--><AD_MESSAGE>
 <!--DF6BD33E986149C0ADE4D0CC45D7394C-->  <AD_MESSAGE_ID><![CDATA[DF6BD33E986149C0ADE4D0CC45D7394C]]></AD_MESSAGE_ID>
 <!--DF6BD33E986149C0ADE4D0CC45D7394C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1483,7 +1519,7 @@
 <!--EF56DCF572A94E6CAFE4F13948268050-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--EF56DCF572A94E6CAFE4F13948268050-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--EF56DCF572A94E6CAFE4F13948268050-->  <VALUE><![CDATA[APRM_SplitBankStatementLineConfirm]]></VALUE>
-<!--EF56DCF572A94E6CAFE4F13948268050-->  <MSGTEXT><![CDATA[Bank statement line and transaction amount does not match. Do you want to perform a partial match?]]></MSGTEXT>
+<!--EF56DCF572A94E6CAFE4F13948268050-->  <MSGTEXT><![CDATA[Bank statement line amount [%0] and transaction amount [%1] does not match. Do you want to perform a partial match?]]></MSGTEXT>
 <!--EF56DCF572A94E6CAFE4F13948268050-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
 <!--EF56DCF572A94E6CAFE4F13948268050-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--EF56DCF572A94E6CAFE4F13948268050-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 16 06:35:23 2016 +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.29727]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.30440]]></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[PR16Q3]]></VERSION_LABEL>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION_LABEL><![CDATA[PR16Q4]]></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	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Dec 16 06:35:23 2016 +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.29727]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.30440]]></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.29727]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->  <STARTVERSION><![CDATA[3.0.30440]]></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_REFERENCE.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -300,6 +300,18 @@
 <!--8D551C48949841EC84D4FA693C4D7AE3-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
 <!--8D551C48949841EC84D4FA693C4D7AE3--></AD_REFERENCE>
 
+<!--98E0BF0783E44EFABE2F2BDDE866D6AE--><AD_REFERENCE>
+<!--98E0BF0783E44EFABE2F2BDDE866D6AE-->  <AD_REFERENCE_ID><![CDATA[98E0BF0783E44EFABE2F2BDDE866D6AE]]></AD_REFERENCE_ID>
+<!--98E0BF0783E44EFABE2F2BDDE866D6AE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--98E0BF0783E44EFABE2F2BDDE866D6AE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--98E0BF0783E44EFABE2F2BDDE866D6AE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--98E0BF0783E44EFABE2F2BDDE866D6AE-->  <NAME><![CDATA[FIN_Finacc_Transaction selector]]></NAME>
+<!--98E0BF0783E44EFABE2F2BDDE866D6AE-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--98E0BF0783E44EFABE2F2BDDE866D6AE-->  <ISBASEREFERENCE><![CDATA[N]]></ISBASEREFERENCE>
+<!--98E0BF0783E44EFABE2F2BDDE866D6AE-->  <PARENTREFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></PARENTREFERENCE_ID>
+<!--98E0BF0783E44EFABE2F2BDDE866D6AE-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
+<!--98E0BF0783E44EFABE2F2BDDE866D6AE--></AD_REFERENCE>
+
 <!--B8C833E4F0A44A2DA5FC7606F3CD9439--><AD_REFERENCE>
 <!--B8C833E4F0A44A2DA5FC7606F3CD9439-->  <AD_REFERENCE_ID><![CDATA[B8C833E4F0A44A2DA5FC7606F3CD9439]]></AD_REFERENCE_ID>
 <!--B8C833E4F0A44A2DA5FC7606F3CD9439-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -609,7 +609,7 @@
 <!--B6049E97C1254A1092C883EA59172013-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
 <!--B6049E97C1254A1092C883EA59172013-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--B6049E97C1254A1092C883EA59172013-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
-<!--B6049E97C1254A1092C883EA59172013-->  <EM_OBUIAPP_SELECTION_TYPE><![CDATA[S]]></EM_OBUIAPP_SELECTION_TYPE>
+<!--B6049E97C1254A1092C883EA59172013-->  <EM_OBUIAPP_SELECTION_TYPE><![CDATA[M]]></EM_OBUIAPP_SELECTION_TYPE>
 <!--B6049E97C1254A1092C883EA59172013--></AD_TAB>
 
 <!--B82C02920AA84E8DB57D553185BD2F06--><AD_TAB>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -69,14 +69,13 @@
 <!--58AF4D3E594B421A9A7307480736F03E-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--58AF4D3E594B421A9A7307480736F03E-->  <HQLQUERY><![CDATA[select @selectClause@
 from FIN_Payment_ScheduleDetail as psd
+join psd.businessPartner as bp
 left outer join psd.orderPaymentSchedule as ops  
 left outer join ops.order as ord @joinClauseOrder@
-left outer join ord.businessPartner as ordbp
 left outer join ops.fINPaymentPriority as opriority 
 left outer join ops.finPaymentmethod opsfp
 left outer join psd.invoicePaymentSchedule as ips  
 left outer join ips.invoice as inv @joinClauseInvoice@
-left outer join inv.businessPartner as invbp
 left outer join ips.fINPaymentPriority as ipriority 
 left outer join ips.finPaymentmethod as ipsfp
 left outer join psd.organization as org 
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_VAL_RULE.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_VAL_RULE.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -88,6 +88,17 @@
 <!--575E470ABADB4C278132C957A78C47E3-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--575E470ABADB4C278132C957A78C47E3--></AD_VAL_RULE>
 
+<!--8CEAB789915E4575BDEB66F1930067BA--><AD_VAL_RULE>
+<!--8CEAB789915E4575BDEB66F1930067BA-->  <AD_VAL_RULE_ID><![CDATA[8CEAB789915E4575BDEB66F1930067BA]]></AD_VAL_RULE_ID>
+<!--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-->  <TYPE><![CDATA[HQL_JS]]></TYPE>
+<!--8CEAB789915E4575BDEB66F1930067BA-->  <CODE><![CDATA["e.id != '" + OB.getParameters().get('inpfinFinancialAccountId') + "'"]]></CODE>
+<!--8CEAB789915E4575BDEB66F1930067BA-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--8CEAB789915E4575BDEB66F1930067BA--></AD_VAL_RULE>
+
 <!--959ADF046AFE4F509ABC6E2F41F9DB04--><AD_VAL_RULE>
 <!--959ADF046AFE4F509ABC6E2F41F9DB04-->  <AD_VAL_RULE_ID><![CDATA[959ADF046AFE4F509ABC6E2F41F9DB04]]></AD_VAL_RULE_ID>
 <!--959ADF046AFE4F509ABC6E2F41F9DB04-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -457,6 +457,32 @@
 <!--383A1B1C19674F23AF643521AEE759D8-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--383A1B1C19674F23AF643521AEE759D8--></OBUIAPP_PARAMETER>
 
+<!--3DF3601019064F109BBB871E833E506C--><OBUIAPP_PARAMETER>
+<!--3DF3601019064F109BBB871E833E506C-->  <OBUIAPP_PARAMETER_ID><![CDATA[3DF3601019064F109BBB871E833E506C]]></OBUIAPP_PARAMETER_ID>
+<!--3DF3601019064F109BBB871E833E506C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3DF3601019064F109BBB871E833E506C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3DF3601019064F109BBB871E833E506C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3DF3601019064F109BBB871E833E506C-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--3DF3601019064F109BBB871E833E506C-->  <NAME><![CDATA[Bank Fee To]]></NAME>
+<!--3DF3601019064F109BBB871E833E506C-->  <DESCRIPTION><![CDATA[Fee at the target Bank]]></DESCRIPTION>
+<!--3DF3601019064F109BBB871E833E506C-->  <HELP><![CDATA[Fee at the target Bank]]></HELP>
+<!--3DF3601019064F109BBB871E833E506C-->  <SEQNO><![CDATA[100]]></SEQNO>
+<!--3DF3601019064F109BBB871E833E506C-->  <AD_REFERENCE_ID><![CDATA[12]]></AD_REFERENCE_ID>
+<!--3DF3601019064F109BBB871E833E506C-->  <COLUMNNAME><![CDATA[bank_fee_to]]></COLUMNNAME>
+<!--3DF3601019064F109BBB871E833E506C-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--3DF3601019064F109BBB871E833E506C-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
+<!--3DF3601019064F109BBB871E833E506C-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--3DF3601019064F109BBB871E833E506C-->  <AD_ELEMENT_ID><![CDATA[4E2A12CBEE07461DAA355A0E0B81AA3B]]></AD_ELEMENT_ID>
+<!--3DF3601019064F109BBB871E833E506C-->  <ISFIXED><![CDATA[N]]></ISFIXED>
+<!--3DF3601019064F109BBB871E833E506C-->  <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE>
+<!--3DF3601019064F109BBB871E833E506C-->  <OBUIAPP_PROCESS_ID><![CDATA[CC73C4845CDC487395804946EACB225F]]></OBUIAPP_PROCESS_ID>
+<!--3DF3601019064F109BBB871E833E506C-->  <STARTINNEWLINE><![CDATA[Y]]></STARTINNEWLINE>
+<!--3DF3601019064F109BBB871E833E506C-->  <DISPLAYLOGIC><![CDATA[@bank_fee@]]></DISPLAYLOGIC>
+<!--3DF3601019064F109BBB871E833E506C-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
+<!--3DF3601019064F109BBB871E833E506C-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--3DF3601019064F109BBB871E833E506C-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
+<!--3DF3601019064F109BBB871E833E506C--></OBUIAPP_PARAMETER>
+
 <!--43F72D96CBDB467A900294090A3A03D7--><OBUIAPP_PARAMETER>
 <!--43F72D96CBDB467A900294090A3A03D7-->  <OBUIAPP_PARAMETER_ID><![CDATA[43F72D96CBDB467A900294090A3A03D7]]></OBUIAPP_PARAMETER_ID>
 <!--43F72D96CBDB467A900294090A3A03D7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -491,7 +517,7 @@
 <!--4C09892656344AB1ACF988D57D84B96B-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--4C09892656344AB1ACF988D57D84B96B-->  <NAME><![CDATA[Currency To]]></NAME>
 <!--4C09892656344AB1ACF988D57D84B96B-->  <DESCRIPTION><![CDATA[Target currency]]></DESCRIPTION>
-<!--4C09892656344AB1ACF988D57D84B96B-->  <HELP><![CDATA[The Currency To defines the target currency for this conversion rate.]]></HELP>
+<!--4C09892656344AB1ACF988D57D84B96B-->  <HELP><![CDATA[The Currency To defines the target currency for this conversion rate]]></HELP>
 <!--4C09892656344AB1ACF988D57D84B96B-->  <SEQNO><![CDATA[40]]></SEQNO>
 <!--4C09892656344AB1ACF988D57D84B96B-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
 <!--4C09892656344AB1ACF988D57D84B96B-->  <AD_REFERENCE_VALUE_ID><![CDATA[E384FFD20B664C7894E94B05B1D8EE27]]></AD_REFERENCE_VALUE_ID>
@@ -752,6 +778,32 @@
 <!--65AFBD9140014688A842ACF5ECF9E5A1-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--65AFBD9140014688A842ACF5ECF9E5A1--></OBUIAPP_PARAMETER>
 
+<!--6958319C12B34393B37A54BE0E9B36E5--><OBUIAPP_PARAMETER>
+<!--6958319C12B34393B37A54BE0E9B36E5-->  <OBUIAPP_PARAMETER_ID><![CDATA[6958319C12B34393B37A54BE0E9B36E5]]></OBUIAPP_PARAMETER_ID>
+<!--6958319C12B34393B37A54BE0E9B36E5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6958319C12B34393B37A54BE0E9B36E5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6958319C12B34393B37A54BE0E9B36E5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6958319C12B34393B37A54BE0E9B36E5-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--6958319C12B34393B37A54BE0E9B36E5-->  <NAME><![CDATA[Transaction Date]]></NAME>
+<!--6958319C12B34393B37A54BE0E9B36E5-->  <DESCRIPTION><![CDATA[Date for the generated transactions]]></DESCRIPTION>
+<!--6958319C12B34393B37A54BE0E9B36E5-->  <HELP><![CDATA[Date for the generated transactions]]></HELP>
+<!--6958319C12B34393B37A54BE0E9B36E5-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--6958319C12B34393B37A54BE0E9B36E5-->  <AD_REFERENCE_ID><![CDATA[15]]></AD_REFERENCE_ID>
+<!--6958319C12B34393B37A54BE0E9B36E5-->  <COLUMNNAME><![CDATA[trxdate]]></COLUMNNAME>
+<!--6958319C12B34393B37A54BE0E9B36E5-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--6958319C12B34393B37A54BE0E9B36E5-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
+<!--6958319C12B34393B37A54BE0E9B36E5-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--6958319C12B34393B37A54BE0E9B36E5-->  <DEFAULTVALUE><![CDATA[OB.getSession().getAttribute('#DATE')]]></DEFAULTVALUE>
+<!--6958319C12B34393B37A54BE0E9B36E5-->  <AD_ELEMENT_ID><![CDATA[3FD7BEBC464E44469550B39D5C48AE2C]]></AD_ELEMENT_ID>
+<!--6958319C12B34393B37A54BE0E9B36E5-->  <ISFIXED><![CDATA[N]]></ISFIXED>
+<!--6958319C12B34393B37A54BE0E9B36E5-->  <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE>
+<!--6958319C12B34393B37A54BE0E9B36E5-->  <OBUIAPP_PROCESS_ID><![CDATA[CC73C4845CDC487395804946EACB225F]]></OBUIAPP_PROCESS_ID>
+<!--6958319C12B34393B37A54BE0E9B36E5-->  <STARTINNEWLINE><![CDATA[Y]]></STARTINNEWLINE>
+<!--6958319C12B34393B37A54BE0E9B36E5-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
+<!--6958319C12B34393B37A54BE0E9B36E5-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--6958319C12B34393B37A54BE0E9B36E5-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
+<!--6958319C12B34393B37A54BE0E9B36E5--></OBUIAPP_PARAMETER>
+
 <!--6AF091FD5F1440BB9F0E0C674A168144--><OBUIAPP_PARAMETER>
 <!--6AF091FD5F1440BB9F0E0C674A168144-->  <OBUIAPP_PARAMETER_ID><![CDATA[6AF091FD5F1440BB9F0E0C674A168144]]></OBUIAPP_PARAMETER_ID>
 <!--6AF091FD5F1440BB9F0E0C674A168144-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -989,6 +1041,32 @@
 <!--7B2AE9099ECB4CE9B80C665D7662FA03-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--7B2AE9099ECB4CE9B80C665D7662FA03--></OBUIAPP_PARAMETER>
 
+<!--7B77F9EF9387445FBB5A40E84D256EE4--><OBUIAPP_PARAMETER>
+<!--7B77F9EF9387445FBB5A40E84D256EE4-->  <OBUIAPP_PARAMETER_ID><![CDATA[7B77F9EF9387445FBB5A40E84D256EE4]]></OBUIAPP_PARAMETER_ID>
+<!--7B77F9EF9387445FBB5A40E84D256EE4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7B77F9EF9387445FBB5A40E84D256EE4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7B77F9EF9387445FBB5A40E84D256EE4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7B77F9EF9387445FBB5A40E84D256EE4-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--7B77F9EF9387445FBB5A40E84D256EE4-->  <NAME><![CDATA[GL Item]]></NAME>
+<!--7B77F9EF9387445FBB5A40E84D256EE4-->  <DESCRIPTION><![CDATA[G/L Items  added as part of a given payment]]></DESCRIPTION>
+<!--7B77F9EF9387445FBB5A40E84D256EE4-->  <HELP><![CDATA[G/L Items  added as part of a given payment]]></HELP>
+<!--7B77F9EF9387445FBB5A40E84D256EE4-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--7B77F9EF9387445FBB5A40E84D256EE4-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--7B77F9EF9387445FBB5A40E84D256EE4-->  <AD_REFERENCE_VALUE_ID><![CDATA[1A6C5E0A5868417786ECCF3C02B17D65]]></AD_REFERENCE_VALUE_ID>
+<!--7B77F9EF9387445FBB5A40E84D256EE4-->  <COLUMNNAME><![CDATA[glitem]]></COLUMNNAME>
+<!--7B77F9EF9387445FBB5A40E84D256EE4-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--7B77F9EF9387445FBB5A40E84D256EE4-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
+<!--7B77F9EF9387445FBB5A40E84D256EE4-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--7B77F9EF9387445FBB5A40E84D256EE4-->  <AD_ELEMENT_ID><![CDATA[DABC92A3E32E4DBFB78068CF6A4FBAC7]]></AD_ELEMENT_ID>
+<!--7B77F9EF9387445FBB5A40E84D256EE4-->  <ISFIXED><![CDATA[N]]></ISFIXED>
+<!--7B77F9EF9387445FBB5A40E84D256EE4-->  <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE>
+<!--7B77F9EF9387445FBB5A40E84D256EE4-->  <OBUIAPP_PROCESS_ID><![CDATA[CC73C4845CDC487395804946EACB225F]]></OBUIAPP_PROCESS_ID>
+<!--7B77F9EF9387445FBB5A40E84D256EE4-->  <STARTINNEWLINE><![CDATA[Y]]></STARTINNEWLINE>
+<!--7B77F9EF9387445FBB5A40E84D256EE4-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
+<!--7B77F9EF9387445FBB5A40E84D256EE4-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--7B77F9EF9387445FBB5A40E84D256EE4-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
+<!--7B77F9EF9387445FBB5A40E84D256EE4--></OBUIAPP_PARAMETER>
+
 <!--7F740AFA59DB483FB1BBDD79E066C543--><OBUIAPP_PARAMETER>
 <!--7F740AFA59DB483FB1BBDD79E066C543-->  <OBUIAPP_PARAMETER_ID><![CDATA[7F740AFA59DB483FB1BBDD79E066C543]]></OBUIAPP_PARAMETER_ID>
 <!--7F740AFA59DB483FB1BBDD79E066C543-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1278,6 +1356,33 @@
 <!--93DC15C203EB4205BDE0D87AFE185D5C-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--93DC15C203EB4205BDE0D87AFE185D5C--></OBUIAPP_PARAMETER>
 
+<!--94462E5E2D2746668C1080B5B6CF1682--><OBUIAPP_PARAMETER>
+<!--94462E5E2D2746668C1080B5B6CF1682-->  <OBUIAPP_PARAMETER_ID><![CDATA[94462E5E2D2746668C1080B5B6CF1682]]></OBUIAPP_PARAMETER_ID>
+<!--94462E5E2D2746668C1080B5B6CF1682-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--94462E5E2D2746668C1080B5B6CF1682-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--94462E5E2D2746668C1080B5B6CF1682-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--94462E5E2D2746668C1080B5B6CF1682-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--94462E5E2D2746668C1080B5B6CF1682-->  <NAME><![CDATA[Currency To]]></NAME>
+<!--94462E5E2D2746668C1080B5B6CF1682-->  <DESCRIPTION><![CDATA[Target currency]]></DESCRIPTION>
+<!--94462E5E2D2746668C1080B5B6CF1682-->  <HELP><![CDATA[The Currency To defines the target currency for this conversion rate]]></HELP>
+<!--94462E5E2D2746668C1080B5B6CF1682-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--94462E5E2D2746668C1080B5B6CF1682-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--94462E5E2D2746668C1080B5B6CF1682-->  <AD_REFERENCE_VALUE_ID><![CDATA[9CEE02F4DBA84DB7997AC39C35F2CEA0]]></AD_REFERENCE_VALUE_ID>
+<!--94462E5E2D2746668C1080B5B6CF1682-->  <COLUMNNAME><![CDATA[c_currency_to_id]]></COLUMNNAME>
+<!--94462E5E2D2746668C1080B5B6CF1682-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--94462E5E2D2746668C1080B5B6CF1682-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
+<!--94462E5E2D2746668C1080B5B6CF1682-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--94462E5E2D2746668C1080B5B6CF1682-->  <AD_ELEMENT_ID><![CDATA[2D1363BA8FFD443D89B0F2C92FD2BBC4]]></AD_ELEMENT_ID>
+<!--94462E5E2D2746668C1080B5B6CF1682-->  <ISFIXED><![CDATA[N]]></ISFIXED>
+<!--94462E5E2D2746668C1080B5B6CF1682-->  <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE>
+<!--94462E5E2D2746668C1080B5B6CF1682-->  <OBUIAPP_PROCESS_ID><![CDATA[CC73C4845CDC487395804946EACB225F]]></OBUIAPP_PROCESS_ID>
+<!--94462E5E2D2746668C1080B5B6CF1682-->  <STARTINNEWLINE><![CDATA[Y]]></STARTINNEWLINE>
+<!--94462E5E2D2746668C1080B5B6CF1682-->  <READONLYLOGIC><![CDATA['Y']]></READONLYLOGIC>
+<!--94462E5E2D2746668C1080B5B6CF1682-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
+<!--94462E5E2D2746668C1080B5B6CF1682-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--94462E5E2D2746668C1080B5B6CF1682-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
+<!--94462E5E2D2746668C1080B5B6CF1682--></OBUIAPP_PARAMETER>
+
 <!--94DAEE7477AF40ED9B40E3A546EACD02--><OBUIAPP_PARAMETER>
 <!--94DAEE7477AF40ED9B40E3A546EACD02-->  <OBUIAPP_PARAMETER_ID><![CDATA[94DAEE7477AF40ED9B40E3A546EACD02]]></OBUIAPP_PARAMETER_ID>
 <!--94DAEE7477AF40ED9B40E3A546EACD02-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1553,6 +1658,32 @@
 <!--ACCFACE260B24599969EC724A567EB28-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--ACCFACE260B24599969EC724A567EB28--></OBUIAPP_PARAMETER>
 
+<!--AD2513E2D7394526B1949BEEE43E5251--><OBUIAPP_PARAMETER>
+<!--AD2513E2D7394526B1949BEEE43E5251-->  <OBUIAPP_PARAMETER_ID><![CDATA[AD2513E2D7394526B1949BEEE43E5251]]></OBUIAPP_PARAMETER_ID>
+<!--AD2513E2D7394526B1949BEEE43E5251-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--AD2513E2D7394526B1949BEEE43E5251-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--AD2513E2D7394526B1949BEEE43E5251-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--AD2513E2D7394526B1949BEEE43E5251-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--AD2513E2D7394526B1949BEEE43E5251-->  <NAME><![CDATA[Bank Fee From]]></NAME>
+<!--AD2513E2D7394526B1949BEEE43E5251-->  <DESCRIPTION><![CDATA[Fee at the origin Bank]]></DESCRIPTION>
+<!--AD2513E2D7394526B1949BEEE43E5251-->  <HELP><![CDATA[Fee at the origin Bank]]></HELP>
+<!--AD2513E2D7394526B1949BEEE43E5251-->  <SEQNO><![CDATA[90]]></SEQNO>
+<!--AD2513E2D7394526B1949BEEE43E5251-->  <AD_REFERENCE_ID><![CDATA[12]]></AD_REFERENCE_ID>
+<!--AD2513E2D7394526B1949BEEE43E5251-->  <COLUMNNAME><![CDATA[bank_fee_from]]></COLUMNNAME>
+<!--AD2513E2D7394526B1949BEEE43E5251-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--AD2513E2D7394526B1949BEEE43E5251-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
+<!--AD2513E2D7394526B1949BEEE43E5251-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--AD2513E2D7394526B1949BEEE43E5251-->  <AD_ELEMENT_ID><![CDATA[B8DABAF351464FA1A0F3C4C91515BDE5]]></AD_ELEMENT_ID>
+<!--AD2513E2D7394526B1949BEEE43E5251-->  <ISFIXED><![CDATA[N]]></ISFIXED>
+<!--AD2513E2D7394526B1949BEEE43E5251-->  <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE>
+<!--AD2513E2D7394526B1949BEEE43E5251-->  <OBUIAPP_PROCESS_ID><![CDATA[CC73C4845CDC487395804946EACB225F]]></OBUIAPP_PROCESS_ID>
+<!--AD2513E2D7394526B1949BEEE43E5251-->  <STARTINNEWLINE><![CDATA[Y]]></STARTINNEWLINE>
+<!--AD2513E2D7394526B1949BEEE43E5251-->  <DISPLAYLOGIC><![CDATA[@bank_fee@]]></DISPLAYLOGIC>
+<!--AD2513E2D7394526B1949BEEE43E5251-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
+<!--AD2513E2D7394526B1949BEEE43E5251-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--AD2513E2D7394526B1949BEEE43E5251-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
+<!--AD2513E2D7394526B1949BEEE43E5251--></OBUIAPP_PARAMETER>
+
 <!--B2E975E0ADE3445C90DA81F0F492EA1C--><OBUIAPP_PARAMETER>
 <!--B2E975E0ADE3445C90DA81F0F492EA1C-->  <OBUIAPP_PARAMETER_ID><![CDATA[B2E975E0ADE3445C90DA81F0F492EA1C]]></OBUIAPP_PARAMETER_ID>
 <!--B2E975E0ADE3445C90DA81F0F492EA1C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1687,6 +1818,32 @@
 <!--BC5E638E184C4F3AB36B9DA574E0E8BB-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--BC5E638E184C4F3AB36B9DA574E0E8BB--></OBUIAPP_PARAMETER>
 
+<!--BF4F039785D24BA6B93A2494B89F0C47--><OBUIAPP_PARAMETER>
+<!--BF4F039785D24BA6B93A2494B89F0C47-->  <OBUIAPP_PARAMETER_ID><![CDATA[BF4F039785D24BA6B93A2494B89F0C47]]></OBUIAPP_PARAMETER_ID>
+<!--BF4F039785D24BA6B93A2494B89F0C47-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BF4F039785D24BA6B93A2494B89F0C47-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BF4F039785D24BA6B93A2494B89F0C47-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BF4F039785D24BA6B93A2494B89F0C47-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--BF4F039785D24BA6B93A2494B89F0C47-->  <NAME><![CDATA[Multiple Rate By]]></NAME>
+<!--BF4F039785D24BA6B93A2494B89F0C47-->  <DESCRIPTION><![CDATA[The rate by which the base unit will be mutiplied by to create the converted unit.]]></DESCRIPTION>
+<!--BF4F039785D24BA6B93A2494B89F0C47-->  <HELP><![CDATA[To convert Source number to Target number, the Source is multiplied by the multiply rate.  If the Multiply Rate is entered, then the Divide Rate will be automatically calculated.]]></HELP>
+<!--BF4F039785D24BA6B93A2494B89F0C47-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--BF4F039785D24BA6B93A2494B89F0C47-->  <AD_REFERENCE_ID><![CDATA[22]]></AD_REFERENCE_ID>
+<!--BF4F039785D24BA6B93A2494B89F0C47-->  <COLUMNNAME><![CDATA[multiply_rate]]></COLUMNNAME>
+<!--BF4F039785D24BA6B93A2494B89F0C47-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--BF4F039785D24BA6B93A2494B89F0C47-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
+<!--BF4F039785D24BA6B93A2494B89F0C47-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--BF4F039785D24BA6B93A2494B89F0C47-->  <AD_ELEMENT_ID><![CDATA[466]]></AD_ELEMENT_ID>
+<!--BF4F039785D24BA6B93A2494B89F0C47-->  <ISFIXED><![CDATA[N]]></ISFIXED>
+<!--BF4F039785D24BA6B93A2494B89F0C47-->  <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE>
+<!--BF4F039785D24BA6B93A2494B89F0C47-->  <OBUIAPP_PROCESS_ID><![CDATA[CC73C4845CDC487395804946EACB225F]]></OBUIAPP_PROCESS_ID>
+<!--BF4F039785D24BA6B93A2494B89F0C47-->  <STARTINNEWLINE><![CDATA[Y]]></STARTINNEWLINE>
+<!--BF4F039785D24BA6B93A2494B89F0C47-->  <DISPLAYLOGIC><![CDATA[(@c_currency_to_id@ ! @c_currency_from_id@) & @c_currency_to_id@!undefined]]></DISPLAYLOGIC>
+<!--BF4F039785D24BA6B93A2494B89F0C47-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
+<!--BF4F039785D24BA6B93A2494B89F0C47-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--BF4F039785D24BA6B93A2494B89F0C47-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
+<!--BF4F039785D24BA6B93A2494B89F0C47--></OBUIAPP_PARAMETER>
+
 <!--C0BB1F1D542A41DC9FE160E3A19CADC9--><OBUIAPP_PARAMETER>
 <!--C0BB1F1D542A41DC9FE160E3A19CADC9-->  <OBUIAPP_PARAMETER_ID><![CDATA[C0BB1F1D542A41DC9FE160E3A19CADC9]]></OBUIAPP_PARAMETER_ID>
 <!--C0BB1F1D542A41DC9FE160E3A19CADC9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1826,6 +1983,29 @@
 <!--C722D23258B64E50A9137C73598C418F-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--C722D23258B64E50A9137C73598C418F--></OBUIAPP_PARAMETER>
 
+<!--D0947EBFAD8647CAB36D0B9B115DAA11--><OBUIAPP_PARAMETER>
+<!--D0947EBFAD8647CAB36D0B9B115DAA11-->  <OBUIAPP_PARAMETER_ID><![CDATA[D0947EBFAD8647CAB36D0B9B115DAA11]]></OBUIAPP_PARAMETER_ID>
+<!--D0947EBFAD8647CAB36D0B9B115DAA11-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D0947EBFAD8647CAB36D0B9B115DAA11-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D0947EBFAD8647CAB36D0B9B115DAA11-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D0947EBFAD8647CAB36D0B9B115DAA11-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--D0947EBFAD8647CAB36D0B9B115DAA11-->  <NAME><![CDATA[Deposit Amount]]></NAME>
+<!--D0947EBFAD8647CAB36D0B9B115DAA11-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--D0947EBFAD8647CAB36D0B9B115DAA11-->  <AD_REFERENCE_ID><![CDATA[12]]></AD_REFERENCE_ID>
+<!--D0947EBFAD8647CAB36D0B9B115DAA11-->  <COLUMNNAME><![CDATA[deposit_amount]]></COLUMNNAME>
+<!--D0947EBFAD8647CAB36D0B9B115DAA11-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--D0947EBFAD8647CAB36D0B9B115DAA11-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
+<!--D0947EBFAD8647CAB36D0B9B115DAA11-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--D0947EBFAD8647CAB36D0B9B115DAA11-->  <AD_ELEMENT_ID><![CDATA[B4F49C74A5FE40A48F023D34C6BE3837]]></AD_ELEMENT_ID>
+<!--D0947EBFAD8647CAB36D0B9B115DAA11-->  <ISFIXED><![CDATA[N]]></ISFIXED>
+<!--D0947EBFAD8647CAB36D0B9B115DAA11-->  <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE>
+<!--D0947EBFAD8647CAB36D0B9B115DAA11-->  <OBUIAPP_PROCESS_ID><![CDATA[CC73C4845CDC487395804946EACB225F]]></OBUIAPP_PROCESS_ID>
+<!--D0947EBFAD8647CAB36D0B9B115DAA11-->  <STARTINNEWLINE><![CDATA[Y]]></STARTINNEWLINE>
+<!--D0947EBFAD8647CAB36D0B9B115DAA11-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
+<!--D0947EBFAD8647CAB36D0B9B115DAA11-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--D0947EBFAD8647CAB36D0B9B115DAA11-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
+<!--D0947EBFAD8647CAB36D0B9B115DAA11--></OBUIAPP_PARAMETER>
+
 <!--D2F76322DF994A58B49D62E79944C219--><OBUIAPP_PARAMETER>
 <!--D2F76322DF994A58B49D62E79944C219-->  <OBUIAPP_PARAMETER_ID><![CDATA[D2F76322DF994A58B49D62E79944C219]]></OBUIAPP_PARAMETER_ID>
 <!--D2F76322DF994A58B49D62E79944C219-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1882,6 +2062,32 @@
 <!--D58EE6F45C72436DB613C79F5FE8A37C-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--D58EE6F45C72436DB613C79F5FE8A37C--></OBUIAPP_PARAMETER>
 
+<!--D9BE781BB0DE4045AF3BFD5AB55B65DF--><OBUIAPP_PARAMETER>
+<!--D9BE781BB0DE4045AF3BFD5AB55B65DF-->  <OBUIAPP_PARAMETER_ID><![CDATA[D9BE781BB0DE4045AF3BFD5AB55B65DF]]></OBUIAPP_PARAMETER_ID>
+<!--D9BE781BB0DE4045AF3BFD5AB55B65DF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D9BE781BB0DE4045AF3BFD5AB55B65DF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D9BE781BB0DE4045AF3BFD5AB55B65DF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D9BE781BB0DE4045AF3BFD5AB55B65DF-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--D9BE781BB0DE4045AF3BFD5AB55B65DF-->  <NAME><![CDATA[Bank Fee]]></NAME>
+<!--D9BE781BB0DE4045AF3BFD5AB55B65DF-->  <DESCRIPTION><![CDATA[This transaction is subject to a Bank Fee]]></DESCRIPTION>
+<!--D9BE781BB0DE4045AF3BFD5AB55B65DF-->  <HELP><![CDATA[This transaction is subject to a Bank Fee]]></HELP>
+<!--D9BE781BB0DE4045AF3BFD5AB55B65DF-->  <SEQNO><![CDATA[80]]></SEQNO>
+<!--D9BE781BB0DE4045AF3BFD5AB55B65DF-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--D9BE781BB0DE4045AF3BFD5AB55B65DF-->  <COLUMNNAME><![CDATA[bank_fee]]></COLUMNNAME>
+<!--D9BE781BB0DE4045AF3BFD5AB55B65DF-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--D9BE781BB0DE4045AF3BFD5AB55B65DF-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
+<!--D9BE781BB0DE4045AF3BFD5AB55B65DF-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--D9BE781BB0DE4045AF3BFD5AB55B65DF-->  <DEFAULTVALUE><![CDATA['N']]></DEFAULTVALUE>
+<!--D9BE781BB0DE4045AF3BFD5AB55B65DF-->  <AD_ELEMENT_ID><![CDATA[A0CEAF4259424F31B5E8751CBFBCCF26]]></AD_ELEMENT_ID>
+<!--D9BE781BB0DE4045AF3BFD5AB55B65DF-->  <ISFIXED><![CDATA[N]]></ISFIXED>
+<!--D9BE781BB0DE4045AF3BFD5AB55B65DF-->  <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE>
+<!--D9BE781BB0DE4045AF3BFD5AB55B65DF-->  <OBUIAPP_PROCESS_ID><![CDATA[CC73C4845CDC487395804946EACB225F]]></OBUIAPP_PROCESS_ID>
+<!--D9BE781BB0DE4045AF3BFD5AB55B65DF-->  <STARTINNEWLINE><![CDATA[Y]]></STARTINNEWLINE>
+<!--D9BE781BB0DE4045AF3BFD5AB55B65DF-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
+<!--D9BE781BB0DE4045AF3BFD5AB55B65DF-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--D9BE781BB0DE4045AF3BFD5AB55B65DF-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
+<!--D9BE781BB0DE4045AF3BFD5AB55B65DF--></OBUIAPP_PARAMETER>
+
 <!--DA22BED18BD944C9B6252B8400B89934--><OBUIAPP_PARAMETER>
 <!--DA22BED18BD944C9B6252B8400B89934-->  <OBUIAPP_PARAMETER_ID><![CDATA[DA22BED18BD944C9B6252B8400B89934]]></OBUIAPP_PARAMETER_ID>
 <!--DA22BED18BD944C9B6252B8400B89934-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2163,6 +2369,34 @@
 <!--F2C546F2C45C4AB58494B2D384E6A8E8-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--F2C546F2C45C4AB58494B2D384E6A8E8--></OBUIAPP_PARAMETER>
 
+<!--F4029E7726074FF2B6D3B59AE3072711--><OBUIAPP_PARAMETER>
+<!--F4029E7726074FF2B6D3B59AE3072711-->  <OBUIAPP_PARAMETER_ID><![CDATA[F4029E7726074FF2B6D3B59AE3072711]]></OBUIAPP_PARAMETER_ID>
+<!--F4029E7726074FF2B6D3B59AE3072711-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F4029E7726074FF2B6D3B59AE3072711-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F4029E7726074FF2B6D3B59AE3072711-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F4029E7726074FF2B6D3B59AE3072711-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--F4029E7726074FF2B6D3B59AE3072711-->  <NAME><![CDATA[Deposit To]]></NAME>
+<!--F4029E7726074FF2B6D3B59AE3072711-->  <DESCRIPTION><![CDATA[Financial Account to which the amount is going to be deposited.]]></DESCRIPTION>
+<!--F4029E7726074FF2B6D3B59AE3072711-->  <HELP><![CDATA[Financial Account to which the amount is going to be deposited.]]></HELP>
+<!--F4029E7726074FF2B6D3B59AE3072711-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--F4029E7726074FF2B6D3B59AE3072711-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--F4029E7726074FF2B6D3B59AE3072711-->  <AD_REFERENCE_VALUE_ID><![CDATA[03D336BF39A7455C8FD64CBCCFB4FC1C]]></AD_REFERENCE_VALUE_ID>
+<!--F4029E7726074FF2B6D3B59AE3072711-->  <COLUMNNAME><![CDATA[fin_financial_account_id]]></COLUMNNAME>
+<!--F4029E7726074FF2B6D3B59AE3072711-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--F4029E7726074FF2B6D3B59AE3072711-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
+<!--F4029E7726074FF2B6D3B59AE3072711-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--F4029E7726074FF2B6D3B59AE3072711-->  <AD_ELEMENT_ID><![CDATA[E33F3B5BAC75488DAAAC10471326EFFA]]></AD_ELEMENT_ID>
+<!--F4029E7726074FF2B6D3B59AE3072711-->  <ISFIXED><![CDATA[N]]></ISFIXED>
+<!--F4029E7726074FF2B6D3B59AE3072711-->  <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE>
+<!--F4029E7726074FF2B6D3B59AE3072711-->  <OBUIAPP_PROCESS_ID><![CDATA[CC73C4845CDC487395804946EACB225F]]></OBUIAPP_PROCESS_ID>
+<!--F4029E7726074FF2B6D3B59AE3072711-->  <STARTINNEWLINE><![CDATA[Y]]></STARTINNEWLINE>
+<!--F4029E7726074FF2B6D3B59AE3072711-->  <AD_VAL_RULE_ID><![CDATA[8CEAB789915E4575BDEB66F1930067BA]]></AD_VAL_RULE_ID>
+<!--F4029E7726074FF2B6D3B59AE3072711-->  <ONCHANGEFUNCTION><![CDATA[OB.APRM.FundsTranfer.depositToOnChange]]></ONCHANGEFUNCTION>
+<!--F4029E7726074FF2B6D3B59AE3072711-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
+<!--F4029E7726074FF2B6D3B59AE3072711-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--F4029E7726074FF2B6D3B59AE3072711-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
+<!--F4029E7726074FF2B6D3B59AE3072711--></OBUIAPP_PARAMETER>
+
 <!--F627024CD1994930A448FD641C7BB43F--><OBUIAPP_PARAMETER>
 <!--F627024CD1994930A448FD641C7BB43F-->  <OBUIAPP_PARAMETER_ID><![CDATA[F627024CD1994930A448FD641C7BB43F]]></OBUIAPP_PARAMETER_ID>
 <!--F627024CD1994930A448FD641C7BB43F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2305,4 +2539,32 @@
 <!--FDF5AB17A1154D6AB440E1F5A02B45F5-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--FDF5AB17A1154D6AB440E1F5A02B45F5--></OBUIAPP_PARAMETER>
 
+<!--FFD88561D33F4E23ADFC1A19A54AAAF8--><OBUIAPP_PARAMETER>
+<!--FFD88561D33F4E23ADFC1A19A54AAAF8-->  <OBUIAPP_PARAMETER_ID><![CDATA[FFD88561D33F4E23ADFC1A19A54AAAF8]]></OBUIAPP_PARAMETER_ID>
+<!--FFD88561D33F4E23ADFC1A19A54AAAF8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FFD88561D33F4E23ADFC1A19A54AAAF8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FFD88561D33F4E23ADFC1A19A54AAAF8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FFD88561D33F4E23ADFC1A19A54AAAF8-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--FFD88561D33F4E23ADFC1A19A54AAAF8-->  <NAME><![CDATA[Currency From]]></NAME>
+<!--FFD88561D33F4E23ADFC1A19A54AAAF8-->  <DESCRIPTION><![CDATA[The Currency From defines the source currency]]></DESCRIPTION>
+<!--FFD88561D33F4E23ADFC1A19A54AAAF8-->  <HELP><![CDATA[The Currency From defines the source currency]]></HELP>
+<!--FFD88561D33F4E23ADFC1A19A54AAAF8-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--FFD88561D33F4E23ADFC1A19A54AAAF8-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--FFD88561D33F4E23ADFC1A19A54AAAF8-->  <AD_REFERENCE_VALUE_ID><![CDATA[9CEE02F4DBA84DB7997AC39C35F2CEA0]]></AD_REFERENCE_VALUE_ID>
+<!--FFD88561D33F4E23ADFC1A19A54AAAF8-->  <COLUMNNAME><![CDATA[c_currency_from_id]]></COLUMNNAME>
+<!--FFD88561D33F4E23ADFC1A19A54AAAF8-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--FFD88561D33F4E23ADFC1A19A54AAAF8-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
+<!--FFD88561D33F4E23ADFC1A19A54AAAF8-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--FFD88561D33F4E23ADFC1A19A54AAAF8-->  <DEFAULTVALUE><![CDATA[@C_CURRENCY_ID@]]></DEFAULTVALUE>
+<!--FFD88561D33F4E23ADFC1A19A54AAAF8-->  <AD_ELEMENT_ID><![CDATA[D521B46D67FA4014B71B52EE04B0492A]]></AD_ELEMENT_ID>
+<!--FFD88561D33F4E23ADFC1A19A54AAAF8-->  <ISFIXED><![CDATA[N]]></ISFIXED>
+<!--FFD88561D33F4E23ADFC1A19A54AAAF8-->  <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE>
+<!--FFD88561D33F4E23ADFC1A19A54AAAF8-->  <OBUIAPP_PROCESS_ID><![CDATA[CC73C4845CDC487395804946EACB225F]]></OBUIAPP_PROCESS_ID>
+<!--FFD88561D33F4E23ADFC1A19A54AAAF8-->  <STARTINNEWLINE><![CDATA[Y]]></STARTINNEWLINE>
+<!--FFD88561D33F4E23ADFC1A19A54AAAF8-->  <READONLYLOGIC><![CDATA['Y']]></READONLYLOGIC>
+<!--FFD88561D33F4E23ADFC1A19A54AAAF8-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
+<!--FFD88561D33F4E23ADFC1A19A54AAAF8-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--FFD88561D33F4E23ADFC1A19A54AAAF8-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
+<!--FFD88561D33F4E23ADFC1A19A54AAAF8--></OBUIAPP_PARAMETER>
+
 </data>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PROCESS.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PROCESS.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -138,6 +138,26 @@
 <!--9BED7889E1034FE68BD85D5D16857320-->  <ISCANADDRECORDSTOSELECTOR><![CDATA[Y]]></ISCANADDRECORDSTOSELECTOR>
 <!--9BED7889E1034FE68BD85D5D16857320--></OBUIAPP_PROCESS>
 
+<!--CC73C4845CDC487395804946EACB225F--><OBUIAPP_PROCESS>
+<!--CC73C4845CDC487395804946EACB225F-->  <OBUIAPP_PROCESS_ID><![CDATA[CC73C4845CDC487395804946EACB225F]]></OBUIAPP_PROCESS_ID>
+<!--CC73C4845CDC487395804946EACB225F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--CC73C4845CDC487395804946EACB225F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--CC73C4845CDC487395804946EACB225F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--CC73C4845CDC487395804946EACB225F-->  <VALUE><![CDATA[Funds Transfer]]></VALUE>
+<!--CC73C4845CDC487395804946EACB225F-->  <NAME><![CDATA[Funds Transfer]]></NAME>
+<!--CC73C4845CDC487395804946EACB225F-->  <DESCRIPTION><![CDATA[Transfer funds between Financial Accounts]]></DESCRIPTION>
+<!--CC73C4845CDC487395804946EACB225F-->  <HELP><![CDATA[Transfer funds between Financial Accounts]]></HELP>
+<!--CC73C4845CDC487395804946EACB225F-->  <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
+<!--CC73C4845CDC487395804946EACB225F-->  <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.actionHandler.FundsTransferActionHandler]]></CLASSNAME>
+<!--CC73C4845CDC487395804946EACB225F-->  <ISBACKGROUND><![CDATA[N]]></ISBACKGROUND>
+<!--CC73C4845CDC487395804946EACB225F-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--CC73C4845CDC487395804946EACB225F-->  <UIPATTERN><![CDATA[OBUIAPP_PickAndExecute]]></UIPATTERN>
+<!--CC73C4845CDC487395804946EACB225F-->  <ISMULTIRECORD><![CDATA[N]]></ISMULTIRECORD>
+<!--CC73C4845CDC487395804946EACB225F-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
+<!--CC73C4845CDC487395804946EACB225F-->  <ISGRIDLEGACY><![CDATA[N]]></ISGRIDLEGACY>
+<!--CC73C4845CDC487395804946EACB225F-->  <ISCANADDRECORDSTOSELECTOR><![CDATA[N]]></ISCANADDRECORDSTOSELECTOR>
+<!--CC73C4845CDC487395804946EACB225F--></OBUIAPP_PROCESS>
+
 <!--E68790A7B65F4D45AB35E2BAE34C1F39--><OBUIAPP_PROCESS>
 <!--E68790A7B65F4D45AB35E2BAE34C1F39-->  <OBUIAPP_PROCESS_ID><![CDATA[E68790A7B65F4D45AB35E2BAE34C1F39]]></OBUIAPP_PROCESS_ID>
 <!--E68790A7B65F4D45AB35E2BAE34C1F39-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -99,6 +99,22 @@
 <!--7811D4DBBB734D5ABB5DCC0CFDA21B88-->  <CUSTOM_QUERY><![CDATA[N]]></CUSTOM_QUERY>
 <!--7811D4DBBB734D5ABB5DCC0CFDA21B88--></OBUISEL_SELECTOR>
 
+<!--8E06629A43A84B099387466818B1C54F--><OBUISEL_SELECTOR>
+<!--8E06629A43A84B099387466818B1C54F-->  <OBUISEL_SELECTOR_ID><![CDATA[8E06629A43A84B099387466818B1C54F]]></OBUISEL_SELECTOR_ID>
+<!--8E06629A43A84B099387466818B1C54F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8E06629A43A84B099387466818B1C54F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8E06629A43A84B099387466818B1C54F-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--8E06629A43A84B099387466818B1C54F-->  <NAME><![CDATA[FIN_Finacc_Transaction Selector]]></NAME>
+<!--8E06629A43A84B099387466818B1C54F-->  <AD_REFERENCE_ID><![CDATA[98E0BF0783E44EFABE2F2BDDE866D6AE]]></AD_REFERENCE_ID>
+<!--8E06629A43A84B099387466818B1C54F-->  <AD_TABLE_ID><![CDATA[4D8C3B3C31D1410DA046140C9F024D17]]></AD_TABLE_ID>
+<!--8E06629A43A84B099387466818B1C54F-->  <AD_COLUMN_ID><![CDATA[7891269C840E655DE040007F010155CE]]></AD_COLUMN_ID>
+<!--8E06629A43A84B099387466818B1C54F-->  <OBCLKER_TEMPLATE_ID><![CDATA[9314DE8599AD44E7BFC4CC50699042AB]]></OBCLKER_TEMPLATE_ID>
+<!--8E06629A43A84B099387466818B1C54F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8E06629A43A84B099387466818B1C54F-->  <SUGGESTIONTEXTMATCHSTYLE><![CDATA[startsWith]]></SUGGESTIONTEXTMATCHSTYLE>
+<!--8E06629A43A84B099387466818B1C54F-->  <POPUPTEXTMATCHSTYLE><![CDATA[startsWith]]></POPUPTEXTMATCHSTYLE>
+<!--8E06629A43A84B099387466818B1C54F-->  <CUSTOM_QUERY><![CDATA[N]]></CUSTOM_QUERY>
+<!--8E06629A43A84B099387466818B1C54F--></OBUISEL_SELECTOR>
+
 <!--9FAD469CE4414A25974CF45C0AD22D35--><OBUISEL_SELECTOR>
 <!--9FAD469CE4414A25974CF45C0AD22D35-->  <OBUISEL_SELECTOR_ID><![CDATA[9FAD469CE4414A25974CF45C0AD22D35]]></OBUISEL_SELECTOR_ID>
 <!--9FAD469CE4414A25974CF45C0AD22D35-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 16 06:35:23 2016 +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.29727]]></VERSION>
+<!--8A098711BB324335A19833286BDB093D-->  <VERSION><![CDATA[1.0.30440]]></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[PR16Q3]]></VERSION_LABEL>
+<!--8A098711BB324335A19833286BDB093D-->  <VERSION_LABEL><![CDATA[PR16Q4]]></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	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Dec 16 06:35:23 2016 +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.29727]]></STARTVERSION>
+<!--1467C397BC5F4999A5606F39CD6FF8A4-->  <STARTVERSION><![CDATA[2.1.30440]]></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	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 16 06:35:23 2016 +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.29727]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.30440]]></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[PR16Q3]]></VERSION_LABEL>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION_LABEL><![CDATA[PR16Q4]]></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	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Dec 16 06:35:23 2016 +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.29727]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.30440]]></STARTVERSION>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_REPORT.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_REPORT.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -63,6 +63,6 @@
       </unique>
       <check name="OBUIAPP_REPORT_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="OBUIAPP_REPORT_PDF_AS_XLS_CHK"><![CDATA[USE_PDF_AS_XLS_TEMPLATE IN ('Y', 'N')]]></check>
-      <check name="OBUIAPP_REPORT_TMP_CHK"><![CDATA[PDF_TEMPLATE IS NOT NULL OR XLS_TEMPLATE IS NOT NULL OR HTML_TEMPLATE IS NOT NULL]]></check>
+      <check name="OBUIAPP_REPORT_TMP_CHK"><![CDATA[PDF_TEMPLATE IS NOT NULL OR XLS_TEMPLATE IS NOT NULL]]></check>
     </table>
   </database>
--- a/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -7879,8 +7879,8 @@
 <!--93DDA487C86244A28FB80B6F09E74385-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--93DDA487C86244A28FB80B6F09E74385-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--93DDA487C86244A28FB80B6F09E74385-->  <NAME><![CDATA[IsLazyFiltering]]></NAME>
-<!--93DDA487C86244A28FB80B6F09E74385-->  <DESCRIPTION><![CDATA[If it is set, the grid won't perform a filter and/or a sorting action until a button be pressed.]]></DESCRIPTION>
-<!--93DDA487C86244A28FB80B6F09E74385-->  <HELP><![CDATA[If it is set, the grid won't perform a filter and/or a sorting action until the 'Apply Filters' button be pressed.]]></HELP>
+<!--93DDA487C86244A28FB80B6F09E74385-->  <DESCRIPTION><![CDATA[If it is set, the grid won't perform a filter and/or a sorting action until the 'Apply Filters' button be pressed. In the same way, the summary functions present in the grid won't be recalculated until this button be pressed.]]></DESCRIPTION>
+<!--93DDA487C86244A28FB80B6F09E74385-->  <HELP><![CDATA[If it is set, the grid won't perform a filter and/or a sorting action until the 'Apply Filters' button be pressed. In the same way, the summary functions present in the grid won't be recalculated until this button be pressed.]]></HELP>
 <!--93DDA487C86244A28FB80B6F09E74385-->  <COLUMNNAME><![CDATA[IsLazyFiltering]]></COLUMNNAME>
 <!--93DDA487C86244A28FB80B6F09E74385-->  <AD_TABLE_ID><![CDATA[5D50320222DD4865ADFD50364C84291D]]></AD_TABLE_ID>
 <!--93DDA487C86244A28FB80B6F09E74385-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
@@ -11576,8 +11576,8 @@
 <!--FEEFB3DC943940A08FE7DCF663BFF90F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FEEFB3DC943940A08FE7DCF663BFF90F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FEEFB3DC943940A08FE7DCF663BFF90F-->  <NAME><![CDATA[IsLazyFiltering]]></NAME>
-<!--FEEFB3DC943940A08FE7DCF663BFF90F-->  <DESCRIPTION><![CDATA[If it is set, the grid won't perform a filter and/or a sorting action until a button be pressed.]]></DESCRIPTION>
-<!--FEEFB3DC943940A08FE7DCF663BFF90F-->  <HELP><![CDATA[If it is set, the grid won't perform a filter and/or a sorting action until the 'Apply Filters' button be pressed.]]></HELP>
+<!--FEEFB3DC943940A08FE7DCF663BFF90F-->  <DESCRIPTION><![CDATA[If it is set, the grid won't perform a filter and/or a sorting action until the 'Apply Filters' button be pressed. In the same way, the summary functions present in the grid won't be recalculated until this button be pressed.]]></DESCRIPTION>
+<!--FEEFB3DC943940A08FE7DCF663BFF90F-->  <HELP><![CDATA[If it is set, the grid won't perform a filter and/or a sorting action until the 'Apply Filters' button be pressed. In the same way, the summary functions present in the grid won't be recalculated until this button be pressed.]]></HELP>
 <!--FEEFB3DC943940A08FE7DCF663BFF90F-->  <COLUMNNAME><![CDATA[IsLazyFiltering]]></COLUMNNAME>
 <!--FEEFB3DC943940A08FE7DCF663BFF90F-->  <AD_TABLE_ID><![CDATA[8A16662B37184121A1EDAA89890E160C]]></AD_TABLE_ID>
 <!--FEEFB3DC943940A08FE7DCF663BFF90F-->  <AD_REFERENCE_ID><![CDATA[17]]></AD_REFERENCE_ID>
--- a/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -88,8 +88,8 @@
 <!--10922048465547F48765035389E22977-->  <COLUMNNAME><![CDATA[IsLazyFiltering]]></COLUMNNAME>
 <!--10922048465547F48765035389E22977-->  <NAME><![CDATA[Lazy Filtering on Grid]]></NAME>
 <!--10922048465547F48765035389E22977-->  <PRINTNAME><![CDATA[Lazy Filtering on Grid]]></PRINTNAME>
-<!--10922048465547F48765035389E22977-->  <DESCRIPTION><![CDATA[If it is set, the grid won't perform a filter and/or a sorting action until a button be pressed.]]></DESCRIPTION>
-<!--10922048465547F48765035389E22977-->  <HELP><![CDATA[If it is set, the grid won't perform a filter and/or a sorting action until the 'Apply Filters' button be pressed.]]></HELP>
+<!--10922048465547F48765035389E22977-->  <DESCRIPTION><![CDATA[If it is set, the grid won't perform a filter and/or a sorting action until the 'Apply Filters' button be pressed. In the same way, the summary functions present in the grid won't be recalculated until this button be pressed.]]></DESCRIPTION>
+<!--10922048465547F48765035389E22977-->  <HELP><![CDATA[If it is set, the grid won't perform a filter and/or a sorting action until the 'Apply Filters' button be pressed. In the same way, the summary functions present in the grid won't be recalculated until this button be pressed.]]></HELP>
 <!--10922048465547F48765035389E22977-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--10922048465547F48765035389E22977-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--10922048465547F48765035389E22977--></AD_ELEMENT>
--- a/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -6369,8 +6369,8 @@
 <!--B222E0B3174A43D0935CCDD7520C37EF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--B222E0B3174A43D0935CCDD7520C37EF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--B222E0B3174A43D0935CCDD7520C37EF-->  <NAME><![CDATA[Lazy Filtering on Grid]]></NAME>
-<!--B222E0B3174A43D0935CCDD7520C37EF-->  <DESCRIPTION><![CDATA[If it is set, the grid won't perform a filter and/or a sorting action until a button be pressed.]]></DESCRIPTION>
-<!--B222E0B3174A43D0935CCDD7520C37EF-->  <HELP><![CDATA[If it is set, the grid won't perform a filter and/or a sorting action until the 'Apply Filters' button be pressed.]]></HELP>
+<!--B222E0B3174A43D0935CCDD7520C37EF-->  <DESCRIPTION><![CDATA[If it is set, the grid won't perform a filter and/or a sorting action until the 'Apply Filters' button be pressed. In the same way, the summary functions present in the grid won't be recalculated until this button be pressed.]]></DESCRIPTION>
+<!--B222E0B3174A43D0935CCDD7520C37EF-->  <HELP><![CDATA[If it is set, the grid won't perform a filter and/or a sorting action until the 'Apply Filters' button be pressed. In the same way, the summary functions present in the grid won't be recalculated until this button be pressed.]]></HELP>
 <!--B222E0B3174A43D0935CCDD7520C37EF-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--B222E0B3174A43D0935CCDD7520C37EF-->  <AD_TAB_ID><![CDATA[13FE911F7F684A47801DF55525BAD4A1]]></AD_TAB_ID>
 <!--B222E0B3174A43D0935CCDD7520C37EF-->  <AD_COLUMN_ID><![CDATA[93DDA487C86244A28FB80B6F09E74385]]></AD_COLUMN_ID>
@@ -6397,8 +6397,8 @@
 <!--B46E1D7D67054980830418FDA0F571BF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--B46E1D7D67054980830418FDA0F571BF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--B46E1D7D67054980830418FDA0F571BF-->  <NAME><![CDATA[Lazy Filtering on Grid]]></NAME>
-<!--B46E1D7D67054980830418FDA0F571BF-->  <DESCRIPTION><![CDATA[If it is set, the grid won't perform a filter and/or a sorting action until a button be pressed.]]></DESCRIPTION>
-<!--B46E1D7D67054980830418FDA0F571BF-->  <HELP><![CDATA[If it is set, the grid won't perform a filter and/or a sorting action until the 'Apply Filters' button be pressed.]]></HELP>
+<!--B46E1D7D67054980830418FDA0F571BF-->  <DESCRIPTION><![CDATA[If it is set, the grid won't perform a filter and/or a sorting action until the 'Apply Filters' button be pressed. In the same way, the summary functions present in the grid won't be recalculated until this button be pressed.]]></DESCRIPTION>
+<!--B46E1D7D67054980830418FDA0F571BF-->  <HELP><![CDATA[If it is set, the grid won't perform a filter and/or a sorting action until the 'Apply Filters' button be pressed. In the same way, the summary functions present in the grid won't be recalculated until this button be pressed.]]></HELP>
 <!--B46E1D7D67054980830418FDA0F571BF-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--B46E1D7D67054980830418FDA0F571BF-->  <AD_TAB_ID><![CDATA[49B33DC2EDFD45A48EECE139AD5E9AC9]]></AD_TAB_ID>
 <!--B46E1D7D67054980830418FDA0F571BF-->  <AD_COLUMN_ID><![CDATA[FEEFB3DC943940A08FE7DCF663BFF90F]]></AD_COLUMN_ID>
--- a/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -458,6 +458,18 @@
 <!--2C8A8843F1E04317AD38623A3C52F978-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--2C8A8843F1E04317AD38623A3C52F978--></AD_MESSAGE>
 
+<!--2EEFD14AC47C4C2ABB4218DFB2F12564--><AD_MESSAGE>
+<!--2EEFD14AC47C4C2ABB4218DFB2F12564-->  <AD_MESSAGE_ID><![CDATA[2EEFD14AC47C4C2ABB4218DFB2F12564]]></AD_MESSAGE_ID>
+<!--2EEFD14AC47C4C2ABB4218DFB2F12564-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2EEFD14AC47C4C2ABB4218DFB2F12564-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2EEFD14AC47C4C2ABB4218DFB2F12564-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2EEFD14AC47C4C2ABB4218DFB2F12564-->  <VALUE><![CDATA[OBUIAPP_GridFilterNewRecord]]></VALUE>
+<!--2EEFD14AC47C4C2ABB4218DFB2F12564-->  <MSGTEXT><![CDATA[New record filter applied. Click to clear.]]></MSGTEXT>
+<!--2EEFD14AC47C4C2ABB4218DFB2F12564-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--2EEFD14AC47C4C2ABB4218DFB2F12564-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--2EEFD14AC47C4C2ABB4218DFB2F12564-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--2EEFD14AC47C4C2ABB4218DFB2F12564--></AD_MESSAGE>
+
 <!--30C2B55E35744A9182219A8B4091A6E3--><AD_MESSAGE>
 <!--30C2B55E35744A9182219A8B4091A6E3-->  <AD_MESSAGE_ID><![CDATA[30C2B55E35744A9182219A8B4091A6E3]]></AD_MESSAGE_ID>
 <!--30C2B55E35744A9182219A8B4091A6E3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1172,6 +1184,18 @@
 <!--839DDEEC373B4151BC1C721AB90FB5AC-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--839DDEEC373B4151BC1C721AB90FB5AC--></AD_MESSAGE>
 
+<!--86043443EEC547A3814372EA43D69BF5--><AD_MESSAGE>
+<!--86043443EEC547A3814372EA43D69BF5-->  <AD_MESSAGE_ID><![CDATA[86043443EEC547A3814372EA43D69BF5]]></AD_MESSAGE_ID>
+<!--86043443EEC547A3814372EA43D69BF5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--86043443EEC547A3814372EA43D69BF5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--86043443EEC547A3814372EA43D69BF5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--86043443EEC547A3814372EA43D69BF5-->  <VALUE><![CDATA[OBUIAPP_NewRecordFilterMsg]]></VALUE>
+<!--86043443EEC547A3814372EA43D69BF5-->  <MSGTEXT><![CDATA[The window has been opened to create a new record in form view. Click on the refresh button to load the data using the current grid filters.]]></MSGTEXT>
+<!--86043443EEC547A3814372EA43D69BF5-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--86043443EEC547A3814372EA43D69BF5-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--86043443EEC547A3814372EA43D69BF5-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--86043443EEC547A3814372EA43D69BF5--></AD_MESSAGE>
+
 <!--888D0AF770AE4037B85120FB775FE038--><AD_MESSAGE>
 <!--888D0AF770AE4037B85120FB775FE038-->  <AD_MESSAGE_ID><![CDATA[888D0AF770AE4037B85120FB775FE038]]></AD_MESSAGE_ID>
 <!--888D0AF770AE4037B85120FB775FE038-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 16 06:35:23 2016 +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.29727]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.30440]]></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[PR16Q3]]></VERSION_LABEL>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION_LABEL><![CDATA[PR16Q4]]></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	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Dec 16 06:35:23 2016 +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.29727]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.30440]]></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.29727]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->  <STARTVERSION><![CDATA[2.1.30440]]></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.29727]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->  <STARTVERSION><![CDATA[3.0.30440]]></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.29727]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->  <STARTVERSION><![CDATA[8.1.30440]]></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.application/src-db/database/sourcedata/AD_REF_LIST.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_REF_LIST.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -447,6 +447,18 @@
 <!--F45C2509CCF14629906DE44B542D903F-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--F45C2509CCF14629906DE44B542D903F--></AD_REF_LIST>
 
+<!--F8A1CEF24CD44C8491ACE015BBD5F83A--><AD_REF_LIST>
+<!--F8A1CEF24CD44C8491ACE015BBD5F83A-->  <AD_REF_LIST_ID><![CDATA[F8A1CEF24CD44C8491ACE015BBD5F83A]]></AD_REF_LIST_ID>
+<!--F8A1CEF24CD44C8491ACE015BBD5F83A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F8A1CEF24CD44C8491ACE015BBD5F83A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F8A1CEF24CD44C8491ACE015BBD5F83A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F8A1CEF24CD44C8491ACE015BBD5F83A-->  <VALUE><![CDATA[OBUIAPP_ShowNewRecordFilterMsg]]></VALUE>
+<!--F8A1CEF24CD44C8491ACE015BBD5F83A-->  <NAME><![CDATA[Show New Record Filter Message]]></NAME>
+<!--F8A1CEF24CD44C8491ACE015BBD5F83A-->  <DESCRIPTION><![CDATA[If true, shows a message when newly created record filter is applied]]></DESCRIPTION>
+<!--F8A1CEF24CD44C8491ACE015BBD5F83A-->  <AD_REFERENCE_ID><![CDATA[A26BA480E2014707B47257024C3CBFF7]]></AD_REFERENCE_ID>
+<!--F8A1CEF24CD44C8491ACE015BBD5F83A-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--F8A1CEF24CD44C8491ACE015BBD5F83A--></AD_REF_LIST>
+
 <!--FF8080812DE1CD58012DE1FC1FB9002F--><AD_REF_LIST>
 <!--FF8080812DE1CD58012DE1FC1FB9002F-->  <AD_REF_LIST_ID><![CDATA[FF8080812DE1CD58012DE1FC1FB9002F]]></AD_REF_LIST_ID>
 <!--FF8080812DE1CD58012DE1FC1FB9002F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 16 06:35:23 2016 +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.29727]]></VERSION>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.30440]]></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[PR16Q3]]></VERSION_LABEL>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION_LABEL><![CDATA[PR16Q4]]></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	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Dec 16 06:35:23 2016 +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.29727]]></STARTVERSION>
+<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.30440]]></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	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 16 06:35:23 2016 +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.29727]]></VERSION>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.30440]]></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[PR16Q3]]></VERSION_LABEL>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION_LABEL><![CDATA[PR16Q4]]></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	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Dec 16 06:35:23 2016 +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.29727]]></STARTVERSION>
+<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.30440]]></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.29727]]></STARTVERSION>
+<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <STARTVERSION><![CDATA[1.1.30440]]></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.29727]]></STARTVERSION>
+<!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <STARTVERSION><![CDATA[2.0.30440]]></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	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 16 06:35:23 2016 +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.29727]]></VERSION>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.30440]]></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[PR16Q3]]></VERSION_LABEL>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION_LABEL><![CDATA[PR16Q4]]></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	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Dec 16 06:35:23 2016 +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.29727]]></STARTVERSION>
+<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.30440]]></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.29727]]></STARTVERSION>
+<!--E71B28FC949D481D9F59C17D01E46EF9-->  <STARTVERSION><![CDATA[3.0.30440]]></STARTVERSION>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 16 06:35:23 2016 +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.29727]]></VERSION>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.30440]]></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[PR16Q3]]></VERSION_LABEL>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION_LABEL><![CDATA[PR16Q4]]></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	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Dec 16 06:35:23 2016 +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.29727]]></STARTVERSION>
+<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.30440]]></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	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 16 06:35:23 2016 +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.29727]]></VERSION>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.30440]]></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[PR16Q3]]></VERSION_LABEL>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION_LABEL><![CDATA[PR16Q4]]></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	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Dec 16 06:35:23 2016 +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.29727]]></STARTVERSION>
+<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.30440]]></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	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 16 06:35:23 2016 +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.29727]]></VERSION>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.30440]]></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[PR16Q3]]></VERSION_LABEL>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION_LABEL><![CDATA[PR16Q4]]></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	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Dec 16 06:35:23 2016 +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.29727]]></STARTVERSION>
+<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.30440]]></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	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 16 06:35:23 2016 +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.29727]]></VERSION>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.30440]]></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[PR16Q3]]></VERSION_LABEL>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION_LABEL><![CDATA[PR16Q4]]></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	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Dec 16 06:35:23 2016 +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.29727]]></STARTVERSION>
+<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.30440]]></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	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 16 06:35:23 2016 +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.29727]]></VERSION>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION><![CDATA[2.1.30440]]></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[PR16Q3]]></VERSION_LABEL>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION_LABEL><![CDATA[PR16Q4]]></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	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Dec 16 06:35:23 2016 +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.29727]]></STARTVERSION>
+<!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <STARTVERSION><![CDATA[1.1.30440]]></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.29727]]></STARTVERSION>
+<!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <STARTVERSION><![CDATA[2.0.30440]]></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.29727]]></STARTVERSION>
+<!--4FCE95802A854F7E8623AFF7C33D13EE-->  <STARTVERSION><![CDATA[3.0.30440]]></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.29727]]></STARTVERSION>
+<!--54AF8B39C55E4E7496902893ECD82786-->  <STARTVERSION><![CDATA[2.1.30440]]></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.29727]]></STARTVERSION>
+<!--D03C56D8A4E14F45A5466350E05C631F-->  <STARTVERSION><![CDATA[8.1.30440]]></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	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 16 06:35:23 2016 +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.29727]]></VERSION>
+<!--FF8080813129ADA401312CA1222A0005-->  <VERSION><![CDATA[0.1.30440]]></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[PR16Q3]]></VERSION_LABEL>
+<!--FF8080813129ADA401312CA1222A0005-->  <VERSION_LABEL><![CDATA[PR16Q4]]></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	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Dec 16 06:35:23 2016 +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.29727]]></STARTVERSION>
+<!--FF8080813141B198013141BA0F7D0012-->  <STARTVERSION><![CDATA[0.1.30440]]></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.29727]]></STARTVERSION>
+<!--FF8080813151AEE1013151C4ACE6001B-->  <STARTVERSION><![CDATA[2.1.30440]]></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	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 16 06:35:23 2016 +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.29727]]></VERSION>
+<!--FF8080813141B198013141B86DD70003-->  <VERSION><![CDATA[0.1.30440]]></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[PR16Q3]]></VERSION_LABEL>
+<!--FF8080813141B198013141B86DD70003-->  <VERSION_LABEL><![CDATA[PR16Q4]]></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	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Dec 16 06:35:23 2016 +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.29727]]></STARTVERSION>
+<!--FF8080813141B198013141B8B21B0006-->  <STARTVERSION><![CDATA[3.0.30440]]></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	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 16 06:35:23 2016 +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.29727]]></VERSION>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION><![CDATA[2.0.30440]]></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[PR16Q3]]></VERSION_LABEL>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION_LABEL><![CDATA[PR16Q4]]></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	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Dec 16 06:35:23 2016 +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.29727]]></STARTVERSION>
+<!--9E3E7B42DB16405FB794496D309D7044-->  <STARTVERSION><![CDATA[3.0.30440]]></STARTVERSION>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 16 06:35:23 2016 +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.29727]]></VERSION>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION><![CDATA[2.1.30440]]></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[PR16Q3]]></VERSION_LABEL>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION_LABEL><![CDATA[PR16Q4]]></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	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Dec 16 06:35:23 2016 +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.29727]]></STARTVERSION>
+<!--38825CAED43941D38CA0C78DB04FCFA0-->  <STARTVERSION><![CDATA[8.1.30440]]></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.29727]]></STARTVERSION>
+<!--6DDE7B1A70174242AF82B5022FB89279-->  <STARTVERSION><![CDATA[2.1.30440]]></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.29727]]></STARTVERSION>
+<!--94F9CD2CB5EF4467A67475C786C984A7-->  <STARTVERSION><![CDATA[2.1.30440]]></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.29727]]></STARTVERSION>
+<!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <STARTVERSION><![CDATA[1.1.30440]]></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.29727]]></STARTVERSION>
+<!--C8DAC574B88649D08C9468521B343F12-->  <STARTVERSION><![CDATA[3.0.30440]]></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.29727]]></STARTVERSION>
+<!--F14EB17946BE4724A46F80CB1A47EC70-->  <STARTVERSION><![CDATA[2.1.30440]]></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	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 16 06:35:23 2016 +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.29727]]></VERSION>
+<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION><![CDATA[2.0.30440]]></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[PR16Q3]]></VERSION_LABEL>
+<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION_LABEL><![CDATA[PR16Q4]]></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	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Dec 16 06:35:23 2016 +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.29727]]></STARTVERSION>
+<!--39BF75AD9AB3453698BF5DE29E727AA9-->  <STARTVERSION><![CDATA[3.0.30440]]></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	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 16 06:35:23 2016 +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.29727]]></VERSION>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION><![CDATA[8.1.30440]]></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[PR16Q3]]></VERSION_LABEL>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION_LABEL><![CDATA[PR16Q4]]></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	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Dec 16 06:35:23 2016 +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.29727]]></STARTVERSION>
+<!--086331E18477496B8AC74D2CFEBD1307-->  <STARTVERSION><![CDATA[3.0.30440]]></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.29727]]></STARTVERSION>
+<!--DC5D4EF450244482BD2B458DAA496333-->  <STARTVERSION><![CDATA[2.1.30440]]></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.29727]]></STARTVERSION>
+<!--F2AF15C0AF5540E393D96BE506E20648-->  <STARTVERSION><![CDATA[1.1.30440]]></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	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 16 06:35:23 2016 +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.29727]]></VERSION>
+<!--8A34B301DC524EA3A07513DF9F42CC90-->  <VERSION><![CDATA[1.0.30440]]></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[PR16Q3]]></VERSION_LABEL>
+<!--8A34B301DC524EA3A07513DF9F42CC90-->  <VERSION_LABEL><![CDATA[PR16Q4]]></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	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Dec 16 06:35:23 2016 +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.29727]]></STARTVERSION>
+<!--86EBD30DEB8045508185B457896C9F6D-->  <STARTVERSION><![CDATA[2.1.30440]]></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	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 16 06:35:23 2016 +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.29727]]></VERSION>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION><![CDATA[3.0.30440]]></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[PR16Q3]]></VERSION_LABEL>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION_LABEL><![CDATA[PR16Q4]]></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	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Dec 16 06:35:23 2016 +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.29727]]></STARTVERSION>
+<!--148A000EE9A04A3CA653B1296A00B8E6-->  <STARTVERSION><![CDATA[3.0.30440]]></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.29727]]></STARTVERSION>
+<!--30F966407A6F4E15965821BAEE34D25B-->  <STARTVERSION><![CDATA[3.0.30440]]></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.29727]]></STARTVERSION>
+<!--F93CE30003B24F8F8886510B0065EECC-->  <STARTVERSION><![CDATA[1.1.30440]]></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	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 16 06:35:23 2016 +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.29727]]></VERSION>
+<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION><![CDATA[2.1.30440]]></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[PR16Q3]]></VERSION_LABEL>
+<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION_LABEL><![CDATA[PR16Q4]]></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	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Dec 16 06:35:23 2016 +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.29727]]></STARTVERSION>
+<!--01E1BCCEC9114DE0960538DF34E30E6F-->  <STARTVERSION><![CDATA[2.1.30440]]></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.29727]]></STARTVERSION>
+<!--025B181F63CA47B48A920F6983242390-->  <STARTVERSION><![CDATA[3.0.30440]]></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.29727]]></STARTVERSION>
+<!--054B4FEAF919478AA3FF27098A46D1D6-->  <STARTVERSION><![CDATA[2.1.30440]]></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.29727]]></STARTVERSION>
+<!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <STARTVERSION><![CDATA[1.0.30440]]></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.29727]]></STARTVERSION>
+<!--224754C3EF674C93B0D468F47BAAB824-->  <STARTVERSION><![CDATA[2.1.30440]]></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.29727]]></STARTVERSION>
+<!--5B72D24032DD4879A950194139D961B6-->  <STARTVERSION><![CDATA[2.1.30440]]></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.29727]]></STARTVERSION>
+<!--8730CA6A4224439D82E0DD31B3806E36-->  <STARTVERSION><![CDATA[1.0.30440]]></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.29727]]></STARTVERSION>
+<!--98C47FF058F8413B8A2B26036061446E-->  <STARTVERSION><![CDATA[8.1.30440]]></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.29727]]></STARTVERSION>
+<!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <STARTVERSION><![CDATA[2.0.30440]]></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.29727]]></STARTVERSION>
+<!--A9CB99330AF34944877F889DD8A0AB3C-->  <STARTVERSION><![CDATA[2.1.30440]]></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.29727]]></STARTVERSION>
+<!--E72A053A403C4A98A189C105B850ADB0-->  <STARTVERSION><![CDATA[1.1.30440]]></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.29727]]></STARTVERSION>
+<!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <STARTVERSION><![CDATA[2.0.30440]]></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	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 16 06:35:23 2016 +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.29727]]></VERSION>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION><![CDATA[3.0.30440]]></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[PR16Q3]]></VERSION_LABEL>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION_LABEL><![CDATA[PR16Q4]]></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	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Dec 16 06:35:23 2016 +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.29727]]></STARTVERSION>
+<!--48D556894CE54CF998DC97882E904CBD-->  <STARTVERSION><![CDATA[1.0.30440]]></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.29727]]></STARTVERSION>
+<!--4D11E3A70650475381139522373CD191-->  <STARTVERSION><![CDATA[2.1.30440]]></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.29727]]></STARTVERSION>
+<!--52CE523C40634C47A99C6EBBD9C3125C-->  <STARTVERSION><![CDATA[3.0.30440]]></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.29727]]></STARTVERSION>
+<!--60834727BB114764ACEF019F40A34562-->  <STARTVERSION><![CDATA[1.1.30440]]></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.29727]]></STARTVERSION>
+<!--8418885E97D643138B6D907671351E3D-->  <STARTVERSION><![CDATA[3.0.30440]]></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.29727]]></STARTVERSION>
+<!--A32F3279B3374FC0A6CFEA2368BB7053-->  <STARTVERSION><![CDATA[3.0.30440]]></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.29727]]></STARTVERSION>
+<!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <STARTVERSION><![CDATA[3.0.30440]]></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.29727]]></STARTVERSION>
+<!--FEF6E40F244A4061B7C62CB755663712-->  <STARTVERSION><![CDATA[1.0.30440]]></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.29727]]></STARTVERSION>
+<!--FF8080813189932B013189B45B59003A-->  <STARTVERSION><![CDATA[0.1.30440]]></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.29727]]></STARTVERSION>
+<!--FF8080813189932B013189B4C00F003D-->  <STARTVERSION><![CDATA[0.1.30440]]></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.29727]]></STARTVERSION>
+<!--FF8081812E2F6F3C012E2F750109001C-->  <STARTVERSION><![CDATA[0.0.30440]]></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/C_INVOICE_POST.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/functions/C_INVOICE_POST.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -775,15 +775,10 @@
 
         -- Check if there is any manually added tax
         FOR Cur_InvoiceTax IN
-          (SELECT c_tax_id, ad_client_id, ad_org_id, isactive,
-            taxbaseamt, taxamt, recalculate
+          (SELECT c_tax_id, ad_client_id, ad_org_id, isactive, taxbaseamt, taxamt, recalculate
           FROM c_invoicetax
           WHERE c_invoice_id = v_Record_ID
-          MINUS
-          SELECT c_tax_id, ad_client_id, ad_org_id, isactive,
-            -taxbaseamt, -taxamt, recalculate
-          FROM c_invoicetax
-          WHERE c_invoice_id = v_RInvoice_ID)
+          AND RECALCULATE = 'N')
         LOOP
           SELECT MAX(line) + 10 INTO v_LineMax FROM c_invoicetax WHERE c_invoice_id = v_RInvoice_ID;
           INSERT INTO c_invoicetax(c_tax_id, c_invoice_id, ad_client_id, ad_org_id, isactive, created, createdby, updated, updatedby,
--- a/model/src-db/database/model/functions/C_ORDER_POST1.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/functions/C_ORDER_POST1.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -1265,9 +1265,10 @@
                   )
             ) LOOP
               SELECT count(*), max(m_reservation_id)
-                INTO v_aux, v_reservation_id
+              INTO v_aux, v_reservation_id
               FROM m_reservation
-              WHERE c_orderline_id = cur_orderline.c_orderline_id;
+              WHERE c_orderline_id = cur_orderline.c_orderline_id
+              AND res_status <> 'CL';
               -- Initialize so_res_status
               UPDATE c_orderline
               SET so_res_status = 'NR'
@@ -1324,6 +1325,7 @@
                   END IF;
                   UPDATE m_reservation
                   SET quantity = cur_orderline.qtyordered,
+                      res_status = 'CL',
                       updated = now(),
                       updatedby = v_user
                   WHERE m_reservation_id = v_reservation_id;
@@ -1342,10 +1344,20 @@
                                       END
                   WHERE c_orderline_id = cur_orderline.c_orderline_id;
                 END IF;
-              ELSIF (cur_orderline.create_reservation = 'CRP') THEN
-                M_CREATE_RESERVE_FROM_SOL(cur_orderline.c_orderline_id, 'Y', v_user, v_reservation_id);
-              ELSIF (cur_orderline.create_reservation = 'CR') THEN
-                M_CREATE_RESERVE_FROM_SOL(cur_orderline.c_orderline_id, 'N', v_user, v_reservation_id);
+              ELSE
+                SELECT count(*)
+                INTO v_aux
+                FROM dual
+                WHERE EXISTS (
+                  SELECT 1
+                  FROM m_reservation
+                  WHERE c_orderline_id = cur_orderline.c_orderline_id
+                );
+                IF (v_aux = 0 AND cur_orderline.create_reservation = 'CRP') THEN
+                  M_CREATE_RESERVE_FROM_SOL(cur_orderline.c_orderline_id, 'Y', v_user, v_reservation_id);
+                ELSIF (v_aux = 0 AND cur_orderline.create_reservation = 'CR') THEN
+                  M_CREATE_RESERVE_FROM_SOL(cur_orderline.c_orderline_id, 'N', v_user, v_reservation_id);
+                END IF;
               END IF;
             END LOOP;
             SELECT COUNT(*), SUM(CASE ol.so_res_status WHEN 'CR' THEN 1 ELSE 0 END), SUM(CASE ol.so_res_status WHEN 'PR' THEN 1 ELSE 0 END)
--- a/model/src-db/database/model/functions/M_INOUT_POST.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/functions/M_INOUT_POST.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -520,7 +520,7 @@
             (SELECT *
             FROM M_INOUTLINE
             WHERE M_InOut_ID=Cur_InOut.M_InOut_ID
-              AND IsActive='Y'  FOR UPDATE
+              AND IsActive='Y' ORDER BY line FOR UPDATE
             )
           LOOP
             -- Incomming or Outgoing :1:2
@@ -1180,10 +1180,13 @@
               JOIN M_INOUTLINE iol
               ON ol.c_orderline_id = iol.c_orderline_id
               AND ol.m_product_id = iol.m_product_id
+              JOIN C_ORDER o
+              ON ol.c_order_id = o.c_order_id
               WHERE iol.m_inout_id = Cur_InOut.m_inout_id
               AND r.res_status <> 'DR'
               AND iol.movementqty > 0
               AND iol.canceled_inoutline_id IS NULL
+              AND o.docstatus <> 'CL'
               AND r.created = (
                 SELECT max(created)
                 FROM M_RESERVATION
@@ -1282,12 +1285,12 @@
                   INSERT INTO M_RESERVATION_STOCK (
                     m_reservation_stock_id, ad_client_id, ad_org_id, isactive,
                     created, createdby, updated, updatedby,
-                    m_reservation_id, quantity, isallocated,
+                    m_reservation_id, quantity, releasedqty, isallocated,
                     m_locator_id, m_attributesetinstance_id
                   ) VALUES (
                     get_uuid(), Cur_Reservation.ad_client_id, Cur_Reservation.ad_org_id, 'Y',
                     now(), v_user, now(), v_user,
-                    v_reservation_id, v_RS_Quantity, 'N',
+                    v_reservation_id, v_RS_Quantity, 0, 'N',
                     Cur_InOutLine.m_locator_id, Cur_InOutLine.m_attributesetinstance_id
                   );
                   v_R_Reservedqty := v_R_Reservedqty + v_RS_Quantity;
--- a/model/src-db/database/model/functions/M_PROMOTION_ADJUSTMENT.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/functions/M_PROMOTION_ADJUSTMENT.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -61,38 +61,32 @@
   v_multiple NUMBER;
   v_issotrx CHAR(1);
 BEGIN
-  select fixed, coalesce(addamt, 0), coalesce(discount, 0),
-         qty_From, qty_To, apply_next, ismultiple, multiple
-    into v_fixed, v_add, v_discount,
-         v_qty_From, v_qty_To, v_apply_next, v_ismultiple, v_multiple
-    from m_offer
-   where m_offer_id = p_rule_id;
 
-  if (p_type ='O') then
-		select gross_unit_price, c_tax_id, qtyordered, priceactual,
-		       line_gross_amount, linenetamt
-			into v_unitprice, v_tax, v_qty, v_priceactual,
-			     v_origGrossAmt, v_origLineNetAmt
-			from c_orderline
-		 where c_orderline_id = p_line_id;
+  IF (p_type ='O') THEN
+    SELECT ol.gross_unit_price, ol.c_tax_id, ol.qtyordered, ol.priceactual, ol.line_gross_amount, ol.linenetamt, o.issotrx
+    INTO v_unitprice, v_tax, v_qty, v_priceactual, v_origGrossAmt, v_origLineNetAmt, v_issotrx
+    FROM c_order o
+    JOIN c_orderline ol
+    ON o.c_order_id = ol.c_order_id
+    WHERE ol.c_orderline_id = p_line_id;
+  ELSE
+    SELECT il.gross_unit_price, il.c_tax_id, il.qtyinvoiced, il.priceactual, il.line_gross_amount, il.linenetamt, i.issotrx
+    INTO v_unitprice, v_tax, v_qty, v_priceactual, v_origGrossAmt, v_origLineNetAmt, v_issotrx
+    FROM c_invoice i
+    JOIN c_invoiceline il
+    ON i.c_invoice_id = il.c_invoice_id
+    WHERE c_invoiceline_id = p_line_id;
+  END IF;
 
-		select issotrx  into v_issotrx
-				from c_order 
-				where c_order_id in (select c_order_id from c_orderline
-				where c_orderline_id = p_line_id);
-  else 
-	 select gross_unit_price, c_tax_id, qtyinvoiced, priceactual,
-	        line_gross_amount, linenetamt
-		 into v_unitprice, v_tax, v_qty, v_priceactual,
-		      v_origGrossAmt, v_origLineNetAmt
-		 from c_invoiceline
-		where c_invoiceline_id = p_line_id;
+  -- Discounts and Promotions only work for Sales flow
+  IF (v_issotrx = 'N') THEN
+    RETURN v_apply_next;
+  END IF;
 
-		select issotrx  into v_issotrx
-				from c_invoice 
-				where c_invoice_id in (select c_invoice_id from c_invoiceline
-				where c_invoiceline_id = p_line_id);
-  end if;
+  SELECT fixed, coalesce(addamt, 0), coalesce(discount, 0), qty_From, qty_To, apply_next, ismultiple, multiple
+  INTO v_fixed, v_add, v_discount, v_qty_From, v_qty_To, v_apply_next, v_ismultiple, v_multiple
+  FROM m_offer
+  WHERE m_offer_id = p_rule_id;
 
   if (v_qty_From is not null and v_qty < v_qty_From) or (v_qty_To is not null and v_qty > v_qty_To) or (v_ismultiple = 'Y' and ((v_multiple is null) or (MOD(v_qty, v_multiple) <> 0))) then
     return 'Y'; -- rule not applied, apply next one if present
@@ -122,10 +116,9 @@
     v_totalPromotion := v_origLineNetAmt - v_newNetAmt;
     v_basePrice := v_priceactual;
   end if;
-  --verify the sales flow
-  if(v_issotrx='Y') then
+
   M_PROMOTION_ADD(p_type, p_line_id, p_rule_id, p_taxIncluded, v_newUnitPrice, v_newGrossAmt, v_newNetPrice, v_newNetAmt, v_totalPromotion, v_totalPromotion, v_basePrice, p_user_id);
-  end if;
+
   return v_apply_next;
 END M_PROMOTION_ADJUSTMENT
 ]]></body>
--- a/model/src-db/database/model/functions/M_UPDATE_STOCK_VALUATION.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/functions/M_UPDATE_STOCK_VALUATION.xml	Fri Dec 16 06:35:23 2016 +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) 2014 Openbravo SLU
+* All portions are Copyright (C) 2014-2016 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -71,7 +71,7 @@
     JOIN ad_client c ON o.ad_client_id = c.ad_client_id
   WHERE o.ad_org_id = p_org;
 
-  SELECT COUNT(*), COALESCE(SUM(stock), 0), COALESCE(SUM(stock_valuation),0)
+  SELECT COUNT(*), COALESCE(SUM(stock), 0), COALESCE(SUM(stock_valuation), 0)
     INTO v_count, v_stock, v_valuation
   FROM m_stock_valuation
   WHERE ad_client_id = p_client
@@ -84,15 +84,17 @@
 
   IF (v_stock = 0) THEN
     v_unit_price := 0;
-    v_valuation := 0;
+    IF (p_stock <> 0) THEN
+      v_valuation := 0;
+    END IF;
   ELSE
     v_unit_price := ROUND(v_valuation/v_stock, v_costprecission);
   END IF;
 
   IF (v_count > 0) THEN
     UPDATE m_stock_valuation
-    SET stock = stock + p_stock,
-        stock_valuation = stock_valuation + p_valuation,
+    SET stock = v_stock,
+        stock_valuation = v_valuation,
         unit_price = v_unit_price
     WHERE ad_client_id = p_client
       AND ad_org_id = p_org
--- a/model/src-db/database/model/postscript-Oracle.sql	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/postscript-Oracle.sql	Fri Dec 16 06:35:23 2016 +0000
@@ -22,6 +22,17 @@
 END NOW;
 /-- END NOW
 
+DECLARE
+  isPresent number;
+BEGIN
+  SELECT count(*) INTO isPresent
+  FROM USER_PROCEDURES WHERE object_name ='HEX_TO_INT' AND object_type = 'FUNCTION';
+  IF isPresent != 0 THEN
+    EXECUTE IMMEDIATE 'drop function hex_to_int';
+  end if;
+END;
+/-- END
+
 CREATE OR REPLACE FUNCTION ad_script_execute (param_Message VARCHAR2)
   RETURN VARCHAR2
 AS
--- a/model/src-db/database/model/prescript-PostgreSql.sql	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/prescript-PostgreSql.sql	Fri Dec 16 06:35:23 2016 +0000
@@ -415,6 +415,10 @@
 ' language 'plpgsql' IMMUTABLE
 /-- END
 
+DROP function IF EXISTS hex_to_int(varchar);
+
+DROP function IF EXISTS hex_to_int(numeric);
+
 CREATE OR REPLACE FUNCTION add_months
 (
 date,
@@ -838,7 +842,6 @@
 occur_number integer NOT NULL DEFAULT 0;
 temp_str varchar;
 beg integer;
-i integer;
 length integer;
 ss_length integer; BEGIN
     IF ((string IS NULL) OR (string_to_search IS NULL) OR (beg_index IS NULL) OR (occur_index IS NULL)) THEN RETURN 0; END IF;
@@ -964,6 +967,8 @@
   RIGHTARG = numeric)
 /-- END
 
+DROP function IF EXISTS is_Trigger_Enabled(text);
+
 -- Creating auxiliar functions for view dropping
 CREATE or REPLACE function drop_view (view_name IN varchar) returns varchar as '
 DECLARE
--- a/model/src-db/database/model/tables/AD_ROLE.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/tables/AD_ROLE.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -45,6 +45,14 @@
         <default><![CDATA[  O]]></default>
         <onCreateDefault/>
       </column>
+      <column name="CLIENTLIST" primaryKey="false" required="true" type="NVARCHAR" size="2000" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="ORGLIST" primaryKey="false" required="true" type="NVARCHAR" size="2000" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
       <column name="C_CURRENCY_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
         <default/>
         <onCreateDefault/>
--- a/model/src-db/database/model/tables/C_BPARTNER_LOCATION.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/tables/C_BPARTNER_LOCATION.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -103,6 +103,9 @@
       <index name="C_BPLOCATION_BPARTNER" unique="false">
         <index-column name="C_BPARTNER_ID"/>
       </index>
+      <index name="C_BPLOCATION_LOCATION" unique="false">
+        <index-column name="C_LOCATION_ID"/>
+      </index>
       <index name="C_BPLOCATION_UPDATED" unique="false">
         <index-column name="UPDATED"/>
       </index>
--- a/model/src-db/database/model/tables/C_CONVERSION_RATE.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/tables/C_CONVERSION_RATE.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -82,6 +82,5 @@
         <unique-column name="VALIDFROM"/>
       </unique>
       <check name="C_CONVERSION_RA_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
-      <check name="C_CONVERSION_RATE_RATE_CHECK"><![CDATA[MULTIPLYRATE > 0 AND DIVIDERATE > 0]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/C_ORDER.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/tables/C_ORDER.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -341,6 +341,30 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="CANCELANDREPLACE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="CONFIRMCANCELANDREPLACE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="CANCELLEDORDER_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="REPLACEDORDER_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="ISCANCELLED" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault><![CDATA['N']]></onCreateDefault>
+      </column>
+      <column name="REPLACEMENTORDER_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="C_DOCTYPE" name="C_DOCTYPE_CORDER">
         <reference local="C_DOCTYPE_ID" foreign="C_DOCTYPE_ID"/>
       </foreign-key>
@@ -463,6 +487,9 @@
         <index-column name="DOCUMENTNO"/>
         <index-column name="C_ORDER_ID"/>
       </index>
+      <index name="C_ORDER_ISSELECTED" unique="false">
+        <index-column name="ISSELECTED"/>
+      </index>
       <index name="C_ORDER_POSTED" unique="false">
         <index-column name="POSTED"/>
       </index>
@@ -470,6 +497,7 @@
         <index-column name="UPDATED"/>
       </index>
       <check name="C_ORDER_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
+      <check name="C_ORDER_ISCANCELANDREPLA_CHECK"><![CDATA[ISCANCELLED IN ('Y', 'N')]]></check>
       <check name="C_ORDER_ISCASHVAT_CH"><![CDATA[ISCASHVAT IN ('Y', 'N')]]></check>
       <check name="C_ORDER_ISDELIVERED_CHECK"><![CDATA[ISDELIVERED IN ('Y', 'N')]]></check>
       <check name="C_ORDER_ISDISCOUNTPRINTED_CHK"><![CDATA[ISDISCOUNTPRINTED IN ('Y', 'N')]]></check>
--- a/model/src-db/database/model/tables/C_ORDERLINE.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/tables/C_ORDERLINE.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -281,6 +281,10 @@
         <default><![CDATA[N]]></default>
         <onCreateDefault/>
       </column>
+      <column name="REPLACEDORDERLINE_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="A_ASSET" name="C_ORDERLINE_A_ASSET">
         <reference local="A_ASSET_ID" foreign="A_ASSET_ID"/>
       </foreign-key>
--- a/model/src-db/database/model/tables/C_POC_DOCTYPE_TEMPLATE.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/tables/C_POC_DOCTYPE_TEMPLATE.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -65,6 +65,10 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="ISDEFAULT" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="C_POC_DOCTYPE_TEMPLATE_AD_CLIE">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
--- a/model/src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -212,6 +212,9 @@
       <index name="FIN_FINACC_TRANSACTION_POSTED" unique="false">
         <index-column name="POSTED"/>
       </index>
+      <index name="FIN_FINACC_TRX_RECONCILIATION" unique="false">
+        <index-column name="FIN_RECONCILIATION_ID"/>
+      </index>
       <unique name="FIN_FINACC_TRANSACTION_UN">
         <unique-column name="FIN_PAYMENT_ID"/>
       </unique>
--- a/model/src-db/database/model/tables/FIN_PAYMENT_SCHEDULEDETAIL.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/tables/FIN_PAYMENT_SCHEDULEDETAIL.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -143,6 +143,9 @@
       <foreign-key foreignTable="USER2" name="FIN_SCHEDULEDETAIL_USER2">
         <reference local="USER2_ID" foreign="USER2_ID"/>
       </foreign-key>
+      <index name="FIN_PAY_SCHEDULEDETAIL_BP" unique="false">
+        <index-column name="C_BPARTNER_ID"/>
+      </index>
       <index name="FIN_PAY_SCHEDULEDETAIL_IN" unique="false">
         <index-column name="FIN_PAYMENT_SCHEDULE_INVOICE"/>
       </index>
--- a/model/src-db/database/model/tables/M_TRANSACTION.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/tables/M_TRANSACTION.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -206,6 +206,9 @@
       <index name="M_TRANSACTION_PRODUCTIONLINE" unique="false">
         <index-column name="M_PRODUCTIONLINE_ID"/>
       </index>
+      <index name="M_TRANSACTION_TRXPROCDATE" unique="false">
+        <index-column name="TRXPROCESSDATE"/>
+      </index>
       <index name="M_TRANSSACTION_PRODUCT" unique="false">
         <index-column name="M_PRODUCT_ID"/>
       </index>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/src-db/database/model/tables/M_TRANSACTION_LAST.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+  <database name="TABLE M_TRANSACTION_LAST">
+    <table name="M_TRANSACTION_LAST" primaryKey="M_TRANSACTION_LAST_KEY">
+      <column name="M_TRANSACTION_LAST_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="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="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[Y]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="M_TRANSACTION_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="M_WAREHOUSE_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <foreign-key foreignTable="AD_CLIENT" name="M_TRANSACTION_LAST_AD_CLIENT">
+        <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="M_TRANSACTION_LAST_AD_ORG">
+        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="M_PRODUCT" name="M_TRANSACTION_LAST_M_PRODUCT">
+        <reference local="M_PRODUCT_ID" foreign="M_PRODUCT_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="M_TRANSACTION" name="M_TRANSACTION_LAST_M_TRX">
+        <reference local="M_TRANSACTION_ID" foreign="M_TRANSACTION_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="M_WAREHOUSE" name="M_TRANSACTION_LAST_M_WAREHOUSE">
+        <reference local="M_WAREHOUSE_ID" foreign="M_WAREHOUSE_ID"/>
+      </foreign-key>
+      <index name="M_TRX_LAST_PRODUCT_ORG_WH" unique="false">
+        <index-column name="M_PRODUCT_ID"/>
+        <index-column name="AD_ORG_ID"/>
+        <index-column name="M_WAREHOUSE_ID"/>
+      </index>
+      <index name="M_TRX_LAST_TRX" unique="false">
+        <index-column name="M_TRANSACTION_ID"/>
+      </index>
+      <check name="M_TRANSACTION_LAST_ACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
+    </table>
+  </database>
--- a/model/src-db/database/model/triggers/C_ACCTSCHEMA_TRG.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/triggers/C_ACCTSCHEMA_TRG.xml	Fri Dec 16 06:35:23 2016 +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-2006 Openbravo SLU
+    * All portions are Copyright (C) 2001-2016 Openbravo SLU
     * All Rights Reserved.
     * Contributor(s):  ______________________________________.
     ************************************************************************/
@@ -67,7 +67,8 @@
   END LOOP;
   UPDATE C_ACCTSCHEMA_TABLE
     SET ISACTIVE='Y'
-  WHERE AD_TABLE_ID IN
+  WHERE c_acctschema_id = :new.c_acctschema_id
+  AND AD_TABLE_ID IN
     (SELECT AD_TABLE_ID FROM AD_TABLE WHERE ISDEFAULTACCT='Y')
     ;
 END C_ACCTSCHEMA_TRG
--- a/model/src-db/database/model/triggers/C_ACTIVITY_TRG.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/triggers/C_ACTIVITY_TRG.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -14,13 +14,12 @@
 * 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 Openbravo SLU
+* All portions are Copyright (C) 2010-2016 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
   v_xTree_ID VARCHAR2(32);
   v_xParent_ID VARCHAR2(32);
-  v_NextNo     VARCHAR2(32);
     
 BEGIN
     
--- a/model/src-db/database/model/triggers/C_BANKSTATEMENTLINE_TRG.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/triggers/C_BANKSTATEMENTLINE_TRG.xml	Fri Dec 16 06:35:23 2016 +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-2012 Openbravo, S.L.U.
+    * Contributions are Copyright (C) 2001-2016 Openbravo, S.L.U.
     *
     * Specifically, this derivative work is based upon the following Compiere
     * file and version.
@@ -29,7 +29,6 @@
     ************************************************************************/
   v_Difference NUMBER:=0;
   v_ID VARCHAR2(32);
-  v_RO NUMBER;
     
 BEGIN
     
--- a/model/src-db/database/model/triggers/C_BPARTNER_TRG.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/triggers/C_BPARTNER_TRG.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -60,7 +60,7 @@
         v_C_AcctSchema_ID:=null;
 	FOR Cur_Defaults IN
 	(
-		SELECT AD_IsOrgIncluded(:new.AD_Org_ID, a.AD_Org_ID, :new.AD_Client_ID),
+		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),
     a.ad_sequence_bp_id, a.isbpnewaccount, a.acct_length, a.subacct_length, a.createdby, a.updatedby,	a.C_AcctSchema_ID, 
     d1.ad_client_id, d1.C_Receivable_Acct, d1.C_Prepayment_Acct, d1.V_Liability_Acct,	d1.V_Liability_Services_Acct, 
     d1.V_Prepayment_Acct, d1.status, d1.ISACTIVE 
@@ -68,8 +68,12 @@
 		WHERE d1.C_BP_Group_ID=:new.C_BP_Group_ID
 		AND d1.C_AcctSchema_ID = a.C_AcctSchema_ID
 		AND a.ISACTIVE = 'Y'
-      		AND AD_IsOrgIncluded(:new.AD_Org_ID, a.AD_Org_ID, :new.AD_Client_ID)<>-1
-		ORDER BY 1
+		AND (AD_IsOrgIncluded(:new.AD_Org_ID, a.AD_Org_ID, :new.AD_Client_ID) <> -1
+		OR AD_IsOrgIncluded(a.AD_Org_ID, :new.AD_Org_ID, :new.AD_Client_ID) <> -1)
+		ORDER BY CASE WHEN AD_IsOrgIncluded(:new.AD_Org_ID, a.AD_Org_ID, :new.AD_Client_ID) <> -1
+		THEN AD_IsOrgIncluded(:new.AD_Org_ID, a.AD_Org_ID, :new.AD_Client_ID)
+		ELSE AD_IsOrgIncluded(a.AD_Org_ID, :new.AD_Org_ID, :new.AD_Client_ID)
+		END
 	)
 	LOOP
 	
@@ -187,15 +191,19 @@
   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),
+              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),
               oa.ad_sequence_bp_id, oa.isbpnewaccount, oa.acct_length, oa.subacct_length, oa.createdby, oa.updatedby,
               d2.E_Expense_Acct, d2.E_Prepayment_Acct, d2.AD_Client_ID, d2.C_AcctSchema_ID, d2.ISACTIVE
               FROM C_AcctSchema_Default d2, AD_Org_AcctSchema oa 
               WHERE d2.C_AcctSchema_ID = oa.C_AcctSchema_ID
               AND oa.ISACTIVE = 'Y'
               AND oA.AD_Client_ID = d2.AD_Client_ID
-              AND AD_IsOrgIncluded(:new.AD_Org_ID, oa.AD_Org_ID, :new.AD_Client_ID)<>-1
-              ORDER BY 1
+              AND (AD_IsOrgIncluded(:new.AD_Org_ID, oa.AD_Org_ID, :new.AD_Client_ID) <> -1
+              OR AD_IsOrgIncluded(oa.AD_Org_ID, :new.AD_Org_ID, :new.AD_Client_ID) <> -1)
+              ORDER BY CASE WHEN AD_IsOrgIncluded(:new.AD_Org_ID, oa.AD_Org_ID, :new.AD_Client_ID) <> -1
+              THEN AD_IsOrgIncluded(:new.AD_Org_ID, oa.AD_Org_ID, :new.AD_Client_ID)
+              ELSE AD_IsOrgIncluded(oa.AD_Org_ID, :new.AD_Org_ID, :new.AD_Client_ID)
+              END
 	) 
   LOOP
 	
--- a/model/src-db/database/model/triggers/C_CASHLINE_TRG.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/triggers/C_CASHLINE_TRG.xml	Fri Dec 16 06:35:23 2016 +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-2012 Openbravo, S.L.U.
+  * Contributions are Copyright (C) 2001-2016 Openbravo, S.L.U.
   *
   * Specifically, this derivative work is based upon the following Compiere
   * file and version.
@@ -37,7 +37,6 @@
  UPDATE C_CashLine cl SET C_Currency_ID = (SELECT b.C_Currency_ID FROM C_Cash c, C_CashBook b WHERE c.C_Cash_ID=cl.C_Cash_ID AND c.C_CashBook_ID=b.C_CashBook_ID) WHERE C_Currency_ID IS NULL;
  ************************************************************************/
 
- v_NextNo    VARCHAR2(32);
  v_Currency_ID   varchar2(32) := NULL;
  -- CashBook
  v_CB_Currency_ID  varchar2(32);
@@ -48,9 +47,7 @@
  v_Org_ID    varchar2(32);
  v_Cash_ID    varchar2(32);
  v_Debt_Payment_ID  varchar2(32) := NULL;
- v_RO     NUMBER;
  --
- v_Trace     VARCHAR2(2000) := 'CashLine: ';
     
 BEGIN
     
--- a/model/src-db/database/model/triggers/C_ELEMENTVALUE_TRG.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/triggers/C_ELEMENTVALUE_TRG.xml	Fri Dec 16 06:35:23 2016 +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-2015 Openbravo SLU
+* All portions are Copyright (C) 2001-2016 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -24,7 +24,6 @@
 
   v_xTree_ID VARCHAR2(32);
   v_xParent_ID VARCHAR2(32);
-  v_NextNo     VARCHAR2(32);
   v_count NUMBER;
   TYPE RECORD IS REF CURSOR;
   cur_AcctSchema RECORD;
--- a/model/src-db/database/model/triggers/C_INVOICELINETAX_TRG.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/triggers/C_INVOICELINETAX_TRG.xml	Fri Dec 16 06:35:23 2016 +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-2015 Openbravo, S.L.U.
+  * Contributions are Copyright (C) 2010-2016 Openbravo, S.L.U.
   *
   * Specifically, this derivative work is based upon the following Compiere
   * file and version.
@@ -34,8 +34,6 @@
 v_Processed   VARCHAR(60);
 v_Increment_Amount C_ORDERTAX.TAXAMT%TYPE ;
 v_Increment_Base C_ORDERTAX.TAXBASEAMT%TYPE ;
-v_totallines NUMBER:=0;
-v_grandtotal NUMBER:=0;
 v_istaxincluded CHAR(1);
     
 BEGIN
--- a/model/src-db/database/model/triggers/C_INVOICELINE_BEFORE_TRG.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/triggers/C_INVOICELINE_BEFORE_TRG.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -14,14 +14,13 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2015 Openbravo SLU
+* All portions are Copyright (C) 2015-2016 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
 
   v_std_prec NUMBER:=2;
   v_price_prec NUMBER:=2;
-  v_invoiceline_id VARCHAR2(32);
   v_invoice_id VARCHAR2(32);
   v_istaxincluded CHAR(1);
   v_PriceActual NUMBER;
--- a/model/src-db/database/model/triggers/C_INVOICELINE_TRG.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/triggers/C_INVOICELINE_TRG.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -22,21 +22,8 @@
 
 
 
- v_newTaxBaseAmt  NUMBER;
- v_oldTaxBaseAmt  NUMBER;
- v_oldLine NUMBER:= 0;
- v_newLine NUMBER:= 0;
- v_taxAmt NUMBER:= 0;
- v_HasTaxLine  BOOLEAN := FALSE;
- v_isPosted   VARCHAR(60);
  v_ID    varchar2(32);
- v_Processed   VARCHAR(60);
- v_Prec NUMBER:=2;
   v_UOM_ID   varchar2(32);
- v_Currency   VARCHAR2(32);
- v_ChargeAmt   NUMBER;
- v_LineNetAmt  NUMBER;
- v_CinvoiceTaxID varchar2(32);
  v_AttrSetValueType M_Product.AttrSetValueType%TYPE;
  v_count NUMBER;
     
--- a/model/src-db/database/model/triggers/C_INVOICE_REVERSE_TRG.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/triggers/C_INVOICE_REVERSE_TRG.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -19,14 +19,13 @@
     * under the License.
     * The Original Code is Openbravo ERP.
     * The Initial Developer of the Original Code is Openbravo SLU
-    * All portions are Copyright (C) 2009-2010 Openbravo SLU
+    * All portions are Copyright (C) 2009-2016 Openbravo SLU
     * All Rights Reserved.
     * Contributor(s):  ______________________________________.
     ************************************************************************/
     /*************************************************************************
     * Title: Check the introduced BP is the same as the Invoice
     ************************************************************************/
-   v_n NUMBER;
    v_isprocessed C_Invoice.Processed%TYPE;
    v_bpheader_id C_Invoice.C_BPARTNER_ID%TYPE;
    v_bpreversed_id C_Invoice.C_BPARTNER_ID%TYPE;
--- a/model/src-db/database/model/triggers/C_ORDERLINE_TRG.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/triggers/C_ORDERLINE_TRG.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -31,7 +31,6 @@
   v_Count NUMBER;
   v_CountRelations NUMBER;
   v_reservation_id    VARCHAR2(32);
-  v_prereservedqty    NUMBER;
   v_istaxincluded CHAR(1);
   v_PriceActual NUMBER;
   
--- a/model/src-db/database/model/triggers/C_ORDERTAX_TRG.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/triggers/C_ORDERTAX_TRG.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -27,8 +27,6 @@
     * Title: ReadOnly Check
     * Description:
     ************************************************************************/
-    v_ID VARCHAR2(32);
-  v_RO         NUMBER;
   v_Processed  VARCHAR(60) ;
   v_C_ORDER_ID VARCHAR2(32) ;
   v_Docaction VARCHAR(60) ;
--- a/model/src-db/database/model/triggers/C_ORDER_CHK_RESTRINCTIONS_TRG.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/triggers/C_ORDER_CHK_RESTRINCTIONS_TRG.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -3,11 +3,6 @@
     <trigger name="C_ORDER_CHK_RESTRINCTIONS_TRG" table="C_ORDER" fires="before" insert="true" update="true" delete="true" foreach="row">
       <body><![CDATA[
 v_n NUMBER;
-v_OrderLine_Offer_ID VARCHAR2(32);
-v_Price NUMBER;
-v_lineNo NUMBER;
-v_PriceNew NUMBER;
-v_amt NUMBER;
 v_DateNull DATE := TO_DATE('01-01-1900','DD-MM-YYYY');
 
 BEGIN
@@ -73,6 +68,9 @@
     IF :OLD.Processed='Y' THEN
       RAISE_APPLICATION_ERROR(-20000, '@20501@') ;
     END IF;
+    IF (:OLD.DOCSTATUS <> 'TMP' AND :OLD.REPLACEDORDER_ID IS NOT NULL) THEN
+      RAISE_APPLICATION_ERROR(-20000, '@CannotDeleteReplacementOrder@') ;
+    END IF;
   END IF;
   IF(INSERTING) THEN
     IF :NEW.Processed='Y' THEN
--- a/model/src-db/database/model/triggers/C_ORDLINE_CHK_RESTRICTIONS_TRG.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/triggers/C_ORDLINE_CHK_RESTRICTIONS_TRG.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -99,8 +99,17 @@
   FROM C_ORDER
   WHERE C_ORDER_ID=v_C_ORDER_ID;
     IF (v_Processed='Y' and v_Docaction<> 'CL') THEN
-    RAISE_APPLICATION_ERROR(-20000, '@20501@') ;
+      RAISE_APPLICATION_ERROR(-20000, '@20501@') ;
+    END IF;
   END IF;
+  IF (DELETING AND :OLD.REPLACEDORDERLINE_ID IS NOT NULL) THEN
+  SELECT DOCSTATUS
+  INTO v_DocStatus
+  FROM C_ORDER
+  WHERE C_ORDER_ID=v_C_ORDER_ID;
+    IF (v_DocStatus <> 'TMP') THEN
+      RAISE_APPLICATION_ERROR(-20000, '@CannotDeleteReplacementOrderLine@') ;
+    END IF;
   END IF;
   IF (INSERTING OR UPDATING) THEN
     IF (:NEW.m_product_id IS NOT NULL) THEN
--- a/model/src-db/database/model/triggers/C_PERIOD_TRG2.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/triggers/C_PERIOD_TRG2.xml	Fri Dec 16 06:35:23 2016 +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-2011 Openbravo, S.L.U.
+    * Contributions are Copyright (C) 2001-2016 Openbravo, S.L.U.
     *
     * Specifically, this derivative work is based upon the following Compiere
     * file and version.
@@ -25,7 +25,6 @@
     * Calculate End Date
     */
     v_DateNull DATE := TO_DATE('01-01-1900','DD-MM-YYYY');
-    V_COUNT NUMBER:= 0;
     V_NEVER_OPENED NUMBER;
 
 BEGIN
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/src-db/database/model/triggers/C_POC_DOCTYPE_TEMPLATE_TRG.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+  <database name="TRIGGER C_POC_DOCTYPE_TEMPLATE_TRG">
+    <trigger name="C_POC_DOCTYPE_TEMPLATE_TRG" table="C_POC_DOCTYPE_TEMPLATE" fires="after" insert="true" update="true" delete="false" foreach="statement">
+      <body><![CDATA[
+ /*************************************************************************
+  * The contents of this file are subject to the Openbravo  Public  License
+  * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
+  * Version 1.1  with a permitted attribution clause; you may not  use this
+  * file except in compliance with the License. You  may  obtain  a copy of
+  * the License at http://www.openbravo.com/legal/license.html
+  * Software distributed under the License  is  distributed  on  an "AS IS"
+  * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+  * License for the specific  language  governing  rights  and  limitations
+  * under the License.
+  * The Original Code is Openbravo ERP.
+  * The Initial Developer of the Original Code is Openbravo SLU
+  * All portions are Copyright (C) 2016 Openbravo SLU
+  * All Rights Reserved.
+  * Contributor(s):  ______________________________________.
+  ************************************************************************/
+
+   v_count NUMBER;
+
+ BEGIN
+
+   IF AD_isTriggerEnabled()='N' THEN RETURN;
+   END IF;
+
+   -- Get number of document types with multiple templates marked as default
+   SELECT COUNT(*) INTO v_count
+   FROM dual
+   WHERE EXISTS (SELECT 1
+                 FROM c_poc_doctype_template
+                 WHERE isdefault = 'Y'
+                 GROUP BY c_doctype_id HAVING COUNT(*) > 1);
+
+   IF v_count > 0 THEN
+     RAISE_APPLICATION_ERROR(-20000, '@DuplicatedDefaults@');
+   END IF;
+
+ END C_POC_DOCTYPE_TEMPLATE_TRG
+]]></body>
+    </trigger>
+  </database>
--- a/model/src-db/database/model/triggers/C_REMITTANCELINE_TRG.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/triggers/C_REMITTANCELINE_TRG.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -19,14 +19,12 @@
     * 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-2012 Openbravo SLU
+    * All portions are Copyright (C) 2001-2016 Openbravo SLU
     * All Rights Reserved.
     * Contributor(s):  ______________________________________.
     ************************************************************************/
   v_Processed VARCHAR(60) ;
   v_C_Remittance_ID VARCHAR2(32) ;
-  v_Prec NUMBER:=2;
-  v_Currency        VARCHAR2(32);
     
 BEGIN
     
--- a/model/src-db/database/model/triggers/C_TAX_REPORT_TRG.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/triggers/C_TAX_REPORT_TRG.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -18,13 +18,12 @@
 * 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-2012 Openbravo SLU
+* All portions are Copyright (C) 2001-2016 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
   v_xTree_ID VARCHAR2(32);
   v_xParent_ID VARCHAR2(32);
-  v_NextNo     VARCHAR2(32);
     
 BEGIN
     
--- a/model/src-db/database/model/triggers/GL_JL_CHK_RESTRICTIONS_TRG.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/triggers/GL_JL_CHK_RESTRICTIONS_TRG.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -19,14 +19,13 @@
     * 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-2012 Openbravo SLU
+    * All portions are Copyright (C) 2001-2016 Openbravo SLU
     * All Rights Reserved.
     * Contributor(s):  ______________________________________.
     ************************************************************************/
   v_Processed VARCHAR(60) ;
   v_Posted        VARCHAR(60) ;
   v_GL_JOURNAL_ID VARCHAR2(32) ;
-  v_DateNull DATE :=TO_DATE('01-01-1900','DD-MM-YYYY');
     
 BEGIN
     
--- a/model/src-db/database/model/triggers/M_ATTRIBUTEVALUE_TRG.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/triggers/M_ATTRIBUTEVALUE_TRG.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -18,13 +18,12 @@
     * 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-2006 Openbravo SLU
+    * All portions are Copyright (C) 2001-2016 Openbravo SLU
     * All Rights Reserved.
     * Contributor(s):  ______________________________________.
     ************************************************************************/
 
   v_desc     varchar2(500);
-  v_desc_aux varchar2(500);
   pos        INTEGER;
   TYPE RECORD IS REF CURSOR;
   CurSetInstance RECORD;
--- a/model/src-db/database/model/triggers/M_CH_VALUE_TRG.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/triggers/M_CH_VALUE_TRG.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -15,14 +15,13 @@
 * 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-2014 Openbravo SLU
+* All portions are Copyright (C) 2013-2016 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
 
   v_Tree_ID           VARCHAR2(32);
   v_Parent_ID         VARCHAR2(32);
-  v_NextNo            VARCHAR2(32);
   v_count             NUMBER;
   v_active            VARCHAR2(32):='N';
   v_exist NUMBER:=0;
--- a/model/src-db/database/model/triggers/M_CH_VALUE_TRG2.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/triggers/M_CH_VALUE_TRG2.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -15,13 +15,11 @@
 * 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 Openbravo SLU
+* All portions are Copyright (C) 2013-2016 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
   v_Count     NUMBER;
-  v_ch_name   M_CHARACTERISTIC.NAME%TYPE;
-  v_chv_name  M_CH_VALUE.NAME%TYPE;
 
 BEGIN
   IF AD_isTriggerEnabled()='N' THEN RETURN;
--- a/model/src-db/database/model/triggers/M_COSTING_TRG.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/triggers/M_COSTING_TRG.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -20,7 +20,6 @@
 * Contributor(s):  ______________________________________.
 ************************************************************************/
 v_count NUMBER;
-v_relateddocs BOOLEAN;
 BEGIN
   IF AD_isTriggerEnabled()='N' THEN RETURN;
   END IF;
--- a/model/src-db/database/model/triggers/M_PRODUCT_TRG.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/triggers/M_PRODUCT_TRG.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -29,9 +29,6 @@
    Cur_Warehouses RECORD;
    Cur_Legal RECORD;
 
-    v_xTree_ID    			           varchar2(32);
-    v_xParent_ID  			           varchar2(32);
-    v_NextNo      			           VARCHAR2(32);
     v_ControlNo 	 	               NUMBER;
     v_P_Revenue_Acct    		       VARCHAR2(32);
     v_P_Def_Revenue_Acct    		   VARCHAR2(32);
--- a/model/src-db/database/model/triggers/M_RESERVATION_TRG.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/triggers/M_RESERVATION_TRG.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -23,7 +23,6 @@
   v_linecount           NUMBER;
   v_creservedcount      NUMBER;
   v_preservedcount      NUMBER;
-  v_reservedcount       NUMBER;
   v_count               NUMBER;
   v_dummy               VARCHAR2(2000);
   v_productname         m_product.name%TYPE;
--- a/model/src-db/database/model/triggers/M_TRANSACTION_TRG.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/triggers/M_TRANSACTION_TRG.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -32,7 +32,6 @@
   v_LINE NUMBER;
   v_DateNull DATE := TO_DATE('01-01-1900', 'DD-MM-YYYY');
   v_DocumentLineNo M_InventoryLine.line%TYPE;
-  v_sv_count NUMBER;
   v_warehouse VARCHAR(32);
   v_count NUMBER;
   v_doIncrease BOOLEAN:= FALSE;
--- a/model/src-db/database/model/triggers/M_TRANSACTION_TRG2.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/triggers/M_TRANSACTION_TRG2.xml	Fri Dec 16 06:35:23 2016 +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-2013 Openbravo SLU
+* All portions are Copyright (C) 2012-2016 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -24,7 +24,7 @@
   v_count       NUMBER;
   v_productname m_product.name%TYPE;
   v_isgeneric   CHAR(1);
-  v_product     VARCHAR(60);
+
   v_attr_description    VARCHAR2(255);
   v_product_value       VARCHAR2(40);
   v_locator_value       VARCHAR2(40);
--- a/model/src-db/database/model/triggers/S_TIMEEXPENSE_TRG.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/triggers/S_TIMEEXPENSE_TRG.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -6,8 +6,6 @@
 
 
 
-  v_ID    varchar2(32);
-  v_RO    NUMBER;
 /*************************************************************************
 * The contents of this file are subject to the Openbravo  Public  License
 * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
@@ -20,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-2012 Openbravo SLU
+* All portions are Copyright (C) 2001-2016 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
--- a/model/src-db/database/model/views/C_INVOICETAX_CASHVAT_V.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/views/C_INVOICETAX_CASHVAT_V.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
   <database name="VIEW C_INVOICETAX_CASHVAT_V">
-    <view name="C_INVOICETAX_CASHVAT_V"><![CDATA[SELECT itcv.c_invoicetax_cashvat_id AS c_invoicetax_cashvat_v_id, itcv.ad_client_id, itcv.ad_org_id, itcv.created, itcv.createdby, itcv.updated, itcv.updatedby, itcv.isactive, fp.paymentdate, itcv.percentage, itcv.taxamt, itcv.taxbaseamt, fpsd.iscanceled, fp.fin_payment_id, fpd.fin_payment_detail_id, fp.isreceipt, fp.c_bpartner_id, fp.fin_paymentmethod_id, fp.status, fp.amount, fp.c_currency_id, itcv.c_invoicetax_id, itcv.ismanualsettlement FROM c_invoicetax_cashvat itcv JOIN c_invoicetax it ON it.c_invoicetax_id = itcv.c_invoicetax_id JOIN fin_payment_detail fpd ON fpd.fin_payment_detail_id = itcv.fin_payment_detail_id JOIN fin_payment fp ON fp.fin_payment_id = fpd.fin_payment_id JOIN fin_payment_scheduledetail fpsd ON fpd.fin_payment_detail_id = fpsd.fin_payment_detail_id JOIN fin_payment_schedule fpsi ON fpsi.fin_payment_schedule_id = fpsd.fin_payment_schedule_invoice WHERE itcv.ismanualsettlement = 'N' AND fpsi.c_invoice_id = it.c_invoice_id UNION ALL SELECT itcv.c_invoicetax_cashvat_id AS c_invoicetax_cashvat_v_id, itcv.ad_client_id, itcv.ad_org_id, itcv.created, itcv.createdby, itcv.updated, itcv.updatedby, itcv.isactive, NULL AS paymentdate, itcv.percentage, itcv.taxamt, itcv.taxbaseamt, 'N' AS iscanceled, NULL AS fin_payment_id, NULL AS fin_payment_detail_id, NULL AS isreceipt, NULL AS c_bpartner_id, NULL AS fin_paymentmethod_id, NULL AS status, NULL AS amount, NULL AS c_currency_id, itcv.c_invoicetax_id, itcv.ismanualsettlement FROM c_invoicetax_cashvat itcv WHERE itcv.ismanualsettlement = 'Y']]></view>
+    <view name="C_INVOICETAX_CASHVAT_V"><![CDATA[SELECT itcv.c_invoicetax_cashvat_id AS c_invoicetax_cashvat_v_id, itcv.ad_client_id, itcv.ad_org_id, itcv.created, itcv.createdby, itcv.updated, itcv.updatedby, itcv.isactive, fp.paymentdate, itcv.percentage, itcv.taxamt, itcv.taxbaseamt, COALESCE(fpsd.iscanceled, 'N') AS iscanceled, fp.fin_payment_id, fpd.fin_payment_detail_id, fp.isreceipt, fp.c_bpartner_id, fp.fin_paymentmethod_id, fp.status, fp.amount, fp.c_currency_id, itcv.c_invoicetax_id, itcv.ismanualsettlement FROM c_invoicetax_cashvat itcv LEFT JOIN c_invoicetax it ON it.c_invoicetax_id = itcv.c_invoicetax_id LEFT JOIN fin_payment_detail fpd ON fpd.fin_payment_detail_id = itcv.fin_payment_detail_id LEFT JOIN fin_payment fp ON fp.fin_payment_id = fpd.fin_payment_id LEFT JOIN fin_payment_scheduledetail fpsd ON fpd.fin_payment_detail_id = fpsd.fin_payment_detail_id LEFT JOIN fin_payment_schedule fpsi ON fpsi.fin_payment_schedule_id = fpsd.fin_payment_schedule_invoice WHERE itcv.ismanualsettlement = 'N' AND fpsi.c_invoice_id = it.c_invoice_id OR itcv.ismanualsettlement = 'Y']]></view>
   </database>
--- a/model/src-db/database/model/views/FIN_PAYMENT_DETAIL_V.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/model/views/FIN_PAYMENT_DETAIL_V.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
   <database name="VIEW FIN_PAYMENT_DETAIL_V">
-    <view name="FIN_PAYMENT_DETAIL_V"><![CDATA[SELECT psd.fin_payment_scheduledetail_id AS fin_payment_detail_v_id, psd.ad_client_id, psd.ad_org_id, psd.isactive, psd.created, psd.createdby, psd.updated, psd.updatedby, psi.fin_payment_schedule_id AS fin_payment_sched_inv_v_id, pso.fin_payment_schedule_id AS fin_payment_sched_ord_v_id, psi.fin_payment_schedule_id AS fin_payment_sched_inv_id, pso.fin_payment_schedule_id AS fin_payment_sched_ord_id, i.documentno AS invoiceno, o.documentno AS orderno, p.documentno AS paymentno, pd.fin_payment_id, COALESCE(psi.duedate, pso.duedate) AS duedate, COALESCE(i.grandtotal, o.grandtotal) AS invoicedamt, COALESCE(psi.amount, pso.amount) AS expected, psd.amount AS paidamt, p.c_bpartner_id, p.fin_paymentmethod_id, p.fin_financial_account_id, p.c_currency_id, p.paymentdate, gli.name AS glitemname, pd.writeoffamt, fa.c_currency_id AS finacc_currency_id, p.finacc_txn_convert_rate, psd.amount * p.finacc_txn_convert_rate AS paidconverted, COALESCE(psi.amount, pso.amount) * p.finacc_txn_convert_rate AS expectedconverted, psd.iscanceled, psd.c_bpartner_id AS c_bpartner_id_dim, psd.c_activity_id, psd.m_product_id, psd.c_campaign_id, psd.c_project_id, psd.c_salesregion_id, p.status FROM fin_payment p LEFT JOIN fin_financial_account fa ON p.fin_financial_account_id = fa.fin_financial_account_id, fin_payment_detail pd JOIN fin_payment_scheduledetail psd ON pd.fin_payment_detail_id = psd.fin_payment_detail_id LEFT JOIN fin_payment_schedule psi ON psd.fin_payment_schedule_invoice = psi.fin_payment_schedule_id LEFT JOIN c_invoice i ON psi.c_invoice_id = i.c_invoice_id LEFT JOIN fin_payment_schedule pso ON psd.fin_payment_schedule_order = pso.fin_payment_schedule_id LEFT JOIN c_order o ON pso.c_order_id = o.c_order_id LEFT JOIN c_glitem gli ON pd.c_glitem_id = gli.c_glitem_id WHERE p.fin_payment_id = pd.fin_payment_id]]></view>
+    <view name="FIN_PAYMENT_DETAIL_V"><![CDATA[SELECT psd.fin_payment_scheduledetail_id AS fin_payment_detail_v_id, psd.ad_client_id, psd.ad_org_id, psd.isactive, psd.created, psd.createdby, psd.updated, psd.updatedby, psi.fin_payment_schedule_id AS fin_payment_sched_inv_v_id, pso.fin_payment_schedule_id AS fin_payment_sched_ord_v_id, psi.fin_payment_schedule_id AS fin_payment_sched_inv_id, pso.fin_payment_schedule_id AS fin_payment_sched_ord_id, i.documentno AS invoiceno, o.documentno AS orderno, p.documentno AS paymentno, pd.fin_payment_id, COALESCE(psi.duedate, pso.duedate) AS duedate, COALESCE(i.grandtotal, o.grandtotal) AS invoicedamt, COALESCE(psi.amount, pso.amount) AS expected, psd.amount AS paidamt, p.c_bpartner_id, p.fin_paymentmethod_id, p.fin_financial_account_id, p.c_currency_id, p.paymentdate, gli.name AS glitemname, pd.writeoffamt, fa.c_currency_id AS finacc_currency_id, p.finacc_txn_convert_rate, psd.amount * p.finacc_txn_convert_rate AS paidconverted, COALESCE(psi.amount, pso.amount) * p.finacc_txn_convert_rate AS expectedconverted, psd.iscanceled, psd.c_bpartner_id AS c_bpartner_id_dim, psd.c_activity_id, psd.m_product_id, psd.c_campaign_id, psd.c_project_id, psd.c_salesregion_id, p.status, CASE p.amount WHEN 0 THEN NULL ELSE p.fin_paymentmethod_id END AS em_aprm_displayed_paymmeth_id, CASE p.amount WHEN 0 THEN NULL ELSE p.fin_financial_account_id END AS em_aprm_displayed_acc_id FROM fin_payment p LEFT JOIN fin_financial_account fa ON p.fin_financial_account_id = fa.fin_financial_account_id, fin_payment_detail pd JOIN fin_payment_scheduledetail psd ON pd.fin_payment_detail_id = psd.fin_payment_detail_id LEFT JOIN fin_payment_schedule psi ON psd.fin_payment_schedule_invoice = psi.fin_payment_schedule_id LEFT JOIN c_invoice i ON psi.c_invoice_id = i.c_invoice_id LEFT JOIN fin_payment_schedule pso ON psd.fin_payment_schedule_order = pso.fin_payment_schedule_id LEFT JOIN c_order o ON pso.c_order_id = o.c_order_id LEFT JOIN c_glitem gli ON pd.c_glitem_id = gli.c_glitem_id WHERE p.fin_payment_id = pd.fin_payment_id]]></view>
   </database>
--- a/model/src-db/database/sourcedata/AD_COLUMN.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/sourcedata/AD_COLUMN.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -7502,6 +7502,82 @@
 <!--534-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--534--></AD_COLUMN>
 
+<!--535--><AD_COLUMN>
+<!--535-->  <AD_COLUMN_ID><![CDATA[535]]></AD_COLUMN_ID>
+<!--535-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--535-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--535-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--535-->  <NAME><![CDATA[Client List]]></NAME>
+<!--535-->  <DESCRIPTION><![CDATA[Clients this Role can access]]></DESCRIPTION>
+<!--535-->  <HELP><![CDATA[Indicates the Clients (by client id) that this Role can access.  Multiple Clients are delimited by a comma ','.]]></HELP>
+<!--535-->  <COLUMNNAME><![CDATA[ClientList]]></COLUMNNAME>
+<!--535-->  <AD_TABLE_ID><![CDATA[156]]></AD_TABLE_ID>
+<!--535-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--535-->  <FIELDLENGTH><![CDATA[2000]]></FIELDLENGTH>
+<!--535-->  <DEFAULTVALUE><![CDATA[@AD_Client_ID@]]></DEFAULTVALUE>
+<!--535-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--535-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--535-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--535-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--535-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--535-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--535-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--535-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--535-->  <AD_ELEMENT_ID><![CDATA[226]]></AD_ELEMENT_ID>
+<!--535-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--535-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--535-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--535-->  <DEVELOPMENTSTATUS><![CDATA[DP]]></DEVELOPMENTSTATUS>
+<!--535-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--535-->  <POSITION><![CDATA[12]]></POSITION>
+<!--535-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--535-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--535-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--535-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--535-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--535-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--535-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--535-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--535--></AD_COLUMN>
+
+<!--536--><AD_COLUMN>
+<!--536-->  <AD_COLUMN_ID><![CDATA[536]]></AD_COLUMN_ID>
+<!--536-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--536-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--536-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--536-->  <NAME><![CDATA[Organization List]]></NAME>
+<!--536-->  <DESCRIPTION><![CDATA[List of Organizations this Role can access]]></DESCRIPTION>
+<!--536-->  <HELP><![CDATA[The Organization List indicates the Organizations (by organization id) that this Role can access.  Multiple Organizations are delimited by a comma ','.]]></HELP>
+<!--536-->  <COLUMNNAME><![CDATA[OrgList]]></COLUMNNAME>
+<!--536-->  <AD_TABLE_ID><![CDATA[156]]></AD_TABLE_ID>
+<!--536-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--536-->  <FIELDLENGTH><![CDATA[2000]]></FIELDLENGTH>
+<!--536-->  <DEFAULTVALUE><![CDATA[@AD_Org_ID@]]></DEFAULTVALUE>
+<!--536-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--536-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--536-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--536-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--536-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--536-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--536-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--536-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--536-->  <AD_ELEMENT_ID><![CDATA[478]]></AD_ELEMENT_ID>
+<!--536-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--536-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--536-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--536-->  <DEVELOPMENTSTATUS><![CDATA[DP]]></DEVELOPMENTSTATUS>
+<!--536-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--536-->  <POSITION><![CDATA[13]]></POSITION>
+<!--536-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--536-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--536-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--536-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--536-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--536-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--536-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--536-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--536--></AD_COLUMN>
+
 <!--537--><AD_COLUMN>
 <!--537-->  <AD_COLUMN_ID><![CDATA[537]]></AD_COLUMN_ID>
 <!--537-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -32126,7 +32202,7 @@
 <!--2169-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--2169-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
 <!--2169-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--2169-->  <READONLYLOGIC><![CDATA[@Processed@='Y']]></READONLYLOGIC>
+<!--2169-->  <READONLYLOGIC><![CDATA[@Processed@='Y' | @DocStatus@='TMP']]></READONLYLOGIC>
 <!--2169-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
 <!--2169-->  <SEQNO><![CDATA[150]]></SEQNO>
 <!--2169-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -32286,7 +32362,7 @@
 <!--2173-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--2173-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
 <!--2173-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--2173-->  <READONLYLOGIC><![CDATA[@Processed@='Y']]></READONLYLOGIC>
+<!--2173-->  <READONLYLOGIC><![CDATA[@Processed@='Y' | @DocStatus@='TMP']]></READONLYLOGIC>
 <!--2173-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--2173-->  <SEQNO><![CDATA[300]]></SEQNO>
 <!--2173-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -32671,7 +32747,7 @@
 <!--2189-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--2189-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
 <!--2189-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--2189-->  <READONLYLOGIC><![CDATA[@Processed@='Y']]></READONLYLOGIC>
+<!--2189-->  <READONLYLOGIC><![CDATA[@Processed@='Y' | @DocStatus@='TMP']]></READONLYLOGIC>
 <!--2189-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--2189-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--2189-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -33058,7 +33134,7 @@
 <!--2204-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--2204-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
 <!--2204-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--2204-->  <READONLYLOGIC><![CDATA[@Processed@='Y']]></READONLYLOGIC>
+<!--2204-->  <READONLYLOGIC><![CDATA[@Processed@='Y' | @DocStatus@='TMP']]></READONLYLOGIC>
 <!--2204-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--2204-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--2204-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -44224,7 +44300,7 @@
 <!--2762-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--2762-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
 <!--2762-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--2762-->  <READONLYLOGIC><![CDATA[@Processed@='Y']]></READONLYLOGIC>
+<!--2762-->  <READONLYLOGIC><![CDATA[@Processed@='Y' | @DocStatus@='TMP']]></READONLYLOGIC>
 <!--2762-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--2762-->  <SEQNO><![CDATA[350]]></SEQNO>
 <!--2762-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -57818,7 +57894,7 @@
 <!--3400-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--3400-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
 <!--3400-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--3400-->  <READONLYLOGIC><![CDATA[@Processed@='Y']]></READONLYLOGIC>
+<!--3400-->  <READONLYLOGIC><![CDATA[@Processed@='Y' | @DocStatus@='TMP']]></READONLYLOGIC>
 <!--3400-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--3400-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--3400-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -68381,7 +68457,7 @@
 <!--3850-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--3850-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
 <!--3850-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--3850-->  <READONLYLOGIC><![CDATA[@Processed@='Y']]></READONLYLOGIC>
+<!--3850-->  <READONLYLOGIC><![CDATA[@Processed@='Y' | @Recalculate@='Y']]></READONLYLOGIC>
 <!--3850-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
 <!--3850-->  <SEQNO><![CDATA[2]]></SEQNO>
 <!--3850-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -68724,7 +68800,7 @@
 <!--3859-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--3859-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
 <!--3859-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--3859-->  <READONLYLOGIC><![CDATA[@Processed@='Y']]></READONLYLOGIC>
+<!--3859-->  <READONLYLOGIC><![CDATA[@Processed@='Y' | @Recalculate@='Y']]></READONLYLOGIC>
 <!--3859-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--3859-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--3859-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -68763,7 +68839,7 @@
 <!--3860-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--3860-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
 <!--3860-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--3860-->  <READONLYLOGIC><![CDATA[@Processed@='Y']]></READONLYLOGIC>
+<!--3860-->  <READONLYLOGIC><![CDATA[@Processed@='Y' | @Recalculate@='Y']]></READONLYLOGIC>
 <!--3860-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--3860-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--3860-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -121373,7 +121449,7 @@
 <!--8766-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--8766-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--8766-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--8766-->  <READONLYLOGIC><![CDATA[@Processed@='Y']]></READONLYLOGIC>
+<!--8766-->  <READONLYLOGIC><![CDATA[@Processed@='Y' | @DocStatus@='TMP']]></READONLYLOGIC>
 <!--8766-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--8766-->  <SEQNO><![CDATA[0]]></SEQNO>
 <!--8766-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -247692,6 +247768,45 @@
 <!--129A714A729241E2ABB54C374A4031BD-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--129A714A729241E2ABB54C374A4031BD--></AD_COLUMN>
 
+<!--129F2530A63B4C7CA9AF17996732E6A4--><AD_COLUMN>
+<!--129F2530A63B4C7CA9AF17996732E6A4-->  <AD_COLUMN_ID><![CDATA[129F2530A63B4C7CA9AF17996732E6A4]]></AD_COLUMN_ID>
+<!--129F2530A63B4C7CA9AF17996732E6A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--129F2530A63B4C7CA9AF17996732E6A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--129F2530A63B4C7CA9AF17996732E6A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--129F2530A63B4C7CA9AF17996732E6A4-->  <NAME><![CDATA[Cancelledorder]]></NAME>
+<!--129F2530A63B4C7CA9AF17996732E6A4-->  <DESCRIPTION><![CDATA[Link to the order that has been canceled]]></DESCRIPTION>
+<!--129F2530A63B4C7CA9AF17996732E6A4-->  <HELP><![CDATA[Link to the order that has been canceled]]></HELP>
+<!--129F2530A63B4C7CA9AF17996732E6A4-->  <COLUMNNAME><![CDATA[Cancelledorder_id]]></COLUMNNAME>
+<!--129F2530A63B4C7CA9AF17996732E6A4-->  <AD_TABLE_ID><![CDATA[259]]></AD_TABLE_ID>
+<!--129F2530A63B4C7CA9AF17996732E6A4-->  <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID>
+<!--129F2530A63B4C7CA9AF17996732E6A4-->  <AD_REFERENCE_VALUE_ID><![CDATA[290]]></AD_REFERENCE_VALUE_ID>
+<!--129F2530A63B4C7CA9AF17996732E6A4-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--129F2530A63B4C7CA9AF17996732E6A4-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--129F2530A63B4C7CA9AF17996732E6A4-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--129F2530A63B4C7CA9AF17996732E6A4-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--129F2530A63B4C7CA9AF17996732E6A4-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--129F2530A63B4C7CA9AF17996732E6A4-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--129F2530A63B4C7CA9AF17996732E6A4-->  <SEQNO><![CDATA[720]]></SEQNO>
+<!--129F2530A63B4C7CA9AF17996732E6A4-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--129F2530A63B4C7CA9AF17996732E6A4-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--129F2530A63B4C7CA9AF17996732E6A4-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--129F2530A63B4C7CA9AF17996732E6A4-->  <AD_ELEMENT_ID><![CDATA[EB7F6DD0A85D48AD84ED48CF6D2C3776]]></AD_ELEMENT_ID>
+<!--129F2530A63B4C7CA9AF17996732E6A4-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--129F2530A63B4C7CA9AF17996732E6A4-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--129F2530A63B4C7CA9AF17996732E6A4-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--129F2530A63B4C7CA9AF17996732E6A4-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--129F2530A63B4C7CA9AF17996732E6A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--129F2530A63B4C7CA9AF17996732E6A4-->  <POSITION><![CDATA[97]]></POSITION>
+<!--129F2530A63B4C7CA9AF17996732E6A4-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--129F2530A63B4C7CA9AF17996732E6A4-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--129F2530A63B4C7CA9AF17996732E6A4-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--129F2530A63B4C7CA9AF17996732E6A4-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--129F2530A63B4C7CA9AF17996732E6A4-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--129F2530A63B4C7CA9AF17996732E6A4-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--129F2530A63B4C7CA9AF17996732E6A4-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--129F2530A63B4C7CA9AF17996732E6A4-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--129F2530A63B4C7CA9AF17996732E6A4--></AD_COLUMN>
+
 <!--12ABCD6B91A348CBB09D4629CA6E707A--><AD_COLUMN>
 <!--12ABCD6B91A348CBB09D4629CA6E707A-->  <AD_COLUMN_ID><![CDATA[12ABCD6B91A348CBB09D4629CA6E707A]]></AD_COLUMN_ID>
 <!--12ABCD6B91A348CBB09D4629CA6E707A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -249590,6 +249705,44 @@
 <!--174E582A1EC411DEA7ADDFB2CB2977ED-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--174E582A1EC411DEA7ADDFB2CB2977ED--></AD_COLUMN>
 
+<!--17738BA927A94FE8A38DDFFF664EB572--><AD_COLUMN>
+<!--17738BA927A94FE8A38DDFFF664EB572-->  <AD_COLUMN_ID><![CDATA[17738BA927A94FE8A38DDFFF664EB572]]></AD_COLUMN_ID>
+<!--17738BA927A94FE8A38DDFFF664EB572-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--17738BA927A94FE8A38DDFFF664EB572-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--17738BA927A94FE8A38DDFFF664EB572-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--17738BA927A94FE8A38DDFFF664EB572-->  <NAME><![CDATA[Warehouse]]></NAME>
+<!--17738BA927A94FE8A38DDFFF664EB572-->  <DESCRIPTION><![CDATA[The location where products arrive to or are sent from.]]></DESCRIPTION>
+<!--17738BA927A94FE8A38DDFFF664EB572-->  <HELP><![CDATA[The Warehouse identifies a unique Warehouse where products are stored or Services are provided.]]></HELP>
+<!--17738BA927A94FE8A38DDFFF664EB572-->  <COLUMNNAME><![CDATA[M_Warehouse_ID]]></COLUMNNAME>
+<!--17738BA927A94FE8A38DDFFF664EB572-->  <AD_TABLE_ID><![CDATA[8D568B85F2A142E68911FC49AE3B3F57]]></AD_TABLE_ID>
+<!--17738BA927A94FE8A38DDFFF664EB572-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--17738BA927A94FE8A38DDFFF664EB572-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--17738BA927A94FE8A38DDFFF664EB572-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--17738BA927A94FE8A38DDFFF664EB572-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--17738BA927A94FE8A38DDFFF664EB572-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--17738BA927A94FE8A38DDFFF664EB572-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--17738BA927A94FE8A38DDFFF664EB572-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--17738BA927A94FE8A38DDFFF664EB572-->  <SEQNO><![CDATA[110]]></SEQNO>
+<!--17738BA927A94FE8A38DDFFF664EB572-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--17738BA927A94FE8A38DDFFF664EB572-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--17738BA927A94FE8A38DDFFF664EB572-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--17738BA927A94FE8A38DDFFF664EB572-->  <AD_ELEMENT_ID><![CDATA[459]]></AD_ELEMENT_ID>
+<!--17738BA927A94FE8A38DDFFF664EB572-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--17738BA927A94FE8A38DDFFF664EB572-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--17738BA927A94FE8A38DDFFF664EB572-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--17738BA927A94FE8A38DDFFF664EB572-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--17738BA927A94FE8A38DDFFF664EB572-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--17738BA927A94FE8A38DDFFF664EB572-->  <POSITION><![CDATA[11]]></POSITION>
+<!--17738BA927A94FE8A38DDFFF664EB572-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--17738BA927A94FE8A38DDFFF664EB572-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--17738BA927A94FE8A38DDFFF664EB572-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--17738BA927A94FE8A38DDFFF664EB572-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--17738BA927A94FE8A38DDFFF664EB572-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--17738BA927A94FE8A38DDFFF664EB572-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--17738BA927A94FE8A38DDFFF664EB572-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--17738BA927A94FE8A38DDFFF664EB572-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--17738BA927A94FE8A38DDFFF664EB572--></AD_COLUMN>
+
 <!--17BB8FE0016640D89F1C95F0D65A74E2--><AD_COLUMN>
 <!--17BB8FE0016640D89F1C95F0D65A74E2-->  <AD_COLUMN_ID><![CDATA[17BB8FE0016640D89F1C95F0D65A74E2]]></AD_COLUMN_ID>
 <!--17BB8FE0016640D89F1C95F0D65A74E2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -256125,6 +256278,45 @@
 <!--2CA46C14D66F4B7AA6550531F6D329E7-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--2CA46C14D66F4B7AA6550531F6D329E7--></AD_COLUMN>
 
+<!--2CC98C761A3F460BB9D88F4E43DD3588--><AD_COLUMN>
+<!--2CC98C761A3F460BB9D88F4E43DD3588-->  <AD_COLUMN_ID><![CDATA[2CC98C761A3F460BB9D88F4E43DD3588]]></AD_COLUMN_ID>
+<!--2CC98C761A3F460BB9D88F4E43DD3588-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2CC98C761A3F460BB9D88F4E43DD3588-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2CC98C761A3F460BB9D88F4E43DD3588-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2CC98C761A3F460BB9D88F4E43DD3588-->  <NAME><![CDATA[Creation Date]]></NAME>
+<!--2CC98C761A3F460BB9D88F4E43DD3588-->  <DESCRIPTION><![CDATA[The date that this record is completed.]]></DESCRIPTION>
+<!--2CC98C761A3F460BB9D88F4E43DD3588-->  <HELP><![CDATA[The Created field indicates the date that this record was created.]]></HELP>
+<!--2CC98C761A3F460BB9D88F4E43DD3588-->  <COLUMNNAME><![CDATA[Created]]></COLUMNNAME>
+<!--2CC98C761A3F460BB9D88F4E43DD3588-->  <AD_TABLE_ID><![CDATA[8D568B85F2A142E68911FC49AE3B3F57]]></AD_TABLE_ID>
+<!--2CC98C761A3F460BB9D88F4E43DD3588-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
+<!--2CC98C761A3F460BB9D88F4E43DD3588-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--2CC98C761A3F460BB9D88F4E43DD3588-->  <DEFAULTVALUE><![CDATA[@#Date@]]></DEFAULTVALUE>
+<!--2CC98C761A3F460BB9D88F4E43DD3588-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--2CC98C761A3F460BB9D88F4E43DD3588-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--2CC98C761A3F460BB9D88F4E43DD3588-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--2CC98C761A3F460BB9D88F4E43DD3588-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--2CC98C761A3F460BB9D88F4E43DD3588-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--2CC98C761A3F460BB9D88F4E43DD3588-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--2CC98C761A3F460BB9D88F4E43DD3588-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--2CC98C761A3F460BB9D88F4E43DD3588-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--2CC98C761A3F460BB9D88F4E43DD3588-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--2CC98C761A3F460BB9D88F4E43DD3588-->  <AD_ELEMENT_ID><![CDATA[245]]></AD_ELEMENT_ID>
+<!--2CC98C761A3F460BB9D88F4E43DD3588-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--2CC98C761A3F460BB9D88F4E43DD3588-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--2CC98C761A3F460BB9D88F4E43DD3588-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--2CC98C761A3F460BB9D88F4E43DD3588-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--2CC98C761A3F460BB9D88F4E43DD3588-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--2CC98C761A3F460BB9D88F4E43DD3588-->  <POSITION><![CDATA[4]]></POSITION>
+<!--2CC98C761A3F460BB9D88F4E43DD3588-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--2CC98C761A3F460BB9D88F4E43DD3588-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--2CC98C761A3F460BB9D88F4E43DD3588-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--2CC98C761A3F460BB9D88F4E43DD3588-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--2CC98C761A3F460BB9D88F4E43DD3588-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--2CC98C761A3F460BB9D88F4E43DD3588-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--2CC98C761A3F460BB9D88F4E43DD3588-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--2CC98C761A3F460BB9D88F4E43DD3588-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--2CC98C761A3F460BB9D88F4E43DD3588--></AD_COLUMN>
+
 <!--2CE15055000B485AA55F72E3649C27F1--><AD_COLUMN>
 <!--2CE15055000B485AA55F72E3649C27F1-->  <AD_COLUMN_ID><![CDATA[2CE15055000B485AA55F72E3649C27F1]]></AD_COLUMN_ID>
 <!--2CE15055000B485AA55F72E3649C27F1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -265979,6 +266171,45 @@
 <!--51C9656E43E6464FB6AA62A1E40B0411-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--51C9656E43E6464FB6AA62A1E40B0411--></AD_COLUMN>
 
+<!--51E299D6B5824EC480B524E1ED726985--><AD_COLUMN>
+<!--51E299D6B5824EC480B524E1ED726985-->  <AD_COLUMN_ID><![CDATA[51E299D6B5824EC480B524E1ED726985]]></AD_COLUMN_ID>
+<!--51E299D6B5824EC480B524E1ED726985-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--51E299D6B5824EC480B524E1ED726985-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--51E299D6B5824EC480B524E1ED726985-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--51E299D6B5824EC480B524E1ED726985-->  <NAME><![CDATA[Confirmcancelandreplace]]></NAME>
+<!--51E299D6B5824EC480B524E1ED726985-->  <DESCRIPTION><![CDATA[Button that confirms the temporal Order by closing it and creates a canceled order]]></DESCRIPTION>
+<!--51E299D6B5824EC480B524E1ED726985-->  <HELP><![CDATA[Button that confirms the temporal Order by closing it and creates a canceled order]]></HELP>
+<!--51E299D6B5824EC480B524E1ED726985-->  <COLUMNNAME><![CDATA[Confirmcancelandreplace]]></COLUMNNAME>
+<!--51E299D6B5824EC480B524E1ED726985-->  <AD_TABLE_ID><![CDATA[259]]></AD_TABLE_ID>
+<!--51E299D6B5824EC480B524E1ED726985-->  <AD_REFERENCE_ID><![CDATA[28]]></AD_REFERENCE_ID>
+<!--51E299D6B5824EC480B524E1ED726985-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--51E299D6B5824EC480B524E1ED726985-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--51E299D6B5824EC480B524E1ED726985-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--51E299D6B5824EC480B524E1ED726985-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--51E299D6B5824EC480B524E1ED726985-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--51E299D6B5824EC480B524E1ED726985-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--51E299D6B5824EC480B524E1ED726985-->  <SEQNO><![CDATA[710]]></SEQNO>
+<!--51E299D6B5824EC480B524E1ED726985-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--51E299D6B5824EC480B524E1ED726985-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--51E299D6B5824EC480B524E1ED726985-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--51E299D6B5824EC480B524E1ED726985-->  <AD_ELEMENT_ID><![CDATA[11F2729B6B6B452F854E4A3BA8EA732B]]></AD_ELEMENT_ID>
+<!--51E299D6B5824EC480B524E1ED726985-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--51E299D6B5824EC480B524E1ED726985-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--51E299D6B5824EC480B524E1ED726985-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--51E299D6B5824EC480B524E1ED726985-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--51E299D6B5824EC480B524E1ED726985-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--51E299D6B5824EC480B524E1ED726985-->  <POSITION><![CDATA[94]]></POSITION>
+<!--51E299D6B5824EC480B524E1ED726985-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--51E299D6B5824EC480B524E1ED726985-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--51E299D6B5824EC480B524E1ED726985-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--51E299D6B5824EC480B524E1ED726985-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--51E299D6B5824EC480B524E1ED726985-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--51E299D6B5824EC480B524E1ED726985-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--51E299D6B5824EC480B524E1ED726985-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--51E299D6B5824EC480B524E1ED726985-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--51E299D6B5824EC480B524E1ED726985-->  <EM_OBUIAPP_PROCESS_ID><![CDATA[0C2AFAEFB67B4CB8A1429195EB119A49]]></EM_OBUIAPP_PROCESS_ID>
+<!--51E299D6B5824EC480B524E1ED726985--></AD_COLUMN>
+
 <!--521EA21E6E7577ABE040007F010016C0--><AD_COLUMN>
 <!--521EA21E6E7577ABE040007F010016C0-->  <AD_COLUMN_ID><![CDATA[521EA21E6E7577ABE040007F010016C0]]></AD_COLUMN_ID>
 <!--521EA21E6E7577ABE040007F010016C0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -282050,6 +282281,45 @@
 <!--5B7528BF68E748B8B0AFCD93F3335C30-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--5B7528BF68E748B8B0AFCD93F3335C30--></AD_COLUMN>
 
+<!--5B8D8263DFFC44E38CF08FA6867B66A8--><AD_COLUMN>
+<!--5B8D8263DFFC44E38CF08FA6867B66A8-->  <AD_COLUMN_ID><![CDATA[5B8D8263DFFC44E38CF08FA6867B66A8]]></AD_COLUMN_ID>
+<!--5B8D8263DFFC44E38CF08FA6867B66A8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5B8D8263DFFC44E38CF08FA6867B66A8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5B8D8263DFFC44E38CF08FA6867B66A8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5B8D8263DFFC44E38CF08FA6867B66A8-->  <NAME><![CDATA[Client]]></NAME>
+<!--5B8D8263DFFC44E38CF08FA6867B66A8-->  <DESCRIPTION><![CDATA[Client for this installation.]]></DESCRIPTION>
+<!--5B8D8263DFFC44E38CF08FA6867B66A8-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
+<!--5B8D8263DFFC44E38CF08FA6867B66A8-->  <COLUMNNAME><![CDATA[AD_Client_ID]]></COLUMNNAME>
+<!--5B8D8263DFFC44E38CF08FA6867B66A8-->  <AD_TABLE_ID><![CDATA[8D568B85F2A142E68911FC49AE3B3F57]]></AD_TABLE_ID>
+<!--5B8D8263DFFC44E38CF08FA6867B66A8-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--5B8D8263DFFC44E38CF08FA6867B66A8-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--5B8D8263DFFC44E38CF08FA6867B66A8-->  <DEFAULTVALUE><![CDATA[@AD_CLIENT_ID@]]></DEFAULTVALUE>
+<!--5B8D8263DFFC44E38CF08FA6867B66A8-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--5B8D8263DFFC44E38CF08FA6867B66A8-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--5B8D8263DFFC44E38CF08FA6867B66A8-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--5B8D8263DFFC44E38CF08FA6867B66A8-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--5B8D8263DFFC44E38CF08FA6867B66A8-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--5B8D8263DFFC44E38CF08FA6867B66A8-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--5B8D8263DFFC44E38CF08FA6867B66A8-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--5B8D8263DFFC44E38CF08FA6867B66A8-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--5B8D8263DFFC44E38CF08FA6867B66A8-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--5B8D8263DFFC44E38CF08FA6867B66A8-->  <AD_ELEMENT_ID><![CDATA[102]]></AD_ELEMENT_ID>
+<!--5B8D8263DFFC44E38CF08FA6867B66A8-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--5B8D8263DFFC44E38CF08FA6867B66A8-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--5B8D8263DFFC44E38CF08FA6867B66A8-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--5B8D8263DFFC44E38CF08FA6867B66A8-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--5B8D8263DFFC44E38CF08FA6867B66A8-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--5B8D8263DFFC44E38CF08FA6867B66A8-->  <POSITION><![CDATA[2]]></POSITION>
+<!--5B8D8263DFFC44E38CF08FA6867B66A8-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--5B8D8263DFFC44E38CF08FA6867B66A8-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--5B8D8263DFFC44E38CF08FA6867B66A8-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--5B8D8263DFFC44E38CF08FA6867B66A8-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--5B8D8263DFFC44E38CF08FA6867B66A8-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--5B8D8263DFFC44E38CF08FA6867B66A8-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--5B8D8263DFFC44E38CF08FA6867B66A8-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--5B8D8263DFFC44E38CF08FA6867B66A8-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--5B8D8263DFFC44E38CF08FA6867B66A8--></AD_COLUMN>
+
 <!--5BA7B941BEFB9257E040007F01017D15--><AD_COLUMN>
 <!--5BA7B941BEFB9257E040007F01017D15-->  <AD_COLUMN_ID><![CDATA[5BA7B941BEFB9257E040007F01017D15]]></AD_COLUMN_ID>
 <!--5BA7B941BEFB9257E040007F01017D15-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -283868,6 +284138,45 @@
 <!--5C7FEB5FDD3D1EA1E040007F01002676-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--5C7FEB5FDD3D1EA1E040007F01002676--></AD_COLUMN>
 
+<!--5C81AA8ACB054BD98A1230E038714277--><AD_COLUMN>
+<!--5C81AA8ACB054BD98A1230E038714277-->  <AD_COLUMN_ID><![CDATA[5C81AA8ACB054BD98A1230E038714277]]></AD_COLUMN_ID>
+<!--5C81AA8ACB054BD98A1230E038714277-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5C81AA8ACB054BD98A1230E038714277-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5C81AA8ACB054BD98A1230E038714277-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5C81AA8ACB054BD98A1230E038714277-->  <NAME><![CDATA[Updated]]></NAME>
+<!--5C81AA8ACB054BD98A1230E038714277-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
+<!--5C81AA8ACB054BD98A1230E038714277-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
+<!--5C81AA8ACB054BD98A1230E038714277-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
+<!--5C81AA8ACB054BD98A1230E038714277-->  <AD_TABLE_ID><![CDATA[8D568B85F2A142E68911FC49AE3B3F57]]></AD_TABLE_ID>
+<!--5C81AA8ACB054BD98A1230E038714277-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
+<!--5C81AA8ACB054BD98A1230E038714277-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--5C81AA8ACB054BD98A1230E038714277-->  <DEFAULTVALUE><![CDATA[@#Date@]]></DEFAULTVALUE>
+<!--5C81AA8ACB054BD98A1230E038714277-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--5C81AA8ACB054BD98A1230E038714277-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--5C81AA8ACB054BD98A1230E038714277-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--5C81AA8ACB054BD98A1230E038714277-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--5C81AA8ACB054BD98A1230E038714277-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--5C81AA8ACB054BD98A1230E038714277-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--5C81AA8ACB054BD98A1230E038714277-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--5C81AA8ACB054BD98A1230E038714277-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--5C81AA8ACB054BD98A1230E038714277-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--5C81AA8ACB054BD98A1230E038714277-->  <AD_ELEMENT_ID><![CDATA[607]]></AD_ELEMENT_ID>
+<!--5C81AA8ACB054BD98A1230E038714277-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--5C81AA8ACB054BD98A1230E038714277-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--5C81AA8ACB054BD98A1230E038714277-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--5C81AA8ACB054BD98A1230E038714277-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--5C81AA8ACB054BD98A1230E038714277-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--5C81AA8ACB054BD98A1230E038714277-->  <POSITION><![CDATA[6]]></POSITION>
+<!--5C81AA8ACB054BD98A1230E038714277-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--5C81AA8ACB054BD98A1230E038714277-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--5C81AA8ACB054BD98A1230E038714277-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--5C81AA8ACB054BD98A1230E038714277-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--5C81AA8ACB054BD98A1230E038714277-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--5C81AA8ACB054BD98A1230E038714277-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--5C81AA8ACB054BD98A1230E038714277-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--5C81AA8ACB054BD98A1230E038714277-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--5C81AA8ACB054BD98A1230E038714277--></AD_COLUMN>
+
 <!--5C8773B1F56F4B13A8F2FD7A3D2A514F--><AD_COLUMN>
 <!--5C8773B1F56F4B13A8F2FD7A3D2A514F-->  <AD_COLUMN_ID><![CDATA[5C8773B1F56F4B13A8F2FD7A3D2A514F]]></AD_COLUMN_ID>
 <!--5C8773B1F56F4B13A8F2FD7A3D2A514F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -291473,6 +291782,44 @@
 <!--69ACEFACF1054DE0A9F9440C78D9FC0C-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--69ACEFACF1054DE0A9F9440C78D9FC0C--></AD_COLUMN>
 
+<!--69B3805AD7764FE99394FC976CB02426--><AD_COLUMN>
+<!--69B3805AD7764FE99394FC976CB02426-->  <AD_COLUMN_ID><![CDATA[69B3805AD7764FE99394FC976CB02426]]></AD_COLUMN_ID>
+<!--69B3805AD7764FE99394FC976CB02426-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--69B3805AD7764FE99394FC976CB02426-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--69B3805AD7764FE99394FC976CB02426-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--69B3805AD7764FE99394FC976CB02426-->  <NAME><![CDATA[Updated By]]></NAME>
+<!--69B3805AD7764FE99394FC976CB02426-->  <DESCRIPTION><![CDATA[User who updated this records]]></DESCRIPTION>
+<!--69B3805AD7764FE99394FC976CB02426-->  <HELP><![CDATA[The Updated By field indicates the user who updated this record.]]></HELP>
+<!--69B3805AD7764FE99394FC976CB02426-->  <COLUMNNAME><![CDATA[Updatedby]]></COLUMNNAME>
+<!--69B3805AD7764FE99394FC976CB02426-->  <AD_TABLE_ID><![CDATA[8D568B85F2A142E68911FC49AE3B3F57]]></AD_TABLE_ID>
+<!--69B3805AD7764FE99394FC976CB02426-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--69B3805AD7764FE99394FC976CB02426-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--69B3805AD7764FE99394FC976CB02426-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--69B3805AD7764FE99394FC976CB02426-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--69B3805AD7764FE99394FC976CB02426-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--69B3805AD7764FE99394FC976CB02426-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--69B3805AD7764FE99394FC976CB02426-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--69B3805AD7764FE99394FC976CB02426-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--69B3805AD7764FE99394FC976CB02426-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--69B3805AD7764FE99394FC976CB02426-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--69B3805AD7764FE99394FC976CB02426-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--69B3805AD7764FE99394FC976CB02426-->  <AD_ELEMENT_ID><![CDATA[608]]></AD_ELEMENT_ID>
+<!--69B3805AD7764FE99394FC976CB02426-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--69B3805AD7764FE99394FC976CB02426-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--69B3805AD7764FE99394FC976CB02426-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--69B3805AD7764FE99394FC976CB02426-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--69B3805AD7764FE99394FC976CB02426-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--69B3805AD7764FE99394FC976CB02426-->  <POSITION><![CDATA[7]]></POSITION>
+<!--69B3805AD7764FE99394FC976CB02426-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--69B3805AD7764FE99394FC976CB02426-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--69B3805AD7764FE99394FC976CB02426-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--69B3805AD7764FE99394FC976CB02426-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--69B3805AD7764FE99394FC976CB02426-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--69B3805AD7764FE99394FC976CB02426-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--69B3805AD7764FE99394FC976CB02426-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--69B3805AD7764FE99394FC976CB02426-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--69B3805AD7764FE99394FC976CB02426--></AD_COLUMN>
+
 <!--69BC1E85C3334B9292A224991900D233--><AD_COLUMN>
 <!--69BC1E85C3334B9292A224991900D233-->  <AD_COLUMN_ID><![CDATA[69BC1E85C3334B9292A224991900D233]]></AD_COLUMN_ID>
 <!--69BC1E85C3334B9292A224991900D233-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -304260,7 +304607,7 @@
 <!--7DC34559B3F7B45BE040007F0100784A-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--7DC34559B3F7B45BE040007F0100784A-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--7DC34559B3F7B45BE040007F0100784A-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--7DC34559B3F7B45BE040007F0100784A-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--7DC34559B3F7B45BE040007F0100784A-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--7DC34559B3F7B45BE040007F0100784A-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
 <!--7DC34559B3F7B45BE040007F0100784A-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--7DC34559B3F7B45BE040007F0100784A-->  <SEQNO><![CDATA[180]]></SEQNO>
@@ -307403,7 +307750,7 @@
 <!--7FF2234748F2844FE040007F01003861-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--7FF2234748F2844FE040007F01003861-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--7FF2234748F2844FE040007F01003861-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--7FF2234748F2844FE040007F01003861-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--7FF2234748F2844FE040007F01003861-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--7FF2234748F2844FE040007F01003861-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
 <!--7FF2234748F2844FE040007F01003861-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--7FF2234748F2844FE040007F01003861-->  <SEQNO><![CDATA[300]]></SEQNO>
@@ -331008,6 +331355,45 @@
 <!--9ACB466C69F848F4AE2DB1393D780160-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--9ACB466C69F848F4AE2DB1393D780160--></AD_COLUMN>
 
+<!--9AEBE3623CCD4E6F820A2EB70F2F243D--><AD_COLUMN>
+<!--9AEBE3623CCD4E6F820A2EB70F2F243D-->  <AD_COLUMN_ID><![CDATA[9AEBE3623CCD4E6F820A2EB70F2F243D]]></AD_COLUMN_ID>
+<!--9AEBE3623CCD4E6F820A2EB70F2F243D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9AEBE3623CCD4E6F820A2EB70F2F243D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9AEBE3623CCD4E6F820A2EB70F2F243D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9AEBE3623CCD4E6F820A2EB70F2F243D-->  <NAME><![CDATA[Cancelandreplace]]></NAME>
+<!--9AEBE3623CCD4E6F820A2EB70F2F243D-->  <DESCRIPTION><![CDATA[Button that creates a temporal duplicated order]]></DESCRIPTION>
+<!--9AEBE3623CCD4E6F820A2EB70F2F243D-->  <HELP><![CDATA[Button that creates a temporal duplicated order]]></HELP>
+<!--9AEBE3623CCD4E6F820A2EB70F2F243D-->  <COLUMNNAME><![CDATA[Cancelandreplace]]></COLUMNNAME>
+<!--9AEBE3623CCD4E6F820A2EB70F2F243D-->  <AD_TABLE_ID><![CDATA[259]]></AD_TABLE_ID>
+<!--9AEBE3623CCD4E6F820A2EB70F2F243D-->  <AD_REFERENCE_ID><![CDATA[28]]></AD_REFERENCE_ID>
+<!--9AEBE3623CCD4E6F820A2EB70F2F243D-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--9AEBE3623CCD4E6F820A2EB70F2F243D-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--9AEBE3623CCD4E6F820A2EB70F2F243D-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--9AEBE3623CCD4E6F820A2EB70F2F243D-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--9AEBE3623CCD4E6F820A2EB70F2F243D-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--9AEBE3623CCD4E6F820A2EB70F2F243D-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--9AEBE3623CCD4E6F820A2EB70F2F243D-->  <SEQNO><![CDATA[700]]></SEQNO>
+<!--9AEBE3623CCD4E6F820A2EB70F2F243D-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--9AEBE3623CCD4E6F820A2EB70F2F243D-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--9AEBE3623CCD4E6F820A2EB70F2F243D-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--9AEBE3623CCD4E6F820A2EB70F2F243D-->  <AD_ELEMENT_ID><![CDATA[5AF7D5DB814D4907B10F78961BE9EFA8]]></AD_ELEMENT_ID>
+<!--9AEBE3623CCD4E6F820A2EB70F2F243D-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--9AEBE3623CCD4E6F820A2EB70F2F243D-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--9AEBE3623CCD4E6F820A2EB70F2F243D-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--9AEBE3623CCD4E6F820A2EB70F2F243D-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--9AEBE3623CCD4E6F820A2EB70F2F243D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--9AEBE3623CCD4E6F820A2EB70F2F243D-->  <POSITION><![CDATA[86]]></POSITION>
+<!--9AEBE3623CCD4E6F820A2EB70F2F243D-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--9AEBE3623CCD4E6F820A2EB70F2F243D-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--9AEBE3623CCD4E6F820A2EB70F2F243D-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--9AEBE3623CCD4E6F820A2EB70F2F243D-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--9AEBE3623CCD4E6F820A2EB70F2F243D-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--9AEBE3623CCD4E6F820A2EB70F2F243D-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--9AEBE3623CCD4E6F820A2EB70F2F243D-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--9AEBE3623CCD4E6F820A2EB70F2F243D-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--9AEBE3623CCD4E6F820A2EB70F2F243D-->  <EM_OBUIAPP_PROCESS_ID><![CDATA[A2FAF49712D1445ABE750315CE1B473A]]></EM_OBUIAPP_PROCESS_ID>
+<!--9AEBE3623CCD4E6F820A2EB70F2F243D--></AD_COLUMN>
+
 <!--9AFE960A44A147ECAADB875D96399AA2--><AD_COLUMN>
 <!--9AFE960A44A147ECAADB875D96399AA2-->  <AD_COLUMN_ID><![CDATA[9AFE960A44A147ECAADB875D96399AA2]]></AD_COLUMN_ID>
 <!--9AFE960A44A147ECAADB875D96399AA2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -333138,10 +333524,9 @@
 <!--9E82E728716246B393C40D2CDCA0133A-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
 <!--9E82E728716246B393C40D2CDCA0133A-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
 <!--9E82E728716246B393C40D2CDCA0133A-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--9E82E728716246B393C40D2CDCA0133A-->  <SQLLOGIC><![CDATA[(coalesce((select case when sum(abs(ol.qtyordered))  = 0 then 0 else 
-round(coalesce(sum(abs(ol.qtydelivered)), 0)/sum(abs(ol.qtyordered)) * 100, 0)  end 
- from c_orderline ol where ol.c_order_id=c_order_id and ol.c_order_discount_id is null
- ),0))]]></SQLLOGIC>
+<!--9E82E728716246B393C40D2CDCA0133A-->  <SQLLOGIC><![CDATA[(coalesce((select case when sum(abs(ol.qtyordered)) = 0 or iscancelled = 'Y' or cancelledorder_id is not null then 0 else 
+round(coalesce(sum(abs(ol.qtydelivered)), 0)/sum(abs(ol.qtyordered)) * 100, 0) end 
+from c_orderline ol where ol.c_order_id=c_order_id and ol.c_order_discount_id is null),0))]]></SQLLOGIC>
 <!--9E82E728716246B393C40D2CDCA0133A-->  <ALLOWSORTING><![CDATA[N]]></ALLOWSORTING>
 <!--9E82E728716246B393C40D2CDCA0133A-->  <ALLOWFILTERING><![CDATA[N]]></ALLOWFILTERING>
 <!--9E82E728716246B393C40D2CDCA0133A-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
@@ -344055,7 +344440,7 @@
 <!--B5B203AE8D674B8DABC6669419815CA7-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
 <!--B5B203AE8D674B8DABC6669419815CA7-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
 <!--B5B203AE8D674B8DABC6669419815CA7-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--B5B203AE8D674B8DABC6669419815CA7-->  <SQLLOGIC><![CDATA[(coalesce((select case when sum(abs(ol.qtyordered)) = 0 then 0 else 
+<!--B5B203AE8D674B8DABC6669419815CA7-->  <SQLLOGIC><![CDATA[(coalesce((select case when sum(abs(ol.qtyordered)) = 0 or iscancelled = 'Y' or cancelledorder_id is not null then 0 else 
 round(coalesce(sum(abs(ol.qtyinvoiced)), 0)/sum(abs(ol.qtyordered)) * 100, 0)  end 
 from c_orderline ol   where ol.c_order_id=c_order_id and  ol.c_order_discount_id is null), 0))]]></SQLLOGIC>
 <!--B5B203AE8D674B8DABC6669419815CA7-->  <ALLOWSORTING><![CDATA[N]]></ALLOWSORTING>
@@ -349290,6 +349675,45 @@
 <!--BD308BA8925848BF995BC02631A8F5BB-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--BD308BA8925848BF995BC02631A8F5BB--></AD_COLUMN>
 
+<!--BD3122BF968E482B8B8747CF7126BC5A--><AD_COLUMN>
+<!--BD3122BF968E482B8B8747CF7126BC5A-->  <AD_COLUMN_ID><![CDATA[BD3122BF968E482B8B8747CF7126BC5A]]></AD_COLUMN_ID>
+<!--BD3122BF968E482B8B8747CF7126BC5A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BD3122BF968E482B8B8747CF7126BC5A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BD3122BF968E482B8B8747CF7126BC5A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BD3122BF968E482B8B8747CF7126BC5A-->  <NAME><![CDATA[Isdefault]]></NAME>
+<!--BD3122BF968E482B8B8747CF7126BC5A-->  <DESCRIPTION><![CDATA[A value that is shown whenever a record is created.]]></DESCRIPTION>
+<!--BD3122BF968E482B8B8747CF7126BC5A-->  <HELP><![CDATA[The Default Checkbox indicates if this record will be used as a default value.]]></HELP>
+<!--BD3122BF968E482B8B8747CF7126BC5A-->  <COLUMNNAME><![CDATA[Isdefault]]></COLUMNNAME>
+<!--BD3122BF968E482B8B8747CF7126BC5A-->  <AD_TABLE_ID><![CDATA[1000500001]]></AD_TABLE_ID>
+<!--BD3122BF968E482B8B8747CF7126BC5A-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--BD3122BF968E482B8B8747CF7126BC5A-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--BD3122BF968E482B8B8747CF7126BC5A-->  <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE>
+<!--BD3122BF968E482B8B8747CF7126BC5A-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--BD3122BF968E482B8B8747CF7126BC5A-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--BD3122BF968E482B8B8747CF7126BC5A-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--BD3122BF968E482B8B8747CF7126BC5A-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--BD3122BF968E482B8B8747CF7126BC5A-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--BD3122BF968E482B8B8747CF7126BC5A-->  <SEQNO><![CDATA[170]]></SEQNO>
+<!--BD3122BF968E482B8B8747CF7126BC5A-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--BD3122BF968E482B8B8747CF7126BC5A-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--BD3122BF968E482B8B8747CF7126BC5A-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--BD3122BF968E482B8B8747CF7126BC5A-->  <AD_ELEMENT_ID><![CDATA[1103]]></AD_ELEMENT_ID>
+<!--BD3122BF968E482B8B8747CF7126BC5A-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--BD3122BF968E482B8B8747CF7126BC5A-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--BD3122BF968E482B8B8747CF7126BC5A-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--BD3122BF968E482B8B8747CF7126BC5A-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--BD3122BF968E482B8B8747CF7126BC5A-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--BD3122BF968E482B8B8747CF7126BC5A-->  <POSITION><![CDATA[17]]></POSITION>
+<!--BD3122BF968E482B8B8747CF7126BC5A-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--BD3122BF968E482B8B8747CF7126BC5A-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--BD3122BF968E482B8B8747CF7126BC5A-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--BD3122BF968E482B8B8747CF7126BC5A-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--BD3122BF968E482B8B8747CF7126BC5A-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--BD3122BF968E482B8B8747CF7126BC5A-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--BD3122BF968E482B8B8747CF7126BC5A-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--BD3122BF968E482B8B8747CF7126BC5A-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--BD3122BF968E482B8B8747CF7126BC5A--></AD_COLUMN>
+
 <!--BD4D0980F314451086F4A861BD92C25E--><AD_COLUMN>
 <!--BD4D0980F314451086F4A861BD92C25E-->  <AD_COLUMN_ID><![CDATA[BD4D0980F314451086F4A861BD92C25E]]></AD_COLUMN_ID>
 <!--BD4D0980F314451086F4A861BD92C25E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -350761,6 +351185,42 @@
 <!--C20673CACE0A4660A288B973950AD7A5-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--C20673CACE0A4660A288B973950AD7A5--></AD_COLUMN>
 
+<!--C2283BD2196F418E8D102CC4BCFAA469--><AD_COLUMN>
+<!--C2283BD2196F418E8D102CC4BCFAA469-->  <AD_COLUMN_ID><![CDATA[C2283BD2196F418E8D102CC4BCFAA469]]></AD_COLUMN_ID>
+<!--C2283BD2196F418E8D102CC4BCFAA469-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C2283BD2196F418E8D102CC4BCFAA469-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C2283BD2196F418E8D102CC4BCFAA469-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C2283BD2196F418E8D102CC4BCFAA469-->  <NAME><![CDATA[M_Transaction_Last_ID]]></NAME>
+<!--C2283BD2196F418E8D102CC4BCFAA469-->  <COLUMNNAME><![CDATA[M_Transaction_Last_ID]]></COLUMNNAME>
+<!--C2283BD2196F418E8D102CC4BCFAA469-->  <AD_TABLE_ID><![CDATA[8D568B85F2A142E68911FC49AE3B3F57]]></AD_TABLE_ID>
+<!--C2283BD2196F418E8D102CC4BCFAA469-->  <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
+<!--C2283BD2196F418E8D102CC4BCFAA469-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--C2283BD2196F418E8D102CC4BCFAA469-->  <ISKEY><![CDATA[Y]]></ISKEY>
+<!--C2283BD2196F418E8D102CC4BCFAA469-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--C2283BD2196F418E8D102CC4BCFAA469-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--C2283BD2196F418E8D102CC4BCFAA469-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--C2283BD2196F418E8D102CC4BCFAA469-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
+<!--C2283BD2196F418E8D102CC4BCFAA469-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--C2283BD2196F418E8D102CC4BCFAA469-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--C2283BD2196F418E8D102CC4BCFAA469-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--C2283BD2196F418E8D102CC4BCFAA469-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--C2283BD2196F418E8D102CC4BCFAA469-->  <AD_ELEMENT_ID><![CDATA[DD19C74005B148DF821FCA2E83EFAE39]]></AD_ELEMENT_ID>
+<!--C2283BD2196F418E8D102CC4BCFAA469-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--C2283BD2196F418E8D102CC4BCFAA469-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--C2283BD2196F418E8D102CC4BCFAA469-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--C2283BD2196F418E8D102CC4BCFAA469-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--C2283BD2196F418E8D102CC4BCFAA469-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--C2283BD2196F418E8D102CC4BCFAA469-->  <POSITION><![CDATA[1]]></POSITION>
+<!--C2283BD2196F418E8D102CC4BCFAA469-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--C2283BD2196F418E8D102CC4BCFAA469-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--C2283BD2196F418E8D102CC4BCFAA469-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--C2283BD2196F418E8D102CC4BCFAA469-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--C2283BD2196F418E8D102CC4BCFAA469-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--C2283BD2196F418E8D102CC4BCFAA469-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--C2283BD2196F418E8D102CC4BCFAA469-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--C2283BD2196F418E8D102CC4BCFAA469-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--C2283BD2196F418E8D102CC4BCFAA469--></AD_COLUMN>
+
 <!--C228CBC21EC74A0D8785A309736F0446--><AD_COLUMN>
 <!--C228CBC21EC74A0D8785A309736F0446-->  <AD_COLUMN_ID><![CDATA[C228CBC21EC74A0D8785A309736F0446]]></AD_COLUMN_ID>
 <!--C228CBC21EC74A0D8785A309736F0446-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -352620,6 +353080,45 @@
 <!--C6F25057A96548A493E665727DDF7A46-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--C6F25057A96548A493E665727DDF7A46--></AD_COLUMN>
 
+<!--C724ECE5B05848489719C64111425FDB--><AD_COLUMN>
+<!--C724ECE5B05848489719C64111425FDB-->  <AD_COLUMN_ID><![CDATA[C724ECE5B05848489719C64111425FDB]]></AD_COLUMN_ID>
+<!--C724ECE5B05848489719C64111425FDB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C724ECE5B05848489719C64111425FDB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C724ECE5B05848489719C64111425FDB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C724ECE5B05848489719C64111425FDB-->  <NAME><![CDATA[Replacedorderline]]></NAME>
+<!--C724ECE5B05848489719C64111425FDB-->  <DESCRIPTION><![CDATA[Link to the Order that has been replaced]]></DESCRIPTION>
+<!--C724ECE5B05848489719C64111425FDB-->  <HELP><![CDATA[Link to the Order that has been replaced]]></HELP>
+<!--C724ECE5B05848489719C64111425FDB-->  <COLUMNNAME><![CDATA[Replacedorderline_id]]></COLUMNNAME>
+<!--C724ECE5B05848489719C64111425FDB-->  <AD_TABLE_ID><![CDATA[260]]></AD_TABLE_ID>
+<!--C724ECE5B05848489719C64111425FDB-->  <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID>
+<!--C724ECE5B05848489719C64111425FDB-->  <AD_REFERENCE_VALUE_ID><![CDATA[271]]></AD_REFERENCE_VALUE_ID>
+<!--C724ECE5B05848489719C64111425FDB-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--C724ECE5B05848489719C64111425FDB-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--C724ECE5B05848489719C64111425FDB-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--C724ECE5B05848489719C64111425FDB-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--C724ECE5B05848489719C64111425FDB-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--C724ECE5B05848489719C64111425FDB-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--C724ECE5B05848489719C64111425FDB-->  <SEQNO><![CDATA[214]]></SEQNO>
+<!--C724ECE5B05848489719C64111425FDB-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--C724ECE5B05848489719C64111425FDB-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--C724ECE5B05848489719C64111425FDB-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--C724ECE5B05848489719C64111425FDB-->  <AD_ELEMENT_ID><![CDATA[BE7014D21A43412CA94D17540B8D4692]]></AD_ELEMENT_ID>
+<!--C724ECE5B05848489719C64111425FDB-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--C724ECE5B05848489719C64111425FDB-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--C724ECE5B05848489719C64111425FDB-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--C724ECE5B05848489719C64111425FDB-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--C724ECE5B05848489719C64111425FDB-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--C724ECE5B05848489719C64111425FDB-->  <POSITION><![CDATA[68]]></POSITION>
+<!--C724ECE5B05848489719C64111425FDB-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--C724ECE5B05848489719C64111425FDB-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--C724ECE5B05848489719C64111425FDB-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--C724ECE5B05848489719C64111425FDB-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--C724ECE5B05848489719C64111425FDB-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--C724ECE5B05848489719C64111425FDB-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--C724ECE5B05848489719C64111425FDB-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--C724ECE5B05848489719C64111425FDB-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--C724ECE5B05848489719C64111425FDB--></AD_COLUMN>
+
 <!--C73593CD83514760916EBC58EEB5EB41--><AD_COLUMN>
 <!--C73593CD83514760916EBC58EEB5EB41-->  <AD_COLUMN_ID><![CDATA[C73593CD83514760916EBC58EEB5EB41]]></AD_COLUMN_ID>
 <!--C73593CD83514760916EBC58EEB5EB41-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -355546,6 +356045,45 @@
 <!--CB2739BEE006A0E9E040007F010023A5-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--CB2739BEE006A0E9E040007F010023A5--></AD_COLUMN>
 
+<!--CB3A64CFC2B8471E91DBBF12A663D0FB--><AD_COLUMN>
+<!--CB3A64CFC2B8471E91DBBF12A663D0FB-->  <AD_COLUMN_ID><![CDATA[CB3A64CFC2B8471E91DBBF12A663D0FB]]></AD_COLUMN_ID>
+<!--CB3A64CFC2B8471E91DBBF12A663D0FB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--CB3A64CFC2B8471E91DBBF12A663D0FB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--CB3A64CFC2B8471E91DBBF12A663D0FB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--CB3A64CFC2B8471E91DBBF12A663D0FB-->  <NAME><![CDATA[Replacedorder]]></NAME>
+<!--CB3A64CFC2B8471E91DBBF12A663D0FB-->  <DESCRIPTION><![CDATA[Link to the order that has been replaced]]></DESCRIPTION>
+<!--CB3A64CFC2B8471E91DBBF12A663D0FB-->  <HELP><![CDATA[Link to the order that has been replaced]]></HELP>
+<!--CB3A64CFC2B8471E91DBBF12A663D0FB-->  <COLUMNNAME><![CDATA[Replacedorder_id]]></COLUMNNAME>
+<!--CB3A64CFC2B8471E91DBBF12A663D0FB-->  <AD_TABLE_ID><![CDATA[259]]></AD_TABLE_ID>
+<!--CB3A64CFC2B8471E91DBBF12A663D0FB-->  <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID>
+<!--CB3A64CFC2B8471E91DBBF12A663D0FB-->  <AD_REFERENCE_VALUE_ID><![CDATA[290]]></AD_REFERENCE_VALUE_ID>
+<!--CB3A64CFC2B8471E91DBBF12A663D0FB-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--CB3A64CFC2B8471E91DBBF12A663D0FB-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--CB3A64CFC2B8471E91DBBF12A663D0FB-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--CB3A64CFC2B8471E91DBBF12A663D0FB-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--CB3A64CFC2B8471E91DBBF12A663D0FB-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--CB3A64CFC2B8471E91DBBF12A663D0FB-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--CB3A64CFC2B8471E91DBBF12A663D0FB-->  <SEQNO><![CDATA[730]]></SEQNO>
+<!--CB3A64CFC2B8471E91DBBF12A663D0FB-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--CB3A64CFC2B8471E91DBBF12A663D0FB-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--CB3A64CFC2B8471E91DBBF12A663D0FB-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--CB3A64CFC2B8471E91DBBF12A663D0FB-->  <AD_ELEMENT_ID><![CDATA[2627023DF29E469E89105888E791393B]]></AD_ELEMENT_ID>
+<!--CB3A64CFC2B8471E91DBBF12A663D0FB-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--CB3A64CFC2B8471E91DBBF12A663D0FB-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--CB3A64CFC2B8471E91DBBF12A663D0FB-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--CB3A64CFC2B8471E91DBBF12A663D0FB-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--CB3A64CFC2B8471E91DBBF12A663D0FB-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--CB3A64CFC2B8471E91DBBF12A663D0FB-->  <POSITION><![CDATA[98]]></POSITION>
+<!--CB3A64CFC2B8471E91DBBF12A663D0FB-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--CB3A64CFC2B8471E91DBBF12A663D0FB-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--CB3A64CFC2B8471E91DBBF12A663D0FB-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--CB3A64CFC2B8471E91DBBF12A663D0FB-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--CB3A64CFC2B8471E91DBBF12A663D0FB-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--CB3A64CFC2B8471E91DBBF12A663D0FB-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--CB3A64CFC2B8471E91DBBF12A663D0FB-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--CB3A64CFC2B8471E91DBBF12A663D0FB-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--CB3A64CFC2B8471E91DBBF12A663D0FB--></AD_COLUMN>
+
 <!--CB3B154781F840CCA73D6656027F5595--><AD_COLUMN>
 <!--CB3B154781F840CCA73D6656027F5595-->  <AD_COLUMN_ID><![CDATA[CB3B154781F840CCA73D6656027F5595]]></AD_COLUMN_ID>
 <!--CB3B154781F840CCA73D6656027F5595-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -359274,6 +359812,43 @@
 <!--D0029DD2D6314D83BFE6141C3DBAA8E1-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--D0029DD2D6314D83BFE6141C3DBAA8E1--></AD_COLUMN>
 
+<!--D00A2056DC044334974FB9DA5A7372A4--><AD_COLUMN>
+<!--D00A2056DC044334974FB9DA5A7372A4-->  <AD_COLUMN_ID><![CDATA[D00A2056DC044334974FB9DA5A7372A4]]></AD_COLUMN_ID>
+<!--D00A2056DC044334974FB9DA5A7372A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D00A2056DC044334974FB9DA5A7372A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D00A2056DC044334974FB9DA5A7372A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D00A2056DC044334974FB9DA5A7372A4-->  <NAME><![CDATA[Inventory Transaction]]></NAME>
+<!--D00A2056DC044334974FB9DA5A7372A4-->  <HELP><![CDATA[The ID identifies a unique record]]></HELP>
+<!--D00A2056DC044334974FB9DA5A7372A4-->  <COLUMNNAME><![CDATA[M_Transaction_ID]]></COLUMNNAME>
+<!--D00A2056DC044334974FB9DA5A7372A4-->  <AD_TABLE_ID><![CDATA[8D568B85F2A142E68911FC49AE3B3F57]]></AD_TABLE_ID>
+<!--D00A2056DC044334974FB9DA5A7372A4-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--D00A2056DC044334974FB9DA5A7372A4-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--D00A2056DC044334974FB9DA5A7372A4-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--D00A2056DC044334974FB9DA5A7372A4-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--D00A2056DC044334974FB9DA5A7372A4-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--D00A2056DC044334974FB9DA5A7372A4-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--D00A2056DC044334974FB9DA5A7372A4-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--D00A2056DC044334974FB9DA5A7372A4-->  <SEQNO><![CDATA[90]]></SEQNO>
+<!--D00A2056DC044334974FB9DA5A7372A4-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--D00A2056DC044334974FB9DA5A7372A4-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--D00A2056DC044334974FB9DA5A7372A4-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--D00A2056DC044334974FB9DA5A7372A4-->  <AD_ELEMENT_ID><![CDATA[1035]]></AD_ELEMENT_ID>
+<!--D00A2056DC044334974FB9DA5A7372A4-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--D00A2056DC044334974FB9DA5A7372A4-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--D00A2056DC044334974FB9DA5A7372A4-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--D00A2056DC044334974FB9DA5A7372A4-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--D00A2056DC044334974FB9DA5A7372A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D00A2056DC044334974FB9DA5A7372A4-->  <POSITION><![CDATA[9]]></POSITION>
+<!--D00A2056DC044334974FB9DA5A7372A4-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--D00A2056DC044334974FB9DA5A7372A4-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--D00A2056DC044334974FB9DA5A7372A4-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--D00A2056DC044334974FB9DA5A7372A4-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--D00A2056DC044334974FB9DA5A7372A4-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--D00A2056DC044334974FB9DA5A7372A4-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--D00A2056DC044334974FB9DA5A7372A4-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--D00A2056DC044334974FB9DA5A7372A4-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--D00A2056DC044334974FB9DA5A7372A4--></AD_COLUMN>
+
 <!--D010ED8083334E3CB4294827AF15C564--><AD_COLUMN>
 <!--D010ED8083334E3CB4294827AF15C564-->  <AD_COLUMN_ID><![CDATA[D010ED8083334E3CB4294827AF15C564]]></AD_COLUMN_ID>
 <!--D010ED8083334E3CB4294827AF15C564-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -359586,6 +360161,45 @@
 <!--D18C0FEE668D4E578894BE4EF4330704-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--D18C0FEE668D4E578894BE4EF4330704--></AD_COLUMN>
 
+<!--D18FA7EA8D3941C3A325A0D93FE76A6D--><AD_COLUMN>
+<!--D18FA7EA8D3941C3A325A0D93FE76A6D-->  <AD_COLUMN_ID><![CDATA[D18FA7EA8D3941C3A325A0D93FE76A6D]]></AD_COLUMN_ID>
+<!--D18FA7EA8D3941C3A325A0D93FE76A6D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D18FA7EA8D3941C3A325A0D93FE76A6D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D18FA7EA8D3941C3A325A0D93FE76A6D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D18FA7EA8D3941C3A325A0D93FE76A6D-->  <NAME><![CDATA[Organization]]></NAME>
+<!--D18FA7EA8D3941C3A325A0D93FE76A6D-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
+<!--D18FA7EA8D3941C3A325A0D93FE76A6D-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
+<!--D18FA7EA8D3941C3A325A0D93FE76A6D-->  <COLUMNNAME><![CDATA[AD_Org_ID]]></COLUMNNAME>
+<!--D18FA7EA8D3941C3A325A0D93FE76A6D-->  <AD_TABLE_ID><![CDATA[8D568B85F2A142E68911FC49AE3B3F57]]></AD_TABLE_ID>
+<!--D18FA7EA8D3941C3A325A0D93FE76A6D-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--D18FA7EA8D3941C3A325A0D93FE76A6D-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--D18FA7EA8D3941C3A325A0D93FE76A6D-->  <DEFAULTVALUE><![CDATA[@AD_ORG_ID@]]></DEFAULTVALUE>
+<!--D18FA7EA8D3941C3A325A0D93FE76A6D-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--D18FA7EA8D3941C3A325A0D93FE76A6D-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--D18FA7EA8D3941C3A325A0D93FE76A6D-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--D18FA7EA8D3941C3A325A0D93FE76A6D-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--D18FA7EA8D3941C3A325A0D93FE76A6D-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--D18FA7EA8D3941C3A325A0D93FE76A6D-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--D18FA7EA8D3941C3A325A0D93FE76A6D-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--D18FA7EA8D3941C3A325A0D93FE76A6D-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--D18FA7EA8D3941C3A325A0D93FE76A6D-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--D18FA7EA8D3941C3A325A0D93FE76A6D-->  <AD_ELEMENT_ID><![CDATA[113]]></AD_ELEMENT_ID>
+<!--D18FA7EA8D3941C3A325A0D93FE76A6D-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--D18FA7EA8D3941C3A325A0D93FE76A6D-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--D18FA7EA8D3941C3A325A0D93FE76A6D-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--D18FA7EA8D3941C3A325A0D93FE76A6D-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--D18FA7EA8D3941C3A325A0D93FE76A6D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D18FA7EA8D3941C3A325A0D93FE76A6D-->  <POSITION><![CDATA[3]]></POSITION>
+<!--D18FA7EA8D3941C3A325A0D93FE76A6D-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--D18FA7EA8D3941C3A325A0D93FE76A6D-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--D18FA7EA8D3941C3A325A0D93FE76A6D-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--D18FA7EA8D3941C3A325A0D93FE76A6D-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--D18FA7EA8D3941C3A325A0D93FE76A6D-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--D18FA7EA8D3941C3A325A0D93FE76A6D-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--D18FA7EA8D3941C3A325A0D93FE76A6D-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--D18FA7EA8D3941C3A325A0D93FE76A6D-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--D18FA7EA8D3941C3A325A0D93FE76A6D--></AD_COLUMN>
+
 <!--D1B2113CC0504A0C8A29B2EEC76EE22A--><AD_COLUMN>
 <!--D1B2113CC0504A0C8A29B2EEC76EE22A-->  <AD_COLUMN_ID><![CDATA[D1B2113CC0504A0C8A29B2EEC76EE22A]]></AD_COLUMN_ID>
 <!--D1B2113CC0504A0C8A29B2EEC76EE22A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -368443,7 +369057,7 @@
 <!--E16BB81D95984DF08700A8940683A636-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--E16BB81D95984DF08700A8940683A636-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
 <!--E16BB81D95984DF08700A8940683A636-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--E16BB81D95984DF08700A8940683A636-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--E16BB81D95984DF08700A8940683A636-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
 <!--E16BB81D95984DF08700A8940683A636-->  <SEQNO><![CDATA[300]]></SEQNO>
 <!--E16BB81D95984DF08700A8940683A636-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--E16BB81D95984DF08700A8940683A636-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -369581,6 +370195,45 @@
 <!--E59D4BB7F1C342619CB4131FE4888FFA-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--E59D4BB7F1C342619CB4131FE4888FFA--></AD_COLUMN>
 
+<!--E61022D568524DD78F02815F50092DB8--><AD_COLUMN>
+<!--E61022D568524DD78F02815F50092DB8-->  <AD_COLUMN_ID><![CDATA[E61022D568524DD78F02815F50092DB8]]></AD_COLUMN_ID>
+<!--E61022D568524DD78F02815F50092DB8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E61022D568524DD78F02815F50092DB8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E61022D568524DD78F02815F50092DB8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E61022D568524DD78F02815F50092DB8-->  <NAME><![CDATA[Replacementorder_ID]]></NAME>
+<!--E61022D568524DD78F02815F50092DB8-->  <DESCRIPTION><![CDATA[Link to the replacement order. This order is the order that has replaced the current Cancelled order.]]></DESCRIPTION>
+<!--E61022D568524DD78F02815F50092DB8-->  <HELP><![CDATA[Link to the replacement order. This order is the order that has replaced the current Cancelled order.]]></HELP>
+<!--E61022D568524DD78F02815F50092DB8-->  <COLUMNNAME><![CDATA[Replacementorder_ID]]></COLUMNNAME>
+<!--E61022D568524DD78F02815F50092DB8-->  <AD_TABLE_ID><![CDATA[259]]></AD_TABLE_ID>
+<!--E61022D568524DD78F02815F50092DB8-->  <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID>
+<!--E61022D568524DD78F02815F50092DB8-->  <AD_REFERENCE_VALUE_ID><![CDATA[290]]></AD_REFERENCE_VALUE_ID>
+<!--E61022D568524DD78F02815F50092DB8-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--E61022D568524DD78F02815F50092DB8-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--E61022D568524DD78F02815F50092DB8-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--E61022D568524DD78F02815F50092DB8-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--E61022D568524DD78F02815F50092DB8-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--E61022D568524DD78F02815F50092DB8-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--E61022D568524DD78F02815F50092DB8-->  <SEQNO><![CDATA[750]]></SEQNO>
+<!--E61022D568524DD78F02815F50092DB8-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--E61022D568524DD78F02815F50092DB8-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--E61022D568524DD78F02815F50092DB8-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--E61022D568524DD78F02815F50092DB8-->  <AD_ELEMENT_ID><![CDATA[06D885749834459BABA740AA25636ECA]]></AD_ELEMENT_ID>
+<!--E61022D568524DD78F02815F50092DB8-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--E61022D568524DD78F02815F50092DB8-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--E61022D568524DD78F02815F50092DB8-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--E61022D568524DD78F02815F50092DB8-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--E61022D568524DD78F02815F50092DB8-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--E61022D568524DD78F02815F50092DB8-->  <POSITION><![CDATA[103]]></POSITION>
+<!--E61022D568524DD78F02815F50092DB8-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--E61022D568524DD78F02815F50092DB8-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--E61022D568524DD78F02815F50092DB8-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--E61022D568524DD78F02815F50092DB8-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--E61022D568524DD78F02815F50092DB8-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--E61022D568524DD78F02815F50092DB8-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--E61022D568524DD78F02815F50092DB8-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--E61022D568524DD78F02815F50092DB8-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--E61022D568524DD78F02815F50092DB8--></AD_COLUMN>
+
 <!--E631C21ED303AC60E040007F01002676--><AD_COLUMN>
 <!--E631C21ED303AC60E040007F01002676-->  <AD_COLUMN_ID><![CDATA[E631C21ED303AC60E040007F01002676]]></AD_COLUMN_ID>
 <!--E631C21ED303AC60E040007F01002676-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -369811,6 +370464,44 @@
 <!--E6CB7938B2AB40EDB5BE6BFEEA6AFE53-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--E6CB7938B2AB40EDB5BE6BFEEA6AFE53--></AD_COLUMN>
 
+<!--E6E1A235D7B7483AA93DAA329320F8D6--><AD_COLUMN>
+<!--E6E1A235D7B7483AA93DAA329320F8D6-->  <AD_COLUMN_ID><![CDATA[E6E1A235D7B7483AA93DAA329320F8D6]]></AD_COLUMN_ID>
+<!--E6E1A235D7B7483AA93DAA329320F8D6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E6E1A235D7B7483AA93DAA329320F8D6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E6E1A235D7B7483AA93DAA329320F8D6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E6E1A235D7B7483AA93DAA329320F8D6-->  <NAME><![CDATA[Created By]]></NAME>
+<!--E6E1A235D7B7483AA93DAA329320F8D6-->  <DESCRIPTION><![CDATA[User who created this records]]></DESCRIPTION>
+<!--E6E1A235D7B7483AA93DAA329320F8D6-->  <HELP><![CDATA[The Created By field indicates the user who created this record.]]></HELP>
+<!--E6E1A235D7B7483AA93DAA329320F8D6-->  <COLUMNNAME><![CDATA[Createdby]]></COLUMNNAME>
+<!--E6E1A235D7B7483AA93DAA329320F8D6-->  <AD_TABLE_ID><![CDATA[8D568B85F2A142E68911FC49AE3B3F57]]></AD_TABLE_ID>
+<!--E6E1A235D7B7483AA93DAA329320F8D6-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--E6E1A235D7B7483AA93DAA329320F8D6-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--E6E1A235D7B7483AA93DAA329320F8D6-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--E6E1A235D7B7483AA93DAA329320F8D6-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--E6E1A235D7B7483AA93DAA329320F8D6-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--E6E1A235D7B7483AA93DAA329320F8D6-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--E6E1A235D7B7483AA93DAA329320F8D6-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--E6E1A235D7B7483AA93DAA329320F8D6-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--E6E1A235D7B7483AA93DAA329320F8D6-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--E6E1A235D7B7483AA93DAA329320F8D6-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--E6E1A235D7B7483AA93DAA329320F8D6-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--E6E1A235D7B7483AA93DAA329320F8D6-->  <AD_ELEMENT_ID><![CDATA[246]]></AD_ELEMENT_ID>
+<!--E6E1A235D7B7483AA93DAA329320F8D6-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--E6E1A235D7B7483AA93DAA329320F8D6-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--E6E1A235D7B7483AA93DAA329320F8D6-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--E6E1A235D7B7483AA93DAA329320F8D6-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--E6E1A235D7B7483AA93DAA329320F8D6-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--E6E1A235D7B7483AA93DAA329320F8D6-->  <POSITION><![CDATA[5]]></POSITION>
+<!--E6E1A235D7B7483AA93DAA329320F8D6-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--E6E1A235D7B7483AA93DAA329320F8D6-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--E6E1A235D7B7483AA93DAA329320F8D6-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--E6E1A235D7B7483AA93DAA329320F8D6-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--E6E1A235D7B7483AA93DAA329320F8D6-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--E6E1A235D7B7483AA93DAA329320F8D6-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--E6E1A235D7B7483AA93DAA329320F8D6-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--E6E1A235D7B7483AA93DAA329320F8D6-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--E6E1A235D7B7483AA93DAA329320F8D6--></AD_COLUMN>
+
 <!--E7026E12CF7E4ED8A4CB0C6D0426EB15--><AD_COLUMN>
 <!--E7026E12CF7E4ED8A4CB0C6D0426EB15-->  <AD_COLUMN_ID><![CDATA[E7026E12CF7E4ED8A4CB0C6D0426EB15]]></AD_COLUMN_ID>
 <!--E7026E12CF7E4ED8A4CB0C6D0426EB15-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -370156,6 +370847,47 @@
 <!--E7DF08EA4F934843BDA989385500FFAE-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--E7DF08EA4F934843BDA989385500FFAE--></AD_COLUMN>
 
+<!--E7DFB243C5244D4C9493ABD9230F61E0--><AD_COLUMN>
+<!--E7DFB243C5244D4C9493ABD9230F61E0-->  <AD_COLUMN_ID><![CDATA[E7DFB243C5244D4C9493ABD9230F61E0]]></AD_COLUMN_ID>
+<!--E7DFB243C5244D4C9493ABD9230F61E0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E7DFB243C5244D4C9493ABD9230F61E0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E7DFB243C5244D4C9493ABD9230F61E0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E7DFB243C5244D4C9493ABD9230F61E0-->  <NAME><![CDATA[Active]]></NAME>
+<!--E7DFB243C5244D4C9493ABD9230F61E0-->  <DESCRIPTION><![CDATA[A flag indicating whether this record is available for use or de-activated.]]></DESCRIPTION>
+<!--E7DFB243C5244D4C9493ABD9230F61E0-->  <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>
+<!--E7DFB243C5244D4C9493ABD9230F61E0-->  <COLUMNNAME><![CDATA[Isactive]]></COLUMNNAME>
+<!--E7DFB243C5244D4C9493ABD9230F61E0-->  <AD_TABLE_ID><![CDATA[8D568B85F2A142E68911FC49AE3B3F57]]></AD_TABLE_ID>
+<!--E7DFB243C5244D4C9493ABD9230F61E0-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--E7DFB243C5244D4C9493ABD9230F61E0-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--E7DFB243C5244D4C9493ABD9230F61E0-->  <DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE>
+<!--E7DFB243C5244D4C9493ABD9230F61E0-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--E7DFB243C5244D4C9493ABD9230F61E0-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--E7DFB243C5244D4C9493ABD9230F61E0-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--E7DFB243C5244D4C9493ABD9230F61E0-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--E7DFB243C5244D4C9493ABD9230F61E0-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--E7DFB243C5244D4C9493ABD9230F61E0-->  <SEQNO><![CDATA[80]]></SEQNO>
+<!--E7DFB243C5244D4C9493ABD9230F61E0-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--E7DFB243C5244D4C9493ABD9230F61E0-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--E7DFB243C5244D4C9493ABD9230F61E0-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--E7DFB243C5244D4C9493ABD9230F61E0-->  <AD_ELEMENT_ID><![CDATA[348]]></AD_ELEMENT_ID>
+<!--E7DFB243C5244D4C9493ABD9230F61E0-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--E7DFB243C5244D4C9493ABD9230F61E0-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--E7DFB243C5244D4C9493ABD9230F61E0-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--E7DFB243C5244D4C9493ABD9230F61E0-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--E7DFB243C5244D4C9493ABD9230F61E0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--E7DFB243C5244D4C9493ABD9230F61E0-->  <POSITION><![CDATA[8]]></POSITION>
+<!--E7DFB243C5244D4C9493ABD9230F61E0-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--E7DFB243C5244D4C9493ABD9230F61E0-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--E7DFB243C5244D4C9493ABD9230F61E0-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--E7DFB243C5244D4C9493ABD9230F61E0-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--E7DFB243C5244D4C9493ABD9230F61E0-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--E7DFB243C5244D4C9493ABD9230F61E0-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--E7DFB243C5244D4C9493ABD9230F61E0-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--E7DFB243C5244D4C9493ABD9230F61E0-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--E7DFB243C5244D4C9493ABD9230F61E0--></AD_COLUMN>
+
 <!--E7E1777671FD476A86073668B12CEF1E--><AD_COLUMN>
 <!--E7E1777671FD476A86073668B12CEF1E-->  <AD_COLUMN_ID><![CDATA[E7E1777671FD476A86073668B12CEF1E]]></AD_COLUMN_ID>
 <!--E7E1777671FD476A86073668B12CEF1E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -372469,6 +373201,45 @@
 <!--EE5656508FCB4E63A1495AA85F993105-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--EE5656508FCB4E63A1495AA85F993105--></AD_COLUMN>
 
+<!--EE7A8154A4484691A246CE47376538A9--><AD_COLUMN>
+<!--EE7A8154A4484691A246CE47376538A9-->  <AD_COLUMN_ID><![CDATA[EE7A8154A4484691A246CE47376538A9]]></AD_COLUMN_ID>
+<!--EE7A8154A4484691A246CE47376538A9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--EE7A8154A4484691A246CE47376538A9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--EE7A8154A4484691A246CE47376538A9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--EE7A8154A4484691A246CE47376538A9-->  <NAME><![CDATA[Product]]></NAME>
+<!--EE7A8154A4484691A246CE47376538A9-->  <DESCRIPTION><![CDATA[An item produced by a process.]]></DESCRIPTION>
+<!--EE7A8154A4484691A246CE47376538A9-->  <HELP><![CDATA[Identifies an item which is either purchased or sold in this organization.]]></HELP>
+<!--EE7A8154A4484691A246CE47376538A9-->  <COLUMNNAME><![CDATA[M_Product_ID]]></COLUMNNAME>
+<!--EE7A8154A4484691A246CE47376538A9-->  <AD_TABLE_ID><![CDATA[8D568B85F2A142E68911FC49AE3B3F57]]></AD_TABLE_ID>
+<!--EE7A8154A4484691A246CE47376538A9-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--EE7A8154A4484691A246CE47376538A9-->  <AD_REFERENCE_VALUE_ID><![CDATA[800060]]></AD_REFERENCE_VALUE_ID>
+<!--EE7A8154A4484691A246CE47376538A9-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--EE7A8154A4484691A246CE47376538A9-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--EE7A8154A4484691A246CE47376538A9-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--EE7A8154A4484691A246CE47376538A9-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--EE7A8154A4484691A246CE47376538A9-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--EE7A8154A4484691A246CE47376538A9-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--EE7A8154A4484691A246CE47376538A9-->  <SEQNO><![CDATA[100]]></SEQNO>
+<!--EE7A8154A4484691A246CE47376538A9-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--EE7A8154A4484691A246CE47376538A9-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--EE7A8154A4484691A246CE47376538A9-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--EE7A8154A4484691A246CE47376538A9-->  <AD_ELEMENT_ID><![CDATA[454]]></AD_ELEMENT_ID>
+<!--EE7A8154A4484691A246CE47376538A9-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--EE7A8154A4484691A246CE47376538A9-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--EE7A8154A4484691A246CE47376538A9-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--EE7A8154A4484691A246CE47376538A9-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--EE7A8154A4484691A246CE47376538A9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--EE7A8154A4484691A246CE47376538A9-->  <POSITION><![CDATA[10]]></POSITION>
+<!--EE7A8154A4484691A246CE47376538A9-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--EE7A8154A4484691A246CE47376538A9-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--EE7A8154A4484691A246CE47376538A9-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--EE7A8154A4484691A246CE47376538A9-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--EE7A8154A4484691A246CE47376538A9-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--EE7A8154A4484691A246CE47376538A9-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--EE7A8154A4484691A246CE47376538A9-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--EE7A8154A4484691A246CE47376538A9-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--EE7A8154A4484691A246CE47376538A9--></AD_COLUMN>
+
 <!--EE8A77D46BED44A29CE8A3584B7924AF--><AD_COLUMN>
 <!--EE8A77D46BED44A29CE8A3584B7924AF-->  <AD_COLUMN_ID><![CDATA[EE8A77D46BED44A29CE8A3584B7924AF]]></AD_COLUMN_ID>
 <!--EE8A77D46BED44A29CE8A3584B7924AF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -373854,6 +374625,45 @@
 <!--F52B56FE91C64CB2B5AC43E52C1C763E-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--F52B56FE91C64CB2B5AC43E52C1C763E--></AD_COLUMN>
 
+<!--F54BEAEAA4C04BDD9DC1448954589ED0--><AD_COLUMN>
+<!--F54BEAEAA4C04BDD9DC1448954589ED0-->  <AD_COLUMN_ID><![CDATA[F54BEAEAA4C04BDD9DC1448954589ED0]]></AD_COLUMN_ID>
+<!--F54BEAEAA4C04BDD9DC1448954589ED0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F54BEAEAA4C04BDD9DC1448954589ED0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F54BEAEAA4C04BDD9DC1448954589ED0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F54BEAEAA4C04BDD9DC1448954589ED0-->  <NAME><![CDATA[Iscancelled]]></NAME>
+<!--F54BEAEAA4C04BDD9DC1448954589ED0-->  <DESCRIPTION><![CDATA[The Sales Order has been canceled or cancelled and replaced.]]></DESCRIPTION>
+<!--F54BEAEAA4C04BDD9DC1448954589ED0-->  <HELP><![CDATA[The Sales Order has been canceled and canceled and replaced. A new Cancellation Sales Order has been created in Closed Status and if it is replaced also a new Sales Order in Book Status has been created replacing the original one.]]></HELP>
+<!--F54BEAEAA4C04BDD9DC1448954589ED0-->  <COLUMNNAME><![CDATA[Iscancelled]]></COLUMNNAME>
+<!--F54BEAEAA4C04BDD9DC1448954589ED0-->  <AD_TABLE_ID><![CDATA[259]]></AD_TABLE_ID>
+<!--F54BEAEAA4C04BDD9DC1448954589ED0-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--F54BEAEAA4C04BDD9DC1448954589ED0-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--F54BEAEAA4C04BDD9DC1448954589ED0-->  <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE>
+<!--F54BEAEAA4C04BDD9DC1448954589ED0-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--F54BEAEAA4C04BDD9DC1448954589ED0-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--F54BEAEAA4C04BDD9DC1448954589ED0-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--F54BEAEAA4C04BDD9DC1448954589ED0-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--F54BEAEAA4C04BDD9DC1448954589ED0-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--F54BEAEAA4C04BDD9DC1448954589ED0-->  <SEQNO><![CDATA[740]]></SEQNO>
+<!--F54BEAEAA4C04BDD9DC1448954589ED0-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--F54BEAEAA4C04BDD9DC1448954589ED0-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--F54BEAEAA4C04BDD9DC1448954589ED0-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--F54BEAEAA4C04BDD9DC1448954589ED0-->  <AD_ELEMENT_ID><![CDATA[5BD4AC040C044BB1A5817915C0961F35]]></AD_ELEMENT_ID>
+<!--F54BEAEAA4C04BDD9DC1448954589ED0-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--F54BEAEAA4C04BDD9DC1448954589ED0-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--F54BEAEAA4C04BDD9DC1448954589ED0-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--F54BEAEAA4C04BDD9DC1448954589ED0-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--F54BEAEAA4C04BDD9DC1448954589ED0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--F54BEAEAA4C04BDD9DC1448954589ED0-->  <POSITION><![CDATA[101]]></POSITION>
+<!--F54BEAEAA4C04BDD9DC1448954589ED0-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--F54BEAEAA4C04BDD9DC1448954589ED0-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--F54BEAEAA4C04BDD9DC1448954589ED0-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--F54BEAEAA4C04BDD9DC1448954589ED0-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--F54BEAEAA4C04BDD9DC1448954589ED0-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--F54BEAEAA4C04BDD9DC1448954589ED0-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--F54BEAEAA4C04BDD9DC1448954589ED0-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--F54BEAEAA4C04BDD9DC1448954589ED0-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--F54BEAEAA4C04BDD9DC1448954589ED0--></AD_COLUMN>
+
 <!--F55387BA03C14531AA6A20E0AF799E1B--><AD_COLUMN>
 <!--F55387BA03C14531AA6A20E0AF799E1B-->  <AD_COLUMN_ID><![CDATA[F55387BA03C14531AA6A20E0AF799E1B]]></AD_COLUMN_ID>
 <!--F55387BA03C14531AA6A20E0AF799E1B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/src-db/database/sourcedata/AD_ELEMENT.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/sourcedata/AD_ELEMENT.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -1328,6 +1328,20 @@
 <!--225-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--225--></AD_ELEMENT>
 
+<!--226--><AD_ELEMENT>
+<!--226-->  <AD_ELEMENT_ID><![CDATA[226]]></AD_ELEMENT_ID>
+<!--226-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--226-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--226-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--226-->  <COLUMNNAME><![CDATA[ClientList]]></COLUMNNAME>
+<!--226-->  <NAME><![CDATA[Client List]]></NAME>
+<!--226-->  <PRINTNAME><![CDATA[Client List]]></PRINTNAME>
+<!--226-->  <DESCRIPTION><![CDATA[Clients this Role can access]]></DESCRIPTION>
+<!--226-->  <HELP><![CDATA[Indicates the Clients (by client id) that this Role can access.  Multiple Clients are delimited by a comma ','.]]></HELP>
+<!--226-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--226-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--226--></AD_ELEMENT>
+
 <!--227--><AD_ELEMENT>
 <!--227-->  <AD_ELEMENT_ID><![CDATA[227]]></AD_ELEMENT_ID>
 <!--227-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -21104,6 +21118,20 @@
 <!--06982089ED1442FAA0E2626D2228CF4E-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--06982089ED1442FAA0E2626D2228CF4E--></AD_ELEMENT>
 
+<!--06D885749834459BABA740AA25636ECA--><AD_ELEMENT>
+<!--06D885749834459BABA740AA25636ECA-->  <AD_ELEMENT_ID><![CDATA[06D885749834459BABA740AA25636ECA]]></AD_ELEMENT_ID>
+<!--06D885749834459BABA740AA25636ECA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--06D885749834459BABA740AA25636ECA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--06D885749834459BABA740AA25636ECA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--06D885749834459BABA740AA25636ECA-->  <COLUMNNAME><![CDATA[Replacementorder_ID]]></COLUMNNAME>
+<!--06D885749834459BABA740AA25636ECA-->  <NAME><![CDATA[Replacement Order]]></NAME>
+<!--06D885749834459BABA740AA25636ECA-->  <PRINTNAME><![CDATA[Replacement Order]]></PRINTNAME>
+<!--06D885749834459BABA740AA25636ECA-->  <DESCRIPTION><![CDATA[Link to the replacement order. This order is the order that has replaced the current Cancelled order.]]></DESCRIPTION>
+<!--06D885749834459BABA740AA25636ECA-->  <HELP><![CDATA[Link to the replacement order. This order is the order that has replaced the current Cancelled order.]]></HELP>
+<!--06D885749834459BABA740AA25636ECA-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--06D885749834459BABA740AA25636ECA-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--06D885749834459BABA740AA25636ECA--></AD_ELEMENT>
+
 <!--073EB11474B542B5AA579581C8741C53--><AD_ELEMENT>
 <!--073EB11474B542B5AA579581C8741C53-->  <AD_ELEMENT_ID><![CDATA[073EB11474B542B5AA579581C8741C53]]></AD_ELEMENT_ID>
 <!--073EB11474B542B5AA579581C8741C53-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -21415,6 +21443,20 @@
 <!--11C2BC5D35EE4A098C6C99FE71F06590-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--11C2BC5D35EE4A098C6C99FE71F06590--></AD_ELEMENT>
 
+<!--11F2729B6B6B452F854E4A3BA8EA732B--><AD_ELEMENT>
+<!--11F2729B6B6B452F854E4A3BA8EA732B-->  <AD_ELEMENT_ID><![CDATA[11F2729B6B6B452F854E4A3BA8EA732B]]></AD_ELEMENT_ID>
+<!--11F2729B6B6B452F854E4A3BA8EA732B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--11F2729B6B6B452F854E4A3BA8EA732B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--11F2729B6B6B452F854E4A3BA8EA732B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--11F2729B6B6B452F854E4A3BA8EA732B-->  <COLUMNNAME><![CDATA[Confirmcancelandreplace]]></COLUMNNAME>
+<!--11F2729B6B6B452F854E4A3BA8EA732B-->  <NAME><![CDATA[Confirm Cancel and Replace]]></NAME>
+<!--11F2729B6B6B452F854E4A3BA8EA732B-->  <PRINTNAME><![CDATA[Confirm Cancel and Replace]]></PRINTNAME>
+<!--11F2729B6B6B452F854E4A3BA8EA732B-->  <DESCRIPTION><![CDATA[Button that confirms the temporal Order by closing it and creates a canceled order]]></DESCRIPTION>
+<!--11F2729B6B6B452F854E4A3BA8EA732B-->  <HELP><![CDATA[Button that confirms the temporal Order by closing it and creates a canceled order]]></HELP>
+<!--11F2729B6B6B452F854E4A3BA8EA732B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--11F2729B6B6B452F854E4A3BA8EA732B-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--11F2729B6B6B452F854E4A3BA8EA732B--></AD_ELEMENT>
+
 <!--13338440A6404E389A502A20DCDDF226--><AD_ELEMENT>
 <!--13338440A6404E389A502A20DCDDF226-->  <AD_ELEMENT_ID><![CDATA[13338440A6404E389A502A20DCDDF226]]></AD_ELEMENT_ID>
 <!--13338440A6404E389A502A20DCDDF226-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -21999,6 +22041,20 @@
 <!--24DF09C68AD04D86963F5DE05B759600-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--24DF09C68AD04D86963F5DE05B759600--></AD_ELEMENT>
 
+<!--2627023DF29E469E89105888E791393B--><AD_ELEMENT>
+<!--2627023DF29E469E89105888E791393B-->  <AD_ELEMENT_ID><![CDATA[2627023DF29E469E89105888E791393B]]></AD_ELEMENT_ID>
+<!--2627023DF29E469E89105888E791393B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2627023DF29E469E89105888E791393B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2627023DF29E469E89105888E791393B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2627023DF29E469E89105888E791393B-->  <COLUMNNAME><![CDATA[Replacedorder_id]]></COLUMNNAME>
+<!--2627023DF29E469E89105888E791393B-->  <NAME><![CDATA[Replaced Order]]></NAME>
+<!--2627023DF29E469E89105888E791393B-->  <PRINTNAME><![CDATA[Replaced Order]]></PRINTNAME>
+<!--2627023DF29E469E89105888E791393B-->  <DESCRIPTION><![CDATA[Link to the order that has been replaced]]></DESCRIPTION>
+<!--2627023DF29E469E89105888E791393B-->  <HELP><![CDATA[Link to the order that has been replaced]]></HELP>
+<!--2627023DF29E469E89105888E791393B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--2627023DF29E469E89105888E791393B-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--2627023DF29E469E89105888E791393B--></AD_ELEMENT>
+
 <!--267A3D0068D048C2991366C96CB19590--><AD_ELEMENT>
 <!--267A3D0068D048C2991366C96CB19590-->  <AD_ELEMENT_ID><![CDATA[267A3D0068D048C2991366C96CB19590]]></AD_ELEMENT_ID>
 <!--267A3D0068D048C2991366C96CB19590-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -25584,6 +25640,20 @@
 <!--5ACB703E0038CD12E040007F010160B4-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--5ACB703E0038CD12E040007F010160B4--></AD_ELEMENT>
 
+<!--5AF7D5DB814D4907B10F78961BE9EFA8--><AD_ELEMENT>
+<!--5AF7D5DB814D4907B10F78961BE9EFA8-->  <AD_ELEMENT_ID><![CDATA[5AF7D5DB814D4907B10F78961BE9EFA8]]></AD_ELEMENT_ID>
+<!--5AF7D5DB814D4907B10F78961BE9EFA8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5AF7D5DB814D4907B10F78961BE9EFA8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5AF7D5DB814D4907B10F78961BE9EFA8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5AF7D5DB814D4907B10F78961BE9EFA8-->  <COLUMNNAME><![CDATA[Cancelandreplace]]></COLUMNNAME>
+<!--5AF7D5DB814D4907B10F78961BE9EFA8-->  <NAME><![CDATA[Cancel and Replace]]></NAME>
+<!--5AF7D5DB814D4907B10F78961BE9EFA8-->  <PRINTNAME><![CDATA[Cancel and Replace]]></PRINTNAME>
+<!--5AF7D5DB814D4907B10F78961BE9EFA8-->  <DESCRIPTION><![CDATA[Button that creates a temporal duplicated order]]></DESCRIPTION>
+<!--5AF7D5DB814D4907B10F78961BE9EFA8-->  <HELP><![CDATA[Button that creates a temporal duplicated order]]></HELP>
+<!--5AF7D5DB814D4907B10F78961BE9EFA8-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--5AF7D5DB814D4907B10F78961BE9EFA8-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--5AF7D5DB814D4907B10F78961BE9EFA8--></AD_ELEMENT>
+
 <!--5AFB22E6D5924B6DBE8F5C4FE839A5AE--><AD_ELEMENT>
 <!--5AFB22E6D5924B6DBE8F5C4FE839A5AE-->  <AD_ELEMENT_ID><![CDATA[5AFB22E6D5924B6DBE8F5C4FE839A5AE]]></AD_ELEMENT_ID>
 <!--5AFB22E6D5924B6DBE8F5C4FE839A5AE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -25640,6 +25710,20 @@
 <!--5BCA37B278504F459215615AABC0BF2C-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--5BCA37B278504F459215615AABC0BF2C--></AD_ELEMENT>
 
+<!--5BD4AC040C044BB1A5817915C0961F35--><AD_ELEMENT>
+<!--5BD4AC040C044BB1A5817915C0961F35-->  <AD_ELEMENT_ID><![CDATA[5BD4AC040C044BB1A5817915C0961F35]]></AD_ELEMENT_ID>
+<!--5BD4AC040C044BB1A5817915C0961F35-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5BD4AC040C044BB1A5817915C0961F35-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5BD4AC040C044BB1A5817915C0961F35-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5BD4AC040C044BB1A5817915C0961F35-->  <COLUMNNAME><![CDATA[Iscancelled]]></COLUMNNAME>
+<!--5BD4AC040C044BB1A5817915C0961F35-->  <NAME><![CDATA[Is Canceled]]></NAME>
+<!--5BD4AC040C044BB1A5817915C0961F35-->  <PRINTNAME><![CDATA[Is Canceled]]></PRINTNAME>
+<!--5BD4AC040C044BB1A5817915C0961F35-->  <DESCRIPTION><![CDATA[The Sales Order has been canceled or cancelled and replaced.]]></DESCRIPTION>
+<!--5BD4AC040C044BB1A5817915C0961F35-->  <HELP><![CDATA[The Sales Order has been canceled and canceled and replaced. A new Cancellation Sales Order has been created in Closed Status and if it is replaced also a new Sales Order in Book Status has been created replacing the original one.]]></HELP>
+<!--5BD4AC040C044BB1A5817915C0961F35-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--5BD4AC040C044BB1A5817915C0961F35-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--5BD4AC040C044BB1A5817915C0961F35--></AD_ELEMENT>
+
 <!--5BE187236833538BE040007F010169BF--><AD_ELEMENT>
 <!--5BE187236833538BE040007F010169BF-->  <AD_ELEMENT_ID><![CDATA[5BE187236833538BE040007F010169BF]]></AD_ELEMENT_ID>
 <!--5BE187236833538BE040007F010169BF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -31831,6 +31915,20 @@
 <!--BDC51EB4B3284866A2919ED98022A14F-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--BDC51EB4B3284866A2919ED98022A14F--></AD_ELEMENT>
 
+<!--BE7014D21A43412CA94D17540B8D4692--><AD_ELEMENT>
+<!--BE7014D21A43412CA94D17540B8D4692-->  <AD_ELEMENT_ID><![CDATA[BE7014D21A43412CA94D17540B8D4692]]></AD_ELEMENT_ID>
+<!--BE7014D21A43412CA94D17540B8D4692-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BE7014D21A43412CA94D17540B8D4692-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BE7014D21A43412CA94D17540B8D4692-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BE7014D21A43412CA94D17540B8D4692-->  <COLUMNNAME><![CDATA[Replacedorderline_id]]></COLUMNNAME>
+<!--BE7014D21A43412CA94D17540B8D4692-->  <NAME><![CDATA[Replaced Order Line]]></NAME>
+<!--BE7014D21A43412CA94D17540B8D4692-->  <PRINTNAME><![CDATA[Replaced Order Line]]></PRINTNAME>
+<!--BE7014D21A43412CA94D17540B8D4692-->  <DESCRIPTION><![CDATA[Link to the Order that has been replaced]]></DESCRIPTION>
+<!--BE7014D21A43412CA94D17540B8D4692-->  <HELP><![CDATA[Link to the Order that has been replaced]]></HELP>
+<!--BE7014D21A43412CA94D17540B8D4692-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--BE7014D21A43412CA94D17540B8D4692-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--BE7014D21A43412CA94D17540B8D4692--></AD_ELEMENT>
+
 <!--BEADA4ABFE544524B69FEC20E82F2D95--><AD_ELEMENT>
 <!--BEADA4ABFE544524B69FEC20E82F2D95-->  <AD_ELEMENT_ID><![CDATA[BEADA4ABFE544524B69FEC20E82F2D95]]></AD_ELEMENT_ID>
 <!--BEADA4ABFE544524B69FEC20E82F2D95-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -33442,6 +33540,18 @@
 <!--DD118282B81E4345A62EAE0C0D6E42BF-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--DD118282B81E4345A62EAE0C0D6E42BF--></AD_ELEMENT>
 
+<!--DD19C74005B148DF821FCA2E83EFAE39--><AD_ELEMENT>
+<!--DD19C74005B148DF821FCA2E83EFAE39-->  <AD_ELEMENT_ID><![CDATA[DD19C74005B148DF821FCA2E83EFAE39]]></AD_ELEMENT_ID>
+<!--DD19C74005B148DF821FCA2E83EFAE39-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--DD19C74005B148DF821FCA2E83EFAE39-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--DD19C74005B148DF821FCA2E83EFAE39-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--DD19C74005B148DF821FCA2E83EFAE39-->  <COLUMNNAME><![CDATA[M_Transaction_Last_ID]]></COLUMNNAME>
+<!--DD19C74005B148DF821FCA2E83EFAE39-->  <NAME><![CDATA[M_Transaction_Last_ID]]></NAME>
+<!--DD19C74005B148DF821FCA2E83EFAE39-->  <PRINTNAME><![CDATA[M_Transaction_Last_ID]]></PRINTNAME>
+<!--DD19C74005B148DF821FCA2E83EFAE39-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--DD19C74005B148DF821FCA2E83EFAE39-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--DD19C74005B148DF821FCA2E83EFAE39--></AD_ELEMENT>
+
 <!--DD64C1EFFA364FE7E040007F01002A49--><AD_ELEMENT>
 <!--DD64C1EFFA364FE7E040007F01002A49-->  <AD_ELEMENT_ID><![CDATA[DD64C1EFFA364FE7E040007F01002A49]]></AD_ELEMENT_ID>
 <!--DD64C1EFFA364FE7E040007F01002A49-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -34035,6 +34145,20 @@
 <!--EB58AFE2D52942FEA4B7DA407282DC1D-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--EB58AFE2D52942FEA4B7DA407282DC1D--></AD_ELEMENT>
 
+<!--EB7F6DD0A85D48AD84ED48CF6D2C3776--><AD_ELEMENT>
+<!--EB7F6DD0A85D48AD84ED48CF6D2C3776-->  <AD_ELEMENT_ID><![CDATA[EB7F6DD0A85D48AD84ED48CF6D2C3776]]></AD_ELEMENT_ID>
+<!--EB7F6DD0A85D48AD84ED48CF6D2C3776-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--EB7F6DD0A85D48AD84ED48CF6D2C3776-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--EB7F6DD0A85D48AD84ED48CF6D2C3776-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--EB7F6DD0A85D48AD84ED48CF6D2C3776-->  <COLUMNNAME><![CDATA[Cancelledorder_id]]></COLUMNNAME>
+<!--EB7F6DD0A85D48AD84ED48CF6D2C3776-->  <NAME><![CDATA[Canceled Order]]></NAME>
+<!--EB7F6DD0A85D48AD84ED48CF6D2C3776-->  <PRINTNAME><![CDATA[Canceled Order]]></PRINTNAME>
+<!--EB7F6DD0A85D48AD84ED48CF6D2C3776-->  <DESCRIPTION><![CDATA[Link to the order that has been canceled]]></DESCRIPTION>
+<!--EB7F6DD0A85D48AD84ED48CF6D2C3776-->  <HELP><![CDATA[Link to the order that has been canceled]]></HELP>
+<!--EB7F6DD0A85D48AD84ED48CF6D2C3776-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--EB7F6DD0A85D48AD84ED48CF6D2C3776-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--EB7F6DD0A85D48AD84ED48CF6D2C3776--></AD_ELEMENT>
+
 <!--EBE913C1DDD84066A1D88C9903717DB9--><AD_ELEMENT>
 <!--EBE913C1DDD84066A1D88C9903717DB9-->  <AD_ELEMENT_ID><![CDATA[EBE913C1DDD84066A1D88C9903717DB9]]></AD_ELEMENT_ID>
 <!--EBE913C1DDD84066A1D88C9903717DB9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/src-db/database/sourcedata/AD_FIELD.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/sourcedata/AD_FIELD.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -5702,6 +5702,60 @@
 <!--364-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--364--></AD_FIELD>
 
+<!--365--><AD_FIELD>
+<!--365-->  <AD_FIELD_ID><![CDATA[365]]></AD_FIELD_ID>
+<!--365-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--365-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--365-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--365-->  <NAME><![CDATA[Client List]]></NAME>
+<!--365-->  <DESCRIPTION><![CDATA[Clients this Role can access]]></DESCRIPTION>
+<!--365-->  <HELP><![CDATA[Indicates the Clients (by client id) that this Role can access.  Multiple Clients are delimited by a comma ','.]]></HELP>
+<!--365-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--365-->  <AD_TAB_ID><![CDATA[119]]></AD_TAB_ID>
+<!--365-->  <AD_COLUMN_ID><![CDATA[535]]></AD_COLUMN_ID>
+<!--365-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--365-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--365-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
+<!--365-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--365-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--365-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--365-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--365-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--365-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--365-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--365-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--365-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--365-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--365-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--365--></AD_FIELD>
+
+<!--366--><AD_FIELD>
+<!--366-->  <AD_FIELD_ID><![CDATA[366]]></AD_FIELD_ID>
+<!--366-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--366-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--366-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--366-->  <NAME><![CDATA[Organization List]]></NAME>
+<!--366-->  <DESCRIPTION><![CDATA[List of Organizations this Role can access]]></DESCRIPTION>
+<!--366-->  <HELP><![CDATA[The Organization List indicates the Organizations (by organization id) that this Role can access.  Multiple Organizations are delimited by a comma ','.]]></HELP>
+<!--366-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--366-->  <AD_TAB_ID><![CDATA[119]]></AD_TAB_ID>
+<!--366-->  <AD_COLUMN_ID><![CDATA[536]]></AD_COLUMN_ID>
+<!--366-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--366-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--366-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
+<!--366-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--366-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--366-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--366-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--366-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--366-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--366-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--366-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--366-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--366-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--366-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--366--></AD_FIELD>
+
 <!--367--><AD_FIELD>
 <!--367-->  <AD_FIELD_ID><![CDATA[367]]></AD_FIELD_ID>
 <!--367-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -14358,7 +14412,7 @@
 <!--1083-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--1083-->  <AD_FIELDGROUP_ID><![CDATA[101]]></AD_FIELDGROUP_ID>
 <!--1083-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--1083-->  <DISPLAYLOGIC><![CDATA[@DocStatus@!'VO'&@DocStatus@!'CL']]></DISPLAYLOGIC>
+<!--1083-->  <DISPLAYLOGIC><![CDATA[@DocStatus@!'VO'&@DocStatus@!'CL'&@DocStatus@!'TMP']]></DISPLAYLOGIC>
 <!--1083-->  <DISPLAYLENGTH><![CDATA[23]]></DISPLAYLENGTH>
 <!--1083-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--1083-->  <SEQNO><![CDATA[336]]></SEQNO>
@@ -80841,6 +80895,34 @@
 <!--6734-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--6734--></AD_FIELD>
 
+<!--6735--><AD_FIELD>
+<!--6735-->  <AD_FIELD_ID><![CDATA[6735]]></AD_FIELD_ID>
+<!--6735-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6735-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6735-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6735-->  <NAME><![CDATA[Client List]]></NAME>
+<!--6735-->  <DESCRIPTION><![CDATA[Clients this Role can access]]></DESCRIPTION>
+<!--6735-->  <HELP><![CDATA[Indicates the Clients (by client id) that this Role can access.  Multiple Clients are delimited by a comma ','.]]></HELP>
+<!--6735-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--6735-->  <AD_TAB_ID><![CDATA[485]]></AD_TAB_ID>
+<!--6735-->  <AD_COLUMN_ID><![CDATA[535]]></AD_COLUMN_ID>
+<!--6735-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--6735-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--6735-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
+<!--6735-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--6735-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--6735-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--6735-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--6735-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--6735-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--6735-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--6735-->  <GRID_SEQNO><![CDATA[30]]></GRID_SEQNO>
+<!--6735-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--6735-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--6735-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--6735-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--6735--></AD_FIELD>
+
 <!--6736--><AD_FIELD>
 <!--6736-->  <AD_FIELD_ID><![CDATA[6736]]></AD_FIELD_ID>
 <!--6736-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -80927,6 +81009,34 @@
 <!--6738-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--6738--></AD_FIELD>
 
+<!--6739--><AD_FIELD>
+<!--6739-->  <AD_FIELD_ID><![CDATA[6739]]></AD_FIELD_ID>
+<!--6739-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6739-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6739-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6739-->  <NAME><![CDATA[Organization List]]></NAME>
+<!--6739-->  <DESCRIPTION><![CDATA[List of Organizations this Role can access]]></DESCRIPTION>
+<!--6739-->  <HELP><![CDATA[The Organization List indicates the Organizations (by organization id) that this Role can access.  Multiple Organizations are delimited by a comma ','.]]></HELP>
+<!--6739-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--6739-->  <AD_TAB_ID><![CDATA[485]]></AD_TAB_ID>
+<!--6739-->  <AD_COLUMN_ID><![CDATA[536]]></AD_COLUMN_ID>
+<!--6739-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--6739-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--6739-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
+<!--6739-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--6739-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--6739-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--6739-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--6739-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--6739-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--6739-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--6739-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
+<!--6739-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--6739-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--6739-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--6739-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--6739--></AD_FIELD>
+
 <!--6740--><AD_FIELD>
 <!--6740-->  <AD_FIELD_ID><![CDATA[6740]]></AD_FIELD_ID>
 <!--6740-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -179951,6 +180061,35 @@
 <!--059F7231F8A246A585FD4E2E503FC1ED-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--059F7231F8A246A585FD4E2E503FC1ED--></AD_FIELD>
 
+<!--05E7C043CEC5432EBAFF1F3FD71A05E9--><AD_FIELD>
+<!--05E7C043CEC5432EBAFF1F3FD71A05E9-->  <AD_FIELD_ID><![CDATA[05E7C043CEC5432EBAFF1F3FD71A05E9]]></AD_FIELD_ID>
+<!--05E7C043CEC5432EBAFF1F3FD71A05E9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--05E7C043CEC5432EBAFF1F3FD71A05E9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--05E7C043CEC5432EBAFF1F3FD71A05E9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--05E7C043CEC5432EBAFF1F3FD71A05E9-->  <NAME><![CDATA[Is Canceled]]></NAME>
+<!--05E7C043CEC5432EBAFF1F3FD71A05E9-->  <DESCRIPTION><![CDATA[The Sales Order has been canceled or cancelled and replaced.]]></DESCRIPTION>
+<!--05E7C043CEC5432EBAFF1F3FD71A05E9-->  <HELP><![CDATA[The Sales Order has been canceled and canceled and replaced. A new Cancellation Sales Order has been created in Closed Status and if it is replaced also a new Sales Order in Book Status has been created replacing the original one.]]></HELP>
+<!--05E7C043CEC5432EBAFF1F3FD71A05E9-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--05E7C043CEC5432EBAFF1F3FD71A05E9-->  <AD_TAB_ID><![CDATA[186]]></AD_TAB_ID>
+<!--05E7C043CEC5432EBAFF1F3FD71A05E9-->  <AD_COLUMN_ID><![CDATA[F54BEAEAA4C04BDD9DC1448954589ED0]]></AD_COLUMN_ID>
+<!--05E7C043CEC5432EBAFF1F3FD71A05E9-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--05E7C043CEC5432EBAFF1F3FD71A05E9-->  <AD_FIELDGROUP_ID><![CDATA[402880E72F1C15A5012F1C7AA98B00E8]]></AD_FIELDGROUP_ID>
+<!--05E7C043CEC5432EBAFF1F3FD71A05E9-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--05E7C043CEC5432EBAFF1F3FD71A05E9-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--05E7C043CEC5432EBAFF1F3FD71A05E9-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--05E7C043CEC5432EBAFF1F3FD71A05E9-->  <SEQNO><![CDATA[580]]></SEQNO>
+<!--05E7C043CEC5432EBAFF1F3FD71A05E9-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--05E7C043CEC5432EBAFF1F3FD71A05E9-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--05E7C043CEC5432EBAFF1F3FD71A05E9-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--05E7C043CEC5432EBAFF1F3FD71A05E9-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--05E7C043CEC5432EBAFF1F3FD71A05E9-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--05E7C043CEC5432EBAFF1F3FD71A05E9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--05E7C043CEC5432EBAFF1F3FD71A05E9-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--05E7C043CEC5432EBAFF1F3FD71A05E9-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--05E7C043CEC5432EBAFF1F3FD71A05E9-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--05E7C043CEC5432EBAFF1F3FD71A05E9-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--05E7C043CEC5432EBAFF1F3FD71A05E9--></AD_FIELD>
+
 <!--06005FA0890493DAE050007F01006246--><AD_FIELD>
 <!--06005FA0890493DAE050007F01006246-->  <AD_FIELD_ID><![CDATA[06005FA0890493DAE050007F01006246]]></AD_FIELD_ID>
 <!--06005FA0890493DAE050007F01006246-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -202097,6 +202236,36 @@
 <!--3C0B7FD069C24F40AB9CA1F21DB182F4-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--3C0B7FD069C24F40AB9CA1F21DB182F4--></AD_FIELD>
 
+<!--3C2B8257EC414EFBB6BA098C8400D28A--><AD_FIELD>
+<!--3C2B8257EC414EFBB6BA098C8400D28A-->  <AD_FIELD_ID><![CDATA[3C2B8257EC414EFBB6BA098C8400D28A]]></AD_FIELD_ID>
+<!--3C2B8257EC414EFBB6BA098C8400D28A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3C2B8257EC414EFBB6BA098C8400D28A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3C2B8257EC414EFBB6BA098C8400D28A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3C2B8257EC414EFBB6BA098C8400D28A-->  <NAME><![CDATA[Canceled Order]]></NAME>
+<!--3C2B8257EC414EFBB6BA098C8400D28A-->  <DESCRIPTION><![CDATA[Link to the order that has been canceled]]></DESCRIPTION>
+<!--3C2B8257EC414EFBB6BA098C8400D28A-->  <HELP><![CDATA[Link to the order that has been canceled]]></HELP>
+<!--3C2B8257EC414EFBB6BA098C8400D28A-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--3C2B8257EC414EFBB6BA098C8400D28A-->  <AD_TAB_ID><![CDATA[186]]></AD_TAB_ID>
+<!--3C2B8257EC414EFBB6BA098C8400D28A-->  <AD_COLUMN_ID><![CDATA[129F2530A63B4C7CA9AF17996732E6A4]]></AD_COLUMN_ID>
+<!--3C2B8257EC414EFBB6BA098C8400D28A-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--3C2B8257EC414EFBB6BA098C8400D28A-->  <AD_FIELDGROUP_ID><![CDATA[402880E72F1C15A5012F1C7AA98B00E8]]></AD_FIELDGROUP_ID>
+<!--3C2B8257EC414EFBB6BA098C8400D28A-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--3C2B8257EC414EFBB6BA098C8400D28A-->  <DISPLAYLOGIC><![CDATA[@Cancelledorder_id@!'']]></DISPLAYLOGIC>
+<!--3C2B8257EC414EFBB6BA098C8400D28A-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--3C2B8257EC414EFBB6BA098C8400D28A-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--3C2B8257EC414EFBB6BA098C8400D28A-->  <SEQNO><![CDATA[550]]></SEQNO>
+<!--3C2B8257EC414EFBB6BA098C8400D28A-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--3C2B8257EC414EFBB6BA098C8400D28A-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--3C2B8257EC414EFBB6BA098C8400D28A-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--3C2B8257EC414EFBB6BA098C8400D28A-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--3C2B8257EC414EFBB6BA098C8400D28A-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--3C2B8257EC414EFBB6BA098C8400D28A-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--3C2B8257EC414EFBB6BA098C8400D28A-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--3C2B8257EC414EFBB6BA098C8400D28A-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--3C2B8257EC414EFBB6BA098C8400D28A-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--3C2B8257EC414EFBB6BA098C8400D28A-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--3C2B8257EC414EFBB6BA098C8400D28A--></AD_FIELD>
+
 <!--3C42EE919FD647FEAD42BA89899FCB0F--><AD_FIELD>
 <!--3C42EE919FD647FEAD42BA89899FCB0F-->  <AD_FIELD_ID><![CDATA[3C42EE919FD647FEAD42BA89899FCB0F]]></AD_FIELD_ID>
 <!--3C42EE919FD647FEAD42BA89899FCB0F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -202323,6 +202492,35 @@
 <!--3C9B4A09C20D453FAFD2E8A768B71324-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--3C9B4A09C20D453FAFD2E8A768B71324--></AD_FIELD>
 
+<!--3C9B97CD980A4D809BDE5B9FDC3E0E73--><AD_FIELD>
+<!--3C9B97CD980A4D809BDE5B9FDC3E0E73-->  <AD_FIELD_ID><![CDATA[3C9B97CD980A4D809BDE5B9FDC3E0E73]]></AD_FIELD_ID>
+<!--3C9B97CD980A4D809BDE5B9FDC3E0E73-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3C9B97CD980A4D809BDE5B9FDC3E0E73-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3C9B97CD980A4D809BDE5B9FDC3E0E73-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3C9B97CD980A4D809BDE5B9FDC3E0E73-->  <NAME><![CDATA[Cancel and Replace]]></NAME>
+<!--3C9B97CD980A4D809BDE5B9FDC3E0E73-->  <DESCRIPTION><![CDATA[Button that creates a temporal duplicated order]]></DESCRIPTION>
+<!--3C9B97CD980A4D809BDE5B9FDC3E0E73-->  <HELP><![CDATA[Button that creates a temporal duplicated order]]></HELP>
+<!--3C9B97CD980A4D809BDE5B9FDC3E0E73-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--3C9B97CD980A4D809BDE5B9FDC3E0E73-->  <AD_TAB_ID><![CDATA[186]]></AD_TAB_ID>
+<!--3C9B97CD980A4D809BDE5B9FDC3E0E73-->  <AD_COLUMN_ID><![CDATA[9AEBE3623CCD4E6F820A2EB70F2F243D]]></AD_COLUMN_ID>
+<!--3C9B97CD980A4D809BDE5B9FDC3E0E73-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--3C9B97CD980A4D809BDE5B9FDC3E0E73-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--3C9B97CD980A4D809BDE5B9FDC3E0E73-->  <DISPLAYLOGIC><![CDATA[@DocStatus@='CO'&@Cancelledorder_id@=''&@Iscancelled@='N' & @OrderType@='SO' & @EnableCanceAndReplace@!'']]></DISPLAYLOGIC>
+<!--3C9B97CD980A4D809BDE5B9FDC3E0E73-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--3C9B97CD980A4D809BDE5B9FDC3E0E73-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--3C9B97CD980A4D809BDE5B9FDC3E0E73-->  <SEQNO><![CDATA[2140]]></SEQNO>
+<!--3C9B97CD980A4D809BDE5B9FDC3E0E73-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--3C9B97CD980A4D809BDE5B9FDC3E0E73-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--3C9B97CD980A4D809BDE5B9FDC3E0E73-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--3C9B97CD980A4D809BDE5B9FDC3E0E73-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--3C9B97CD980A4D809BDE5B9FDC3E0E73-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--3C9B97CD980A4D809BDE5B9FDC3E0E73-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--3C9B97CD980A4D809BDE5B9FDC3E0E73-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--3C9B97CD980A4D809BDE5B9FDC3E0E73-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--3C9B97CD980A4D809BDE5B9FDC3E0E73-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--3C9B97CD980A4D809BDE5B9FDC3E0E73-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--3C9B97CD980A4D809BDE5B9FDC3E0E73--></AD_FIELD>
+
 <!--3C9BD03FD58E4B32AD993C9712287066--><AD_FIELD>
 <!--3C9BD03FD58E4B32AD993C9712287066-->  <AD_FIELD_ID><![CDATA[3C9BD03FD58E4B32AD993C9712287066]]></AD_FIELD_ID>
 <!--3C9BD03FD58E4B32AD993C9712287066-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -232499,6 +232697,36 @@
 <!--70AEECD6D8A8479792ACAD28B2937C57-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--70AEECD6D8A8479792ACAD28B2937C57--></AD_FIELD>
 
+<!--70B30B77B3F347D6A4CCE368FF95426B--><AD_FIELD>
+<!--70B30B77B3F347D6A4CCE368FF95426B-->  <AD_FIELD_ID><![CDATA[70B30B77B3F347D6A4CCE368FF95426B]]></AD_FIELD_ID>
+<!--70B30B77B3F347D6A4CCE368FF95426B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--70B30B77B3F347D6A4CCE368FF95426B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--70B30B77B3F347D6A4CCE368FF95426B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--70B30B77B3F347D6A4CCE368FF95426B-->  <NAME><![CDATA[Replacement Order]]></NAME>
+<!--70B30B77B3F347D6A4CCE368FF95426B-->  <DESCRIPTION><![CDATA[Link to the replacement order. This order is the order that has replaced the current Cancelled order.]]></DESCRIPTION>
+<!--70B30B77B3F347D6A4CCE368FF95426B-->  <HELP><![CDATA[Link to the replacement order. This order is the order that has replaced the current Cancelled order.]]></HELP>
+<!--70B30B77B3F347D6A4CCE368FF95426B-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--70B30B77B3F347D6A4CCE368FF95426B-->  <AD_TAB_ID><![CDATA[186]]></AD_TAB_ID>
+<!--70B30B77B3F347D6A4CCE368FF95426B-->  <AD_COLUMN_ID><![CDATA[E61022D568524DD78F02815F50092DB8]]></AD_COLUMN_ID>
+<!--70B30B77B3F347D6A4CCE368FF95426B-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--70B30B77B3F347D6A4CCE368FF95426B-->  <AD_FIELDGROUP_ID><![CDATA[402880E72F1C15A5012F1C7AA98B00E8]]></AD_FIELDGROUP_ID>
+<!--70B30B77B3F347D6A4CCE368FF95426B-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--70B30B77B3F347D6A4CCE368FF95426B-->  <DISPLAYLOGIC><![CDATA[@Replacementorder_ID@!'']]></DISPLAYLOGIC>
+<!--70B30B77B3F347D6A4CCE368FF95426B-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--70B30B77B3F347D6A4CCE368FF95426B-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--70B30B77B3F347D6A4CCE368FF95426B-->  <SEQNO><![CDATA[570]]></SEQNO>
+<!--70B30B77B3F347D6A4CCE368FF95426B-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--70B30B77B3F347D6A4CCE368FF95426B-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--70B30B77B3F347D6A4CCE368FF95426B-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--70B30B77B3F347D6A4CCE368FF95426B-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--70B30B77B3F347D6A4CCE368FF95426B-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--70B30B77B3F347D6A4CCE368FF95426B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--70B30B77B3F347D6A4CCE368FF95426B-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--70B30B77B3F347D6A4CCE368FF95426B-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--70B30B77B3F347D6A4CCE368FF95426B-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--70B30B77B3F347D6A4CCE368FF95426B-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--70B30B77B3F347D6A4CCE368FF95426B--></AD_FIELD>
+
 <!--70BC8DA302454124BFE119D7641B50D8--><AD_FIELD>
 <!--70BC8DA302454124BFE119D7641B50D8-->  <AD_FIELD_ID><![CDATA[70BC8DA302454124BFE119D7641B50D8]]></AD_FIELD_ID>
 <!--70BC8DA302454124BFE119D7641B50D8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -237319,6 +237547,35 @@
 <!--7A95551B78214EC593A6ECE75023DE4A-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--7A95551B78214EC593A6ECE75023DE4A--></AD_FIELD>
 
+<!--7A9B164A52CA41D2A93F1043BA6A888F--><AD_FIELD>
+<!--7A9B164A52CA41D2A93F1043BA6A888F-->  <AD_FIELD_ID><![CDATA[7A9B164A52CA41D2A93F1043BA6A888F]]></AD_FIELD_ID>
+<!--7A9B164A52CA41D2A93F1043BA6A888F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7A9B164A52CA41D2A93F1043BA6A888F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7A9B164A52CA41D2A93F1043BA6A888F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7A9B164A52CA41D2A93F1043BA6A888F-->  <NAME><![CDATA[Default]]></NAME>
+<!--7A9B164A52CA41D2A93F1043BA6A888F-->  <DESCRIPTION><![CDATA[A value that is shown whenever a record is created.]]></DESCRIPTION>
+<!--7A9B164A52CA41D2A93F1043BA6A888F-->  <HELP><![CDATA[The Default Checkbox indicates if this record will be used as a default value.]]></HELP>
+<!--7A9B164A52CA41D2A93F1043BA6A888F-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--7A9B164A52CA41D2A93F1043BA6A888F-->  <AD_TAB_ID><![CDATA[1000500001]]></AD_TAB_ID>
+<!--7A9B164A52CA41D2A93F1043BA6A888F-->  <AD_COLUMN_ID><![CDATA[BD3122BF968E482B8B8747CF7126BC5A]]></AD_COLUMN_ID>
+<!--7A9B164A52CA41D2A93F1043BA6A888F-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--7A9B164A52CA41D2A93F1043BA6A888F-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--7A9B164A52CA41D2A93F1043BA6A888F-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--7A9B164A52CA41D2A93F1043BA6A888F-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--7A9B164A52CA41D2A93F1043BA6A888F-->  <SEQNO><![CDATA[90]]></SEQNO>
+<!--7A9B164A52CA41D2A93F1043BA6A888F-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--7A9B164A52CA41D2A93F1043BA6A888F-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--7A9B164A52CA41D2A93F1043BA6A888F-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7A9B164A52CA41D2A93F1043BA6A888F-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--7A9B164A52CA41D2A93F1043BA6A888F-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--7A9B164A52CA41D2A93F1043BA6A888F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7A9B164A52CA41D2A93F1043BA6A888F-->  <GRID_SEQNO><![CDATA[80]]></GRID_SEQNO>
+<!--7A9B164A52CA41D2A93F1043BA6A888F-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--7A9B164A52CA41D2A93F1043BA6A888F-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--7A9B164A52CA41D2A93F1043BA6A888F-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--7A9B164A52CA41D2A93F1043BA6A888F-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--7A9B164A52CA41D2A93F1043BA6A888F--></AD_FIELD>
+
 <!--7A9D145141994C22A571BF26D57F684A--><AD_FIELD>
 <!--7A9D145141994C22A571BF26D57F684A-->  <AD_FIELD_ID><![CDATA[7A9D145141994C22A571BF26D57F684A]]></AD_FIELD_ID>
 <!--7A9D145141994C22A571BF26D57F684A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -300492,6 +300749,35 @@
 <!--E021828CBBA74A29B77D98B771B9A81D-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--E021828CBBA74A29B77D98B771B9A81D--></AD_FIELD>
 
+<!--E03B2279B7F54EE1BDCDCD21D2AFF7F6--><AD_FIELD>
+<!--E03B2279B7F54EE1BDCDCD21D2AFF7F6-->  <AD_FIELD_ID><![CDATA[E03B2279B7F54EE1BDCDCD21D2AFF7F6]]></AD_FIELD_ID>
+<!--E03B2279B7F54EE1BDCDCD21D2AFF7F6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E03B2279B7F54EE1BDCDCD21D2AFF7F6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E03B2279B7F54EE1BDCDCD21D2AFF7F6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E03B2279B7F54EE1BDCDCD21D2AFF7F6-->  <NAME><![CDATA[Replaced Order Line]]></NAME>
+<!--E03B2279B7F54EE1BDCDCD21D2AFF7F6-->  <DESCRIPTION><![CDATA[Link to the Order that has been replaced]]></DESCRIPTION>
+<!--E03B2279B7F54EE1BDCDCD21D2AFF7F6-->  <HELP><![CDATA[Link to the Order that has been replaced]]></HELP>
+<!--E03B2279B7F54EE1BDCDCD21D2AFF7F6-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--E03B2279B7F54EE1BDCDCD21D2AFF7F6-->  <AD_TAB_ID><![CDATA[187]]></AD_TAB_ID>
+<!--E03B2279B7F54EE1BDCDCD21D2AFF7F6-->  <AD_COLUMN_ID><![CDATA[C724ECE5B05848489719C64111425FDB]]></AD_COLUMN_ID>
+<!--E03B2279B7F54EE1BDCDCD21D2AFF7F6-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--E03B2279B7F54EE1BDCDCD21D2AFF7F6-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--E03B2279B7F54EE1BDCDCD21D2AFF7F6-->  <DISPLAYLOGIC><![CDATA[@Replacedorderline_id@!'']]></DISPLAYLOGIC>
+<!--E03B2279B7F54EE1BDCDCD21D2AFF7F6-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--E03B2279B7F54EE1BDCDCD21D2AFF7F6-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--E03B2279B7F54EE1BDCDCD21D2AFF7F6-->  <SEQNO><![CDATA[111]]></SEQNO>
+<!--E03B2279B7F54EE1BDCDCD21D2AFF7F6-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--E03B2279B7F54EE1BDCDCD21D2AFF7F6-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--E03B2279B7F54EE1BDCDCD21D2AFF7F6-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--E03B2279B7F54EE1BDCDCD21D2AFF7F6-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--E03B2279B7F54EE1BDCDCD21D2AFF7F6-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--E03B2279B7F54EE1BDCDCD21D2AFF7F6-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--E03B2279B7F54EE1BDCDCD21D2AFF7F6-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--E03B2279B7F54EE1BDCDCD21D2AFF7F6-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--E03B2279B7F54EE1BDCDCD21D2AFF7F6-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--E03B2279B7F54EE1BDCDCD21D2AFF7F6-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--E03B2279B7F54EE1BDCDCD21D2AFF7F6--></AD_FIELD>
+
 <!--E04D2AFD798A471F86057AE158BF854F--><AD_FIELD>
 <!--E04D2AFD798A471F86057AE158BF854F-->  <AD_FIELD_ID><![CDATA[E04D2AFD798A471F86057AE158BF854F]]></AD_FIELD_ID>
 <!--E04D2AFD798A471F86057AE158BF854F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -303135,6 +303421,36 @@
 <!--E71F2C217A324DE397F8527BFB2513C3-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--E71F2C217A324DE397F8527BFB2513C3--></AD_FIELD>
 
+<!--E7336543F2EA4658A48B719F833D43B6--><AD_FIELD>
+<!--E7336543F2EA4658A48B719F833D43B6-->  <AD_FIELD_ID><![CDATA[E7336543F2EA4658A48B719F833D43B6]]></AD_FIELD_ID>
+<!--E7336543F2EA4658A48B719F833D43B6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E7336543F2EA4658A48B719F833D43B6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E7336543F2EA4658A48B719F833D43B6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E7336543F2EA4658A48B719F833D43B6-->  <NAME><![CDATA[Replaced Order]]></NAME>
+<!--E7336543F2EA4658A48B719F833D43B6-->  <DESCRIPTION><![CDATA[Link to the order that has been replaced]]></DESCRIPTION>
+<!--E7336543F2EA4658A48B719F833D43B6-->  <HELP><![CDATA[Link to the order that has been replaced]]></HELP>
+<!--E7336543F2EA4658A48B719F833D43B6-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--E7336543F2EA4658A48B719F833D43B6-->  <AD_TAB_ID><![CDATA[186]]></AD_TAB_ID>
+<!--E7336543F2EA4658A48B719F833D43B6-->  <AD_COLUMN_ID><![CDATA[CB3A64CFC2B8471E91DBBF12A663D0FB]]></AD_COLUMN_ID>
+<!--E7336543F2EA4658A48B719F833D43B6-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--E7336543F2EA4658A48B719F833D43B6-->  <AD_FIELDGROUP_ID><![CDATA[402880E72F1C15A5012F1C7AA98B00E8]]></AD_FIELDGROUP_ID>
+<!--E7336543F2EA4658A48B719F833D43B6-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--E7336543F2EA4658A48B719F833D43B6-->  <DISPLAYLOGIC><![CDATA[@Replacedorder_id@!'']]></DISPLAYLOGIC>
+<!--E7336543F2EA4658A48B719F833D43B6-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--E7336543F2EA4658A48B719F833D43B6-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--E7336543F2EA4658A48B719F833D43B6-->  <SEQNO><![CDATA[560]]></SEQNO>
+<!--E7336543F2EA4658A48B719F833D43B6-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--E7336543F2EA4658A48B719F833D43B6-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--E7336543F2EA4658A48B719F833D43B6-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--E7336543F2EA4658A48B719F833D43B6-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--E7336543F2EA4658A48B719F833D43B6-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--E7336543F2EA4658A48B719F833D43B6-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--E7336543F2EA4658A48B719F833D43B6-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--E7336543F2EA4658A48B719F833D43B6-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--E7336543F2EA4658A48B719F833D43B6-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--E7336543F2EA4658A48B719F833D43B6-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--E7336543F2EA4658A48B719F833D43B6--></AD_FIELD>
+
 <!--E73474C229524EFEA43AB9F6462E49A8--><AD_FIELD>
 <!--E73474C229524EFEA43AB9F6462E49A8-->  <AD_FIELD_ID><![CDATA[E73474C229524EFEA43AB9F6462E49A8]]></AD_FIELD_ID>
 <!--E73474C229524EFEA43AB9F6462E49A8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -306808,6 +307124,35 @@
 <!--F0A3A82183604553A1DB29504DBA1F45-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--F0A3A82183604553A1DB29504DBA1F45--></AD_FIELD>
 
+<!--F0BF2E4561024D30B93AC7B471DBF5D7--><AD_FIELD>
+<!--F0BF2E4561024D30B93AC7B471DBF5D7-->  <AD_FIELD_ID><![CDATA[F0BF2E4561024D30B93AC7B471DBF5D7]]></AD_FIELD_ID>
+<!--F0BF2E4561024D30B93AC7B471DBF5D7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F0BF2E4561024D30B93AC7B471DBF5D7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F0BF2E4561024D30B93AC7B471DBF5D7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F0BF2E4561024D30B93AC7B471DBF5D7-->  <NAME><![CDATA[Confirm Cancel and Replace]]></NAME>
+<!--F0BF2E4561024D30B93AC7B471DBF5D7-->  <DESCRIPTION><![CDATA[Button that confirms the temporal Order by closing it and creates a canceled order]]></DESCRIPTION>
+<!--F0BF2E4561024D30B93AC7B471DBF5D7-->  <HELP><![CDATA[Button that confirms the temporal Order by closing it and creates a canceled order]]></HELP>
+<!--F0BF2E4561024D30B93AC7B471DBF5D7-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--F0BF2E4561024D30B93AC7B471DBF5D7-->  <AD_TAB_ID><![CDATA[186]]></AD_TAB_ID>
+<!--F0BF2E4561024D30B93AC7B471DBF5D7-->  <AD_COLUMN_ID><![CDATA[51E299D6B5824EC480B524E1ED726985]]></AD_COLUMN_ID>
+<!--F0BF2E4561024D30B93AC7B471DBF5D7-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--F0BF2E4561024D30B93AC7B471DBF5D7-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--F0BF2E4561024D30B93AC7B471DBF5D7-->  <DISPLAYLOGIC><![CDATA[@DocStatus@='TMP' & @OrderType@='SO' & @EnableCanceAndReplace@!'']]></DISPLAYLOGIC>
+<!--F0BF2E4561024D30B93AC7B471DBF5D7-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--F0BF2E4561024D30B93AC7B471DBF5D7-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--F0BF2E4561024D30B93AC7B471DBF5D7-->  <SEQNO><![CDATA[2160]]></SEQNO>
+<!--F0BF2E4561024D30B93AC7B471DBF5D7-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--F0BF2E4561024D30B93AC7B471DBF5D7-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--F0BF2E4561024D30B93AC7B471DBF5D7-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--F0BF2E4561024D30B93AC7B471DBF5D7-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--F0BF2E4561024D30B93AC7B471DBF5D7-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--F0BF2E4561024D30B93AC7B471DBF5D7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--F0BF2E4561024D30B93AC7B471DBF5D7-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--F0BF2E4561024D30B93AC7B471DBF5D7-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--F0BF2E4561024D30B93AC7B471DBF5D7-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--F0BF2E4561024D30B93AC7B471DBF5D7-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--F0BF2E4561024D30B93AC7B471DBF5D7--></AD_FIELD>
+
 <!--F0D198AB8059467299309D4DA1506A8E--><AD_FIELD>
 <!--F0D198AB8059467299309D4DA1506A8E-->  <AD_FIELD_ID><![CDATA[F0D198AB8059467299309D4DA1506A8E]]></AD_FIELD_ID>
 <!--F0D198AB8059467299309D4DA1506A8E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/src-db/database/sourcedata/AD_MESSAGE.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/sourcedata/AD_MESSAGE.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -18307,6 +18307,18 @@
 <!--338EF3E59A594EFC807843510BDEAF46-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--338EF3E59A594EFC807843510BDEAF46--></AD_MESSAGE>
 
+<!--33D53B7E00874B2E8DF895D25394C213--><AD_MESSAGE>
+<!--33D53B7E00874B2E8DF895D25394C213-->  <AD_MESSAGE_ID><![CDATA[33D53B7E00874B2E8DF895D25394C213]]></AD_MESSAGE_ID>
+<!--33D53B7E00874B2E8DF895D25394C213-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--33D53B7E00874B2E8DF895D25394C213-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--33D53B7E00874B2E8DF895D25394C213-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--33D53B7E00874B2E8DF895D25394C213-->  <VALUE><![CDATA[OrderCreatedInTemporalStatus]]></VALUE>
+<!--33D53B7E00874B2E8DF895D25394C213-->  <MSGTEXT><![CDATA[New replacing order created in Temporal status:]]></MSGTEXT>
+<!--33D53B7E00874B2E8DF895D25394C213-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--33D53B7E00874B2E8DF895D25394C213-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--33D53B7E00874B2E8DF895D25394C213-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--33D53B7E00874B2E8DF895D25394C213--></AD_MESSAGE>
+
 <!--33ED747B6F0B4F27B0000B5F1818F8BB--><AD_MESSAGE>
 <!--33ED747B6F0B4F27B0000B5F1818F8BB-->  <AD_MESSAGE_ID><![CDATA[33ED747B6F0B4F27B0000B5F1818F8BB]]></AD_MESSAGE_ID>
 <!--33ED747B6F0B4F27B0000B5F1818F8BB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -19213,6 +19225,18 @@
 <!--459ADF41A2F748B2AFC916760C046C28-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--459ADF41A2F748B2AFC916760C046C28--></AD_MESSAGE>
 
+<!--45B3380FBF8A4F81AB0F9729FF599292--><AD_MESSAGE>
+<!--45B3380FBF8A4F81AB0F9729FF599292-->  <AD_MESSAGE_ID><![CDATA[45B3380FBF8A4F81AB0F9729FF599292]]></AD_MESSAGE_ID>
+<!--45B3380FBF8A4F81AB0F9729FF599292-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--45B3380FBF8A4F81AB0F9729FF599292-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--45B3380FBF8A4F81AB0F9729FF599292-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--45B3380FBF8A4F81AB0F9729FF599292-->  <VALUE><![CDATA[CannotDeleteInvoiceTax]]></VALUE>
+<!--45B3380FBF8A4F81AB0F9729FF599292-->  <MSGTEXT><![CDATA[It is not possible to delete an invoice tax record with recalculate flag checked.]]></MSGTEXT>
+<!--45B3380FBF8A4F81AB0F9729FF599292-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--45B3380FBF8A4F81AB0F9729FF599292-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--45B3380FBF8A4F81AB0F9729FF599292-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--45B3380FBF8A4F81AB0F9729FF599292--></AD_MESSAGE>
+
 <!--45FB8C27317D441CAFD96F2EE0005EA1--><AD_MESSAGE>
 <!--45FB8C27317D441CAFD96F2EE0005EA1-->  <AD_MESSAGE_ID><![CDATA[45FB8C27317D441CAFD96F2EE0005EA1]]></AD_MESSAGE_ID>
 <!--45FB8C27317D441CAFD96F2EE0005EA1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -19327,8 +19351,7 @@
 <!--47D88149F6D2473D892D25F4A86CA161-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--47D88149F6D2473D892D25F4A86CA161-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--47D88149F6D2473D892D25F4A86CA161-->  <VALUE><![CDATA[finnac_paymet_inact]]></VALUE>
-<!--47D88149F6D2473D892D25F4A86CA161-->  <MSGTEXT><![CDATA[The default financial account %s and the default payment method %s are inactive. Please, consider to activate them before continuing.
-]]></MSGTEXT>
+<!--47D88149F6D2473D892D25F4A86CA161-->  <MSGTEXT><![CDATA[The default financial account %s and the default payment method %s are inactive. Please, consider to activate them before continuing.]]></MSGTEXT>
 <!--47D88149F6D2473D892D25F4A86CA161-->  <MSGTYPE><![CDATA[W]]></MSGTYPE>
 <!--47D88149F6D2473D892D25F4A86CA161-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--47D88149F6D2473D892D25F4A86CA161-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
@@ -20686,6 +20709,18 @@
 <!--657E957FEC7243E7AD58A2A009292C26-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--657E957FEC7243E7AD58A2A009292C26--></AD_MESSAGE>
 
+<!--659D3B84D0AF4B2396F02889BF7F9914--><AD_MESSAGE>
+<!--659D3B84D0AF4B2396F02889BF7F9914-->  <AD_MESSAGE_ID><![CDATA[659D3B84D0AF4B2396F02889BF7F9914]]></AD_MESSAGE_ID>
+<!--659D3B84D0AF4B2396F02889BF7F9914-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--659D3B84D0AF4B2396F02889BF7F9914-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--659D3B84D0AF4B2396F02889BF7F9914-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--659D3B84D0AF4B2396F02889BF7F9914-->  <VALUE><![CDATA[CannotDeleteReplacementOrder]]></VALUE>
+<!--659D3B84D0AF4B2396F02889BF7F9914-->  <MSGTEXT><![CDATA[The sales order cannot be deleted because it has a related cancelled sales order]]></MSGTEXT>
+<!--659D3B84D0AF4B2396F02889BF7F9914-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--659D3B84D0AF4B2396F02889BF7F9914-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--659D3B84D0AF4B2396F02889BF7F9914-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--659D3B84D0AF4B2396F02889BF7F9914--></AD_MESSAGE>
+
 <!--65C05BD368ED471CB1E6AE97DD911EDF--><AD_MESSAGE>
 <!--65C05BD368ED471CB1E6AE97DD911EDF-->  <AD_MESSAGE_ID><![CDATA[65C05BD368ED471CB1E6AE97DD911EDF]]></AD_MESSAGE_ID>
 <!--65C05BD368ED471CB1E6AE97DD911EDF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -21721,6 +21756,18 @@
 <!--7D6C9B658A8E4AA0A60888270591F02E-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--7D6C9B658A8E4AA0A60888270591F02E--></AD_MESSAGE>
 
+<!--7D94044078BF4910AEE38AA1A88FE8C2--><AD_MESSAGE>
+<!--7D94044078BF4910AEE38AA1A88FE8C2-->  <AD_MESSAGE_ID><![CDATA[7D94044078BF4910AEE38AA1A88FE8C2]]></AD_MESSAGE_ID>
+<!--7D94044078BF4910AEE38AA1A88FE8C2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7D94044078BF4910AEE38AA1A88FE8C2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7D94044078BF4910AEE38AA1A88FE8C2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7D94044078BF4910AEE38AA1A88FE8C2-->  <VALUE><![CDATA[CannotOrderLessThanDeliveredInCancelReplace]]></VALUE>
+<!--7D94044078BF4910AEE38AA1A88FE8C2-->  <MSGTEXT><![CDATA[Cannot order less quantity than delivered in the original line being replaced.]]></MSGTEXT>
+<!--7D94044078BF4910AEE38AA1A88FE8C2-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--7D94044078BF4910AEE38AA1A88FE8C2-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7D94044078BF4910AEE38AA1A88FE8C2-->  <ISINCLUDEINI18N><![CDATA[Y]]></ISINCLUDEINI18N>
+<!--7D94044078BF4910AEE38AA1A88FE8C2--></AD_MESSAGE>
+
 <!--7DB1074FDA3549A1A211A0A0E16B79A7--><AD_MESSAGE>
 <!--7DB1074FDA3549A1A211A0A0E16B79A7-->  <AD_MESSAGE_ID><![CDATA[7DB1074FDA3549A1A211A0A0E16B79A7]]></AD_MESSAGE_ID>
 <!--7DB1074FDA3549A1A211A0A0E16B79A7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -23420,6 +23467,18 @@
 <!--A1FA3C21D5C84961BC6C35318605EEDF-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--A1FA3C21D5C84961BC6C35318605EEDF--></AD_MESSAGE>
 
+<!--A20CC623669B4EABA8B20E940ABD33DB--><AD_MESSAGE>
+<!--A20CC623669B4EABA8B20E940ABD33DB-->  <AD_MESSAGE_ID><![CDATA[A20CC623669B4EABA8B20E940ABD33DB]]></AD_MESSAGE_ID>
+<!--A20CC623669B4EABA8B20E940ABD33DB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A20CC623669B4EABA8B20E940ABD33DB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A20CC623669B4EABA8B20E940ABD33DB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A20CC623669B4EABA8B20E940ABD33DB-->  <VALUE><![CDATA[CannotDeleteReplacementOrderLine]]></VALUE>
+<!--A20CC623669B4EABA8B20E940ABD33DB-->  <MSGTEXT><![CDATA[The order line cannot be deleted because it has a related cancelled sales order line]]></MSGTEXT>
+<!--A20CC623669B4EABA8B20E940ABD33DB-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--A20CC623669B4EABA8B20E940ABD33DB-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--A20CC623669B4EABA8B20E940ABD33DB-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--A20CC623669B4EABA8B20E940ABD33DB--></AD_MESSAGE>
+
 <!--A2647B75CEFA4460BD7D486262772191--><AD_MESSAGE>
 <!--A2647B75CEFA4460BD7D486262772191-->  <AD_MESSAGE_ID><![CDATA[A2647B75CEFA4460BD7D486262772191]]></AD_MESSAGE_ID>
 <!--A2647B75CEFA4460BD7D486262772191-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -24076,12 +24135,8 @@
 <!--B080C88FF56E4F8594967A6164977D5F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--B080C88FF56E4F8594967A6164977D5F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--B080C88FF56E4F8594967A6164977D5F-->  <VALUE><![CDATA[BPCurrencyChange]]></VALUE>
-<!--B080C88FF56E4F8594967A6164977D5F-->  <MSGTEXT><![CDATA[Detected available credit for this business partner. <br/>
-Changing the Business Partner's currency will not allow you to use available credit in the old currency.
-
-If you want to convert the available credit in the old currency into credit in the new currency automatically, select a G/L Item. 
-<br/>
-Otherwise you will have to do it manually following this document: <a href='http://wiki.openbravo.com/wiki/How_to_convert_credit_to_a_different_currency' target='_blank'>How to convert credit to a different currency</a>]]></MSGTEXT>
+<!--B080C88FF56E4F8594967A6164977D5F-->  <MSGTEXT><![CDATA[Detected available credit for this business partner.<br/>
+Changing the Business Partner's currency will not allow you to use available credit in the old currency. If you want to convert the available credit in the old currency into credit in the new currency automatically, select a G/L Item.]]></MSGTEXT>
 <!--B080C88FF56E4F8594967A6164977D5F-->  <MSGTYPE><![CDATA[W]]></MSGTYPE>
 <!--B080C88FF56E4F8594967A6164977D5F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--B080C88FF56E4F8594967A6164977D5F-->  <ISINCLUDEINI18N><![CDATA[Y]]></ISINCLUDEINI18N>
@@ -24785,6 +24840,18 @@
 <!--BE7801C0E5D24D9EA7F6CBD6A3EC9E2A-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--BE7801C0E5D24D9EA7F6CBD6A3EC9E2A--></AD_MESSAGE>
 
+<!--BEB1CE5CCAC64AC5B43E2F71E0B680B1--><AD_MESSAGE>
+<!--BEB1CE5CCAC64AC5B43E2F71E0B680B1-->  <AD_MESSAGE_ID><![CDATA[BEB1CE5CCAC64AC5B43E2F71E0B680B1]]></AD_MESSAGE_ID>
+<!--BEB1CE5CCAC64AC5B43E2F71E0B680B1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BEB1CE5CCAC64AC5B43E2F71E0B680B1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BEB1CE5CCAC64AC5B43E2F71E0B680B1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BEB1CE5CCAC64AC5B43E2F71E0B680B1-->  <VALUE><![CDATA[CancelAndReplaceNotAllowedForWRWP]]></VALUE>
+<!--BEB1CE5CCAC64AC5B43E2F71E0B680B1-->  <MSGTEXT><![CDATA[It is not possible to Cancel and Replace a Sales Order of Transaction Document Type 'POS Order' or 'Warehouse Order']]></MSGTEXT>
+<!--BEB1CE5CCAC64AC5B43E2F71E0B680B1-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--BEB1CE5CCAC64AC5B43E2F71E0B680B1-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--BEB1CE5CCAC64AC5B43E2F71E0B680B1-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--BEB1CE5CCAC64AC5B43E2F71E0B680B1--></AD_MESSAGE>
+
 <!--BEE3D8398A804644A3298F2D7F1E23F1--><AD_MESSAGE>
 <!--BEE3D8398A804644A3298F2D7F1E23F1-->  <AD_MESSAGE_ID><![CDATA[BEE3D8398A804644A3298F2D7F1E23F1]]></AD_MESSAGE_ID>
 <!--BEE3D8398A804644A3298F2D7F1E23F1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -25013,6 +25080,18 @@
 <!--C3A6BC984AF7478A85D63CE69E113200-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--C3A6BC984AF7478A85D63CE69E113200--></AD_MESSAGE>
 
+<!--C436ED120BFF4B7EB4867052C540BD72--><AD_MESSAGE>
+<!--C436ED120BFF4B7EB4867052C540BD72-->  <AD_MESSAGE_ID><![CDATA[C436ED120BFF4B7EB4867052C540BD72]]></AD_MESSAGE_ID>
+<!--C436ED120BFF4B7EB4867052C540BD72-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C436ED120BFF4B7EB4867052C540BD72-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C436ED120BFF4B7EB4867052C540BD72-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C436ED120BFF4B7EB4867052C540BD72-->  <VALUE><![CDATA[FundsTransfer]]></VALUE>
+<!--C436ED120BFF4B7EB4867052C540BD72-->  <MSGTEXT><![CDATA[Funds Transfer Transaction]]></MSGTEXT>
+<!--C436ED120BFF4B7EB4867052C540BD72-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--C436ED120BFF4B7EB4867052C540BD72-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--C436ED120BFF4B7EB4867052C540BD72-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--C436ED120BFF4B7EB4867052C540BD72--></AD_MESSAGE>
+
 <!--C497496113704DA884B7D6B8C06E4CFE--><AD_MESSAGE>
 <!--C497496113704DA884B7D6B8C06E4CFE-->  <AD_MESSAGE_ID><![CDATA[C497496113704DA884B7D6B8C06E4CFE]]></AD_MESSAGE_ID>
 <!--C497496113704DA884B7D6B8C06E4CFE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -25905,6 +25984,18 @@
 <!--D65C94634D5F43689B97009352C44322-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--D65C94634D5F43689B97009352C44322--></AD_MESSAGE>
 
+<!--D65DD460608A487DB560B9EE0670CE31--><AD_MESSAGE>
+<!--D65DD460608A487DB560B9EE0670CE31-->  <AD_MESSAGE_ID><![CDATA[D65DD460608A487DB560B9EE0670CE31]]></AD_MESSAGE_ID>
+<!--D65DD460608A487DB560B9EE0670CE31-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D65DD460608A487DB560B9EE0670CE31-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D65DD460608A487DB560B9EE0670CE31-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D65DD460608A487DB560B9EE0670CE31-->  <VALUE><![CDATA[OrderInTemporalStatus]]></VALUE>
+<!--D65DD460608A487DB560B9EE0670CE31-->  <MSGTEXT><![CDATA[Order in Temporal Status]]></MSGTEXT>
+<!--D65DD460608A487DB560B9EE0670CE31-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--D65DD460608A487DB560B9EE0670CE31-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D65DD460608A487DB560B9EE0670CE31-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--D65DD460608A487DB560B9EE0670CE31--></AD_MESSAGE>
+
 <!--D668C08F61EE4DCBA55E383321D3676E--><AD_MESSAGE>
 <!--D668C08F61EE4DCBA55E383321D3676E-->  <AD_MESSAGE_ID><![CDATA[D668C08F61EE4DCBA55E383321D3676E]]></AD_MESSAGE_ID>
 <!--D668C08F61EE4DCBA55E383321D3676E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -26073,6 +26164,18 @@
 <!--D84A9308B4674840AB3D78817A6A884D-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--D84A9308B4674840AB3D78817A6A884D--></AD_MESSAGE>
 
+<!--D8572076F54540029247226D6B4D115C--><AD_MESSAGE>
+<!--D8572076F54540029247226D6B4D115C-->  <AD_MESSAGE_ID><![CDATA[D8572076F54540029247226D6B4D115C]]></AD_MESSAGE_ID>
+<!--D8572076F54540029247226D6B4D115C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D8572076F54540029247226D6B4D115C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D8572076F54540029247226D6B4D115C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D8572076F54540029247226D6B4D115C-->  <VALUE><![CDATA[IsCancelled]]></VALUE>
+<!--D8572076F54540029247226D6B4D115C-->  <MSGTEXT><![CDATA[Order %s has been already Canceled]]></MSGTEXT>
+<!--D8572076F54540029247226D6B4D115C-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--D8572076F54540029247226D6B4D115C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D8572076F54540029247226D6B4D115C-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--D8572076F54540029247226D6B4D115C--></AD_MESSAGE>
+
 <!--D9912E810888475ABB8DFF416196FB5E--><AD_MESSAGE>
 <!--D9912E810888475ABB8DFF416196FB5E-->  <AD_MESSAGE_ID><![CDATA[D9912E810888475ABB8DFF416196FB5E]]></AD_MESSAGE_ID>
 <!--D9912E810888475ABB8DFF416196FB5E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -26328,6 +26431,18 @@
 <!--DFC014DED7A24F549320160632DD1FE5-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--DFC014DED7A24F549320160632DD1FE5--></AD_MESSAGE>
 
+<!--DFF92602B529410EA3A94C37AA920458--><AD_MESSAGE>
+<!--DFF92602B529410EA3A94C37AA920458-->  <AD_MESSAGE_ID><![CDATA[DFF92602B529410EA3A94C37AA920458]]></AD_MESSAGE_ID>
+<!--DFF92602B529410EA3A94C37AA920458-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--DFF92602B529410EA3A94C37AA920458-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--DFF92602B529410EA3A94C37AA920458-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--DFF92602B529410EA3A94C37AA920458-->  <VALUE><![CDATA[NoDocTypeDefinedForPaymentIn]]></VALUE>
+<!--DFF92602B529410EA3A94C37AA920458-->  <MSGTEXT><![CDATA[No document type found for Payment In]]></MSGTEXT>
+<!--DFF92602B529410EA3A94C37AA920458-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--DFF92602B529410EA3A94C37AA920458-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--DFF92602B529410EA3A94C37AA920458-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--DFF92602B529410EA3A94C37AA920458--></AD_MESSAGE>
+
 <!--E0711757A1314E6C95581C889FD3E3A3--><AD_MESSAGE>
 <!--E0711757A1314E6C95581C889FD3E3A3-->  <AD_MESSAGE_ID><![CDATA[E0711757A1314E6C95581C889FD3E3A3]]></AD_MESSAGE_ID>
 <!--E0711757A1314E6C95581C889FD3E3A3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/src-db/database/sourcedata/AD_MODEL_OBJECT.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/sourcedata/AD_MODEL_OBJECT.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -3552,6 +3552,18 @@
 <!--4DA7FE3E877447F0AD9342E627ADB8D5-->  <SEQNO><![CDATA[10]]></SEQNO>
 <!--4DA7FE3E877447F0AD9342E627ADB8D5--></AD_MODEL_OBJECT>
 
+<!--5022C4DEE7714F658D9A26BC719D6A21--><AD_MODEL_OBJECT>
+<!--5022C4DEE7714F658D9A26BC719D6A21-->  <AD_MODEL_OBJECT_ID><![CDATA[5022C4DEE7714F658D9A26BC719D6A21]]></AD_MODEL_OBJECT_ID>
+<!--5022C4DEE7714F658D9A26BC719D6A21-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5022C4DEE7714F658D9A26BC719D6A21-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5022C4DEE7714F658D9A26BC719D6A21-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5022C4DEE7714F658D9A26BC719D6A21-->  <ACTION><![CDATA[P]]></ACTION>
+<!--5022C4DEE7714F658D9A26BC719D6A21-->  <CLASSNAME><![CDATA[org.openbravo.model.materialmgmt.cost.CostAdjustment]]></CLASSNAME>
+<!--5022C4DEE7714F658D9A26BC719D6A21-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
+<!--5022C4DEE7714F658D9A26BC719D6A21-->  <AD_REFERENCE_ID><![CDATA[DA2E8CEC6A584B7A8052AE1F19551138]]></AD_REFERENCE_ID>
+<!--5022C4DEE7714F658D9A26BC719D6A21-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--5022C4DEE7714F658D9A26BC719D6A21--></AD_MODEL_OBJECT>
+
 <!--54CE0E8B21C145A1A11B97D0420996F3--><AD_MODEL_OBJECT>
 <!--54CE0E8B21C145A1A11B97D0420996F3-->  <AD_MODEL_OBJECT_ID><![CDATA[54CE0E8B21C145A1A11B97D0420996F3]]></AD_MODEL_OBJECT_ID>
 <!--54CE0E8B21C145A1A11B97D0420996F3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/src-db/database/sourcedata/AD_MODULE.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -6,7 +6,7 @@
 <!--0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0-->  <NAME><![CDATA[Core]]></NAME>
-<!--0-->  <VERSION><![CDATA[3.0.29727]]></VERSION>
+<!--0-->  <VERSION><![CDATA[3.0.30440]]></VERSION>
 <!--0-->  <DESCRIPTION><![CDATA[Core module is the base one]]></DESCRIPTION>
 <!--0-->  <HELP><![CDATA[Core module is the base one, all developments in core are included as part of the standard Openbravo ERP.]]></HELP>
 <!--0-->  <URL><![CDATA[www.openbravo.com]]></URL>
@@ -22,7 +22,7 @@
 <!--0-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--0-->  <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
 <!--0-->  <REFERENCEDATAINFO><![CDATA[Standard document types for orders, invoices, etc. and settings]]></REFERENCEDATAINFO>
-<!--0-->  <VERSION_LABEL><![CDATA[PR16Q3]]></VERSION_LABEL>
+<!--0-->  <VERSION_LABEL><![CDATA[PR16Q4]]></VERSION_LABEL>
 <!--0-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--0-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--0--></AD_MODULE>
--- a/model/src-db/database/sourcedata/AD_REF_LIST.xml	Wed Dec 07 13:46:11 2016 +0100
+++ b/model/src-db/database/sourcedata/AD_REF_LIST.xml	Fri Dec 16 06:35:23 2016 +0000
@@ -8254,6 +8254,17 @@
 <!--10816E85CF604A58AD15E89D91DDD485-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--10816E85CF604A58AD15E89D91DDD485--></AD_REF_LIST>
 
+<!--11A6B4A9858245F1962D6C2A741B657F--><AD_REF_LIST>
+<!--11A6B4A9858245F1962D6C2A741B657F-->  <AD_REF_LIST_ID><![CDATA[11A6B4A9858245F1962D6C2A741B657F]]></AD_REF_LIST_ID>
+<!--11A6B4A9858245F1962D6C2A741B657F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--11A6B4A9858245F1962D6C2A741B657F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--11A6B4A9858245F1962D6C2A741B657F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--11A6B4A9858245F1962D6C2A741B657F-->  <VALUE><![CDATA[AD]]></VALUE>
+<!--11A6B4A9858245F1962D6C2A741B657F-->  <NAME><![CDATA[Post: No Accounting Date]]></NAME>
+<!--11A6B4A9858245F1962D6C2A741B657F-->  <AD_REFERENCE_ID><![CDATA[234]]></AD_REFERENCE_ID>
+<!--11A6B4A9858245F1962D6C2A741B657F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--11A6B4A9858245F1962D6C2A741B657F--></AD_REF_LIST>
+
 <!--1207D66D24724452A2B396B3E25AED42--><AD_REF_LIST>
 <!--1207D66D24724452A2B396B3E25AED42-->  <AD_REF_LIST_ID><![CDATA[1207D66D24724452A2B396B3E25AED42]]></AD_REF_LIST_ID>
 <!--1207D66D24724452A2B396B3E25AED42-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -9202,6 +9213,18 @@
 <!--474F41E63A2B4EE6B1321CCB24C14929-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--474F41E63A2B4EE6B1321CCB24C14929--></AD_REF_LIST>
 
+<!--478C8DC8C5644D3A822FD49063F5E316--><AD_REF_LIST>
+<!--478C8DC8C5644D3A822FD49063F5E316-->  <AD_REF_LIST_ID><![CDATA[478C8DC8C5644D3A822FD49063F5E316]]></AD_REF_LIST_ID>
+<!--478C8DC8C5644D3A822FD49063F5E316-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--478C8DC8C5644D3A822FD49063F5E316-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--478C8DC8C5644D3A822FD49063F5E316-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--478C8DC8C5644D3A822FD49063F5E316-->  <VALUE><![CDATA[CancelAndReplaceAssociateShipmentToNewTicket]]></VALUE>
+<!--478C8DC8C5644D3A822FD49063F5E316-->  <NAME><![CDATA[Cancel and Replace - Associate shipment lines to new order]]></NAME>
+<!--478C8DC8C5644D3A822FD49063F5E316-->  <DESCRIPTION><![CDATA[Cancelled Sales Order Shipment lines are associated to new Sales Order]]></DESCRIPTION>
+<!--478C8DC8C5644D3A822FD49063F5E316-->  <AD_REFERENCE_ID><![CDATA[A26BA480E2014707B47257024C3CBFF7]]></AD_REFERENCE_ID>
+<!--478C8DC8C5644D3A822FD49063F5E316-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--478C8DC8C5644D3A822FD49063F5E316--></AD_REF_LIST>
+
 <!--47C166E5CA224A808DB986AF06BF8427--><AD_REF_LIST>
 <!--47C166E5CA224A808DB986AF06BF8427-->  <AD_REF_LIST_ID><![CDATA[47C166E5CA224A808DB986AF06BF8427]]></AD_REF_LIST_ID>
 <!--47C166E5CA224A808DB986AF06BF8427-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -9352,6 +9375,17 @@
 <!--4D222A0D339647DFBC9CE6067B1F225E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4D222A0D339647DFBC9CE6067B1F225E--></AD_REF_LIST>
 
+<!--4D44134C67A2484E995D28BFC1951C8B--><AD_REF_LIST>
+<!--4D44134C67A2484E995D28BFC1951C8B-->  <AD_REF_LIST_ID><![CDATA[4D44134C67A2484E995D28BFC1951C8B]]></AD_REF_LIST_ID>
+<!--4D44134C67A2484E995D28BFC1951C8B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4D44134C67A2484E995D28BFC1951C8B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4D44134C67A2484E995D28BFC1951C8B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4D44134C67A2484E995D28BFC1951C8B-->  <VALUE><![CDATA[T]]></VALUE>
+<!--4D44134C67A2484E995D28BFC1951C8B-->  <NAME><![CDATA[Post: Table Disabled]]></NAME>
+<!--4D44134C67A2484E995D28BFC1951C8B-->  <AD_REFERENCE_ID><![CDATA[234]]></AD_REFERENCE_ID>
+<!--4D44134C67A2484E995D28BFC1951C8B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--4D44134C67A2484E995D28BFC1951C8B--></AD_REF_LIST>
+
 <!--4D89F618EFC24D428301EF91AFFC649D--><AD_REF_LIST>
 <!--4D89F618EFC24D428301EF91AFFC649D-->  <AD_REF_LIST_ID><![CDATA[4D89F618EFC24D428301EF91AFFC649D]]></AD_REF_LIST_ID>
 <!--4D89F618EFC24D428301EF91AFFC649D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -9900,6 +9934,17 @@
 <!--6D58DF036C134A799BB7229004F8163F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--6D58DF036C134A799BB7229004F8163F--></AD_REF_LIST>
 
+<!--6EF3F774F73046C28C423EED3373CD11--><AD_REF_LIST>
+<!--6EF3F774F73046C28C423EED3373CD11-->  <AD_REF_LIST_ID><![CDATA[6EF3F774F73046C28C423EED3373CD11]]></AD_REF_LIST_ID>
+<!--6EF3F774F73046C28C423EED3373CD11-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6EF3F774F73046C28C423EED3373CD11-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6EF3F774F73046C28C423EED3373CD11-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6EF3F774F73046C28C423EED3373CD11-->  <VALUE><![CDATA[L]]></VALUE>
+<!--6EF3F774F73046C28C423EED3373CD11-->  <NAME><![CDATA[Post: Document Locked]]></NAME>
+<!--6EF3F774F73046C28C423EED3373CD11-->  <AD_REFERENCE_ID><![CDATA[234]]></AD_REFERENCE_ID>
+<!--6EF3F774F73046C28C423EED3373CD11-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--6EF3F774F73046C28C423EED3373CD11--></AD_REF_LIST>
+
 <!--6F9DD304FD564F60B6C703A0E0E5E6E5--><AD_REF_LIST>
 <!--6F9DD304FD564F60B6C703A0E0E5E6E5-->  <AD_REF_LIST_ID><![CDATA[6F9DD304FD564F60B6C703A0E0E5E6E5]]></AD_REF_LIST_ID>
 <!--6F9DD304FD564F60B6C703A0E0E5E6E5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -9989,6 +10034,17 @@
 <!--74E2E8E4959342CAB71C5C59C3AEC4AC-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--74E2E8E4959342CAB71C5C59C3AEC4AC--></AD_REF_LIST>
 
+<!--751946C62E4D4C9FBA0FF59EEDC4870F--><AD_REF_LIST>
+<!--751946C62E4D4C9FBA0FF59EEDC4870F-->  <AD_REF_LIST_ID><![CDATA[751946C62E4D4C9FBA0FF59EEDC4870F]]></AD_REF_LIST_ID>
+<!--751946C62E4D4C9FBA0FF59EEDC4870F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--751946C62E4D4C9FBA0FF59EEDC4870F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--751946C62E4D4C9FBA0FF59EEDC4870F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--751946C62E4D4C9FBA0FF59EEDC4870F-->  <VALUE><![CDATA[EnableCanceAndReplace]]></VALUE>
+<!--751946C62E4D4C9FBA0FF59EEDC4870F-->  <NAME><![CDATA[Enable Cancel and Replace]]></NAME>
+<!--751946C62E4D4C9FBA0FF59EEDC4870F-->  <AD_REFERENCE_ID><![CDATA[A26BA480E2014707B47257024C3CBFF7]]></AD_REFERENCE_ID>
+<!--751946C62E4D4C9FBA0FF59EEDC4870F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--751946C62E4D4C9FBA0FF59EEDC4870F--></AD_REF_LIST>
+
 <!--7574AC93C7DA4C068DAED8221325F76C--><AD_REF_LIST>
 <!--7574AC93C7DA4C068DAED8221325F76C-->  <AD_REF_LIST_ID><![CDATA[7574AC93C7DA4C068DAED8221325F76C]]></AD_REF_LIST_ID>
 <!--7574AC93C7DA4C068DAED8221325F76C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -11927,6 +11983,17 @@
 <!--C51B76C267CA4E098F5558F3E0BAC2C2-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--C51B76C267CA4E098F5558F3E0BAC2C2--></AD_REF_LIST>
 
+<!--C5834B6433874B9683A1DDB595843ADA--><AD_REF_LIST>
+<!--C5834B6433874B9683A1DDB595843ADA-->  <AD_REF_LIST_ID><![CDATA[C5834B6433874B9683A1DDB595843ADA]]></AD_REF_LIST_ID>
+<!--C5834B6433874B9683A1DDB595843ADA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C5834B6433874B9683A1DDB595843ADA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C5834B6433874B9683A1DDB595843ADA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C5834B6433874B9683A1DDB595843ADA-->  <VALUE><![CDATA[VariantChDescUpdate]]></VALUE>
+<!--C5834B6433874B9683A1DDB595843ADA-->  <NAME><![CDATA[Variant Characteristic description update]]></NAME>
+<!--C5834B6433874B9683A1DDB595843ADA-->  <AD_REFERENCE_ID><![CDATA[11F86B630ECB4A57B28927193F8AB99D]]></AD_REFERENCE_ID>
+<!--C5834B6433874B9683A1DDB595843ADA-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--C5834B6433874B9683A1DDB595843ADA--></AD_REF_LIST>
+
 <!--C6756C85CF3F4AFBB78DFB994952548A--><AD_REF_LIST>
 <!--C6756C85CF3F4AFBB78DFB994952548A-->  <AD_REF_LIST_ID><![CDATA[C6756C85CF3F4AFBB78DFB994952548A]]></AD_REF_LIST_ID>
 <!--C6756C85CF3F4AFBB78DFB994952548A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -12337,6 +12404,17 @@
 <!--D6B9E46590054FD2922E1A3598BF3F2D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--D6B9E46590054FD2922E1A3598BF3F2D--></AD_REF_LIST>
 
+<!--D750393F125A4C479619D8047FBD0E8B--><AD_REF_LIST>
+<!--D750393F125A4C479619D8047FBD0E8B-->  <AD_REF_LIST_ID><![CDATA[D750393F125A4C479619D8047FBD0E8B]]></AD_REF_LIST_ID>
+<!--D750393F125A4C479619D8047FBD0E8B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D750393F125A4C479619D8047FBD0E8B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D750393F125A4C479619D8047FBD0E8B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D750393F125A4C479619D8047FBD0E8B-->  <VALUE><![CDATA[NO]]></VALUE>
+<!--D750393F125A4C479619D8047FBD0E8B-->  <NAME><![CDATA[Post: No Related PO]]></NAME>
+<!--D750393F125A4C479619D8047FBD0E8B-->  <AD_REFERENCE_ID><![CDATA[234]]></AD_REFERENCE_ID>
+<!--D750393F125A4C479619D8047FBD0E8B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D750393F125A4C479619D8047FBD0E8B--></AD_REF_LIST>
+
 <!--D7C4C4C31F0C4C8891E7D5AF68684561--><AD_REF_LIST>
 <!--D7C4C4C31F0C4C8891E7D5AF68684561-->  <AD_REF_LIST_ID><![CDATA[D7C4C4C31F0C4C8891E7D5AF68684561]]></AD_REF_LIST_ID>
 <!--D7C4C4C31F0C4C8891E7D5AF68684561-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -12383,6 +12461,17 @@
 <!--D9FFDD5DD51D434FB45628FCBAD10A4E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--D9FFDD5DD51D434FB45628FCBAD10A4E--></AD_REF_LIST>
 
+<!--DA3E593E14834F0C9895132B46C51369--><AD_REF_LIST>
+<!--DA3E593E14834F0C9895132B46C51369-->  <AD_REF_LIST_ID><![CDATA[DA3E593E14834F0C9895132B46C51369]]></AD_REF_LIST_ID>
+<!--DA3E593E14834F0C9895132B46C51369-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--DA3E593E14834F0C9895132B46C51369-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--DA3E593E14834F0C9895132B46C51369-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--DA3E593E14834F0C9895132B46C51369-->  <VALUE><![CDATA[TMP]]></VALUE>
+<!--DA3E593E14834F0C9895132B46C51369-->  <NAME><![CDATA[Temporal]]></NAME>
+<!--DA3E593E14834F0C9895132B46C51369-->  <AD_REFERENCE_ID><![CDATA[FF80818130217A350130218D802B0011]]></AD_REFERENCE_ID>
+<!--DA3E593E14834F0C9895132B46C51369-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--DA3E593E14834F0C9895132B46C51369--></AD_REF_LIST>
+
 <!--DA98D956E0BF4DCA887932756C327D73--><AD_REF_LIST>
 <!--DA98D956E0BF4DCA887932756C327D73-->  <AD_REF_LIST_ID><![CDATA[DA98D956E0BF4DCA887932756C327D73]]></AD_REF_LIST_ID>
 <!--DA98D956E0BF4DCA887932756C327D73-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -12762,6 +12851,17 @@
 <!--ED26F0D8296E46BCA9A0571BEA07C66E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--ED26F0D8296E46BCA9A0571BEA07C66E--></AD_REF_LIST>
 
+<!--EE5C654083D04EA0B1BFC90A30CF0908--><AD_REF_LIST>
+<!--EE5C654083D04EA0B1BFC90A30CF0908-->  <AD_REF_LIST_ID><![CDATA[EE5C654083D04EA0B1BFC90A30CF0908]]></AD_REF_LIST_ID>
+<!--EE5C654083D04EA0B1BFC90A30CF0908-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--EE5C654083D04EA0B1BFC90A30CF0908-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--EE5C654083D04EA0B1BFC90A30CF0908-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--EE5C654083D04EA0B1BFC90A30CF0908-->  <VALUE><![CDATA[CancelAndReplaceCreateNetShipment]]></VALUE>
+<!--EE5C654083D04EA0B1BFC90A30CF0908-->  <NAME><![CDATA[Cancel and Replace - Create netting goods shipment]]></NAME>
+<!--EE5C654083D04EA0B1BFC90A30CF0908-->  <AD_REFERENCE_ID><![CDATA[A26BA480E2014707B47257024C3CBFF7]]></AD_REFERENCE_ID>
+<!--EE5C654083D04EA0B1BFC90A30CF0908-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--EE5C654083D04EA0B1BFC90A30CF0908--></AD_REF_LIST>
+
 <!--EF551A190C59463988B5D970FA2F7289--><AD_REF_LIST>
 <!--EF551A190C59463988B5D970FA2F7289-->  <AD_REF_LIST_ID><![CDATA[EF551A190C59463988B5D970FA2F7289]]></AD_REF_LIST_ID>
 <!--EF551A190C59463988B5D970FA2F7289--