Merged from PI
authorUnai Martirena <unai.martirena@openbravo.com>
Tue, 20 Sep 2016 09:14:51 +0200
changeset 30561 e1adb77306ba
parent 30199 d1d798d1a889 (current diff)
parent 30560 f2d97e8bbe22 (diff)
child 30562 7df2259d22fb
Merged from PI
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java
modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
src-db/database/model/functions/C_ORDER_POST1.xml
src-db/database/model/functions/M_INOUT_POST.xml
src-db/database/model/tables/C_ORDER.xml
src-db/database/model/tables/C_ORDERLINE.xml
src-db/database/sourcedata/AD_AUXILIARINPUT.xml
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_ELEMENT.xml
src-db/database/sourcedata/AD_FIELD.xml
src-db/database/sourcedata/AD_MESSAGE.xml
src-db/database/sourcedata/AD_MODULE.xml
src-db/database/sourcedata/AD_REFERENCE.xml
src-db/database/sourcedata/AD_REF_LIST.xml
src-db/database/sourcedata/AD_REF_TABLE.xml
src-db/database/sourcedata/AD_TAB.xml
src-db/database/sourcedata/M_OFFER_TYPE.xml
src-db/database/sourcedata/OBUIAPP_PROCESS.xml
src-test/src/org/openbravo/test/AllAntTaskTests.java
src/org/openbravo/dal/core/SessionHandler.java
src/org/openbravo/erpCommon/businessUtility/CancelAndReplaceUtils.java
src/org/openbravo/event/FINPaymentEventHandler.java
src/org/openbravo/event/ProductCharacteristicValueEventHandler.java
--- a/.hgsigs	Wed Sep 14 13:39:12 2016 +0200
+++ b/.hgsigs	Tue Sep 20 09:14:51 2016 +0200
@@ -198,3 +198,4 @@
 ac4b84085793438223d82a0024dd84d2268d0768 0 iEYEABECAAYFAld974YACgkQCX/oGf+2qkPrUgCg05BzCWexFGf76njdN2lBgPJn5uMAoIzGxA0dHD54Km07x2m9J1pgFcoW
 a98ba1097ffda83047f2824177bfd940fd9268b2 0 iEYEABECAAYFAlfAIacACgkQCX/oGf+2qkMeAwCgsAyLUenvqX0uAZTRjaUrUXZfcL0AoJg0tc+GlPLwfSGk9nCtgF8M3v5f
 159bac1903e52d4f6785d5e53405ae988c273975 0 iEYEABECAAYFAlejLbgACgkQCX/oGf+2qkOIMQCcDP51SEWDiDNBGTaEShgrqwhm7xYAoO/e+AXZ3cBSAhUb8CmIpJ0Rls82
+b91eab932a2640f7395e9c1b7d237c08303d0788 0 iEYEABECAAYFAlfGHnMACgkQCX/oGf+2qkNXHQCgysf6qFN75kW873qTx3i0S9a2qjAAoI0R/AZCW4a6RPrNiFfjaWsOE3+v
--- a/.hgtags	Wed Sep 14 13:39:12 2016 +0200
+++ b/.hgtags	Tue Sep 20 09:14:51 2016 +0200
@@ -209,3 +209,4 @@
 7667e8781815f8fa0bf2d3104aeb585cb2ce8681 3.0PR16Q2.1
 d40ef4d2ac507a87b46d3118841d03a6a54fec1e 3.0PR16Q2.2
 ec10d529b9bbe8caa83f2ea72b29b94bd3473cae 3.0PR16Q3
+d0dee6596f281e29afcd159544992498896e93ff 3.0PR16Q3.1
Binary file modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalanceData.class has changed
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINACC_TRANSACTION.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINACC_TRANSACTION.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINANCIAL_ACCOUNT.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINANCIAL_ACCOUNT.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -1068,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>
@@ -2691,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>
@@ -7361,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>
@@ -9870,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>
@@ -11013,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>
@@ -11202,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>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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>
@@ -137,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>
@@ -196,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>
@@ -250,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>
@@ -390,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>
@@ -430,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>
@@ -1038,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>
@@ -1216,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>
@@ -1338,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>
@@ -1378,6 +1502,20 @@
 <!--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>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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>
@@ -20819,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>
@@ -21590,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>
@@ -22403,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/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -240,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>
@@ -1417,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>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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.29935]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.30300]]></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>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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.29935]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.30300]]></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.29935]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->  <STARTVERSION><![CDATA[3.0.30300]]></STARTVERSION>
 <!--B97FC854C6DD41E692161585645A900F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--B97FC854C6DD41E692161585645A900F-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--B97FC854C6DD41E692161585645A900F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_VAL_RULE.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_VAL_RULE.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PROCESS.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PROCESS.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -114,6 +114,22 @@
 <!--80D03C83D251489F984B488FA5B0B75F-->  <CUSTOM_QUERY><![CDATA[N]]></CUSTOM_QUERY>
 <!--80D03C83D251489F984B488FA5B0B75F--></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/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalance_data.xsql	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalance_data.xsql	Tue Sep 20 09:14:51 2016 +0200
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
  ************************************************************************************
- * Copyright (C) 2011-2015 Openbravo S.L.U.
+ * Copyright (C) 2011-2016 Openbravo S.L.U.
  * Licensed under the Openbravo Commercial License version 1.0
  * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
  * or in the legal folder of this module distribution.
@@ -59,18 +59,25 @@
     <Sql>
       <![CDATA[
         SELECT A.c_bpartner_id, SUM(A.amount) as customercredit
-        FROM (SELECT c_bpartner_id, COALESCE(SUM(ps.outstandingamt * (CASE WHEN inv.issotrx = 'Y' THEN 1 ELSE -1 END)), 0) as amount
-              FROM fin_payment_schedule ps join c_invoice inv on (ps.c_invoice_id = inv.c_invoice_id)
-              WHERE ps.outstandingamt <> 0
-              GROUP BY c_bpartner_id
-              UNION ALL
-              SELECT p.c_bpartner_id, COALESCE(SUM((p.generated_credit - p.used_credit) * (CASE WHEN p.isreceipt = 'Y' THEN -1 ELSE 1 END)), 0) as amount
-              FROM FIN_PAYMENT p
-              WHERE p.c_bpartner_id is not null
-                    AND (p.generated_credit - p.used_credit) <> 0
-                    AND p.generated_credit <> 0
-                    AND p.processed = 'Y'
-              GROUP BY p.c_bpartner_id) A
+        FROM (
+          SELECT bp.c_bpartner_id, COALESCE(SUM(c_currency_convert(ps.outstandingamt * (CASE WHEN inv.issotrx = 'Y' THEN 1 ELSE -1 END), inv.c_currency_id, bp.bp_currency_id, inv.created, null, inv.ad_client_id, inv.ad_org_id)), 0) as amount
+          FROM c_invoice inv
+          JOIN c_bpartner bp
+          ON inv.c_bpartner_id = bp.c_bpartner_id
+          JOIN fin_payment_schedule ps
+          ON inv.c_invoice_id = ps.c_invoice_id
+          WHERE ps.outstandingamt <> 0
+          GROUP BY bp.c_bpartner_id
+          UNION ALL
+          SELECT bp.c_bpartner_id, COALESCE(SUM(c_currency_convert((p.generated_credit - p.used_credit) * (CASE WHEN p.isreceipt = 'Y' THEN -1 ELSE 1 END), p.c_currency_id, bp.bp_currency_id, p.created, null, p.ad_client_id, p.ad_org_id)), 0) as amount
+          FROM FIN_PAYMENT p
+          JOIN c_bpartner bp
+          ON p.c_bpartner_id = bp.c_bpartner_id
+          WHERE (p.generated_credit - p.used_credit) <> 0
+          AND p.generated_credit <> 0
+          AND p.processed = 'Y'
+          GROUP BY bp.c_bpartner_id
+        ) A
         GROUP BY A.c_bpartner_id
       ]]>
     </Sql>
--- a/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/src/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalanceData.java	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/src/org/openbravo/advpaymentmngt/modulescript/UpdateCustomerBalanceData.java	Tue Sep 20 09:14:51 2016 +0200
@@ -226,18 +226,25 @@
     String strSql = "";
     strSql = strSql + 
       "        SELECT A.c_bpartner_id, SUM(A.amount) as customercredit" +
-      "        FROM (SELECT c_bpartner_id, COALESCE(SUM(ps.outstandingamt * (CASE WHEN inv.issotrx = 'Y' THEN 1 ELSE -1 END)), 0) as amount" +
-      "              FROM fin_payment_schedule ps join c_invoice inv on (ps.c_invoice_id = inv.c_invoice_id)" +
-      "              WHERE ps.outstandingamt <> 0" +
-      "              GROUP BY c_bpartner_id" +
-      "              UNION ALL" +
-      "              SELECT p.c_bpartner_id, COALESCE(SUM((p.generated_credit - p.used_credit) * (CASE WHEN p.isreceipt = 'Y' THEN -1 ELSE 1 END)), 0) as amount" +
-      "              FROM FIN_PAYMENT p" +
-      "              WHERE p.c_bpartner_id is not null" +
-      "                    AND (p.generated_credit - p.used_credit) <> 0" +
-      "                    AND p.generated_credit <> 0" +
-      "                    AND p.processed = 'Y'" +
-      "              GROUP BY p.c_bpartner_id) A" +
+      "        FROM (" +
+      "          SELECT bp.c_bpartner_id, COALESCE(SUM(c_currency_convert(ps.outstandingamt * (CASE WHEN inv.issotrx = 'Y' THEN 1 ELSE -1 END), inv.c_currency_id, bp.bp_currency_id, inv.created, null, inv.ad_client_id, inv.ad_org_id)), 0) as amount" +
+      "          FROM c_invoice inv" +
+      "          JOIN c_bpartner bp" +
+      "          ON inv.c_bpartner_id = bp.c_bpartner_id" +
+      "          JOIN fin_payment_schedule ps" +
+      "          ON inv.c_invoice_id = ps.c_invoice_id" +
+      "          WHERE ps.outstandingamt <> 0" +
+      "          GROUP BY bp.c_bpartner_id" +
+      "          UNION ALL" +
+      "          SELECT bp.c_bpartner_id, COALESCE(SUM(c_currency_convert((p.generated_credit - p.used_credit) * (CASE WHEN p.isreceipt = 'Y' THEN -1 ELSE 1 END), p.c_currency_id, bp.bp_currency_id, p.created, null, p.ad_client_id, p.ad_org_id)), 0) as amount" +
+      "          FROM FIN_PAYMENT p" +
+      "          JOIN c_bpartner bp" +
+      "          ON p.c_bpartner_id = bp.c_bpartner_id" +
+      "          WHERE (p.generated_credit - p.used_credit) <> 0" +
+      "          AND p.generated_credit <> 0" +
+      "          AND p.processed = 'Y'" +
+      "          GROUP BY bp.c_bpartner_id" +
+      "        ) A" +
       "        GROUP BY A.c_bpartner_id";
 
     ResultSet result;
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/APRMApplicationProvider.java	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/APRMApplicationProvider.java	Tue Sep 20 09:14:51 2016 +0200
@@ -47,6 +47,8 @@
         "web/org.openbravo.advpaymentmngt/js/ob-aprm-addTransaction.js", true));
     globalResources.add(createStaticResource(
         "web/org.openbravo.advpaymentmngt/js/ob-aprm-findTransaction.js", true));
+    globalResources.add(createStaticResource(
+        "web/org.openbravo.advpaymentmngt/js/ob-aprm-fundsTransfer.js", true));
     return globalResources;
   }
 }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/FundsTransferActionHandler.java	Tue Sep 20 09:14:51 2016 +0200
@@ -0,0 +1,312 @@
+/*
+ *************************************************************************
+ * 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):  ______________________________________.
+ ************************************************************************
+ */
+package org.openbravo.advpaymentmngt.actionHandler;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.codehaus.jettison.json.JSONArray;
+import org.codehaus.jettison.json.JSONException;
+import org.codehaus.jettison.json.JSONObject;
+import org.openbravo.advpaymentmngt.dao.TransactionsDao;
+import org.openbravo.advpaymentmngt.process.FIN_TransactionProcess;
+import org.openbravo.base.exception.OBException;
+import org.openbravo.base.provider.OBProvider;
+import org.openbravo.client.application.process.BaseProcessActionHandler;
+import org.openbravo.dal.service.OBDal;
+import org.openbravo.erpCommon.utility.OBMessageUtils;
+import org.openbravo.financial.FinancialUtils;
+import org.openbravo.model.financialmgmt.gl.GLItem;
+import org.openbravo.model.financialmgmt.payment.FIN_FinaccTransaction;
+import org.openbravo.model.financialmgmt.payment.FIN_FinancialAccount;
+import org.openbravo.service.json.JsonConstants;
+import org.openbravo.service.json.JsonUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * This class implements the ability to transfer funds among financial accounts in a simple and
+ * quick way. The idea is to have a button in the Financial Account window to transfer money.
+ * 
+ * @author Daniel Martins
+ */
+public class FundsTransferActionHandler extends BaseProcessActionHandler {
+  private static final String ERROR_IN_PROCESS = "Error in process";
+  private static final Logger log = LoggerFactory.getLogger(FundsTransferActionHandler.class);
+  private static final String BP_DEPOSIT = "BPD";
+  private static final String BP_WITHDRAWAL = "BPW";
+  private static final String BANK_FEE = "BF";
+  private static final String PROCESS_ACTION = "P";
+
+  @Override
+  protected JSONObject doExecute(Map<String, Object> parameters, String content) {
+
+    try {
+      JSONObject request = new JSONObject(content);
+      JSONObject jsonParams = request.getJSONObject("_params");
+
+      // Format Date
+      String strTrxDate = jsonParams.getString("trxdate");
+      Date trxDate = JsonUtils.createDateFormat().parse(strTrxDate);
+
+      // Account from
+      String strAccountFrom = request.getString("inpfinFinancialAccountId");
+      FIN_FinancialAccount accountFrom = OBDal.getInstance().get(FIN_FinancialAccount.class,
+          strAccountFrom);
+
+      // Account to
+      String strAccountTo = jsonParams.getString("fin_financial_account_id");
+      FIN_FinancialAccount accountTo = OBDal.getInstance().get(FIN_FinancialAccount.class,
+          strAccountTo);
+
+      // GL item
+      String strGLItem = jsonParams.getString("glitem");
+      GLItem glitem = OBDal.getInstance().get(GLItem.class, strGLItem);
+
+      // Amount
+      BigDecimal amount = new BigDecimal(jsonParams.getString("deposit_amount"));
+
+      // Conversion Rate
+      BigDecimal manualConversionRate = null;
+      if (accountFrom.getCurrency().getId().equalsIgnoreCase(accountTo.getCurrency().getId())) {
+        manualConversionRate = BigDecimal.ONE;
+      } else if (!jsonParams.isNull("multiply_rate")) {
+        manualConversionRate = new BigDecimal(jsonParams.getString("multiply_rate"));
+      }
+
+      // Fees
+      BigDecimal bankFeeFrom = BigDecimal.ZERO;
+      BigDecimal bankFeeTo = BigDecimal.ZERO;
+      if (jsonParams.getBoolean("bank_fee")) {
+        if (!jsonParams.isNull("bank_fee_from")) {
+          bankFeeFrom = new BigDecimal(jsonParams.getString("bank_fee_from"));
+        }
+        if (!jsonParams.isNull("bank_fee_to")) {
+          bankFeeTo = new BigDecimal(jsonParams.getString("bank_fee_to"));
+        }
+      }
+
+      createTransfer(trxDate, accountFrom, accountTo, glitem, amount, manualConversionRate,
+          bankFeeFrom, bankFeeTo);
+
+    } catch (OBException e) {
+      log.error(ERROR_IN_PROCESS, e);
+
+      return createPopUpError(e.getMessage(), true);
+    } catch (JSONException e) {
+      log.error(ERROR_IN_PROCESS, e);
+
+      return createResponse(JsonConstants.RESPONSE_ERROR,
+          OBMessageUtils.messageBD("OBUIAPP_Error"), OBMessageUtils.messageBD("APRM_UnknownError"),
+          false);
+    } catch (ParseException e) {
+      log.error(ERROR_IN_PROCESS, e);
+
+      return createResponse(JsonConstants.RESPONSE_ERROR,
+          OBMessageUtils.messageBD("OBUIAPP_Error"), OBMessageUtils.messageBD("APRM_UnknownError"),
+          false);
+    }
+
+    return createResponse("success", OBMessageUtils.messageBD("OBUIAPP_Success"),
+        OBMessageUtils.messageBD("APRM_TransferFundsSuccess"), true);
+  }
+
+  /**
+   * Create all the transactions for a funds transfer between two accounts
+   * 
+   * @param date
+   *          used for the transactions, current date is used if this is null.
+   * @param accountFrom
+   *          source account.
+   * @param accountTo
+   *          target account.
+   * @param glitem
+   *          gl item used in transactions.
+   * @param amount
+   *          the transfer amount.
+   * @param manualConversionRate
+   *          conversion rate to override the system one.
+   * @param bankFeeFrom
+   *          fee on the source bank.
+   * @param bankFeeTo
+   *          fee on the target bank.
+   */
+  public static void createTransfer(Date date, FIN_FinancialAccount accountFrom,
+      FIN_FinancialAccount accountTo, GLItem glitem, BigDecimal amount,
+      BigDecimal manualConversionRate, BigDecimal bankFeeFrom, BigDecimal bankFeeTo) {
+    List<FIN_FinaccTransaction> transactions = new ArrayList<FIN_FinaccTransaction>();
+    FIN_FinaccTransaction newTrx;
+    Date trxDate = date;
+    if (trxDate == null) {
+      trxDate = new Date();
+    }
+
+    try {
+      LineNumberUtil lineNoUtil = new LineNumberUtil();
+      BigDecimal targetAmount = convertAmount(amount, accountFrom, accountTo, trxDate,
+          manualConversionRate);
+
+      // Source Account
+      FIN_FinaccTransaction sourceTrx = createTransaction(accountFrom, BP_WITHDRAWAL, trxDate,
+          glitem, amount, lineNoUtil);
+      transactions.add(sourceTrx);
+      if (bankFeeFrom != null && BigDecimal.ZERO.compareTo(bankFeeFrom) != 0) {
+        newTrx = createTransaction(accountFrom, BANK_FEE, trxDate, glitem, bankFeeFrom, lineNoUtil);
+        transactions.add(newTrx);
+      }
+
+      // Target Account
+      newTrx = createTransaction(accountTo, BP_DEPOSIT, trxDate, glitem, targetAmount, lineNoUtil,
+          sourceTrx);
+      transactions.add(newTrx);
+
+      if (bankFeeTo != null && BigDecimal.ZERO.compareTo(bankFeeTo) != 0) {
+        newTrx = createTransaction(accountTo, BANK_FEE, trxDate, glitem, bankFeeTo, lineNoUtil,
+            sourceTrx);
+        transactions.add(newTrx);
+      }
+
+      OBDal.getInstance().flush();
+      processTransactions(transactions);
+    } catch (OBException obe) {
+      String message = OBMessageUtils.parseTranslation(obe.getMessage());
+      throw new OBException(message, obe);
+    }
+  }
+
+  private static BigDecimal convertAmount(BigDecimal amount, FIN_FinancialAccount accountFrom,
+      FIN_FinancialAccount accountTo, Date date, BigDecimal rate) {
+    if (rate != null) {
+      int precision = accountTo.getCurrency().getStandardPrecision().intValue();
+      return amount.multiply(rate).setScale(precision, RoundingMode.HALF_UP);
+    } else {
+      return FinancialUtils.getConvertedAmount(amount, accountFrom.getCurrency(),
+          accountTo.getCurrency(), date, accountFrom.getOrganization(), null);
+    }
+  }
+
+  private static FIN_FinaccTransaction createTransaction(FIN_FinancialAccount account,
+      String trxType, Date trxDate, GLItem glitem, BigDecimal amount, LineNumberUtil lineNoUtil) {
+    return createTransaction(account, trxType, trxDate, glitem, amount, lineNoUtil, null);
+  }
+
+  private static FIN_FinaccTransaction createTransaction(FIN_FinancialAccount account,
+      String trxType, Date trxDate, GLItem glitem, BigDecimal amount, LineNumberUtil lineNoUtil,
+      FIN_FinaccTransaction sourceTrx) {
+    FIN_FinaccTransaction trx = OBProvider.getInstance().get(FIN_FinaccTransaction.class);
+
+    trx.setAccount(account);
+    trx.setTransactionType(trxType);
+    trx.setTransactionDate(trxDate);
+    trx.setDateAcct(trxDate);
+    trx.setGLItem(glitem);
+    trx.setCurrency(account.getCurrency());
+    if (BP_DEPOSIT.equalsIgnoreCase(trxType)) {
+      trx.setDepositAmount(amount);
+    } else {
+      trx.setPaymentAmount(amount);
+    }
+    trx.setOrganization(account.getOrganization());
+
+    Long line = lineNoUtil.getNextLineNumber(account);
+    trx.setLineNo(line);
+
+    trx.setAprmFinaccTransOrigin(sourceTrx);
+    trx.setDescription(OBMessageUtils.messageBD("FundsTransfer"));
+
+    OBDal.getInstance().save(trx);
+
+    return trx;
+  }
+
+  private static void processTransactions(List<FIN_FinaccTransaction> transactions) {
+    for (FIN_FinaccTransaction trx : transactions) {
+      FIN_TransactionProcess.doTransactionProcess(PROCESS_ACTION, trx);
+    }
+  }
+
+  private JSONObject createPopUpError(String message, boolean retry) {
+    JSONObject result = new JSONObject();
+
+    try {
+      result.put("retryExecution", retry);
+      JSONObject msg = new JSONObject();
+      msg.put("severity", JsonConstants.RESPONSE_ERROR);
+      msg.put("text", message);
+      result.put("message", msg);
+    } catch (JSONException ignore) {
+      log.error(ERROR_IN_PROCESS, ignore);
+    }
+
+    return result;
+  }
+
+  private JSONObject createResponse(String type, String title, String message, boolean refresh) {
+    JSONObject result = new JSONObject();
+    JSONArray responseActions = new JSONArray();
+
+    try {
+      JSONObject showMessage = new JSONObject();
+      JSONObject msg = new JSONObject();
+      msg.put("msgType", type);
+      msg.put("msgTitle", title);
+      msg.put("msgText", message);
+      showMessage.put("showMsgInProcessView", msg);
+      responseActions.put(showMessage);
+
+      if (refresh) {
+        JSONObject refreshGrid = new JSONObject();
+        refreshGrid.put("refreshGrid", new JSONObject());
+        responseActions.put(refreshGrid);
+      }
+
+      result.put("responseActions", responseActions);
+    } catch (JSONException ignore) {
+      log.error(ERROR_IN_PROCESS, ignore);
+    }
+    return result;
+  }
+
+  /**
+   * This class exists because TransactionsDao.getTransactionMaxLineNo does not take into account
+   * not flushed transactions
+   * 
+   */
+  private static class LineNumberUtil {
+    private HashMap<FIN_FinancialAccount, Long> lastLineNo = new HashMap<FIN_FinancialAccount, Long>();
+
+    protected Long getNextLineNumber(FIN_FinancialAccount account) {
+      Long lineNo = lastLineNo.get(account);
+
+      if (lineNo == null) {
+        lineNo = TransactionsDao.getTransactionMaxLineNo(account);
+      }
+      lineNo += 10;
+      lastLineNo.put(account, lineNo);
+
+      return lineNo;
+    }
+  }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/FundsTransferOnChangeDepositToActionHandler.java	Tue Sep 20 09:14:51 2016 +0200
@@ -0,0 +1,58 @@
+/*
+ *************************************************************************
+ * 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):  ______________________________________.
+ ************************************************************************
+ */
+package org.openbravo.advpaymentmngt.actionHandler;
+
+import java.util.Map;
+
+import org.codehaus.jettison.json.JSONObject;
+import org.openbravo.client.kernel.BaseActionHandler;
+import org.openbravo.dal.service.OBDal;
+import org.openbravo.model.financialmgmt.payment.FIN_FinancialAccount;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class FundsTransferOnChangeDepositToActionHandler extends BaseActionHandler {
+  private static final Logger log = LoggerFactory
+      .getLogger(FundsTransferOnChangeDepositToActionHandler.class);
+
+  @Override
+  protected JSONObject execute(Map<String, Object> parameters, String data) {
+    JSONObject result = new JSONObject();
+
+    try {
+      final JSONObject jsonData = new JSONObject(data);
+      String accountID = jsonData.getString("accountID");
+
+      if (accountID != null) {
+        FIN_FinancialAccount account = OBDal.getInstance().get(FIN_FinancialAccount.class,
+            accountID);
+
+        if (account != null) {
+          result.put("currencyID", account.getCurrency().getId());
+          result.put("currencyISO", account.getCurrency().getISOCode());
+        }
+      }
+    } catch (Exception e) {
+      log.error("Error when executing FundsTransferOnChangeDepositToActionHandler", e);
+    }
+
+    return result;
+  }
+
+}
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java	Tue Sep 20 09:14:51 2016 +0200
@@ -252,12 +252,14 @@
               return;
             }
 
+            // Reversed invoice's date: voidDate in Purchase Invoice, new Date() in Sales Invoice
+            Date reversedDate = voidDate != null ? voidDate : new Date();
+
             // Calculate Conversion Rate
-            Date date = voidDate != null ? voidDate : invoice.getInvoiceDate();
             BigDecimal rate = null;
             if (!StringUtils.equals(invoice.getCurrency().getId(), bpFinAccount.getCurrency()
                 .getId())) {
-              final ConversionRate conversionRate = FinancialUtils.getConversionRate(date,
+              final ConversionRate conversionRate = FinancialUtils.getConversionRate(reversedDate,
                   invoice.getCurrency(), bpFinAccount.getCurrency(), invoice.getOrganization(),
                   invoice.getClient());
               if (conversionRate != null) {
@@ -266,10 +268,10 @@
             }
 
             // Create dummy payment
-            dummyPayment = dao
-                .getNewPayment(isSOTrx, invoice.getOrganization(), docType, strPaymentDocumentNo,
-                    invoice.getBusinessPartner(), invoice.getPaymentMethod(), bpFinAccount, "0",
-                    date, invoice.getDocumentNo(), invoice.getCurrency(), rate, null);
+            dummyPayment = dao.getNewPayment(isSOTrx, invoice.getOrganization(), docType,
+                strPaymentDocumentNo, invoice.getBusinessPartner(), invoice.getPaymentMethod(),
+                bpFinAccount, "0", reversedDate, invoice.getDocumentNo(), invoice.getCurrency(),
+                rate, null);
             OBDal.getInstance().save(dummyPayment);
 
             List<FIN_PaymentDetail> paymentDetails = new ArrayList<FIN_PaymentDetail>();
@@ -345,6 +347,11 @@
                 message.setMessage(OBMessageUtils.messageBD("PaymentError") + " "
                     + message.getMessage());
                 vars.setMessage(strTabId, message);
+                String strWindowPath = Utility.getTabURL(strTabId, "R", true);
+                if (strWindowPath.equals(""))
+                  strWindowPath = strDefaultServlet;
+                printPageClosePopUp(response, vars, strWindowPath);
+                return;
               }
             }
           } catch (final Exception e) {
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/TransactionAddPaymentDefaultValues.java	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/TransactionAddPaymentDefaultValues.java	Tue Sep 20 09:14:51 2016 +0200
@@ -259,10 +259,18 @@
   @Override
   public String getBankStatementLineAmount(Map<String, String> requestMap) throws JSONException {
     JSONObject context = new JSONObject(requestMap.get("context"));
-    if (context.has("depositamt") && context.has("withdrawalamt")) {
+    if (context.has("depositamt") && context.has("withdrawalamt")
+        && context.get("depositamt") != JSONObject.NULL
+        && context.get("withdrawalamt") != JSONObject.NULL) {
       return new BigDecimal(context.getString("depositamt")).subtract(
           new BigDecimal(context.getString("withdrawalamt"))).toString();
     }
+    if (context.has("inpdepositamt") && context.has("inppaymentamt")
+        && context.get("inpdepositamt") != JSONObject.NULL
+        && context.get("inppaymentamt") != JSONObject.NULL) {
+      return new BigDecimal(context.getString("inpdepositamt")).subtract(
+          new BigDecimal(context.getString("inppaymentamt"))).toString();
+    }
     return BigDecimal.ZERO.toPlainString();
   }
 }
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/hqlinjections/AddPaymentOrderInvoicesTransformer.java	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/hqlinjections/AddPaymentOrderInvoicesTransformer.java	Tue Sep 20 09:14:51 2016 +0200
@@ -11,7 +11,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 - 2016 Openbravo SLU
+ * All portions are Copyright (C) 2014-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  *************************************************************************
@@ -129,8 +129,6 @@
       selectClause
           .append(" COALESCE(ips.finPaymentmethod.id, ops.finPaymentmethod.id) as paymentMethod, ");
       selectClause.append(" COALESCE(ipsfp.name, opsfp.name) as paymentMethodName, ");
-      selectClause.append(" COALESCE(invbp.id, ordbp.id) as businessPartner, ");
-      selectClause.append(" COALESCE(invbp.name, ordbp.name) as businessPartnerName, ");
       selectClause.append(" COALESCE(ips.expectedDate, ops.expectedDate) as expectedDate, ");
       selectClause.append(" max(COALESCE(ips.amount, ops.amount)) as expectedAmount, ");
       selectClause.append(" max(COALESCE(inv.grandTotalAmount, 0)) as invoicedAmount, ");
@@ -145,8 +143,6 @@
       selectClause
           .append(" COALESCE(ops.finPaymentmethod.id, ips.finPaymentmethod.id) as paymentMethod, ");
       selectClause.append(" COALESCE(opsfp.name, ipsfp.name) as paymentMethodName, ");
-      selectClause.append(" COALESCE(invbp.id, ordbp.id) as businessPartner, ");
-      selectClause.append(" COALESCE(invbp.name, ordbp.name) as businessPartnerName, ");
       selectClause.append(" COALESCE(ops.expectedDate, ips.expectedDate) as expectedDate, ");
       selectClause.append(" max(COALESCE(ips.amount, ops.amount)) as expectedAmount, ");
       selectClause.append(" sum(COALESCE(inv.grandTotalAmount, 0)) as invoicedAmount, ");
@@ -160,12 +156,12 @@
       selectClause
           .append(" COALESCE(ips.finPaymentmethod.id, ops.finPaymentmethod.id) as paymentMethod, ");
       selectClause.append(" COALESCE(ipsfp.name, opsfp.name) as paymentMethodName, ");
-      selectClause.append(" COALESCE(invbp.id, ordbp.id) as businessPartner, ");
-      selectClause.append(" COALESCE(invbp.name, ordbp.name) as businessPartnerName, ");
       selectClause.append(" COALESCE(ips.expectedDate, ops.expectedDate) as expectedDate, ");
       selectClause.append(" max(COALESCE(ips.amount, ops.amount)) as expectedAmount, ");
       selectClause.append(" max(COALESCE(inv.grandTotalAmount, 0)) as invoicedAmount, ");
     }
+    selectClause.append(" bp.id as businessPartner, ");
+    selectClause.append(" bp.name as businessPartnerName, ");
     selectClause.append(" SUM(psd.amount + psd.writeoffAmount) as outstandingAmount, ");
     selectClause.append(" COALESCE(sum(pd.amount), 0) as amount, ");
     selectClause
@@ -244,38 +240,24 @@
       }
       whereClause.append(") or ");
     }
+
+    whereClause.append(" ( ");
     if ("I".equals(transactionType)) {
-
-      whereClause.append(" ( ");
       whereClause.append(" inv.salesTransaction = :isSalesTransaction");
-      if (strBusinessPartnerId != null && !"null".equals(strBusinessPartnerId)) {
-        whereClause.append(" and invbp.id = :businessPartnerId ");
-      }
       whereClause.append(" and inv.currency.id = :currencyId ) ");
-
     } else if ("O".equals(transactionType)) {
-      whereClause.append(" ( ");
       whereClause.append(" ord.salesTransaction = :isSalesTransaction");
-      if (strBusinessPartnerId != null && !"null".equals(strBusinessPartnerId)) {
-        whereClause.append(" and ordbp.id = :businessPartnerId ");
-      }
       whereClause.append(" and ord.currency.id = :currencyId ) ");
-
     } else {
-
-      whereClause.append(" ( ");
       whereClause.append(" inv.salesTransaction = :isSalesTransaction");
-      if (strBusinessPartnerId != null && !"null".equals(strBusinessPartnerId)) {
-        whereClause.append(" and invbp.id = :businessPartnerId ");
-      }
       whereClause.append(" and inv.currency.id = :currencyId ) ");
       whereClause.append(" or ( ");
       whereClause.append(" ord.salesTransaction = :isSalesTransaction");
-      if (strBusinessPartnerId != null && !"null".equals(strBusinessPartnerId)) {
-        whereClause.append(" and ordbp.id = :businessPartnerId");
-      }
       whereClause.append(" and ord.currency.id = :currencyId ) ");
+    }
 
+    if (strBusinessPartnerId != null && !"null".equals(strBusinessPartnerId)) {
+      whereClause.append(" and bp.id = :businessPartnerId ");
     }
 
     whereClause.append(")");
@@ -322,8 +304,8 @@
       groupByClause.append(" oinfo.aPRMPaymentDescription, ");
       groupByClause.append(" inv.orderReference, ");
     }
-    groupByClause.append(" COALESCE(invbp.id, ordbp.id), ");
-    groupByClause.append(" COALESCE(invbp.name, ordbp.name) ");
+    groupByClause.append(" bp.id, ");
+    groupByClause.append(" bp.name ");
     return groupByClause;
   }
 
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java	Tue Sep 20 09:14:51 2016 +0200
@@ -1053,12 +1053,15 @@
                   // Create merged Payment Schedule Detail with the pending to be paid amount
                   if (outStandingAmt.compareTo(BigDecimal.ZERO) != 0) {
                     final FIN_PaymentScheduleDetail mergedScheduleDetail = dao
-                        .getNewPaymentScheduleDetail(paymentScheduleDetail.getInvoicePaymentSchedule()
-                           .getInvoice().getOrganization(), outStandingAmt);
+                        .getNewPaymentScheduleDetail(paymentScheduleDetail
+                            .getInvoicePaymentSchedule().getInvoice().getOrganization(),
+                            outStandingAmt);
                     mergedScheduleDetail.setInvoicePaymentSchedule(paymentScheduleDetail
                         .getInvoicePaymentSchedule());
                     mergedScheduleDetail.setOrderPaymentSchedule(paymentScheduleDetail
                         .getOrderPaymentSchedule());
+                    mergedScheduleDetail.setBusinessPartner(paymentScheduleDetail
+                        .getBusinessPartner());
                     OBDal.getInstance().save(mergedScheduleDetail);
                   }
                 } else if (paymentScheduleDetail.getOrderPaymentSchedule() != null) {
@@ -1082,10 +1085,12 @@
                   // Create merged Payment Schedule Detail with the pending to be paid amount
                   if (outStandingAmt.compareTo(BigDecimal.ZERO) != 0) {
                     final FIN_PaymentScheduleDetail mergedScheduleDetail = dao
-                        .getNewPaymentScheduleDetail(paymentScheduleDetail.getOrderPaymentSchedule()
-                        	.getOrder().getOrganization(), outStandingAmt);
+                        .getNewPaymentScheduleDetail(paymentScheduleDetail
+                            .getOrderPaymentSchedule().getOrder().getOrganization(), outStandingAmt);
                     mergedScheduleDetail.setOrderPaymentSchedule(paymentScheduleDetail
                         .getOrderPaymentSchedule());
+                    mergedScheduleDetail.setBusinessPartner(paymentScheduleDetail
+                        .getBusinessPartner());
                     OBDal.getInstance().save(mergedScheduleDetail);
                   }
                 } else if (paymentDetail.getGLItem() != null) {
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java	Tue Sep 20 09:14:51 2016 +0200
@@ -1435,7 +1435,7 @@
     String status = null;
     for (FinAccPaymentMethod finaccpaymentmethod : financialAccount
         .getFinancialMgmtFinAccPaymentMethodList()) {
-      if (finaccpaymentmethod.getPaymentMethod().equals(paymentMethod)) {
+      if (finaccpaymentmethod.getPaymentMethod().getId().equals(paymentMethod.getId())) {
         if (isReceipt) {
           status = finaccpaymentmethod.getPayinInvoicepaidstatus();
         } else {
--- a/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js	Tue Sep 20 09:14:51 2016 +0200
@@ -571,6 +571,7 @@
       selectedIds = orderInvoice.selectedIds,
       glitem = new BigDecimal(String(view.theForm.getItem('amount_gl_items').getValue() || 0)),
       credit = new BigDecimal(String(view.theForm.getItem('used_credit').getValue() || 0)),
+      bslamount = new BigDecimal(String(view.theForm.getItem('bslamount').getValue() || 0)),
       i;
 
   amount = amount.subtract(distributedAmount);
@@ -600,7 +601,16 @@
   } else {
     for (i = 0; i < selectedIds.length; i++) {
       if (selectedIds[i] === record.id) {
-        orderInvoice.setEditValue(orderInvoice.getRecordIndex(record), 'amount', Number(outstandingAmount.toString()));
+        if (bslamount.compareTo(BigDecimal.prototype.ZERO) !== 0) {
+          if (outstandingAmount.compareTo(amount) > 0) {
+            orderInvoice.setEditValue(orderInvoice.getRecordIndex(record), 'amount', Number(amount.toString()));
+          } else {
+            orderInvoice.setEditValue(orderInvoice.getRecordIndex(record), 'amount', Number(outstandingAmount.toString()));
+          }
+        } else {
+          orderInvoice.setEditValue(orderInvoice.getRecordIndex(record), 'amount', Number(outstandingAmount.toString()));
+        }
+
       }
     }
   }
@@ -636,6 +646,7 @@
       generateCredit = new BigDecimal(String(form.getItem('generateCredit').getValue() || 0)),
       glitemtotal = new BigDecimal(String(form.getItem('amount_gl_items').getValue() || 0)),
       credit = new BigDecimal(String(form.getItem('used_credit').getValue() || 0)),
+      bslamount = new BigDecimal(String(form.getItem('bslamount').getValue() || 0)),
       selectedRecords = orderInvoice.selectedIds,
       actpayment, i;
   for (i = 0; i < selectedRecords.length; i++) {
@@ -657,6 +668,15 @@
         actualPayment.setValue(Number(actpayment.subtract(credit)));
       }
     }
+    if (bslamount.compareTo(BigDecimal.prototype.ZERO) !== 0) {
+      if (actpayment.compareTo(BigDecimal.prototype.ZERO) === 0) {
+        actpayment = actpayment.add(bslamount.abs());
+        actualPayment.setValue(Number(actpayment));
+      } else if (actpayment.compareTo(bslamount.abs()) < 0) {
+        actpayment = bslamount.abs();
+        actualPayment.setValue(Number(actpayment));
+      }
+    }
     OB.APRM.AddPayment.updateDifference(form);
     OB.APRM.AddPayment.updateConvertedAmount(null, form, false);
   }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-fundsTransfer.js	Tue Sep 20 09:14:51 2016 +0200
@@ -0,0 +1,38 @@
+/*
+ *************************************************************************
+ * 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):  ______________________________________.
+ ************************************************************************
+ */
+OB.APRM.FundsTranfer = {
+  depositToOnChange: function (item, view, form, grid) {
+    // the callback called after the server side call returns
+    var callback = function (response, data, request) {
+        var currencyTo = form.getItem('c_currency_to_id');
+        if (!currencyTo.valueMap) {
+          currencyTo.valueMap = {};
+        }
+        currencyTo.valueMap[data.currencyID] = data.currencyISO;
+        currencyTo.setValue(data.currencyID);
+
+        // redraw popup after field change to update display logic
+        form.redraw();
+        };
+    // do a server side call and on return call the callback
+    OB.RemoteCallManager.call('org.openbravo.advpaymentmngt.actionHandler.FundsTransferOnChangeDepositToActionHandler', {
+      accountID: item.getValue()
+    }, {}, callback);
+  }
+};
\ No newline at end of file
--- a/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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.29935]]></VERSION>
+<!--8A098711BB324335A19833286BDB093D-->  <VERSION><![CDATA[1.0.30300]]></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>
--- a/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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.29935]]></STARTVERSION>
+<!--1467C397BC5F4999A5606F39CD6FF8A4-->  <STARTVERSION><![CDATA[2.1.30300]]></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/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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.29935]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.30300]]></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>
--- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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.29935]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.30300]]></STARTVERSION>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -506,6 +506,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>
@@ -1268,6 +1280,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/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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.29935]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.30300]]></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>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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.29935]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.30300]]></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.29935]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->  <STARTVERSION><![CDATA[2.1.30300]]></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.29935]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->  <STARTVERSION><![CDATA[3.0.30300]]></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.29935]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->  <STARTVERSION><![CDATA[8.1.30300]]></STARTVERSION>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_REF_LIST.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_REF_LIST.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java	Tue Sep 20 09:14:51 2016 +0200
@@ -485,6 +485,9 @@
     // Product Services
     globalResources.add(createStaticResource("web/js/productServices.js", true));
 
+    // Cancel and Replace
+    globalResources.add(createStaticResource("web/js/cancelAndReplace.js", true));
+
     return globalResources;
   }
 
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/MetadataOnTab.java	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/MetadataOnTab.java	Tue Sep 20 09:14:51 2016 +0200
@@ -38,7 +38,6 @@
  * Sequence Number to set on the new metadata when the Attachment Method is selected.
  */
 public class MetadataOnTab extends SimpleCallout {
-  private static final long serialVersionUID = 1L;
   private static final String WINDOWTABSFIELDS_WINDOW_ID = "102";
 
   @Override
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/ReorderCascadingChildDeletionsHandler.java	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/ReorderCascadingChildDeletionsHandler.java	Tue Sep 20 09:14:51 2016 +0200
@@ -11,7 +11,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) 2011 Openbravo SLU 
+ * All portions are Copyright (C) 2011-2016 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -80,6 +80,8 @@
       otc.add(Restrictions.eq(InvoiceTax.PROPERTY_INVOICE, event.getTargetInstance()));
       List<InvoiceTax> otList = otc.list();
       for (InvoiceTax ot : otList) {
+        // Before delete InvoiceTax set recalculate=N to avoid raise error in InvoiceTaxEventHandler
+        ot.setRecalculate(false);
         OBDal.getInstance().remove(ot);
       }
     }
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/example/JSExecuteCalloutExample.java	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/example/JSExecuteCalloutExample.java	Tue Sep 20 09:14:51 2016 +0200
@@ -11,7 +11,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) 2011 Openbravo SLU
+ * All portions are Copyright (C) 2011-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -28,7 +28,6 @@
  */
 public class JSExecuteCalloutExample extends SimpleCallout {
 
-  private static final long serialVersionUID = 1L;
   private static final String JSEXECUTE = "JSEXECUTE";
 
   @Override
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java	Tue Sep 20 09:14:51 2016 +0200
@@ -31,6 +31,9 @@
 import javax.enterprise.inject.Any;
 import javax.enterprise.inject.Instance;
 import javax.inject.Inject;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import org.apache.log4j.Logger;
 import org.codehaus.jettison.json.JSONArray;
@@ -67,6 +70,11 @@
 import org.openbravo.dal.service.OBDao;
 import org.openbravo.dal.service.OBQuery;
 import org.openbravo.data.Sqlc;
+import org.openbravo.erpCommon.ad_callouts.CalloutConstants;
+import org.openbravo.erpCommon.ad_callouts.CalloutInformationProvider;
+import org.openbravo.erpCommon.ad_callouts.HttpServletCalloutInformationProvider;
+import org.openbravo.erpCommon.ad_callouts.SimpleCallout;
+import org.openbravo.erpCommon.ad_callouts.SimpleCalloutInformationProvider;
 import org.openbravo.erpCommon.utility.Utility;
 import org.openbravo.model.ad.datamodel.Column;
 import org.openbravo.model.ad.domain.Preference;
@@ -1462,49 +1470,69 @@
         continue;
       }
       log.debug("Calling callout " + calloutClassName + " with field changed " + lastFieldChanged);
+      Class<?> calloutClass;
       try {
-        Class<?> calloutClass = Class.forName(calloutClassName);
-        Method init = null;
-        Method service = null;
-        Method post = null;
-        for (Method m : calloutClass.getMethods()) {
-          if (m.getName().equals("init") && m.getParameterTypes().length == 1) {
-            init = m;
-          }
-          if (m.getName().equals("service")) {
-            service = m;
-          }
-          if (m.getName().equals("doPost")) {
-            post = m;
-          }
-        }
+        calloutClass = Class.forName(calloutClassName);
+      } catch (ClassNotFoundException e) {
+        throw new OBException("Couldn't find class " + calloutClassName, e);
+      }
+      try {
         calloutsToCall.remove(calloutClassName);
         lastfieldChangedList.remove(lastFieldChanged);
 
-        if (init == null || service == null) {
-          log.info("Couldn't find method in Callout " + calloutClassName);
+        Object calloutObject;
+        boolean isCalloutInitialized = false;
+        if (calloutInstances.get(calloutClassName) != null) {
+          calloutObject = calloutInstances.get(calloutClassName);
+          isCalloutInitialized = true;
         } else {
-          RequestContext rq = RequestContext.get();
+          calloutObject = calloutClass.newInstance();
+          calloutInstances.put(calloutClassName, calloutObject);
+        }
 
-          RequestContext.get().setRequestParameter("inpLastFieldChanged", lastFieldChanged);
-          RequestContext.get().setRequestParameter("inpOB3UIMode", "Y");
+        if (!(calloutObject instanceof HttpServlet) && !(calloutObject instanceof SimpleCallout)) {
+          log.info("Callout "
+              + calloutClassName
+              + " only allows reference instances of type SimpleCallout and HttpServlet but the callout is an instance of "
+              + calloutObject.getClass().getName());
+          continue;
+        }
+
+        RequestContext request = RequestContext.get();
+        RequestContext.get().setRequestParameter("inpLastFieldChanged", lastFieldChanged);
+        RequestContext.get().setRequestParameter("inpOB3UIMode", "Y");
+        CalloutServletConfig config = new CalloutServletConfig(calloutClassName,
+            RequestContext.getServletContext());
+        CalloutInformationProvider calloutResponseManager = null;
+
+        // execute SimpleCallout callouts
+        if (SimpleCallout.class.isAssignableFrom(calloutClass)) {
+
+          SimpleCallout calloutInstance = (SimpleCallout) calloutObject;
+          calloutInstance.init(config);
+
+          // execute SimpleCallout callout
+          JSONObject result = calloutInstance.executeSimpleCallout(request);
+
+          // updated info values of callouts infrastructure
+          String calloutNameJS = calloutClassName.substring(calloutClassName.lastIndexOf(".") + 1);
+          calledCallouts.add(calloutNameJS);
+
+          calloutResponseManager = new SimpleCalloutInformationProvider(result);
+        } else {
           // We then execute the callout
-          Object calloutInstance;
-          CalloutHttpServletResponse fakeResponse = new CalloutHttpServletResponse(rq.getResponse());
-          Object[] arguments = { rq.getRequest(), fakeResponse };
-          if (calloutInstances.get(calloutClassName) != null) {
-            calloutInstance = calloutInstances.get(calloutClassName);
-            post.invoke(calloutInstance, arguments);
+          HttpServlet calloutInstance = (HttpServlet) calloutObject;
+          CalloutHttpServletResponse fakeResponse = new CalloutHttpServletResponse(
+              request.getResponse());
+
+          if (isCalloutInitialized) {
+            Method doPost = calloutClass.getMethod("doPost", HttpServletRequest.class,
+                HttpServletResponse.class);
+            doPost.setAccessible(true);
+            doPost.invoke(calloutInstance, request.getRequest(), fakeResponse);
           } else {
-            calloutInstance = calloutClass.newInstance();
-            calloutInstances.put(calloutClassName, calloutInstance);
-            CalloutServletConfig config = new CalloutServletConfig(calloutClassName,
-                RequestContext.getServletContext());
-            Object[] initArgs = { config };
-            init.invoke(calloutInstance, initArgs);
-            // We invoke the service method. This method will automatically call the doPost() method
-            // of the callout servlet
-            service.invoke(calloutInstance, arguments);
+            calloutInstance.init(config);
+            calloutInstance.service(request.getRequest(), fakeResponse);
           }
 
           String calloutResponse = fakeResponse.getOutputFromWriter();
@@ -1515,184 +1543,16 @@
           if (calloutNameJS != null && calloutNameJS != "") {
             calledCallouts.add(calloutNameJS);
           }
-          if (returnedArray.size() > 0) {
-            for (NativeArray element : returnedArray) {
-              String name = (String) element.get(0, null);
-              if (name.equals("MESSAGE") || name.equals("INFO") || name.equals("WARNING")
-                  || name.equals("ERROR") || name.equals("SUCCESS")) {
-                log.debug("Callout message: " + element.get(1, null));
-                JSONObject message = new JSONObject();
-                message.put("text", element.get(1, null).toString());
-                message.put("severity", name.equals("MESSAGE") ? "TYPE_INFO" : "TYPE_" + name);
-                messages.add(message);
-              } else if (name.equals("JSEXECUTE")) {
-                // The code on a JSEXECUTE command is sent directly to the client for eval()
-                String code = (String) element.get(1, null);
-                if (code != null) {
-                  jsExecuteCode.add(code);
-                }
-              } else if (name.equals("EXECUTE")) {
-                String js = element.get(1, null) == null ? null : element.get(1, null).toString();
-                if (js != null && !js.equals("")) {
-                  if (js.equals("displayLogic();")) {
-                    // We don't do anything, this is a harmless js response
-                  } else {
-                    JSONObject message = new JSONObject();
-                    message.put("text", Utility.messageBD(new DalConnectionProvider(false),
-                        "OBUIAPP_ExecuteInCallout", RequestContext.get().getVariablesSecureApp()
-                            .getLanguage()));
-                    message.put("severity", "TYPE_ERROR");
-                    messages.add(message);
-                    createNewPreferenceForWindow(tab.getWindow());
-                    log.warn("An EXECUTE element has been found in the response of the callout "
-                        + calloutClassName
-                        + ". A preference has been created for the window "
-                        + tab.getWindow().getName()
-                        + "so that it's shown in classic mode until this problem is fixed. This requires to build the system to generate this classic window.");
-                  }
-                }
-              } else {
-                if (name.startsWith("inp")) {
-                  boolean changed = false;
-                  if (inpFields.containsKey(name)) {
-                    Column col = inpFields.get(name).getColumn();
-                    if (col == null) {
-                      continue;
-                    }
-                    String colId = "inp" + Sqlc.TransformaNombreColumna(col.getDBColumnName());
-                    if (element.get(1, null) instanceof NativeArray) {
-                      // Combo data
-                      NativeArray subelements = (NativeArray) element.get(1, null);
-                      JSONObject jsonobject = new JSONObject();
-                      ArrayList<JSONObject> comboEntries = new ArrayList<JSONObject>();
-                      // If column is not mandatory, we add an initial blank element
-                      if (!col.isMandatory()) {
-                        JSONObject entry = new JSONObject();
-                        entry.put(JsonConstants.ID, (String) null);
-                        entry.put(JsonConstants.IDENTIFIER, (String) null);
-                        comboEntries.add(entry);
-                      }
-                      for (int j = 0; j < subelements.getLength(); j++) {
-                        NativeArray subelement = (NativeArray) subelements.get(j, null);
-                        if (subelement != null && subelement.get(2, null) != null) {
-                          JSONObject entry = new JSONObject();
-                          entry.put(JsonConstants.ID, subelement.get(0, null));
-                          entry.put(JsonConstants.IDENTIFIER, subelement.get(1, null));
-                          comboEntries.add(entry);
-                          if ((j == 0 && col.isMandatory())
-                              || subelement.get(2, null).toString().equalsIgnoreCase("True")) {
-                            // If the column is mandatory, we choose the first value as selected
-                            // In any case, we select the one which is marked as selected "true"
-                            UIDefinition uiDef = UIDefinitionController.getInstance()
-                                .getUIDefinition(col.getId());
-                            String newValue = subelement.get(0, null).toString();
-                            jsonobject.put("value", newValue);
-                            jsonobject.put("classicValue", uiDef.convertToClassicString(newValue));
-                            rq.setRequestParameter(colId, uiDef.convertToClassicString(newValue));
-                            log.debug("Column: " + col.getDBColumnName() + "  Value: " + newValue);
-                          }
-                        }
-                      }
-                      // If the callout returns a combo, we in any case set the new value with what
-                      // the callout returned
-                      columnValues.put(colId, jsonobject);
-                      changed = true;
-                      if (dynamicCols.contains(colId)) {
-                        changedCols.add(col.getDBColumnName());
-                      }
-                      jsonobject.put("entries", new JSONArray(comboEntries));
-                    } else {
-                      // Normal data
-                      Object el = element.get(1, null);
-                      String oldValue = rq.getRequestParameter(colId);
-                      // We set the new value in the request, so that the JSONObject is computed
-                      // with the new value
-                      UIDefinition uiDef = UIDefinitionController.getInstance().getUIDefinition(
-                          col.getId());
-                      if (el instanceof String
-                          || !(uiDef.getDomainType() instanceof PrimitiveDomainType)) {
-                        rq.setRequestParameter(colId, el == null ? null : el.toString());
-                      } else {
-                        rq.setRequestParameter(colId, uiDef.convertToClassicString(el));
-                      }
-                      String jsonStr = uiDef.getFieldProperties(inpFields.get(name), true);
-                      JSONObject jsonobj = new JSONObject(jsonStr);
-                      if (el == null
-                          && (uiDef instanceof ForeignKeyUIDefinition || uiDef instanceof EnumUIDefinition)) {
-                        // Special case for null values for combos: we must clean the combo values
-                        jsonobj.put("value", "");
-                        jsonobj.put("classicValue", "");
-                        jsonobj.put("entries", new JSONArray());
-                      }
-                      if (jsonobj.has("classicValue")) {
-                        String newValue = jsonobj.getString("classicValue");
-                        log.debug("Modified column: " + col.getDBColumnName() + "  Value: " + el);
-                        if ((oldValue == null && newValue != null)
-                            || (oldValue != null && newValue == null)
-                            || (oldValue != null && newValue != null && !oldValue.equals(newValue))) {
-                          columnValues.put(
-                              "inp" + Sqlc.TransformaNombreColumna(col.getDBColumnName()), jsonobj);
-                          changed = true;
-                          if (dynamicCols.contains(colId)) {
-                            changedCols.add(col.getDBColumnName());
-                          }
-                          rq.setRequestParameter(colId, jsonobj.getString("classicValue"));
-                        }
-                      } else {
-                        log.debug("Column value didn't change. We do not attempt to execute any additional callout");
-                      }
-                    }
-                    if (changed && col.getCallout() != null) {
-                      // We need to fire this callout, as the column value was changed
-                      // but only if the callout we are firing is different
-                      if (!calloutClassName.equals(col.getCallout().getADModelImplementationList()
-                          .get(0).getJavaClassName())) {
-                        addCalloutToList(col, calloutsToCall, lastfieldChangedList);
-                      }
-                    }
-                  } else {
-                    for (AuxiliaryInput aux : tab.getADAuxiliaryInputList()) {
-                      if (name
-                          .equalsIgnoreCase("inp" + Sqlc.TransformaNombreColumna(aux.getName()))) {
-                        Object el = element.get(1, null);
-                        JSONObject obj = new JSONObject();
-                        obj.put("value", el);
-                        obj.put("classicValue", el);
-                        columnValues.put(name, obj);
-                        // Add the auxiliary input to the list of auxiliary inputs modified by
-                        // callouts
-                        if (!overwrittenAuxiliaryInputs.contains(aux.getName())) {
-                          overwrittenAuxiliaryInputs.add(aux.getName());
-                        }
-                      }
-                    }
-                    if (!columnValues.containsKey(name)) {
-                      // This returned value wasn't found to be either a column or an auxiliary
-                      // input. We assume it is a hidden input, which are used in places like
-                      // selectors
-                      Object el = element.get(1, null);
-                      if (el != null) {
-                        if (el instanceof NativeArray) {
-                          // In this case, we ignore the value, as a hidden input cannot be an array
-                          // of elements
-                        } else {
-                          hiddenInputs.put(name, el);
-                          // We set the hidden fields in the request, so that subsequent callouts
-                          // can use them
-                          rq.setRequestParameter(name, el.toString());
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
+
+          calloutResponseManager = new HttpServletCalloutInformationProvider(returnedArray);
         }
+
+        managesUpdatedValuesForCallout(columnValues, tab, calloutsToCall, lastfieldChangedList,
+            messages, dynamicCols, jsExecuteCode, hiddenInputs, overwrittenAuxiliaryInputs,
+            changedCols, inpFields, calloutClassName, request, calloutResponseManager);
+
         lastCalledCallout = calloutClassName;
         lastFieldOfLastCalloutCalled = lastFieldChanged;
-      } catch (ClassNotFoundException e) {
-        throw new OBException("Couldn't find class " + calloutClassName, e);
       } catch (Exception e) {
         throw new OBException("Couldn't execute callout (class " + calloutClassName + ")", e);
       }
@@ -1704,6 +1564,170 @@
 
   }
 
+  private void managesUpdatedValuesForCallout(Map<String, JSONObject> columnValues, Tab tab,
+      List<String> calloutsToCall, List<String> lastfieldChangedList, List<JSONObject> messages,
+      List<String> dynamicCols, List<String> jsExecuteCode, Map<String, Object> hiddenInputs,
+      List<String> overwrittenAuxiliaryInputs, List<String> changedCols,
+      HashMap<String, Field> inpFields, String calloutClassName, RequestContext request,
+      CalloutInformationProvider calloutInformationProvider) throws JSONException {
+    Object element = calloutInformationProvider.getNextElement();
+    while (element != null) {
+      String name = (String) calloutInformationProvider.getCurrentElementName();
+      if (name.equals("MESSAGE") || name.equals("INFO") || name.equals("WARNING")
+          || name.equals("ERROR") || name.equals("SUCCESS")) {
+        log.debug("Callout message: " + calloutInformationProvider.getCurrentElementValue(element));
+        JSONObject message = new JSONObject();
+        message.put("text", calloutInformationProvider.getCurrentElementValue(element).toString());
+        message.put("severity", name.equals("MESSAGE") ? "TYPE_INFO" : "TYPE_" + name);
+        messages.add(message);
+      } else if (name.equals("JSEXECUTE")) {
+        // The code on a JSEXECUTE command is sent directly to the client for eval()
+        String code = (String) calloutInformationProvider.getCurrentElementValue(element);
+        if (code != null) {
+          jsExecuteCode.add(code);
+        }
+      } else if (name.equals("EXECUTE")) {
+        String js = calloutInformationProvider.getCurrentElementValue(element) == null ? null
+            : calloutInformationProvider.getCurrentElementValue(element).toString();
+        if (js != null && !js.equals("")) {
+          if (js.equals("displayLogic();")) {
+            // We don't do anything, this is a harmless js response
+          } else {
+            JSONObject message = new JSONObject();
+            message.put("text", Utility.messageBD(new DalConnectionProvider(false),
+                "OBUIAPP_ExecuteInCallout", RequestContext.get().getVariablesSecureApp()
+                    .getLanguage()));
+            message.put("severity", "TYPE_ERROR");
+            messages.add(message);
+            // Create preference to activate classic window only for HttpServlet callouts and in
+            // other cases error is shown.
+            if (calloutInformationProvider instanceof HttpServletCalloutInformationProvider) {
+              createNewPreferenceForWindow(tab.getWindow());
+              log.warn("An EXECUTE element has been found in the response of the callout "
+                  + calloutClassName
+                  + ". A preference has been created for the window "
+                  + tab.getWindow().getName()
+                  + " so that it's shown in classic mode until this problem is fixed. This requires to build the system to generate this classic window.");
+            } else {
+              log.error("An EXECUTE element has been found in the response of the SimpleCallout "
+                  + calloutClassName + ".");
+            }
+          }
+        }
+      } else {
+        if (name.startsWith("inp")) {
+          boolean changed = false;
+          if (inpFields.containsKey(name)) {
+            Column col = inpFields.get(name).getColumn();
+            if (col != null) {
+              String colId = "inp" + Sqlc.TransformaNombreColumna(col.getDBColumnName());
+              if (calloutInformationProvider.isComboData(element)) {
+                // Combo data
+                calloutInformationProvider.manageComboData(columnValues, dynamicCols, changedCols,
+                    request, element, col, colId);
+                // When managing combos, it is not taken into account if the column value has
+                // changed, so 'changed' is always true.
+                changed = true;
+              } else {
+                // Normal data
+                Object el = calloutInformationProvider.getCurrentElementValue(element);
+                String oldValue = request.getRequestParameter(colId);
+                // We set the new value in the request, so that the JSONObject is computed
+                // with the new value
+                UIDefinition uiDef = UIDefinitionController.getInstance().getUIDefinition(
+                    col.getId());
+                if (el instanceof String || !(uiDef.getDomainType() instanceof PrimitiveDomainType)) {
+                  request.setRequestParameter(colId, el == null ? null : el.toString());
+                } else {
+                  request.setRequestParameter(colId, uiDef.convertToClassicString(el));
+                }
+                String jsonStr = uiDef.getFieldProperties(inpFields.get(name), true);
+                JSONObject jsonobj = new JSONObject(jsonStr);
+                if (el == null
+                    && (uiDef instanceof ForeignKeyUIDefinition || uiDef instanceof EnumUIDefinition)) {
+                  // Special case for null values for combos: we must clean the combo values
+                  jsonobj.put(CalloutConstants.VALUE, "");
+                  jsonobj.put(CalloutConstants.CLASSIC_VALUE, "");
+                  jsonobj.put(CalloutConstants.ENTRIES, new JSONArray());
+                }
+                if (jsonobj.has(CalloutConstants.CLASSIC_VALUE)) {
+                  String newValue = jsonobj.getString(CalloutConstants.CLASSIC_VALUE);
+                  log.debug("Modified column: " + col.getDBColumnName() + "  Value: " + el);
+                  if ((oldValue == null && newValue != null)
+                      || (oldValue != null && newValue == null)
+                      || (oldValue != null && newValue != null && !oldValue.equals(newValue))) {
+                    columnValues.put("inp" + Sqlc.TransformaNombreColumna(col.getDBColumnName()),
+                        jsonobj);
+                    changed = true;
+                    if (dynamicCols.contains(colId)) {
+                      changedCols.add(col.getDBColumnName());
+                    }
+                    request.setRequestParameter(colId,
+                        jsonobj.getString(CalloutConstants.CLASSIC_VALUE));
+                  }
+                } else {
+                  log.debug("Column value didn't change. We do not attempt to execute any additional callout");
+                }
+              }
+              if (changed && col.getCallout() != null) {
+                // We need to fire this callout, as the column value was changed
+                // but only if the callout we are firing is different
+                if (isShouldBeFired(calloutClassName, col)) {
+                  addCalloutToList(col, calloutsToCall, lastfieldChangedList);
+                }
+              }
+            }
+          } else {
+            for (AuxiliaryInput aux : tab.getADAuxiliaryInputList()) {
+              if (name.equalsIgnoreCase("inp" + Sqlc.TransformaNombreColumna(aux.getName()))) {
+                Object el = calloutInformationProvider.getCurrentElementValue(element);
+                JSONObject obj = new JSONObject();
+                obj.put(CalloutConstants.VALUE, el);
+                obj.put(CalloutConstants.CLASSIC_VALUE, el);
+                columnValues.put(name, obj);
+                // Add the auxiliary input to the list of auxiliary inputs modified by
+                // callouts
+                if (!overwrittenAuxiliaryInputs.contains(aux.getName())) {
+                  overwrittenAuxiliaryInputs.add(aux.getName());
+                }
+              }
+            }
+            if (!columnValues.containsKey(name)) {
+              // This returned value wasn't found to be either a column or an auxiliary
+              // input. We assume it is a hidden input, which are used in places like
+              // selectors
+              Object el = calloutInformationProvider.getCurrentElementValue(element);
+              if (el != null) {
+                if (calloutInformationProvider.isComboData(element)) {
+                  // In this case, we ignore the value, as a hidden input cannot be an array
+                  // of elements
+                } else {
+                  hiddenInputs.put(name, el);
+                  // We set the hidden fields in the request, so that subsequent callouts
+                  // can use them
+                  request.setRequestParameter(name, el.toString());
+                }
+              }
+            }
+          }
+        }
+      }
+      element = calloutInformationProvider.getNextElement();
+    }
+  }
+
+  /**
+   * This callout should be fire only if the callout we are firing is different.
+   * 
+   * @param calloutClassName
+   *          callout that is firing
+   * @return true if it is should be fired.
+   */
+  private boolean isShouldBeFired(String calloutClassName, Column col) {
+    return !calloutClassName.equals(col.getCallout().getADModelImplementationList().get(0)
+        .getJavaClassName());
+  }
+
   /**
    * This method will create a new preference to show the given window in classic mode, if there is
    * a preference doesn't already exist
@@ -1711,7 +1735,6 @@
    * @param window
    */
   private void createNewPreferenceForWindow(Window window) {
-
     OBCriteria<Preference> prefCriteria = OBDao.getFilteredCriteria(Preference.class,
         Restrictions.eq(Preference.PROPERTY_PROPERTY, "OBUIAPP_UseClassicMode"),
         Restrictions.eq(Preference.PROPERTY_WINDOW, window));
@@ -1726,7 +1749,6 @@
     newPref.setPropertyList(true);
     OBDal.getInstance().save(newPref);
     OBDal.getInstance().flush();
-
   }
 
   private void addCalloutToList(Column col, List<String> listOfCallouts,
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/GridConfigurationSequenceNumberCallout.java	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/GridConfigurationSequenceNumberCallout.java	Tue Sep 20 09:14:51 2016 +0200
@@ -38,7 +38,6 @@
  */
 public class GridConfigurationSequenceNumberCallout extends SimpleCallout {
 
-  private static final long serialVersionUID = 1L;
   private static final String GC_SYSTEM_TAB_ID = "13FE911F7F684A47801DF55525BAD4A1";
   private static final String GC_TAB_TAB_ID = "49B33DC2EDFD45A48EECE139AD5E9AC9";
   private static final String warningMessage = "SameSeqNoForGridConfiguration";
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-tree.js	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-tree.js	Tue Sep 20 09:14:51 2016 +0200
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2013-2015 Openbravo SLU
+ * All portions are Copyright (C) 2013-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -33,30 +33,32 @@
   pickerIconHSpace: 0,
   iconHSpace: 0,
   tree: null,
-  init: function () {
+  init: function (parameters) {
     this.pickerIconSrc = OB.Styles.OBFormField.DefaultComboBox.pickerIconSrc;
-    this.icons = [{
-      src: OB.Styles.OBFormField.DefaultSearch.pickerIconSrc,
-      width: OB.Styles.OBFormField.DefaultSearch.pickerIconWidth,
-      height: OB.Styles.OBFormField.DefaultSearch.pickerIconHeight,
-      click: function (form, item, icon) {
-        item.openTreeWindow();
-      }
-    }];
+    if (parameters.showTreePopupWindow !== false) {
+      this.icons = [{
+        src: OB.Styles.OBFormField.DefaultSearch.pickerIconSrc,
+        width: OB.Styles.OBFormField.DefaultSearch.pickerIconWidth,
+        height: OB.Styles.OBFormField.DefaultSearch.pickerIconHeight,
+        click: function (form, item, icon) {
+          item.openTreeWindow();
+        }
+      }];
+      this.treeWindow = isc.OBTreeItemPopupWindow.create({
+        // solves issue: https://issues.openbravo.com/view.php?id=17268
+        title: (this.form && this.form.grid ? this.form.grid.getField(this.name).title : this.title),
+        dataSource: this.optionDataSource,
+        treeItem: this,
+        valueField: this.valueField,
+        displayField: this.displayField,
+        treeGridFields: isc.shallowClone(this.treeGridFields)
+      });
+    }
     this.Super('init', arguments);
     this.tree = isc.OBTreeItemTree.create({
       treeItem: this
     });
     this.treeDisplayField = this.getTreeDisplayField();
-    this.treeWindow = isc.OBTreeItemPopupWindow.create({
-      // solves issue: https://issues.openbravo.com/view.php?id=17268
-      title: (this.form && this.form.grid ? this.form.grid.getField(this.name).title : this.title),
-      dataSource: this.optionDataSource,
-      treeItem: this,
-      valueField: this.valueField,
-      displayField: this.displayField,
-      treeGridFields: isc.shallowClone(this.treeGridFields)
-    });
     this.enableShortcuts();
   },
 
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js	Tue Sep 20 09:14:51 2016 +0200
@@ -271,7 +271,7 @@
   editNewRecord: function (preventFocus) {
     var grid = this.view.viewGrid;
     this.clearValues();
-    if (grid.lazyFiltering && !isc.isA.ResultSet(grid.data)) {
+    if ((grid.lazyFiltering || this.view.deferOpenNewEdit) && !isc.isA.ResultSet(grid.data)) {
       OB.Utilities.createResultSetManually(grid);
     }
     var ret = this.Super('editNewRecord', arguments);
@@ -1584,6 +1584,13 @@
       // back to grid
       this.view.viewGrid.setSingleRecordFilterMessage();
     }
+    if (this.view.deferOpenNewEdit) {
+      // create new opens form view without loading grid data, set message in toolbar
+      // and show the funnel icon when switching back to grid
+      this.view.viewGrid.filterImage.prompt = OB.I18N.getLabel('OBUIAPP_GridFilterNewRecord');
+      this.view.viewGrid.filterImage.show(true);
+      this.view.viewGrid.setNewRecordFilterMessage();
+    }
 
     this.view.standardWindow.setDirtyEditForm(null);
     this.view.clearTargetRecordInWindow();
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js	Tue Sep 20 09:14:51 2016 +0200
@@ -816,7 +816,7 @@
       // forcing fetch from server in case default filters are removed, in other
       // cases adaptive filtering can be used if possible
       if (this.data) {
-        forceRefresh = this.filterClause || this.sqlFilterClause;
+        forceRefresh = this.filterClause || this.sqlFilterClause || (this.view && this.view.deferOpenNewEdit);
 
         groupState = this.getGroupState();
         if (forceRefresh && groupState && groupState.groupByFields) {
@@ -859,6 +859,9 @@
     if (this.view && this.view.directNavigation) {
       delete this.view.directNavigation;
     }
+    if (this.view && this.view.deferOpenNewEdit) {
+      delete this.view.deferOpenNewEdit;
+    }
   },
 
   showSummaryRow: function () {
@@ -1022,6 +1025,17 @@
     return fkFilterAuxCache;
   },
 
+  setNewRecordFilterMessage: function () {
+    var showMessageProperty, showMessage;
+
+    showMessageProperty = OB.PropertyStore.get('OBUIAPP_ShowNewRecordFilterMsg');
+    showMessage = showMessageProperty !== 'N' && showMessageProperty !== '"N"';
+    if (showMessage) {
+      this.view.messageBar.setMessage(isc.OBMessageBar.TYPE_INFO, '<div><div style="float: left;">' + OB.I18N.getLabel('OBUIAPP_NewRecordFilterMsg') + '<br/>' + OB.I18N.getLabel('OBUIAPP_ClearFilters') + '</div><div style="float: right; padding-top: 15px;"><a href="#" style="font-weight:normal; color:inherit;" onclick="' + 'window[\'' + this.view.messageBar.ID + '\'].hide(); OB.PropertyStore.set(\'OBUIAPP_ShowNewRecordFilterMsg\', \'N\');">' + OB.I18N.getLabel('OBUIAPP_NeverShowMessageAgain') + '</a></div></div>', ' ');
+      this.view.messageBar.hasFilterMessage = true;
+    }
+  },
+
   setSingleRecordFilterMessage: function () {
     var showMessageProperty, showMessage;
 
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js	Tue Sep 20 09:14:51 2016 +0200
@@ -505,7 +505,9 @@
       }
     }
 
-    if (this.lazyFiltering) {
+    if (this.view && this.view.deferOpenNewEdit) {
+      this.noDataEmptyMessage = '<span class="' + this.emptyMessageStyle + '">' + OB.I18N.getLabel('OBUIAPP_GridFilterNoResults') + '</span>' + '<span onclick="window[\'' + this.ID + '\'].clearFilter();" class="' + this.emptyMessageLinkStyle + '">' + OB.I18N.getLabel('OBUIAPP_GridClearFilter') + '</span>';
+    } else if (this.lazyFiltering) {
       this.noDataEmptyMessage = '<span class="' + this.emptyMessageStyle + '">' + OB.I18N.getLabel('OBUIAPP_LazyFilteringNoFetch') + '</span>';
     } else {
       this.noDataEmptyMessage = '<span class="' + this.emptyMessageStyle + '">' + OB.I18N.getLabel('OBUISC_ListGrid.loadingDataMessage') + '</span>'; // OB.I18N.getLabel('OBUIAPP_GridNoRecords')
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js	Tue Sep 20 09:14:51 2016 +0200
@@ -197,7 +197,7 @@
   initWidget: function (properties) {
     var length, rightMemberButtons = [],
         leftMemberButtons = [],
-        i, actionButton;
+        i, actionButton, preferenceValue;
 
     if (this.isRootView) {
       this.buildStructure();
@@ -231,7 +231,10 @@
     if (this.sessionAttributesNames) {
       this.preferenceValues = {};
       for (i = 0; i < this.sessionAttributesNames.length; i++) {
-        this.preferenceValues[this.sessionAttributesNames[i]] = OB.PropertyStore.get(this.sessionAttributesNames[i], this.standardWindow.windowId);
+        preferenceValue = OB.PropertyStore.get(this.sessionAttributesNames[i], this.standardWindow.windowId);
+        if (preferenceValue !== null) {
+          this.preferenceValues[this.sessionAttributesNames[i]] = preferenceValue;
+        }
       }
     }
 
@@ -368,7 +371,7 @@
     // a specific tab with a record, the direct link logic will already take care
     // of fetching data
     if (this.isRootView && !this.standardWindow.directTabInfo) {
-      if (!lazyFiltering) {
+      if (!lazyFiltering && !this.deferOpenNewEdit) {
         if (!this.standardWindow.checkIfDefaultSavedView()) {
           this.viewGrid.fetchData(this.viewGrid.getCriteria());
         } else {
@@ -2007,6 +2010,9 @@
         this.treeGrid.setData([]);
         this.treeGrid.refreshGrid(refreshCallback);
       } else {
+        if (this.deferOpenNewEdit && this.messageBar.isVisible()) {
+          this.messageBar.hide();
+        }
         this.viewGrid.refreshGrid(refreshCallback, newRecordsToBeIncluded);
       }
     } else {
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js	Tue Sep 20 09:14:51 2016 +0200
@@ -93,6 +93,9 @@
     this.viewProperties.isRootView = true;
     if (this.command === isc.OBStandardWindow.COMMAND_NEW) {
       this.viewProperties.allowDefaultEditMode = false;
+      this.viewProperties.deferOpenNewEdit = true;
+    } else {
+      this.viewProperties.deferOpenNewEdit = false;
     }
 
     if (OB.Utilities.checkProfessionalLicense(null, true)) {
@@ -126,6 +129,9 @@
 
     } else if (this.getClass().personalization) {
       this.setPersonalization(this.getClass().personalization);
+    } else {
+      // not applying personalization, not need to defer the form opening
+      this.viewProperties.deferOpenNewEdit = false;
     }
   },
 
@@ -547,10 +553,16 @@
   },
 
   setPersonalization: function (personalization) {
-    var i, defaultView, persDefaultValue, views, length, me = this;
+    var i, defaultView, persDefaultValue, views, currentView = this.activeView || this.view,
+        length, me = this;
 
     // only personalize if there is a professional license
     if (!OB.Utilities.checkProfessionalLicense(null, true)) {
+      // open new record in form if the form opening has been deferred
+      if (currentView.deferOpenNewEdit) {
+        currentView.editRecord();
+        this.command = null;
+      }
       return;
     }
 
@@ -636,6 +648,12 @@
     // restore focus as the focusitem may have been hidden now
     // https://issues.openbravo.com/view.php?id=21249
     this.setFocusInView();
+
+    // personalization has been applied, open new record in form if the form opening has been deferred
+    if (currentView.deferOpenNewEdit) {
+      currentView.editRecord();
+      this.command = null;
+    }
   },
 
   // reapplies partial states that couldn't be initially applied because
@@ -1178,8 +1196,10 @@
       }
     } else if (this.command === isc.OBStandardWindow.COMMAND_NEW) {
       var currentView = this.activeView || this.view;
-      currentView.editRecord();
-      this.command = null;
+      if (!currentView.deferOpenNewEdit) {
+        currentView.editRecord();
+        this.command = null;
+      }
     } else {
       this.setFocusInView(this.view);
     }
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views.js	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views.js	Tue Sep 20 09:14:51 2016 +0200
@@ -11,7 +11,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) 2011-2014 Openbravo SLU
+ * All portions are Copyright (C) 2011-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s): ___________
  ************************************************************************
@@ -191,10 +191,11 @@
     //clear grouping, will be applied later
     view.viewGrid.clearGroupBy();
     view.viewGrid.setViewState(viewTabDefinition.grid);
-    if (!view.viewGrid.lazyFiltering && !view.viewGrid.targetRecordId) {
+    if (!view.viewGrid.lazyFiltering && !view.viewGrid.targetRecordId && !view.deferOpenNewEdit) {
       // do not refresh contents if:
       //  -lazy: requires user action to refresh
       //  -direct navigation: it is done centrally after applying personalizations
+      //  -create new from navigation bar
       view.viewGrid.refreshContents();
     }
   }
--- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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.29935]]></VERSION>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.30300]]></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>
--- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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.29935]]></STARTVERSION>
+<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.30300]]></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/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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.29935]]></VERSION>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.30300]]></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>
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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.29935]]></STARTVERSION>
+<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.30300]]></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.29935]]></STARTVERSION>
+<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <STARTVERSION><![CDATA[1.1.30300]]></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.29935]]></STARTVERSION>
+<!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <STARTVERSION><![CDATA[2.0.30300]]></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/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/NumberUIDefinition.java	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/NumberUIDefinition.java	Tue Sep 20 09:14:51 2016 +0200
@@ -11,7 +11,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-2012 Openbravo SLU 
+ * All portions are Copyright (C) 2010-2016 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -19,6 +19,7 @@
 package org.openbravo.client.kernel.reference;
 
 import java.math.BigDecimal;
+import java.text.DecimalFormat;
 
 import org.codehaus.jettison.json.JSONException;
 import org.codehaus.jettison.json.JSONObject;
@@ -27,6 +28,7 @@
 import org.openbravo.base.secureApp.VariablesSecureApp;
 import org.openbravo.client.kernel.RequestContext;
 import org.openbravo.client.kernel.reference.UIDefinitionController.FormatDefinition;
+import org.openbravo.erpCommon.utility.Utility;
 import org.openbravo.model.ad.ui.Field;
 
 /**
@@ -153,6 +155,41 @@
   }
 
   @Override
+  public String getDefaultValue(VariablesSecureApp vars, String columnName,
+      String defaultValueExpression, String windowId) {
+    String defaultValue = super.getDefaultValue(vars, columnName, defaultValueExpression, windowId);
+    try {
+      return formatDefaultValue(vars, defaultValue);
+    } catch (Exception ex) {
+      throw new OBException("Invalid numeric default value (" + defaultValueExpression
+          + ") defined for column " + columnName + " in window " + windowId, ex);
+    }
+  }
+
+  @Override
+  public String getDefaultValueFromSQLExpression(VariablesSecureApp vars, Field field,
+      String defaultValueExpression) {
+    String defaultValue = super.getDefaultValueFromSQLExpression(vars, field,
+        defaultValueExpression);
+    try {
+      return formatDefaultValue(vars, defaultValue);
+    } catch (Exception ex) {
+      throw new OBException("Invalid numeric value retrieved from default expression ("
+          + defaultValueExpression + ") defined for field " + field.getName(), ex);
+    }
+  }
+
+  private String formatDefaultValue(VariablesSecureApp vars, String defaultValue) {
+    if (defaultValue == null || defaultValue.length() == 0) {
+      return defaultValue;
+    }
+    // Format the numeric default value
+    DecimalFormat df = Utility.getFormat(vars, getFormat());
+    BigDecimal numericDefaultValue = new BigDecimal(defaultValue);
+    return df.format(numericDefaultValue);
+  }
+
+  @Override
   public Object createFromClassicString(String value) {
     if (value == null || value.length() == 0) {
       return null;
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java	Tue Sep 20 09:14:51 2016 +0200
@@ -211,46 +211,10 @@
         if (defaultS.equalsIgnoreCase("@#Date@")) {
           return setNOWDefault();
         } else if (!defaultS.startsWith("@SQL=")) {
-          columnValue = Utility.getDefault(new DalConnectionProvider(false),
-              rq.getVariablesSecureApp(), colName, defaultS, windowId, "");
+          columnValue = getDefaultValue(rq.getVariablesSecureApp(), colName, defaultS, windowId);
         } else {
-          ArrayList<String> params = new ArrayList<String>();
-          String sql = parseSQL(defaultS, params);
-          int indP = 1;
-          PreparedStatement ps = null;
-          try {
-            ps = OBDal.getInstance().getConnection(false).prepareStatement(sql);
-            for (String parameter : params) {
-              String value = "";
-              if (parameter.substring(0, 1).equals("#")) {
-                value = Utility.getContext(new DalConnectionProvider(false), RequestContext.get()
-                    .getVariablesSecureApp(), parameter, field.getTab().getWindow().getId());
-              } else {
-                String fieldId = "inp" + Sqlc.TransformaNombreColumna(parameter);
-                if (RequestContext.get().getParameterMap().containsKey(fieldId)) {
-                  value = RequestContext.get().getRequestParameter(fieldId);
-                }
-                if (value == null || value.equals("")) {
-                  value = Utility.getContext(new DalConnectionProvider(false), RequestContext.get()
-                      .getVariablesSecureApp(), parameter, field.getTab().getWindow().getId());
-                }
-              }
-              ps.setObject(indP++, value);
-            }
-            ResultSet rs = ps.executeQuery();
-            if (rs.next()) {
-              columnValue = getValueFromSQLDefault(rs);
-            }
-          } catch (Exception e) {
-            log.error("Error computing default value for field " + field.getName() + " of tab "
-                + field.getTab().getName(), e);
-          } finally {
-            try {
-              ps.close();
-            } catch (SQLException e) {
-              // won't happen
-            }
-          }
+          columnValue = getDefaultValueFromSQLExpression(rq.getVariablesSecureApp(), field,
+              defaultS);
         }
       }
     }
@@ -269,6 +233,82 @@
   }
 
   /**
+   * Returns the value for a default value expression which represents a session value or a fixed
+   * value. This method is not used to calculate SQL based expressions (those that start with
+   * '@SQL=') and NOW expression ('@#Date@').
+   *
+   * @param vars
+   *          Handler for the session info.
+   * @param columnName
+   *          String with the name of the column that has the default value.
+   * @param defaultValueExpression
+   *          String with the default value expression.
+   * @param window
+   *          String with the window id.
+   * @return String with the calculated default value.
+   */
+  public String getDefaultValue(VariablesSecureApp vars, String columnName,
+      String defaultValueExpression, String windowId) {
+    return Utility.getDefault(new DalConnectionProvider(false), vars, columnName,
+        defaultValueExpression, windowId, "");
+  }
+
+  /**
+   * Returns the value for a default value expression based on a SQL expression. This kind of
+   * expressions start with '@SQL='.
+   *
+   * @param vars
+   *          Handler for the session info.
+   * @param field
+   *          Field whose column has the default value.
+   * @param defaultValueExpression
+   *          String with the default value expression.
+   * @return String with the calculated default value.
+   */
+  public String getDefaultValueFromSQLExpression(VariablesSecureApp vars, Field field,
+      String defaultValueExpression) {
+    ArrayList<String> params = new ArrayList<String>();
+    String sql = parseSQL(defaultValueExpression, params);
+    int indP = 1;
+    PreparedStatement ps = null;
+    String columnValue = null;
+    try {
+      ps = OBDal.getInstance().getConnection(false).prepareStatement(sql);
+      for (String parameter : params) {
+        String value = "";
+        if (parameter.substring(0, 1).equals("#")) {
+          value = Utility.getContext(new DalConnectionProvider(false), RequestContext.get()
+              .getVariablesSecureApp(), parameter, field.getTab().getWindow().getId());
+        } else {
+          String fieldId = "inp" + Sqlc.TransformaNombreColumna(parameter);
+          if (RequestContext.get().getParameterMap().containsKey(fieldId)) {
+            value = RequestContext.get().getRequestParameter(fieldId);
+          }
+          if (value == null || value.equals("")) {
+            value = Utility.getContext(new DalConnectionProvider(false), RequestContext.get()
+                .getVariablesSecureApp(), parameter, field.getTab().getWindow().getId());
+          }
+        }
+        ps.setObject(indP++, value);
+      }
+      ResultSet rs = ps.executeQuery();
+      if (rs.next()) {
+        columnValue = getValueFromSQLDefault(rs);
+      }
+    } catch (Exception e) {
+      log.error("Error computing default value for field " + field.getName() + " of tab "
+          + field.getTab().getName(), e);
+    } finally {
+      try {
+        ps.close();
+      } catch (SQLException e) {
+        // won't happen
+      }
+    }
+    return columnValue;
+  }
+
+  /**
    * It returns the same as getFieldProperties except in the case of combo UIDefinitions. In combo
    * UI definitions, a call to the super will be done, but the combo computation itself will not be
    * done (so only the default value, or the current request value, will be considered).
--- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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.29935]]></VERSION>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.30300]]></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>
--- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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.29935]]></STARTVERSION>
+<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.30300]]></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.29935]]></STARTVERSION>
+<!--E71B28FC949D481D9F59C17D01E46EF9-->  <STARTVERSION><![CDATA[3.0.30300]]></STARTVERSION>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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.29935]]></VERSION>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.30300]]></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>
--- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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.29935]]></STARTVERSION>
+<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.30300]]></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/modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/CheckOptionalFilterCallout.java	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/CheckOptionalFilterCallout.java	Tue Sep 20 09:14:51 2016 +0200
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2013 Openbravo SLU
+ * All portions are Copyright (C) 2013-2016 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -35,7 +35,6 @@
 
 public class CheckOptionalFilterCallout extends SimpleCallout {
 
-  private static final long serialVersionUID = 1L;
   private static final String OPTIONAL_FILTERS = "@optional_filters@";
   private static final String warningMessage = "OBUIAPP_CheckOptionalFilters";
 
--- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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.29935]]></VERSION>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.30300]]></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>
--- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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.29935]]></STARTVERSION>
+<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.30300]]></STARTVERSION>
 <!--FF8080812D842086012D845002070046-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080812D842086012D845002070046-->  <DEPENDANT_MODULE_NAME><![CDATA[Workspace & Widgets]]></DEPENDANT_MODULE_NAME>
 <!--FF8080812D842086012D845002070046-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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.29935]]></VERSION>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.30300]]></VERSION>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <DESCRIPTION><![CDATA[Payment Report]]></DESCRIPTION>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <URL><![CDATA[http://forge.openbravo.com/projects/paymentreport]]></URL>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <TYPE><![CDATA[M]]></TYPE>
--- a/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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.29935]]></STARTVERSION>
+<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.30300]]></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/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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.29935]]></VERSION>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.30300]]></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>
--- a/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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.29935]]></STARTVERSION>
+<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.30300]]></STARTVERSION>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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.29935]]></VERSION>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION><![CDATA[2.1.30300]]></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>
--- a/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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.29935]]></STARTVERSION>
+<!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <STARTVERSION><![CDATA[1.1.30300]]></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.29935]]></STARTVERSION>
+<!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <STARTVERSION><![CDATA[2.0.30300]]></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.29935]]></STARTVERSION>
+<!--4FCE95802A854F7E8623AFF7C33D13EE-->  <STARTVERSION><![CDATA[3.0.30300]]></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.29935]]></STARTVERSION>
+<!--54AF8B39C55E4E7496902893ECD82786-->  <STARTVERSION><![CDATA[2.1.30300]]></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.29935]]></STARTVERSION>
+<!--D03C56D8A4E14F45A5466350E05C631F-->  <STARTVERSION><![CDATA[8.1.30300]]></STARTVERSION>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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.29935]]></VERSION>
+<!--FF8080813129ADA401312CA1222A0005-->  <VERSION><![CDATA[0.1.30300]]></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.
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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.29935]]></STARTVERSION>
+<!--FF8080813141B198013141BA0F7D0012-->  <STARTVERSION><![CDATA[0.1.30300]]></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.29935]]></STARTVERSION>
+<!--FF8080813151AEE1013151C4ACE6001B-->  <STARTVERSION><![CDATA[2.1.30300]]></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/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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.29935]]></VERSION>
+<!--FF8080813141B198013141B86DD70003-->  <VERSION><![CDATA[0.1.30300]]></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.
--- a/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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.29935]]></STARTVERSION>
+<!--FF8080813141B198013141B8B21B0006-->  <STARTVERSION><![CDATA[3.0.30300]]></STARTVERSION>
 <!--FF8080813141B198013141B8B21B0006-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080813141B198013141B8B21B0006-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813141B198013141B8B21B0006-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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.29935]]></VERSION>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION><![CDATA[2.0.30300]]></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>
--- a/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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.29935]]></STARTVERSION>
+<!--9E3E7B42DB16405FB794496D309D7044-->  <STARTVERSION><![CDATA[3.0.30300]]></STARTVERSION>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java	Tue Sep 20 09:14:51 2016 +0200
@@ -312,6 +312,18 @@
     }
   }
 
+  /**
+   * Used on requests received from pick and execute windows in order to avoid losing the selection.
+   * It checks if the request has a criteria that contains the selected records. In that case, if
+   * the amount of selected records is higher than the page size, then the end row is increased so
+   * that all the selected records can be returned within the same page.
+   * 
+   * @param parameters
+   *          map of request parameters
+   * @param startRowStr
+   *          start row of the page
+   * @return the new value for the end row
+   */
   private String getEndRowForSelectedRecords(Map<String, String> parameters, String startRowStr) {
     String endRowStr = parameters.get(JsonConstants.ENDROW_PARAMETER);
     if (startRowStr == null || endRowStr == null) {
@@ -326,6 +338,23 @@
     return endRowStr;
   }
 
+  /**
+   * Used on requests received from pick and execute windows in order to avoid losing the selection.
+   * It is used when the request does not contain information about the selected records. In that
+   * case, this method decides if the query should be done again with a higher page size, according
+   * to the the selection status of the last record returned by the database query and the current
+   * page size.
+   * 
+   * @param parameters
+   *          map of request parameters
+   * @param bobs
+   *          list of objects returned by the database query
+   * @param startRowStr
+   *          start row of the page
+   * @param endRowStr
+   *          end row of the page
+   * @return true if the page size should be increased, false otherwise
+   */
   private boolean shouldIncreasePageSize(Map<String, String> parameters, List<BaseOBObject> bobs,
       String startRowStr, String endRowStr) {
     if (startRowStr == null || endRowStr == null) {
--- a/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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.29935]]></VERSION>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION><![CDATA[2.1.30300]]></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>
--- a/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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.29935]]></STARTVERSION>
+<!--38825CAED43941D38CA0C78DB04FCFA0-->  <STARTVERSION><![CDATA[8.1.30300]]></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.29935]]></STARTVERSION>
+<!--6DDE7B1A70174242AF82B5022FB89279-->  <STARTVERSION><![CDATA[2.1.30300]]></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.29935]]></STARTVERSION>
+<!--94F9CD2CB5EF4467A67475C786C984A7-->  <STARTVERSION><![CDATA[2.1.30300]]></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.29935]]></STARTVERSION>
+<!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <STARTVERSION><![CDATA[1.1.30300]]></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.29935]]></STARTVERSION>
+<!--C8DAC574B88649D08C9468521B343F12-->  <STARTVERSION><![CDATA[3.0.30300]]></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.29935]]></STARTVERSION>
+<!--F14EB17946BE4724A46F80CB1A47EC70-->  <STARTVERSION><![CDATA[2.1.30300]]></STARTVERSION>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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.29935]]></VERSION>
+<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION><![CDATA[2.0.30300]]></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>
--- a/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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.29935]]></STARTVERSION>
+<!--39BF75AD9AB3453698BF5DE29E727AA9-->  <STARTVERSION><![CDATA[3.0.30300]]></STARTVERSION>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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.29935]]></VERSION>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION><![CDATA[8.1.30300]]></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>
--- a/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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.29935]]></STARTVERSION>
+<!--086331E18477496B8AC74D2CFEBD1307-->  <STARTVERSION><![CDATA[3.0.30300]]></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.29935]]></STARTVERSION>
+<!--DC5D4EF450244482BD2B458DAA496333-->  <STARTVERSION><![CDATA[2.1.30300]]></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.29935]]></STARTVERSION>
+<!--F2AF15C0AF5540E393D96BE506E20648-->  <STARTVERSION><![CDATA[1.1.30300]]></STARTVERSION>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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.29935]]></VERSION>
+<!--8A34B301DC524EA3A07513DF9F42CC90-->  <VERSION><![CDATA[1.0.30300]]></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>
--- a/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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.29935]]></STARTVERSION>
+<!--86EBD30DEB8045508185B457896C9F6D-->  <STARTVERSION><![CDATA[2.1.30300]]></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/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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.29935]]></VERSION>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION><![CDATA[3.0.30300]]></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
--- a/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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.29935]]></STARTVERSION>
+<!--148A000EE9A04A3CA653B1296A00B8E6-->  <STARTVERSION><![CDATA[3.0.30300]]></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.29935]]></STARTVERSION>
+<!--30F966407A6F4E15965821BAEE34D25B-->  <STARTVERSION><![CDATA[3.0.30300]]></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.29935]]></STARTVERSION>
+<!--F93CE30003B24F8F8886510B0065EECC-->  <STARTVERSION><![CDATA[1.1.30300]]></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/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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.29935]]></VERSION>
+<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION><![CDATA[2.1.30300]]></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>
--- a/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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.29935]]></STARTVERSION>
+<!--01E1BCCEC9114DE0960538DF34E30E6F-->  <STARTVERSION><![CDATA[2.1.30300]]></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.29935]]></STARTVERSION>
+<!--025B181F63CA47B48A920F6983242390-->  <STARTVERSION><![CDATA[3.0.30300]]></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.29935]]></STARTVERSION>
+<!--054B4FEAF919478AA3FF27098A46D1D6-->  <STARTVERSION><![CDATA[2.1.30300]]></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.29935]]></STARTVERSION>
+<!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <STARTVERSION><![CDATA[1.0.30300]]></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.29935]]></STARTVERSION>
+<!--224754C3EF674C93B0D468F47BAAB824-->  <STARTVERSION><![CDATA[2.1.30300]]></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.29935]]></STARTVERSION>
+<!--5B72D24032DD4879A950194139D961B6-->  <STARTVERSION><![CDATA[2.1.30300]]></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.29935]]></STARTVERSION>
+<!--8730CA6A4224439D82E0DD31B3806E36-->  <STARTVERSION><![CDATA[1.0.30300]]></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.29935]]></STARTVERSION>
+<!--98C47FF058F8413B8A2B26036061446E-->  <STARTVERSION><![CDATA[8.1.30300]]></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.29935]]></STARTVERSION>
+<!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <STARTVERSION><![CDATA[2.0.30300]]></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.29935]]></STARTVERSION>
+<!--A9CB99330AF34944877F889DD8A0AB3C-->  <STARTVERSION><![CDATA[2.1.30300]]></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.29935]]></STARTVERSION>
+<!--E72A053A403C4A98A189C105B850ADB0-->  <STARTVERSION><![CDATA[1.1.30300]]></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.29935]]></STARTVERSION>
+<!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <STARTVERSION><![CDATA[2.0.30300]]></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/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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.29935]]></VERSION>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION><![CDATA[3.0.30300]]></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>
--- a/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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.29935]]></STARTVERSION>
+<!--48D556894CE54CF998DC97882E904CBD-->  <STARTVERSION><![CDATA[1.0.30300]]></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.29935]]></STARTVERSION>
+<!--4D11E3A70650475381139522373CD191-->  <STARTVERSION><![CDATA[2.1.30300]]></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.29935]]></STARTVERSION>
+<!--52CE523C40634C47A99C6EBBD9C3125C-->  <STARTVERSION><![CDATA[3.0.30300]]></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.29935]]></STARTVERSION>
+<!--60834727BB114764ACEF019F40A34562-->  <STARTVERSION><![CDATA[1.1.30300]]></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.29935]]></STARTVERSION>
+<!--8418885E97D643138B6D907671351E3D-->  <STARTVERSION><![CDATA[3.0.30300]]></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.29935]]></STARTVERSION>
+<!--A32F3279B3374FC0A6CFEA2368BB7053-->  <STARTVERSION><![CDATA[3.0.30300]]></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.29935]]></STARTVERSION>
+<!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <STARTVERSION><![CDATA[3.0.30300]]></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.29935]]></STARTVERSION>
+<!--FEF6E40F244A4061B7C62CB755663712-->  <STARTVERSION><![CDATA[1.0.30300]]></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.29935]]></STARTVERSION>
+<!--FF8080813189932B013189B45B59003A-->  <STARTVERSION><![CDATA[0.1.30300]]></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.29935]]></STARTVERSION>
+<!--FF8080813189932B013189B4C00F003D-->  <STARTVERSION><![CDATA[0.1.30300]]></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.29935]]></STARTVERSION>
+<!--FF8081812E2F6F3C012E2F750109001C-->  <STARTVERSION><![CDATA[0.0.30300]]></STARTVERSION>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <DEPENDANT_MODULE_NAME><![CDATA[Widgets Collection]]></DEPENDANT_MODULE_NAME>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/referencedata/sampledata/QA_Testing/AD_PINSTANCE.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/referencedata/sampledata/QA_Testing/AD_PINSTANCE.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -946,6 +946,23 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[DE8D4E06B7DF482BAC830F971B83864B]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[104]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[F939B53C0EBB4E5EA35636DCAF61BF6C]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2016-08-31 16:16:43.158711]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2016-08-31 16:16:43.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[E12EB74317374CCA8B97B0EF88F6C7A2]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[111]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[691E5C50BB4549AE81AE43F74AFD6956]]></RECORD_ID>
--- a/referencedata/sampledata/QA_Testing/AD_SEQUENCE.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/referencedata/sampledata/QA_Testing/AD_SEQUENCE.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -301,6 +301,26 @@
 </AD_SEQUENCE>
 
 <AD_SEQUENCE>
+  <AD_SEQUENCE_ID><![CDATA[2F51565301C641559BB560834CA770F5]]></AD_SEQUENCE_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2016-08-31 16:14:00.668416]]></CREATED>
+  <CREATEDBY><![CDATA[0]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-08-31 16:14:00.668416]]></UPDATED>
+  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <NAME><![CDATA[DocumentNo_C_Attachment_Method]]></NAME>
+  <DESCRIPTION><![CDATA[DocumentNo/Value for Table C_Attachment_Method]]></DESCRIPTION>
+  <ISAUTOSEQUENCE><![CDATA[Y]]></ISAUTOSEQUENCE>
+  <INCREMENTNO><![CDATA[1]]></INCREMENTNO>
+  <STARTNO><![CDATA[10000000]]></STARTNO>
+  <CURRENTNEXT><![CDATA[10000000]]></CURRENTNEXT>
+  <CURRENTNEXTSYS><![CDATA[10000000]]></CURRENTNEXTSYS>
+  <ISTABLEID><![CDATA[N]]></ISTABLEID>
+  <STARTNEWYEAR><![CDATA[N]]></STARTNEWYEAR>
+</AD_SEQUENCE>
+
+<AD_SEQUENCE>
   <AD_SEQUENCE_ID><![CDATA[304B28063A7D4B95BBF4271E7CEF48AC]]></AD_SEQUENCE_ID>
   <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
@@ -1439,6 +1459,26 @@
 </AD_SEQUENCE>
 
 <AD_SEQUENCE>
+  <AD_SEQUENCE_ID><![CDATA[B141B045EBC3496B995B0D07A6FFEF88]]></AD_SEQUENCE_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2016-08-31 16:14:00.683225]]></CREATED>
+  <CREATEDBY><![CDATA[0]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-08-31 16:14:00.683225]]></UPDATED>
+  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <NAME><![CDATA[DocumentNo_m_prodchview_v]]></NAME>
+  <DESCRIPTION><![CDATA[DocumentNo/Value for Table m_prodchview_v]]></DESCRIPTION>
+  <ISAUTOSEQUENCE><![CDATA[Y]]></ISAUTOSEQUENCE>
+  <INCREMENTNO><![CDATA[1]]></INCREMENTNO>
+  <STARTNO><![CDATA[10000000]]></STARTNO>
+  <CURRENTNEXT><![CDATA[10000000]]></CURRENTNEXT>
+  <CURRENTNEXTSYS><![CDATA[10000000]]></CURRENTNEXTSYS>
+  <ISTABLEID><![CDATA[N]]></ISTABLEID>
+  <STARTNEWYEAR><![CDATA[N]]></STARTNEWYEAR>
+</AD_SEQUENCE>
+
+<AD_SEQUENCE>
   <AD_SEQUENCE_ID><![CDATA[B2548281D50642A198EBAFFD44879331]]></AD_SEQUENCE_ID>
   <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
@@ -2046,7 +2086,7 @@
   <ISAUTOSEQUENCE><![CDATA[Y]]></ISAUTOSEQUENCE>
   <INCREMENTNO><![CDATA[1]]></INCREMENTNO>
   <STARTNO><![CDATA[50000]]></STARTNO>
-  <CURRENTNEXT><![CDATA[50016]]></CURRENTNEXT>
+  <CURRENTNEXT><![CDATA[50018]]></CURRENTNEXT>
   <CURRENTNEXTSYS><![CDATA[5000]]></CURRENTNEXTSYS>
   <ISTABLEID><![CDATA[N]]></ISTABLEID>
   <STARTNEWYEAR><![CDATA[N]]></STARTNEWYEAR>
@@ -2255,7 +2295,7 @@
   <ISAUTOSEQUENCE><![CDATA[Y]]></ISAUTOSEQUENCE>
   <INCREMENTNO><![CDATA[1]]></INCREMENTNO>
   <STARTNO><![CDATA[400000]]></STARTNO>
-  <CURRENTNEXT><![CDATA[400034]]></CURRENTNEXT>
+  <CURRENTNEXT><![CDATA[400035]]></CURRENTNEXT>
   <CURRENTNEXTSYS><![CDATA[40000]]></CURRENTNEXTSYS>
   <ISTABLEID><![CDATA[N]]></ISTABLEID>
   <STARTNEWYEAR><![CDATA[N]]></STARTNEWYEAR>
--- a/referencedata/sampledata/QA_Testing/C_ORDER.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/referencedata/sampledata/QA_Testing/C_ORDER.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -59,8 +59,8 @@
   <CREATE_POLINES><![CDATA[N]]></CREATE_POLINES>
   <ISCASHVAT><![CDATA[N]]></ISCASHVAT>
   <RM_PICKFROMRECEIPT><![CDATA[N]]></RM_PICKFROMRECEIPT>
+  <ISCANCELLED><![CDATA[N]]></ISCANCELLED>
   <EM_APRM_ADDPAYMENT><![CDATA[N]]></EM_APRM_ADDPAYMENT>
-  <EM_OBDISC_ADDPACK><![CDATA[N]]></EM_OBDISC_ADDPACK>
 </C_ORDER>
 
 <C_ORDER>
@@ -120,6 +120,7 @@
   <CONVERTQUOTATION><![CDATA[N]]></CONVERTQUOTATION>
   <CREATE_POLINES><![CDATA[N]]></CREATE_POLINES>
   <ISCASHVAT><![CDATA[N]]></ISCASHVAT>
+  <ISCANCELLED><![CDATA[N]]></ISCANCELLED>
 </C_ORDER>
 
 <C_ORDER>
@@ -181,6 +182,7 @@
   <CREATE_POLINES><![CDATA[N]]></CREATE_POLINES>
   <ISCASHVAT><![CDATA[N]]></ISCASHVAT>
   <RM_PICKFROMRECEIPT><![CDATA[N]]></RM_PICKFROMRECEIPT>
+  <ISCANCELLED><![CDATA[N]]></ISCANCELLED>
   <EM_APRM_ADDPAYMENT><![CDATA[N]]></EM_APRM_ADDPAYMENT>
 </C_ORDER>
 
@@ -241,6 +243,7 @@
   <CONVERTQUOTATION><![CDATA[N]]></CONVERTQUOTATION>
   <CREATE_POLINES><![CDATA[N]]></CREATE_POLINES>
   <ISCASHVAT><![CDATA[N]]></ISCASHVAT>
+  <ISCANCELLED><![CDATA[N]]></ISCANCELLED>
 </C_ORDER>
 
 <C_ORDER>
@@ -302,6 +305,7 @@
   <CREATE_POLINES><![CDATA[N]]></CREATE_POLINES>
   <ISCASHVAT><![CDATA[N]]></ISCASHVAT>
   <RM_PICKFROMRECEIPT><![CDATA[N]]></RM_PICKFROMRECEIPT>
+  <ISCANCELLED><![CDATA[N]]></ISCANCELLED>
   <EM_APRM_ADDPAYMENT><![CDATA[N]]></EM_APRM_ADDPAYMENT>
 </C_ORDER>
 
@@ -364,8 +368,74 @@
   <CREATE_POLINES><![CDATA[N]]></CREATE_POLINES>
   <ISCASHVAT><![CDATA[N]]></ISCASHVAT>
   <RM_PICKFROMRECEIPT><![CDATA[N]]></RM_PICKFROMRECEIPT>
+  <ISCANCELLED><![CDATA[N]]></ISCANCELLED>
   <EM_APRM_ADDPAYMENT><![CDATA[N]]></EM_APRM_ADDPAYMENT>
-  <EM_OBDISC_ADDPACK><![CDATA[N]]></EM_OBDISC_ADDPACK>
+</C_ORDER>
+
+<C_ORDER>
+  <C_ORDER_ID><![CDATA[426BF309F4FB43A891331B9ADD9E03A0]]></C_ORDER_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2016-08-31 16:16:58.272]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-08-31 16:16:58.329]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISSOTRX><![CDATA[Y]]></ISSOTRX>
+  <DOCUMENTNO><![CDATA[50016*R*]]></DOCUMENTNO>
+  <DOCSTATUS><![CDATA[CL]]></DOCSTATUS>
+  <DOCACTION><![CDATA[--]]></DOCACTION>
+  <PROCESSING><![CDATA[N]]></PROCESSING>
+  <PROCESSED><![CDATA[Y]]></PROCESSED>
+  <C_DOCTYPE_ID><![CDATA[FF8080812C2ABFC6012C2B3BDF4D005A]]></C_DOCTYPE_ID>
+  <C_DOCTYPETARGET_ID><![CDATA[FF8080812C2ABFC6012C2B3BDF4D005A]]></C_DOCTYPETARGET_ID>
+  <ISDELIVERED><![CDATA[N]]></ISDELIVERED>
+  <ISINVOICED><![CDATA[N]]></ISINVOICED>
+  <ISPRINTED><![CDATA[N]]></ISPRINTED>
+  <ISSELECTED><![CDATA[N]]></ISSELECTED>
+  <DATEORDERED><![CDATA[2016-08-31 00:00:00.0]]></DATEORDERED>
+  <DATEPROMISED><![CDATA[2016-08-31 16:16:58.272]]></DATEPROMISED>
+  <DATEACCT><![CDATA[2016-08-31 00:00:00.0]]></DATEACCT>
+  <C_BPARTNER_ID><![CDATA[4028E6C72959682B01295F40C3CB02EC]]></C_BPARTNER_ID>
+  <BILLTO_ID><![CDATA[4028E6C72959682B01295F40C43802EE]]></BILLTO_ID>
+  <C_BPARTNER_LOCATION_ID><![CDATA[4028E6C72959682B01295F40C43802EE]]></C_BPARTNER_LOCATION_ID>
+  <ISDISCOUNTPRINTED><![CDATA[N]]></ISDISCOUNTPRINTED>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+  <PAYMENTRULE><![CDATA[4]]></PAYMENTRULE>
+  <C_PAYMENTTERM_ID><![CDATA[7B308C5CB9674BB3A56E63D85887058A]]></C_PAYMENTTERM_ID>
+  <INVOICERULE><![CDATA[S]]></INVOICERULE>
+  <DELIVERYRULE><![CDATA[A]]></DELIVERYRULE>
+  <FREIGHTCOSTRULE><![CDATA[I]]></FREIGHTCOSTRULE>
+  <FREIGHTAMT><![CDATA[0]]></FREIGHTAMT>
+  <DELIVERYVIARULE><![CDATA[P]]></DELIVERYVIARULE>
+  <CHARGEAMT><![CDATA[0]]></CHARGEAMT>
+  <PRIORITYRULE><![CDATA[5]]></PRIORITYRULE>
+  <TOTALLINES><![CDATA[-4.00]]></TOTALLINES>
+  <GRANDTOTAL><![CDATA[-4.14]]></GRANDTOTAL>
+  <M_WAREHOUSE_ID><![CDATA[4D7B97565A024DB7B4C61650FA2B9560]]></M_WAREHOUSE_ID>
+  <M_PRICELIST_ID><![CDATA[4028E6C72959682B01295B03CE480243]]></M_PRICELIST_ID>
+  <ISTAXINCLUDED><![CDATA[N]]></ISTAXINCLUDED>
+  <POSTED><![CDATA[N]]></POSTED>
+  <AD_USER_ID><![CDATA[4028E6C72959682B01295F40C43802EF]]></AD_USER_ID>
+  <COPYFROM><![CDATA[N]]></COPYFROM>
+  <ISSELFSERVICE><![CDATA[N]]></ISSELFSERVICE>
+  <GENERATETEMPLATE><![CDATA[N]]></GENERATETEMPLATE>
+  <COPYFROMPO><![CDATA[N]]></COPYFROMPO>
+  <FIN_PAYMENTMETHOD_ID><![CDATA[42E87E97974E4B35849A430B8F6F2884]]></FIN_PAYMENTMETHOD_ID>
+  <RM_PICKFROMSHIPMENT><![CDATA[N]]></RM_PICKFROMSHIPMENT>
+  <RM_RECEIVEMATERIALS><![CDATA[N]]></RM_RECEIVEMATERIALS>
+  <RM_CREATEINVOICE><![CDATA[N]]></RM_CREATEINVOICE>
+  <RM_ADDORPHANLINE><![CDATA[N]]></RM_ADDORPHANLINE>
+  <CALCULATE_PROMOTIONS><![CDATA[N]]></CALCULATE_PROMOTIONS>
+  <CONVERTQUOTATION><![CDATA[N]]></CONVERTQUOTATION>
+  <CREATE_POLINES><![CDATA[N]]></CREATE_POLINES>
+  <ISCASHVAT><![CDATA[N]]></ISCASHVAT>
+  <RM_PICKFROMRECEIPT><![CDATA[N]]></RM_PICKFROMRECEIPT>
+  <CANCELANDREPLACE><![CDATA[N]]></CANCELANDREPLACE>
+  <CONFIRMCANCELANDREPLACE><![CDATA[N]]></CONFIRMCANCELANDREPLACE>
+  <CANCELLEDORDER_ID><![CDATA[F939B53C0EBB4E5EA35636DCAF61BF6C]]></CANCELLEDORDER_ID>
+  <ISCANCELLED><![CDATA[N]]></ISCANCELLED>
+  <EM_APRM_ADDPAYMENT><![CDATA[N]]></EM_APRM_ADDPAYMENT>
 </C_ORDER>
 
 <C_ORDER>
@@ -427,6 +497,7 @@
   <CREATE_POLINES><![CDATA[N]]></CREATE_POLINES>
   <ISCASHVAT><![CDATA[N]]></ISCASHVAT>
   <RM_PICKFROMRECEIPT><![CDATA[N]]></RM_PICKFROMRECEIPT>
+  <ISCANCELLED><![CDATA[N]]></ISCANCELLED>
   <EM_APRM_ADDPAYMENT><![CDATA[N]]></EM_APRM_ADDPAYMENT>
 </C_ORDER>
 
@@ -488,6 +559,7 @@
   <CONVERTQUOTATION><![CDATA[N]]></CONVERTQUOTATION>
   <CREATE_POLINES><![CDATA[N]]></CREATE_POLINES>
   <ISCASHVAT><![CDATA[N]]></ISCASHVAT>
+  <ISCANCELLED><![CDATA[N]]></ISCANCELLED>
 </C_ORDER>
 
 <C_ORDER>
@@ -547,6 +619,7 @@
   <CONVERTQUOTATION><![CDATA[N]]></CONVERTQUOTATION>
   <CREATE_POLINES><![CDATA[N]]></CREATE_POLINES>
   <ISCASHVAT><![CDATA[N]]></ISCASHVAT>
+  <ISCANCELLED><![CDATA[N]]></ISCANCELLED>
 </C_ORDER>
 
 <C_ORDER>
@@ -607,6 +680,7 @@
   <CONVERTQUOTATION><![CDATA[N]]></CONVERTQUOTATION>
   <CREATE_POLINES><![CDATA[N]]></CREATE_POLINES>
   <ISCASHVAT><![CDATA[N]]></ISCASHVAT>
+  <ISCANCELLED><![CDATA[N]]></ISCANCELLED>
 </C_ORDER>
 
 <C_ORDER>
@@ -667,6 +741,7 @@
   <CONVERTQUOTATION><![CDATA[N]]></CONVERTQUOTATION>
   <CREATE_POLINES><![CDATA[N]]></CREATE_POLINES>
   <ISCASHVAT><![CDATA[N]]></ISCASHVAT>
+  <ISCANCELLED><![CDATA[N]]></ISCANCELLED>
 </C_ORDER>
 
 <C_ORDER>
@@ -728,8 +803,8 @@
   <CREATE_POLINES><![CDATA[N]]></CREATE_POLINES>
   <ISCASHVAT><![CDATA[N]]></ISCASHVAT>
   <RM_PICKFROMRECEIPT><![CDATA[N]]></RM_PICKFROMRECEIPT>
+  <ISCANCELLED><![CDATA[N]]></ISCANCELLED>
   <EM_APRM_ADDPAYMENT><![CDATA[N]]></EM_APRM_ADDPAYMENT>
-  <EM_OBDISC_ADDPACK><![CDATA[N]]></EM_OBDISC_ADDPACK>
 </C_ORDER>
 
 <C_ORDER>
@@ -789,6 +864,7 @@
   <CONVERTQUOTATION><![CDATA[N]]></CONVERTQUOTATION>
   <CREATE_POLINES><![CDATA[N]]></CREATE_POLINES>
   <ISCASHVAT><![CDATA[N]]></ISCASHVAT>
+  <ISCANCELLED><![CDATA[N]]></ISCANCELLED>
 </C_ORDER>
 
 <C_ORDER>
@@ -849,6 +925,7 @@
   <CONVERTQUOTATION><![CDATA[N]]></CONVERTQUOTATION>
   <CREATE_POLINES><![CDATA[N]]></CREATE_POLINES>
   <ISCASHVAT><![CDATA[N]]></ISCASHVAT>
+  <ISCANCELLED><![CDATA[N]]></ISCANCELLED>
 </C_ORDER>
 
 <C_ORDER>
@@ -910,6 +987,7 @@
   <CREATE_POLINES><![CDATA[N]]></CREATE_POLINES>
   <ISCASHVAT><![CDATA[N]]></ISCASHVAT>
   <RM_PICKFROMRECEIPT><![CDATA[N]]></RM_PICKFROMRECEIPT>
+  <ISCANCELLED><![CDATA[N]]></ISCANCELLED>
   <EM_APRM_ADDPAYMENT><![CDATA[N]]></EM_APRM_ADDPAYMENT>
 </C_ORDER>
 
@@ -970,6 +1048,73 @@
   <CONVERTQUOTATION><![CDATA[N]]></CONVERTQUOTATION>
   <CREATE_POLINES><![CDATA[N]]></CREATE_POLINES>
   <ISCASHVAT><![CDATA[N]]></ISCASHVAT>
+  <ISCANCELLED><![CDATA[N]]></ISCANCELLED>
+</C_ORDER>
+
+<C_ORDER>
+  <C_ORDER_ID><![CDATA[A38BA8D9DB864C5DB9BB179BEDFAE585]]></C_ORDER_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2016-08-31 16:16:32.919]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-08-31 16:16:58.0]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISSOTRX><![CDATA[Y]]></ISSOTRX>
+  <DOCUMENTNO><![CDATA[50016-1]]></DOCUMENTNO>
+  <DOCSTATUS><![CDATA[CO]]></DOCSTATUS>
+  <DOCACTION><![CDATA[--]]></DOCACTION>
+  <PROCESSING><![CDATA[N]]></PROCESSING>
+  <PROCESSED><![CDATA[Y]]></PROCESSED>
+  <C_DOCTYPE_ID><![CDATA[FF8080812C2ABFC6012C2B3BDF4D005A]]></C_DOCTYPE_ID>
+  <C_DOCTYPETARGET_ID><![CDATA[FF8080812C2ABFC6012C2B3BDF4D005A]]></C_DOCTYPETARGET_ID>
+  <ISDELIVERED><![CDATA[N]]></ISDELIVERED>
+  <ISINVOICED><![CDATA[N]]></ISINVOICED>
+  <ISPRINTED><![CDATA[N]]></ISPRINTED>
+  <ISSELECTED><![CDATA[N]]></ISSELECTED>
+  <DATEORDERED><![CDATA[2016-08-31 16:16:46.834]]></DATEORDERED>
+  <DATEPROMISED><![CDATA[2016-08-31 00:00:00.0]]></DATEPROMISED>
+  <DATEACCT><![CDATA[2016-08-31 16:16:46.834]]></DATEACCT>
+  <C_BPARTNER_ID><![CDATA[4028E6C72959682B01295F40C3CB02EC]]></C_BPARTNER_ID>
+  <BILLTO_ID><![CDATA[4028E6C72959682B01295F40C43802EE]]></BILLTO_ID>
+  <C_BPARTNER_LOCATION_ID><![CDATA[4028E6C72959682B01295F40C43802EE]]></C_BPARTNER_LOCATION_ID>
+  <ISDISCOUNTPRINTED><![CDATA[N]]></ISDISCOUNTPRINTED>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+  <PAYMENTRULE><![CDATA[4]]></PAYMENTRULE>
+  <C_PAYMENTTERM_ID><![CDATA[7B308C5CB9674BB3A56E63D85887058A]]></C_PAYMENTTERM_ID>
+  <INVOICERULE><![CDATA[S]]></INVOICERULE>
+  <DELIVERYRULE><![CDATA[A]]></DELIVERYRULE>
+  <FREIGHTCOSTRULE><![CDATA[I]]></FREIGHTCOSTRULE>
+  <FREIGHTAMT><![CDATA[0]]></FREIGHTAMT>
+  <DELIVERYVIARULE><![CDATA[P]]></DELIVERYVIARULE>
+  <CHARGEAMT><![CDATA[0]]></CHARGEAMT>
+  <PRIORITYRULE><![CDATA[5]]></PRIORITYRULE>
+  <TOTALLINES><![CDATA[8.00]]></TOTALLINES>
+  <GRANDTOTAL><![CDATA[8.28]]></GRANDTOTAL>
+  <M_WAREHOUSE_ID><![CDATA[4D7B97565A024DB7B4C61650FA2B9560]]></M_WAREHOUSE_ID>
+  <M_PRICELIST_ID><![CDATA[4028E6C72959682B01295B03CE480243]]></M_PRICELIST_ID>
+  <ISTAXINCLUDED><![CDATA[N]]></ISTAXINCLUDED>
+  <POSTED><![CDATA[N]]></POSTED>
+  <AD_USER_ID><![CDATA[4028E6C72959682B01295F40C43802EF]]></AD_USER_ID>
+  <COPYFROM><![CDATA[N]]></COPYFROM>
+  <ISSELFSERVICE><![CDATA[N]]></ISSELFSERVICE>
+  <GENERATETEMPLATE><![CDATA[N]]></GENERATETEMPLATE>
+  <COPYFROMPO><![CDATA[N]]></COPYFROMPO>
+  <FIN_PAYMENTMETHOD_ID><![CDATA[42E87E97974E4B35849A430B8F6F2884]]></FIN_PAYMENTMETHOD_ID>
+  <RM_PICKFROMSHIPMENT><![CDATA[N]]></RM_PICKFROMSHIPMENT>
+  <RM_RECEIVEMATERIALS><![CDATA[N]]></RM_RECEIVEMATERIALS>
+  <RM_CREATEINVOICE><![CDATA[N]]></RM_CREATEINVOICE>
+  <RM_ADDORPHANLINE><![CDATA[N]]></RM_ADDORPHANLINE>
+  <CALCULATE_PROMOTIONS><![CDATA[N]]></CALCULATE_PROMOTIONS>
+  <CONVERTQUOTATION><![CDATA[N]]></CONVERTQUOTATION>
+  <CREATE_POLINES><![CDATA[N]]></CREATE_POLINES>
+  <ISCASHVAT><![CDATA[N]]></ISCASHVAT>
+  <RM_PICKFROMRECEIPT><![CDATA[N]]></RM_PICKFROMRECEIPT>
+  <CANCELANDREPLACE><![CDATA[N]]></CANCELANDREPLACE>
+  <CONFIRMCANCELANDREPLACE><![CDATA[N]]></CONFIRMCANCELANDREPLACE>
+  <REPLACEDORDER_ID><![CDATA[F939B53C0EBB4E5EA35636DCAF61BF6C]]></REPLACEDORDER_ID>
+  <ISCANCELLED><![CDATA[N]]></ISCANCELLED>
+  <EM_APRM_ADDPAYMENT><![CDATA[N]]></EM_APRM_ADDPAYMENT>
 </C_ORDER>
 
 <C_ORDER>
@@ -1029,6 +1174,7 @@
   <CONVERTQUOTATION><![CDATA[N]]></CONVERTQUOTATION>
   <CREATE_POLINES><![CDATA[N]]></CREATE_POLINES>
   <ISCASHVAT><![CDATA[N]]></ISCASHVAT>
+  <ISCANCELLED><![CDATA[N]]></ISCANCELLED>
 </C_ORDER>
 
 <C_ORDER>
@@ -1089,6 +1235,7 @@
   <CONVERTQUOTATION><![CDATA[N]]></CONVERTQUOTATION>
   <CREATE_POLINES><![CDATA[N]]></CREATE_POLINES>
   <ISCASHVAT><![CDATA[N]]></ISCASHVAT>
+  <ISCANCELLED><![CDATA[N]]></ISCANCELLED>
 </C_ORDER>
 
 <C_ORDER>
@@ -1148,6 +1295,7 @@
   <CONVERTQUOTATION><![CDATA[N]]></CONVERTQUOTATION>
   <CREATE_POLINES><![CDATA[N]]></CREATE_POLINES>
   <ISCASHVAT><![CDATA[N]]></ISCASHVAT>
+  <ISCANCELLED><![CDATA[N]]></ISCANCELLED>
 </C_ORDER>
 
 <C_ORDER>
@@ -1208,6 +1356,7 @@
   <CONVERTQUOTATION><![CDATA[N]]></CONVERTQUOTATION>
   <CREATE_POLINES><![CDATA[N]]></CREATE_POLINES>
   <ISCASHVAT><![CDATA[N]]></ISCASHVAT>
+  <ISCANCELLED><![CDATA[N]]></ISCANCELLED>
 </C_ORDER>
 
 <C_ORDER>
@@ -1267,6 +1416,7 @@
   <CONVERTQUOTATION><![CDATA[N]]></CONVERTQUOTATION>
   <CREATE_POLINES><![CDATA[N]]></CREATE_POLINES>
   <ISCASHVAT><![CDATA[N]]></ISCASHVAT>
+  <ISCANCELLED><![CDATA[N]]></ISCANCELLED>
 </C_ORDER>
 
 <C_ORDER>
@@ -1327,6 +1477,7 @@
   <CONVERTQUOTATION><![CDATA[N]]></CONVERTQUOTATION>
   <CREATE_POLINES><![CDATA[N]]></CREATE_POLINES>
   <ISCASHVAT><![CDATA[N]]></ISCASHVAT>
+  <ISCANCELLED><![CDATA[N]]></ISCANCELLED>
 </C_ORDER>
 
 <C_ORDER>
@@ -1388,6 +1539,7 @@
   <CREATE_POLINES><![CDATA[N]]></CREATE_POLINES>
   <ISCASHVAT><![CDATA[N]]></ISCASHVAT>
   <RM_PICKFROMRECEIPT><![CDATA[N]]></RM_PICKFROMRECEIPT>
+  <ISCANCELLED><![CDATA[N]]></ISCANCELLED>
 </C_ORDER>
 
 <C_ORDER>
@@ -1448,6 +1600,7 @@
   <CONVERTQUOTATION><![CDATA[N]]></CONVERTQUOTATION>
   <CREATE_POLINES><![CDATA[N]]></CREATE_POLINES>
   <ISCASHVAT><![CDATA[N]]></ISCASHVAT>
+  <ISCANCELLED><![CDATA[N]]></ISCANCELLED>
 </C_ORDER>
 
 <C_ORDER>
@@ -1507,6 +1660,72 @@
   <CONVERTQUOTATION><![CDATA[N]]></CONVERTQUOTATION>
   <CREATE_POLINES><![CDATA[N]]></CREATE_POLINES>
   <ISCASHVAT><![CDATA[N]]></ISCASHVAT>
+  <ISCANCELLED><![CDATA[N]]></ISCANCELLED>
+</C_ORDER>
+
+<C_ORDER>
+  <C_ORDER_ID><![CDATA[F1AAB8C608AA434C9FC7FC1D685BA016]]></C_ORDER_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2016-09-01 08:22:07.099]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-09-01 08:22:16.0]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISSOTRX><![CDATA[Y]]></ISSOTRX>
+  <DOCUMENTNO><![CDATA[50017]]></DOCUMENTNO>
+  <DOCSTATUS><![CDATA[CO]]></DOCSTATUS>
+  <DOCACTION><![CDATA[--]]></DOCACTION>
+  <PROCESSING><![CDATA[N]]></PROCESSING>
+  <PROCESSED><![CDATA[Y]]></PROCESSED>
+  <C_DOCTYPE_ID><![CDATA[FF8080812C2ABFC6012C2B3BDF4D005A]]></C_DOCTYPE_ID>
+  <C_DOCTYPETARGET_ID><![CDATA[FF8080812C2ABFC6012C2B3BDF4D005A]]></C_DOCTYPETARGET_ID>
+  <ISDELIVERED><![CDATA[N]]></ISDELIVERED>
+  <ISINVOICED><![CDATA[N]]></ISINVOICED>
+  <ISPRINTED><![CDATA[N]]></ISPRINTED>
+  <ISSELECTED><![CDATA[N]]></ISSELECTED>
+  <DATEORDERED><![CDATA[2016-09-01 00:00:00.0]]></DATEORDERED>
+  <DATEPROMISED><![CDATA[2016-09-01 00:00:00.0]]></DATEPROMISED>
+  <DATEACCT><![CDATA[2016-09-01 00:00:00.0]]></DATEACCT>
+  <C_BPARTNER_ID><![CDATA[4028E6C72959682B01295F40C3CB02EC]]></C_BPARTNER_ID>
+  <BILLTO_ID><![CDATA[4028E6C72959682B01295F40C43802EE]]></BILLTO_ID>
+  <C_BPARTNER_LOCATION_ID><![CDATA[4028E6C72959682B01295F40C43802EE]]></C_BPARTNER_LOCATION_ID>
+  <ISDISCOUNTPRINTED><![CDATA[N]]></ISDISCOUNTPRINTED>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+  <PAYMENTRULE><![CDATA[4]]></PAYMENTRULE>
+  <C_PAYMENTTERM_ID><![CDATA[7B308C5CB9674BB3A56E63D85887058A]]></C_PAYMENTTERM_ID>
+  <INVOICERULE><![CDATA[S]]></INVOICERULE>
+  <DELIVERYRULE><![CDATA[A]]></DELIVERYRULE>
+  <FREIGHTCOSTRULE><![CDATA[I]]></FREIGHTCOSTRULE>
+  <FREIGHTAMT><![CDATA[0]]></FREIGHTAMT>
+  <DELIVERYVIARULE><![CDATA[P]]></DELIVERYVIARULE>
+  <CHARGEAMT><![CDATA[0]]></CHARGEAMT>
+  <PRIORITYRULE><![CDATA[5]]></PRIORITYRULE>
+  <TOTALLINES><![CDATA[4.00]]></TOTALLINES>
+  <GRANDTOTAL><![CDATA[4.14]]></GRANDTOTAL>
+  <M_WAREHOUSE_ID><![CDATA[4D7B97565A024DB7B4C61650FA2B9560]]></M_WAREHOUSE_ID>
+  <M_PRICELIST_ID><![CDATA[4028E6C72959682B01295B03CE480243]]></M_PRICELIST_ID>
+  <ISTAXINCLUDED><![CDATA[N]]></ISTAXINCLUDED>
+  <POSTED><![CDATA[N]]></POSTED>
+  <AD_USER_ID><![CDATA[4028E6C72959682B01295F40C43802EF]]></AD_USER_ID>
+  <COPYFROM><![CDATA[N]]></COPYFROM>
+  <ISSELFSERVICE><![CDATA[N]]></ISSELFSERVICE>
+  <GENERATETEMPLATE><![CDATA[N]]></GENERATETEMPLATE>
+  <COPYFROMPO><![CDATA[N]]></COPYFROMPO>
+  <FIN_PAYMENTMETHOD_ID><![CDATA[42E87E97974E4B35849A430B8F6F2884]]></FIN_PAYMENTMETHOD_ID>
+  <RM_PICKFROMSHIPMENT><![CDATA[N]]></RM_PICKFROMSHIPMENT>
+  <RM_RECEIVEMATERIALS><![CDATA[N]]></RM_RECEIVEMATERIALS>
+  <RM_CREATEINVOICE><![CDATA[N]]></RM_CREATEINVOICE>
+  <RM_ADDORPHANLINE><![CDATA[N]]></RM_ADDORPHANLINE>
+  <CALCULATE_PROMOTIONS><![CDATA[N]]></CALCULATE_PROMOTIONS>
+  <CONVERTQUOTATION><![CDATA[N]]></CONVERTQUOTATION>
+  <CREATE_POLINES><![CDATA[N]]></CREATE_POLINES>
+  <ISCASHVAT><![CDATA[N]]></ISCASHVAT>
+  <RM_PICKFROMRECEIPT><![CDATA[N]]></RM_PICKFROMRECEIPT>
+  <CANCELANDREPLACE><![CDATA[N]]></CANCELANDREPLACE>
+  <CONFIRMCANCELANDREPLACE><![CDATA[N]]></CONFIRMCANCELANDREPLACE>
+  <ISCANCELLED><![CDATA[N]]></ISCANCELLED>
+  <EM_APRM_ADDPAYMENT><![CDATA[N]]></EM_APRM_ADDPAYMENT>
 </C_ORDER>
 
 <C_ORDER>
@@ -1568,6 +1787,73 @@
   <CREATE_POLINES><![CDATA[N]]></CREATE_POLINES>
   <ISCASHVAT><![CDATA[N]]></ISCASHVAT>
   <RM_PICKFROMRECEIPT><![CDATA[N]]></RM_PICKFROMRECEIPT>
+  <ISCANCELLED><![CDATA[N]]></ISCANCELLED>
+</C_ORDER>
+
+<C_ORDER>
+  <C_ORDER_ID><![CDATA[F939B53C0EBB4E5EA35636DCAF61BF6C]]></C_ORDER_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2016-08-31 16:16:32.919]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-08-31 16:16:58.325]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISSOTRX><![CDATA[Y]]></ISSOTRX>
+  <DOCUMENTNO><![CDATA[50016]]></DOCUMENTNO>
+  <DOCSTATUS><![CDATA[CL]]></DOCSTATUS>
+  <DOCACTION><![CDATA[--]]></DOCACTION>
+  <PROCESSING><![CDATA[N]]></PROCESSING>
+  <PROCESSED><![CDATA[Y]]></PROCESSED>
+  <C_DOCTYPE_ID><![CDATA[FF8080812C2ABFC6012C2B3BDF4D005A]]></C_DOCTYPE_ID>
+  <C_DOCTYPETARGET_ID><![CDATA[FF8080812C2ABFC6012C2B3BDF4D005A]]></C_DOCTYPETARGET_ID>
+  <ISDELIVERED><![CDATA[N]]></ISDELIVERED>
+  <ISINVOICED><![CDATA[N]]></ISINVOICED>
+  <ISPRINTED><![CDATA[N]]></ISPRINTED>
+  <ISSELECTED><![CDATA[N]]></ISSELECTED>
+  <DATEORDERED><![CDATA[2016-08-31 00:00:00.0]]></DATEORDERED>
+  <DATEPROMISED><![CDATA[2016-08-31 00:00:00.0]]></DATEPROMISED>
+  <DATEACCT><![CDATA[2016-08-31 00:00:00.0]]></DATEACCT>
+  <C_BPARTNER_ID><![CDATA[4028E6C72959682B01295F40C3CB02EC]]></C_BPARTNER_ID>
+  <BILLTO_ID><![CDATA[4028E6C72959682B01295F40C43802EE]]></BILLTO_ID>
+  <C_BPARTNER_LOCATION_ID><![CDATA[4028E6C72959682B01295F40C43802EE]]></C_BPARTNER_LOCATION_ID>
+  <ISDISCOUNTPRINTED><![CDATA[N]]></ISDISCOUNTPRINTED>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+  <PAYMENTRULE><![CDATA[4]]></PAYMENTRULE>
+  <C_PAYMENTTERM_ID><![CDATA[7B308C5CB9674BB3A56E63D85887058A]]></C_PAYMENTTERM_ID>
+  <INVOICERULE><![CDATA[S]]></INVOICERULE>
+  <DELIVERYRULE><![CDATA[A]]></DELIVERYRULE>
+  <FREIGHTCOSTRULE><![CDATA[I]]></FREIGHTCOSTRULE>
+  <FREIGHTAMT><![CDATA[0]]></FREIGHTAMT>
+  <DELIVERYVIARULE><![CDATA[P]]></DELIVERYVIARULE>
+  <CHARGEAMT><![CDATA[0]]></CHARGEAMT>
+  <PRIORITYRULE><![CDATA[5]]></PRIORITYRULE>
+  <TOTALLINES><![CDATA[4.00]]></TOTALLINES>
+  <GRANDTOTAL><![CDATA[4.14]]></GRANDTOTAL>
+  <M_WAREHOUSE_ID><![CDATA[4D7B97565A024DB7B4C61650FA2B9560]]></M_WAREHOUSE_ID>
+  <M_PRICELIST_ID><![CDATA[4028E6C72959682B01295B03CE480243]]></M_PRICELIST_ID>
+  <ISTAXINCLUDED><![CDATA[N]]></ISTAXINCLUDED>
+  <POSTED><![CDATA[N]]></POSTED>
+  <AD_USER_ID><![CDATA[4028E6C72959682B01295F40C43802EF]]></AD_USER_ID>
+  <COPYFROM><![CDATA[N]]></COPYFROM>
+  <ISSELFSERVICE><![CDATA[N]]></ISSELFSERVICE>
+  <GENERATETEMPLATE><![CDATA[N]]></GENERATETEMPLATE>
+  <COPYFROMPO><![CDATA[N]]></COPYFROMPO>
+  <FIN_PAYMENTMETHOD_ID><![CDATA[42E87E97974E4B35849A430B8F6F2884]]></FIN_PAYMENTMETHOD_ID>
+  <RM_PICKFROMSHIPMENT><![CDATA[N]]></RM_PICKFROMSHIPMENT>
+  <RM_RECEIVEMATERIALS><![CDATA[N]]></RM_RECEIVEMATERIALS>
+  <RM_CREATEINVOICE><![CDATA[N]]></RM_CREATEINVOICE>
+  <RM_ADDORPHANLINE><![CDATA[N]]></RM_ADDORPHANLINE>
+  <CALCULATE_PROMOTIONS><![CDATA[N]]></CALCULATE_PROMOTIONS>
+  <CONVERTQUOTATION><![CDATA[N]]></CONVERTQUOTATION>
+  <CREATE_POLINES><![CDATA[N]]></CREATE_POLINES>
+  <ISCASHVAT><![CDATA[N]]></ISCASHVAT>
+  <RM_PICKFROMRECEIPT><![CDATA[N]]></RM_PICKFROMRECEIPT>
+  <CANCELANDREPLACE><![CDATA[N]]></CANCELANDREPLACE>
+  <CONFIRMCANCELANDREPLACE><![CDATA[N]]></CONFIRMCANCELANDREPLACE>
+  <ISCANCELLED><![CDATA[Y]]></ISCANCELLED>
+  <REPLACEMENTORDER_ID><![CDATA[A38BA8D9DB864C5DB9BB179BEDFAE585]]></REPLACEMENTORDER_ID>
+  <EM_APRM_ADDPAYMENT><![CDATA[N]]></EM_APRM_ADDPAYMENT>
 </C_ORDER>
 
 <C_ORDER>
@@ -1628,6 +1914,7 @@
   <CONVERTQUOTATION><![CDATA[N]]></CONVERTQUOTATION>
   <CREATE_POLINES><![CDATA[N]]></CREATE_POLINES>
   <ISCASHVAT><![CDATA[N]]></ISCASHVAT>
+  <ISCANCELLED><![CDATA[N]]></ISCANCELLED>
 </C_ORDER>
 
 <C_ORDER>
@@ -1688,6 +1975,7 @@
   <CONVERTQUOTATION><![CDATA[N]]></CONVERTQUOTATION>
   <CREATE_POLINES><![CDATA[N]]></CREATE_POLINES>
   <ISCASHVAT><![CDATA[N]]></ISCASHVAT>
+  <ISCANCELLED><![CDATA[N]]></ISCANCELLED>
 </C_ORDER>
 
 <C_ORDER>
@@ -1748,6 +2036,7 @@
   <CONVERTQUOTATION><![CDATA[N]]></CONVERTQUOTATION>
   <CREATE_POLINES><![CDATA[N]]></CREATE_POLINES>
   <ISCASHVAT><![CDATA[N]]></ISCASHVAT>
+  <ISCANCELLED><![CDATA[N]]></ISCANCELLED>
 </C_ORDER>
 
 <C_ORDER>
@@ -1808,6 +2097,7 @@
   <CONVERTQUOTATION><![CDATA[N]]></CONVERTQUOTATION>
   <CREATE_POLINES><![CDATA[N]]></CREATE_POLINES>
   <ISCASHVAT><![CDATA[N]]></ISCASHVAT>
+  <ISCANCELLED><![CDATA[N]]></ISCANCELLED>
 </C_ORDER>
 
 </data>
--- a/referencedata/sampledata/QA_Testing/C_ORDERLINE.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/referencedata/sampledata/QA_Testing/C_ORDERLINE.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -1146,6 +1146,53 @@
 </C_ORDERLINE>
 
 <C_ORDERLINE>
+  <C_ORDERLINE_ID><![CDATA[35F581F525EC4CE3977DEDC42FDC155A]]></C_ORDERLINE_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2016-09-01 08:22:13.351]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-09-01 08:22:13.351]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <C_ORDER_ID><![CDATA[F1AAB8C608AA434C9FC7FC1D685BA016]]></C_ORDER_ID>
+  <LINE><![CDATA[10]]></LINE>
+  <C_BPARTNER_ID><![CDATA[4028E6C72959682B01295F40C3CB02EC]]></C_BPARTNER_ID>
+  <C_BPARTNER_LOCATION_ID><![CDATA[4028E6C72959682B01295F40C43802EE]]></C_BPARTNER_LOCATION_ID>
+  <DATEORDERED><![CDATA[2016-09-01 00:00:00.0]]></DATEORDERED>
+  <DATEPROMISED><![CDATA[2016-09-01 00:00:00.0]]></DATEPROMISED>
+  <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC1D07022A]]></M_PRODUCT_ID>
+  <M_WAREHOUSE_ID><![CDATA[4D7B97565A024DB7B4C61650FA2B9560]]></M_WAREHOUSE_ID>
+  <DIRECTSHIP><![CDATA[N]]></DIRECTSHIP>
+  <C_UOM_ID><![CDATA[4028E6C72959682B01295ADC1A380221]]></C_UOM_ID>
+  <QTYORDERED><![CDATA[2]]></QTYORDERED>
+  <QTYRESERVED><![CDATA[2]]></QTYRESERVED>
+  <QTYDELIVERED><![CDATA[0]]></QTYDELIVERED>
+  <QTYINVOICED><![CDATA[0]]></QTYINVOICED>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+  <PRICELIST><![CDATA[2]]></PRICELIST>
+  <PRICEACTUAL><![CDATA[2]]></PRICEACTUAL>
+  <PRICELIMIT><![CDATA[2]]></PRICELIMIT>
+  <LINENETAMT><![CDATA[4.00]]></LINENETAMT>
+  <DISCOUNT><![CDATA[0]]></DISCOUNT>
+  <FREIGHTAMT><![CDATA[0.00]]></FREIGHTAMT>
+  <CHARGEAMT><![CDATA[0.00]]></CHARGEAMT>
+  <C_TAX_ID><![CDATA[58A7B9D1DDDD442CAD08052C1B735AFC]]></C_TAX_ID>
+  <ISDESCRIPTION><![CDATA[N]]></ISDESCRIPTION>
+  <PRICESTD><![CDATA[2]]></PRICESTD>
+  <CANCELPRICEAD><![CDATA[N]]></CANCELPRICEAD>
+  <ISEDITLINENETAMT><![CDATA[N]]></ISEDITLINENETAMT>
+  <TAXBASEAMT><![CDATA[4]]></TAXBASEAMT>
+  <GROSS_UNIT_PRICE><![CDATA[0]]></GROSS_UNIT_PRICE>
+  <LINE_GROSS_AMOUNT><![CDATA[0]]></LINE_GROSS_AMOUNT>
+  <GROSSPRICESTD><![CDATA[0]]></GROSSPRICESTD>
+  <MANAGE_RESERVATION><![CDATA[N]]></MANAGE_RESERVATION>
+  <MANAGE_PRERESERVATION><![CDATA[N]]></MANAGE_PRERESERVATION>
+  <EXPLODE><![CDATA[N]]></EXPLODE>
+  <PRINT_DESCRIPTION><![CDATA[N]]></PRINT_DESCRIPTION>
+  <RELATE_ORDERLINE><![CDATA[N]]></RELATE_ORDERLINE>
+</C_ORDERLINE>
+
+<C_ORDERLINE>
   <C_ORDERLINE_ID><![CDATA[37EDA1990F0747F8B16EE8C7497522EA]]></C_ORDERLINE_ID>
   <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
@@ -1430,6 +1477,53 @@
 </C_ORDERLINE>
 
 <C_ORDERLINE>
+  <C_ORDERLINE_ID><![CDATA[53A0A0E0A7EF41C19DD44B73FA8A6AB4]]></C_ORDERLINE_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2016-08-31 16:16:40.358]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-08-31 16:16:58.31]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <C_ORDER_ID><![CDATA[426BF309F4FB43A891331B9ADD9E03A0]]></C_ORDER_ID>
+  <LINE><![CDATA[10]]></LINE>
+  <C_BPARTNER_ID><![CDATA[4028E6C72959682B01295F40C3CB02EC]]></C_BPARTNER_ID>
+  <C_BPARTNER_LOCATION_ID><![CDATA[4028E6C72959682B01295F40C43802EE]]></C_BPARTNER_LOCATION_ID>
+  <DATEORDERED><![CDATA[2016-08-31 00:00:00.0]]></DATEORDERED>
+  <DATEPROMISED><![CDATA[2016-08-31 00:00:00.0]]></DATEPROMISED>
+  <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC1D07022A]]></M_PRODUCT_ID>
+  <M_WAREHOUSE_ID><![CDATA[4D7B97565A024DB7B4C61650FA2B9560]]></M_WAREHOUSE_ID>
+  <DIRECTSHIP><![CDATA[N]]></DIRECTSHIP>
+  <C_UOM_ID><![CDATA[4028E6C72959682B01295ADC1A380221]]></C_UOM_ID>
+  <QTYORDERED><![CDATA[-2]]></QTYORDERED>
+  <QTYRESERVED><![CDATA[0]]></QTYRESERVED>
+  <QTYDELIVERED><![CDATA[-2]]></QTYDELIVERED>
+  <QTYINVOICED><![CDATA[0]]></QTYINVOICED>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+  <PRICELIST><![CDATA[2]]></PRICELIST>
+  <PRICEACTUAL><![CDATA[2]]></PRICEACTUAL>
+  <PRICELIMIT><![CDATA[2]]></PRICELIMIT>
+  <LINENETAMT><![CDATA[-4.00]]></LINENETAMT>
+  <DISCOUNT><![CDATA[0]]></DISCOUNT>
+  <FREIGHTAMT><![CDATA[0.00]]></FREIGHTAMT>
+  <CHARGEAMT><![CDATA[0.00]]></CHARGEAMT>
+  <C_TAX_ID><![CDATA[58A7B9D1DDDD442CAD08052C1B735AFC]]></C_TAX_ID>
+  <ISDESCRIPTION><![CDATA[N]]></ISDESCRIPTION>
+  <PRICESTD><![CDATA[2]]></PRICESTD>
+  <CANCELPRICEAD><![CDATA[N]]></CANCELPRICEAD>
+  <ISEDITLINENETAMT><![CDATA[N]]></ISEDITLINENETAMT>
+  <TAXBASEAMT><![CDATA[4]]></TAXBASEAMT>
+  <GROSS_UNIT_PRICE><![CDATA[0]]></GROSS_UNIT_PRICE>
+  <LINE_GROSS_AMOUNT><![CDATA[0]]></LINE_GROSS_AMOUNT>
+  <GROSSPRICESTD><![CDATA[0]]></GROSSPRICESTD>
+  <MANAGE_RESERVATION><![CDATA[N]]></MANAGE_RESERVATION>
+  <MANAGE_PRERESERVATION><![CDATA[N]]></MANAGE_PRERESERVATION>
+  <EXPLODE><![CDATA[N]]></EXPLODE>
+  <PRINT_DESCRIPTION><![CDATA[N]]></PRINT_DESCRIPTION>
+  <RELATE_ORDERLINE><![CDATA[N]]></RELATE_ORDERLINE>
+</C_ORDERLINE>
+
+<C_ORDERLINE>
   <C_ORDERLINE_ID><![CDATA[56A1E917656F4B32B48E21520AB67E5E]]></C_ORDERLINE_ID>
   <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
@@ -1855,6 +1949,54 @@
 </C_ORDERLINE>
 
 <C_ORDERLINE>
+  <C_ORDERLINE_ID><![CDATA[7F5B5AD6B60E4C8AB6FBD1DAA9643F1E]]></C_ORDERLINE_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2016-08-31 16:16:40.358]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-08-31 16:16:54.211]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <C_ORDER_ID><![CDATA[A38BA8D9DB864C5DB9BB179BEDFAE585]]></C_ORDER_ID>
+  <LINE><![CDATA[10]]></LINE>
+  <C_BPARTNER_ID><![CDATA[4028E6C72959682B01295F40C3CB02EC]]></C_BPARTNER_ID>
+  <C_BPARTNER_LOCATION_ID><![CDATA[4028E6C72959682B01295F40C43802EE]]></C_BPARTNER_LOCATION_ID>
+  <DATEORDERED><![CDATA[2016-08-31 00:00:00.0]]></DATEORDERED>
+  <DATEPROMISED><![CDATA[2016-08-31 00:00:00.0]]></DATEPROMISED>
+  <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC1D07022A]]></M_PRODUCT_ID>
+  <M_WAREHOUSE_ID><![CDATA[4D7B97565A024DB7B4C61650FA2B9560]]></M_WAREHOUSE_ID>
+  <DIRECTSHIP><![CDATA[N]]></DIRECTSHIP>
+  <C_UOM_ID><![CDATA[4028E6C72959682B01295ADC1A380221]]></C_UOM_ID>
+  <QTYORDERED><![CDATA[4]]></QTYORDERED>
+  <QTYRESERVED><![CDATA[4]]></QTYRESERVED>
+  <QTYDELIVERED><![CDATA[0]]></QTYDELIVERED>
+  <QTYINVOICED><![CDATA[0]]></QTYINVOICED>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+  <PRICELIST><![CDATA[2]]></PRICELIST>
+  <PRICEACTUAL><![CDATA[2]]></PRICEACTUAL>
+  <PRICELIMIT><![CDATA[2]]></PRICELIMIT>
+  <LINENETAMT><![CDATA[8.00]]></LINENETAMT>
+  <DISCOUNT><![CDATA[0]]></DISCOUNT>
+  <FREIGHTAMT><![CDATA[0.00]]></FREIGHTAMT>
+  <CHARGEAMT><![CDATA[0.00]]></CHARGEAMT>
+  <C_TAX_ID><![CDATA[58A7B9D1DDDD442CAD08052C1B735AFC]]></C_TAX_ID>
+  <ISDESCRIPTION><![CDATA[N]]></ISDESCRIPTION>
+  <PRICESTD><![CDATA[2]]></PRICESTD>
+  <CANCELPRICEAD><![CDATA[N]]></CANCELPRICEAD>
+  <ISEDITLINENETAMT><![CDATA[N]]></ISEDITLINENETAMT>
+  <TAXBASEAMT><![CDATA[8]]></TAXBASEAMT>
+  <GROSS_UNIT_PRICE><![CDATA[0]]></GROSS_UNIT_PRICE>
+  <LINE_GROSS_AMOUNT><![CDATA[0]]></LINE_GROSS_AMOUNT>
+  <GROSSPRICESTD><![CDATA[0]]></GROSSPRICESTD>
+  <MANAGE_RESERVATION><![CDATA[N]]></MANAGE_RESERVATION>
+  <MANAGE_PRERESERVATION><![CDATA[N]]></MANAGE_PRERESERVATION>
+  <EXPLODE><![CDATA[N]]></EXPLODE>
+  <PRINT_DESCRIPTION><![CDATA[N]]></PRINT_DESCRIPTION>
+  <RELATE_ORDERLINE><![CDATA[N]]></RELATE_ORDERLINE>
+  <REPLACEDORDERLINE_ID><![CDATA[E1140DEF48504160909308A58A0B8D0D]]></REPLACEDORDERLINE_ID>
+</C_ORDERLINE>
+
+<C_ORDERLINE>
   <C_ORDERLINE_ID><![CDATA[84A81802158840FF8A57E95C60A4ED86]]></C_ORDERLINE_ID>
   <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
@@ -3283,6 +3425,53 @@
 </C_ORDERLINE>
 
 <C_ORDERLINE>
+  <C_ORDERLINE_ID><![CDATA[E1140DEF48504160909308A58A0B8D0D]]></C_ORDERLINE_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2016-08-31 16:16:40.358]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-08-31 16:16:58.307]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <C_ORDER_ID><![CDATA[F939B53C0EBB4E5EA35636DCAF61BF6C]]></C_ORDER_ID>
+  <LINE><![CDATA[10]]></LINE>
+  <C_BPARTNER_ID><![CDATA[4028E6C72959682B01295F40C3CB02EC]]></C_BPARTNER_ID>
+  <C_BPARTNER_LOCATION_ID><![CDATA[4028E6C72959682B01295F40C43802EE]]></C_BPARTNER_LOCATION_ID>
+  <DATEORDERED><![CDATA[2016-08-31 00:00:00.0]]></DATEORDERED>
+  <DATEPROMISED><![CDATA[2016-08-31 00:00:00.0]]></DATEPROMISED>
+  <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC1D07022A]]></M_PRODUCT_ID>
+  <M_WAREHOUSE_ID><![CDATA[4D7B97565A024DB7B4C61650FA2B9560]]></M_WAREHOUSE_ID>
+  <DIRECTSHIP><![CDATA[N]]></DIRECTSHIP>
+  <C_UOM_ID><![CDATA[4028E6C72959682B01295ADC1A380221]]></C_UOM_ID>
+  <QTYORDERED><![CDATA[2]]></QTYORDERED>
+  <QTYRESERVED><![CDATA[2]]></QTYRESERVED>
+  <QTYDELIVERED><![CDATA[2]]></QTYDELIVERED>
+  <QTYINVOICED><![CDATA[0]]></QTYINVOICED>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+  <PRICELIST><![CDATA[2]]></PRICELIST>
+  <PRICEACTUAL><![CDATA[2]]></PRICEACTUAL>
+  <PRICELIMIT><![CDATA[2]]></PRICELIMIT>
+  <LINENETAMT><![CDATA[4.00]]></LINENETAMT>
+  <DISCOUNT><![CDATA[0]]></DISCOUNT>
+  <FREIGHTAMT><![CDATA[0.00]]></FREIGHTAMT>
+  <CHARGEAMT><![CDATA[0.00]]></CHARGEAMT>
+  <C_TAX_ID><![CDATA[58A7B9D1DDDD442CAD08052C1B735AFC]]></C_TAX_ID>
+  <ISDESCRIPTION><![CDATA[N]]></ISDESCRIPTION>
+  <PRICESTD><![CDATA[2]]></PRICESTD>
+  <CANCELPRICEAD><![CDATA[N]]></CANCELPRICEAD>
+  <ISEDITLINENETAMT><![CDATA[N]]></ISEDITLINENETAMT>
+  <TAXBASEAMT><![CDATA[4]]></TAXBASEAMT>
+  <GROSS_UNIT_PRICE><![CDATA[0]]></GROSS_UNIT_PRICE>
+  <LINE_GROSS_AMOUNT><![CDATA[0]]></LINE_GROSS_AMOUNT>
+  <GROSSPRICESTD><![CDATA[0]]></GROSSPRICESTD>
+  <MANAGE_RESERVATION><![CDATA[N]]></MANAGE_RESERVATION>
+  <MANAGE_PRERESERVATION><![CDATA[N]]></MANAGE_PRERESERVATION>
+  <EXPLODE><![CDATA[N]]></EXPLODE>
+  <PRINT_DESCRIPTION><![CDATA[N]]></PRINT_DESCRIPTION>
+  <RELATE_ORDERLINE><![CDATA[N]]></RELATE_ORDERLINE>
+</C_ORDERLINE>
+
+<C_ORDERLINE>
   <C_ORDERLINE_ID><![CDATA[E335455C37D3422D99298B6ADD26BBC9]]></C_ORDERLINE_ID>
   <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
--- a/referencedata/sampledata/QA_Testing/C_ORDERLINETAX.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/referencedata/sampledata/QA_Testing/C_ORDERLINETAX.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -18,6 +18,23 @@
 </C_ORDERLINETAX>
 
 <C_ORDERLINETAX>
+  <C_ORDERLINETAX_ID><![CDATA[02C506FCF84C42EC9DE167D0DA728D93]]></C_ORDERLINETAX_ID>
+  <C_ORDERLINE_ID><![CDATA[35F581F525EC4CE3977DEDC42FDC155A]]></C_ORDERLINE_ID>
+  <C_TAX_ID><![CDATA[667A8194F0264B0AAA997B8B51F72024]]></C_TAX_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2016-09-01 08:22:13.0]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-09-01 08:22:13.0]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <TAXBASEAMT><![CDATA[4.00]]></TAXBASEAMT>
+  <TAXAMT><![CDATA[0.12]]></TAXAMT>
+  <LINE><![CDATA[10]]></LINE>
+  <C_ORDER_ID><![CDATA[F1AAB8C608AA434C9FC7FC1D685BA016]]></C_ORDER_ID>
+</C_ORDERLINETAX>
+
+<C_ORDERLINETAX>
   <C_ORDERLINETAX_ID><![CDATA[05DBCD3A622B4A0380D1605995B51155]]></C_ORDERLINETAX_ID>
   <C_ORDERLINE_ID><![CDATA[CC6BC722DBA242259740FDA7EE9E5677]]></C_ORDERLINE_ID>
   <C_TAX_ID><![CDATA[F9D9AF81F4FA459C9CE7A2D9697DF1E4]]></C_TAX_ID>
@@ -86,6 +103,23 @@
 </C_ORDERLINETAX>
 
 <C_ORDERLINETAX>
+  <C_ORDERLINETAX_ID><![CDATA[14CBD36BC61044B49373CD7C6286A6CD]]></C_ORDERLINETAX_ID>
+  <C_ORDERLINE_ID><![CDATA[53A0A0E0A7EF41C19DD44B73FA8A6AB4]]></C_ORDERLINE_ID>
+  <C_TAX_ID><![CDATA[5690F12F2C934F5384FA94F063F63C5F]]></C_TAX_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2016-08-31 16:16:58.0]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-08-31 16:16:58.0]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <TAXBASEAMT><![CDATA[-4.00]]></TAXBASEAMT>
+  <TAXAMT><![CDATA[-0.02]]></TAXAMT>
+  <LINE><![CDATA[20]]></LINE>
+  <C_ORDER_ID><![CDATA[426BF309F4FB43A891331B9ADD9E03A0]]></C_ORDER_ID>
+</C_ORDERLINETAX>
+
+<C_ORDERLINETAX>
   <C_ORDERLINETAX_ID><![CDATA[19586B8545DE5383E0530100007F39E5]]></C_ORDERLINETAX_ID>
   <C_ORDERLINE_ID><![CDATA[2471059F0EBE4D3892A145351F6523FC]]></C_ORDERLINE_ID>
   <C_TAX_ID><![CDATA[667A8194F0264B0AAA997B8B51F72024]]></C_TAX_ID>
@@ -460,6 +494,40 @@
 </C_ORDERLINETAX>
 
 <C_ORDERLINETAX>
+  <C_ORDERLINETAX_ID><![CDATA[2B78E95558AE4AC180266D35779C2C4A]]></C_ORDERLINETAX_ID>
+  <C_ORDERLINE_ID><![CDATA[E1140DEF48504160909308A58A0B8D0D]]></C_ORDERLINE_ID>
+  <C_TAX_ID><![CDATA[667A8194F0264B0AAA997B8B51F72024]]></C_TAX_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2016-08-31 16:16:40.0]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-08-31 16:16:40.0]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <TAXBASEAMT><![CDATA[4.00]]></TAXBASEAMT>
+  <TAXAMT><![CDATA[0.12]]></TAXAMT>
+  <LINE><![CDATA[10]]></LINE>
+  <C_ORDER_ID><![CDATA[F939B53C0EBB4E5EA35636DCAF61BF6C]]></C_ORDER_ID>
+</C_ORDERLINETAX>
+
+<C_ORDERLINETAX>
+  <C_ORDERLINETAX_ID><![CDATA[2DEE60CB7C7A4847B4FBCD4FEC38C75E]]></C_ORDERLINETAX_ID>
+  <C_ORDERLINE_ID><![CDATA[35F581F525EC4CE3977DEDC42FDC155A]]></C_ORDERLINE_ID>
+  <C_TAX_ID><![CDATA[5690F12F2C934F5384FA94F063F63C5F]]></C_TAX_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2016-09-01 08:22:13.0]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-09-01 08:22:13.0]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <TAXBASEAMT><![CDATA[4.00]]></TAXBASEAMT>
+  <TAXAMT><![CDATA[0.02]]></TAXAMT>
+  <LINE><![CDATA[20]]></LINE>
+  <C_ORDER_ID><![CDATA[F1AAB8C608AA434C9FC7FC1D685BA016]]></C_ORDER_ID>
+</C_ORDERLINETAX>
+
+<C_ORDERLINETAX>
   <C_ORDERLINETAX_ID><![CDATA[3193C2E60AB7499B810071941CB89E9C]]></C_ORDERLINETAX_ID>
   <C_ORDERLINE_ID><![CDATA[0126EA5803E84C84A4DB61B5AE73D8BF]]></C_ORDERLINE_ID>
   <C_TAX_ID><![CDATA[F9D9AF81F4FA459C9CE7A2D9697DF1E4]]></C_TAX_ID>
@@ -477,6 +545,23 @@
 </C_ORDERLINETAX>
 
 <C_ORDERLINETAX>
+  <C_ORDERLINETAX_ID><![CDATA[3C1C7EFCDF3C4691B7781E9E3AE36F13]]></C_ORDERLINETAX_ID>
+  <C_ORDERLINE_ID><![CDATA[7F5B5AD6B60E4C8AB6FBD1DAA9643F1E]]></C_ORDERLINE_ID>
+  <C_TAX_ID><![CDATA[667A8194F0264B0AAA997B8B51F72024]]></C_TAX_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2016-08-31 16:16:54.0]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-08-31 16:16:54.0]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <TAXBASEAMT><![CDATA[8.00]]></TAXBASEAMT>
+  <TAXAMT><![CDATA[0.24]]></TAXAMT>
+  <LINE><![CDATA[10]]></LINE>
+  <C_ORDER_ID><![CDATA[A38BA8D9DB864C5DB9BB179BEDFAE585]]></C_ORDER_ID>
+</C_ORDERLINETAX>
+
+<C_ORDERLINETAX>
   <C_ORDERLINETAX_ID><![CDATA[4F1C627A62764977ABCC8EE44DC71CE8]]></C_ORDERLINETAX_ID>
   <C_ORDERLINE_ID><![CDATA[524F7B6E78554D648C094158AA30C60C]]></C_ORDERLINE_ID>
   <C_TAX_ID><![CDATA[F9D9AF81F4FA459C9CE7A2D9697DF1E4]]></C_TAX_ID>
@@ -1123,6 +1208,23 @@
 </C_ORDERLINETAX>
 
 <C_ORDERLINETAX>
+  <C_ORDERLINETAX_ID><![CDATA[C71A40C2C21443D59CDF25BB5F341722]]></C_ORDERLINETAX_ID>
+  <C_ORDERLINE_ID><![CDATA[E1140DEF48504160909308A58A0B8D0D]]></C_ORDERLINE_ID>
+  <C_TAX_ID><![CDATA[5690F12F2C934F5384FA94F063F63C5F]]></C_TAX_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2016-08-31 16:16:40.0]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-08-31 16:16:40.0]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <TAXBASEAMT><![CDATA[4.00]]></TAXBASEAMT>
+  <TAXAMT><![CDATA[0.02]]></TAXAMT>
+  <LINE><![CDATA[20]]></LINE>
+  <C_ORDER_ID><![CDATA[F939B53C0EBB4E5EA35636DCAF61BF6C]]></C_ORDER_ID>
+</C_ORDERLINETAX>
+
+<C_ORDERLINETAX>
   <C_ORDERLINETAX_ID><![CDATA[C9E1CFD93E9D4FC1898A35E5B034D2BA]]></C_ORDERLINETAX_ID>
   <C_ORDERLINE_ID><![CDATA[0B1994EB862848E892CA51D538F2BA4E]]></C_ORDERLINE_ID>
   <C_TAX_ID><![CDATA[F9D9AF81F4FA459C9CE7A2D9697DF1E4]]></C_TAX_ID>
@@ -1208,6 +1310,23 @@
 </C_ORDERLINETAX>
 
 <C_ORDERLINETAX>
+  <C_ORDERLINETAX_ID><![CDATA[D1BEA7724D5D4670B13EC8949654F853]]></C_ORDERLINETAX_ID>
+  <C_ORDERLINE_ID><![CDATA[53A0A0E0A7EF41C19DD44B73FA8A6AB4]]></C_ORDERLINE_ID>
+  <C_TAX_ID><![CDATA[667A8194F0264B0AAA997B8B51F72024]]></C_TAX_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2016-08-31 16:16:58.0]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-08-31 16:16:58.0]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <TAXBASEAMT><![CDATA[-4.00]]></TAXBASEAMT>
+  <TAXAMT><![CDATA[-0.12]]></TAXAMT>
+  <LINE><![CDATA[10]]></LINE>
+  <C_ORDER_ID><![CDATA[426BF309F4FB43A891331B9ADD9E03A0]]></C_ORDER_ID>
+</C_ORDERLINETAX>
+
+<C_ORDERLINETAX>
   <C_ORDERLINETAX_ID><![CDATA[D23DFCD2D72748BA90373DDAA01EE17B]]></C_ORDERLINETAX_ID>
   <C_ORDERLINE_ID><![CDATA[D4CCAB875EE0440A97825C933C8C5B14]]></C_ORDERLINE_ID>
   <C_TAX_ID><![CDATA[F9D9AF81F4FA459C9CE7A2D9697DF1E4]]></C_TAX_ID>
@@ -1310,6 +1429,23 @@
 </C_ORDERLINETAX>
 
 <C_ORDERLINETAX>
+  <C_ORDERLINETAX_ID><![CDATA[EB88FAAA353A4283B407A077838EC2C0]]></C_ORDERLINETAX_ID>
+  <C_ORDERLINE_ID><![CDATA[7F5B5AD6B60E4C8AB6FBD1DAA9643F1E]]></C_ORDERLINE_ID>
+  <C_TAX_ID><![CDATA[5690F12F2C934F5384FA94F063F63C5F]]></C_TAX_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2016-08-31 16:16:54.0]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-08-31 16:16:54.0]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <TAXBASEAMT><![CDATA[8.00]]></TAXBASEAMT>
+  <TAXAMT><![CDATA[0.04]]></TAXAMT>
+  <LINE><![CDATA[20]]></LINE>
+  <C_ORDER_ID><![CDATA[A38BA8D9DB864C5DB9BB179BEDFAE585]]></C_ORDER_ID>
+</C_ORDERLINETAX>
+
+<C_ORDERLINETAX>
   <C_ORDERLINETAX_ID><![CDATA[ED170058A0F44A8CA58729907FFC0DCB]]></C_ORDERLINETAX_ID>
   <C_ORDERLINE_ID><![CDATA[A3AFCF9808874DCB81238596EE266766]]></C_ORDERLINE_ID>
   <C_TAX_ID><![CDATA[F9D9AF81F4FA459C9CE7A2D9697DF1E4]]></C_TAX_ID>
--- a/referencedata/sampledata/QA_Testing/C_ORDERTAX.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/referencedata/sampledata/QA_Testing/C_ORDERTAX.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -17,6 +17,22 @@
 </C_ORDERTAX>
 
 <C_ORDERTAX>
+  <C_ORDERTAX_ID><![CDATA[0C8BF79A5658492B8D46FAD91B39E838]]></C_ORDERTAX_ID>
+  <C_ORDER_ID><![CDATA[F939B53C0EBB4E5EA35636DCAF61BF6C]]></C_ORDER_ID>
+  <C_TAX_ID><![CDATA[667A8194F0264B0AAA997B8B51F72024]]></C_TAX_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2016-08-31 16:16:40.0]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-08-31 16:16:40.0]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <TAXBASEAMT><![CDATA[4.00]]></TAXBASEAMT>
+  <TAXAMT><![CDATA[0.12]]></TAXAMT>
+  <LINE><![CDATA[10]]></LINE>
+</C_ORDERTAX>
+
+<C_ORDERTAX>
   <C_ORDERTAX_ID><![CDATA[0F7CF26BC7534E6E821FBE57A29D3099]]></C_ORDERTAX_ID>
   <C_ORDER_ID><![CDATA[A750BC1D89044BC2B2260B2A2EEBC83E]]></C_ORDER_ID>
   <C_TAX_ID><![CDATA[F9D9AF81F4FA459C9CE7A2D9697DF1E4]]></C_TAX_ID>
@@ -65,6 +81,22 @@
 </C_ORDERTAX>
 
 <C_ORDERTAX>
+  <C_ORDERTAX_ID><![CDATA[16738D9028164C2083A51D2CFF9D7728]]></C_ORDERTAX_ID>
+  <C_ORDER_ID><![CDATA[A38BA8D9DB864C5DB9BB179BEDFAE585]]></C_ORDER_ID>
+  <C_TAX_ID><![CDATA[5690F12F2C934F5384FA94F063F63C5F]]></C_TAX_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2016-08-31 16:16:54.0]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-08-31 16:16:54.0]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <TAXBASEAMT><![CDATA[8.00]]></TAXBASEAMT>
+  <TAXAMT><![CDATA[0.04]]></TAXAMT>
+  <LINE><![CDATA[20]]></LINE>
+</C_ORDERTAX>
+
+<C_ORDERTAX>
   <C_ORDERTAX_ID><![CDATA[19586B8545DF5383E0530100007F39E5]]></C_ORDERTAX_ID>
   <C_ORDER_ID><![CDATA[7EA60D533AEB4EC292EBCA2E8C47F4A2]]></C_ORDER_ID>
   <C_TAX_ID><![CDATA[667A8194F0264B0AAA997B8B51F72024]]></C_TAX_ID>
@@ -225,6 +257,22 @@
 </C_ORDERTAX>
 
 <C_ORDERTAX>
+  <C_ORDERTAX_ID><![CDATA[2C20E53586974FDD9D1D3E6802F45E5E]]></C_ORDERTAX_ID>
+  <C_ORDER_ID><![CDATA[426BF309F4FB43A891331B9ADD9E03A0]]></C_ORDER_ID>
+  <C_TAX_ID><![CDATA[5690F12F2C934F5384FA94F063F63C5F]]></C_TAX_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2016-08-31 16:16:58.0]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-08-31 16:16:58.0]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <TAXBASEAMT><![CDATA[-4.00]]></TAXBASEAMT>
+  <TAXAMT><![CDATA[-0.02]]></TAXAMT>
+  <LINE><![CDATA[20]]></LINE>
+</C_ORDERTAX>
+
+<C_ORDERTAX>
   <C_ORDERTAX_ID><![CDATA[2D17D010538743A9AD7E8BF985ABE664]]></C_ORDERTAX_ID>
   <C_ORDER_ID><![CDATA[8B53B7E6CF3B4D8D9BCF3A49EED6FCB4]]></C_ORDER_ID>
   <C_TAX_ID><![CDATA[BA7059430C0A43A9B86A21C4EECF3A21]]></C_TAX_ID>
@@ -353,6 +401,22 @@
 </C_ORDERTAX>
 
 <C_ORDERTAX>
+  <C_ORDERTAX_ID><![CDATA[6EC934A67C424767BAAC2CF1B4239F39]]></C_ORDERTAX_ID>
+  <C_ORDER_ID><![CDATA[F939B53C0EBB4E5EA35636DCAF61BF6C]]></C_ORDER_ID>
+  <C_TAX_ID><![CDATA[5690F12F2C934F5384FA94F063F63C5F]]></C_TAX_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2016-08-31 16:16:40.0]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-08-31 16:16:40.0]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <TAXBASEAMT><![CDATA[4.00]]></TAXBASEAMT>
+  <TAXAMT><![CDATA[0.02]]></TAXAMT>
+  <LINE><![CDATA[20]]></LINE>
+</C_ORDERTAX>
+
+<C_ORDERTAX>
   <C_ORDERTAX_ID><![CDATA[747B6563127F4EC08D5B5786741DF6DE]]></C_ORDERTAX_ID>
   <C_ORDER_ID><![CDATA[DC04CE3CE2EC4A878DE703F4E46B7C7D]]></C_ORDER_ID>
   <C_TAX_ID><![CDATA[F9D9AF81F4FA459C9CE7A2D9697DF1E4]]></C_TAX_ID>
@@ -369,6 +433,22 @@
 </C_ORDERTAX>
 
 <C_ORDERTAX>
+  <C_ORDERTAX_ID><![CDATA[75FD2865CD20489E84B0C1AEFC10BE16]]></C_ORDERTAX_ID>
+  <C_ORDER_ID><![CDATA[426BF309F4FB43A891331B9ADD9E03A0]]></C_ORDER_ID>
+  <C_TAX_ID><![CDATA[667A8194F0264B0AAA997B8B51F72024]]></C_TAX_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2016-08-31 16:16:58.0]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-08-31 16:16:58.0]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <TAXBASEAMT><![CDATA[-4.00]]></TAXBASEAMT>
+  <TAXAMT><![CDATA[-0.12]]></TAXAMT>
+  <LINE><![CDATA[10]]></LINE>
+</C_ORDERTAX>
+
+<C_ORDERTAX>
   <C_ORDERTAX_ID><![CDATA[7BFBB04C78EB4E79AAE803AF36BC5827]]></C_ORDERTAX_ID>
   <C_ORDER_ID><![CDATA[FF808081329052F301329089D7DE00C7]]></C_ORDER_ID>
   <C_TAX_ID><![CDATA[3271411A5AFB490A91FB618B6B789C24]]></C_TAX_ID>
@@ -465,6 +545,38 @@
 </C_ORDERTAX>
 
 <C_ORDERTAX>
+  <C_ORDERTAX_ID><![CDATA[AF377EC4CF224B51BEDDC07EBEE8D232]]></C_ORDERTAX_ID>
+  <C_ORDER_ID><![CDATA[F1AAB8C608AA434C9FC7FC1D685BA016]]></C_ORDER_ID>
+  <C_TAX_ID><![CDATA[5690F12F2C934F5384FA94F063F63C5F]]></C_TAX_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2016-09-01 08:22:13.0]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-09-01 08:22:13.0]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <TAXBASEAMT><![CDATA[4.00]]></TAXBASEAMT>
+  <TAXAMT><![CDATA[0.02]]></TAXAMT>
+  <LINE><![CDATA[20]]></LINE>
+</C_ORDERTAX>
+
+<C_ORDERTAX>
+  <C_ORDERTAX_ID><![CDATA[B892CB0758E741F1AAD8A5DB9A227F59]]></C_ORDERTAX_ID>
+  <C_ORDER_ID><![CDATA[A38BA8D9DB864C5DB9BB179BEDFAE585]]></C_ORDER_ID>
+  <C_TAX_ID><![CDATA[667A8194F0264B0AAA997B8B51F72024]]></C_TAX_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2016-08-31 16:16:54.0]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-08-31 16:16:54.0]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <TAXBASEAMT><![CDATA[8.00]]></TAXBASEAMT>
+  <TAXAMT><![CDATA[0.24]]></TAXAMT>
+  <LINE><![CDATA[10]]></LINE>
+</C_ORDERTAX>
+
+<C_ORDERTAX>
   <C_ORDERTAX_ID><![CDATA[B99E140E695443829F5AC02E7D2AB072]]></C_ORDERTAX_ID>
   <C_ORDER_ID><![CDATA[3171C696594143E7B2AD63A00AABE473]]></C_ORDER_ID>
   <C_TAX_ID><![CDATA[F9D9AF81F4FA459C9CE7A2D9697DF1E4]]></C_TAX_ID>
@@ -545,6 +657,22 @@
 </C_ORDERTAX>
 
 <C_ORDERTAX>
+  <C_ORDERTAX_ID><![CDATA[E5B809A3A17146FC9B3344D3CA4A1701]]></C_ORDERTAX_ID>
+  <C_ORDER_ID><![CDATA[F1AAB8C608AA434C9FC7FC1D685BA016]]></C_ORDER_ID>
+  <C_TAX_ID><![CDATA[667A8194F0264B0AAA997B8B51F72024]]></C_TAX_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2016-09-01 08:22:13.0]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-09-01 08:22:13.0]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <TAXBASEAMT><![CDATA[4.00]]></TAXBASEAMT>
+  <TAXAMT><![CDATA[0.12]]></TAXAMT>
+  <LINE><![CDATA[10]]></LINE>
+</C_ORDERTAX>
+
+<C_ORDERTAX>
   <C_ORDERTAX_ID><![CDATA[F5BC41C379704E578A9467D1823D4987]]></C_ORDERTAX_ID>
   <C_ORDER_ID><![CDATA[E4844E2792914BDCADF5F8B0530031D0]]></C_ORDER_ID>
   <C_TAX_ID><![CDATA[F9D9AF81F4FA459C9CE7A2D9697DF1E4]]></C_TAX_ID>
--- a/referencedata/sampledata/QA_Testing/FIN_PAYMENT.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/referencedata/sampledata/QA_Testing/FIN_PAYMENT.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -43,7 +43,7 @@
   <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
   <CREATED><![CDATA[2015-05-05 19:27:56.76]]></CREATED>
   <CREATEDBY><![CDATA[100]]></CREATEDBY>
-  <UPDATED><![CDATA[2015-05-05 19:28:19.999]]></UPDATED>
+  <UPDATED><![CDATA[2016-08-31 16:16:49.549052]]></UPDATED>
   <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <ISRECEIPT><![CDATA[Y]]></ISRECEIPT>
@@ -58,7 +58,7 @@
   <STATUS><![CDATA[RPVOID]]></STATUS>
   <PROCESSED><![CDATA[Y]]></PROCESSED>
   <PROCESSING><![CDATA[N]]></PROCESSING>
-  <POSTED><![CDATA[N]]></POSTED>
+  <POSTED><![CDATA[D]]></POSTED>
   <DESCRIPTION><![CDATA[Invoice No.: Issue 29505
 ]]></DESCRIPTION>
   <FIN_FINANCIAL_ACCOUNT_ID><![CDATA[0D0000E0A27040E383D5B03755249B61]]></FIN_FINANCIAL_ACCOUNT_ID>
@@ -121,7 +121,7 @@
   <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
   <CREATED><![CDATA[2015-05-05 19:28:48.566]]></CREATED>
   <CREATEDBY><![CDATA[100]]></CREATEDBY>
-  <UPDATED><![CDATA[2015-05-05 19:28:48.615]]></UPDATED>
+  <UPDATED><![CDATA[2016-08-31 16:16:49.502144]]></UPDATED>
   <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <ISRECEIPT><![CDATA[Y]]></ISRECEIPT>
@@ -136,7 +136,7 @@
   <STATUS><![CDATA[RPR]]></STATUS>
   <PROCESSED><![CDATA[Y]]></PROCESSED>
   <PROCESSING><![CDATA[N]]></PROCESSING>
-  <POSTED><![CDATA[N]]></POSTED>
+  <POSTED><![CDATA[Y]]></POSTED>
   <DESCRIPTION><![CDATA[Invoice No.: Issue 29505
 ]]></DESCRIPTION>
   <FIN_FINANCIAL_ACCOUNT_ID><![CDATA[0D0000E0A27040E383D5B03755249B61]]></FIN_FINANCIAL_ACCOUNT_ID>
@@ -262,6 +262,43 @@
 </FIN_PAYMENT>
 
 <FIN_PAYMENT>
+  <FIN_PAYMENT_ID><![CDATA[CC0C8F540692447B83D012B5266C1E02]]></FIN_PAYMENT_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <CREATED><![CDATA[2016-08-31 16:16:58.42]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-08-31 16:21:49.335563]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <ISRECEIPT><![CDATA[Y]]></ISRECEIPT>
+  <C_BPARTNER_ID><![CDATA[4028E6C72959682B01295F40C3CB02EC]]></C_BPARTNER_ID>
+  <PAYMENTDATE><![CDATA[2016-08-31 00:00:00.0]]></PAYMENTDATE>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+  <AMOUNT><![CDATA[0]]></AMOUNT>
+  <WRITEOFFAMT><![CDATA[0]]></WRITEOFFAMT>
+  <FIN_PAYMENTMETHOD_ID><![CDATA[42E87E97974E4B35849A430B8F6F2884]]></FIN_PAYMENTMETHOD_ID>
+  <DOCUMENTNO><![CDATA[400034*R*]]></DOCUMENTNO>
+  <STATUS><![CDATA[RPR]]></STATUS>
+  <PROCESSED><![CDATA[Y]]></PROCESSED>
+  <PROCESSING><![CDATA[N]]></PROCESSING>
+  <POSTED><![CDATA[Y]]></POSTED>
+  <DESCRIPTION><![CDATA[Order No.: 50016*R*: 50016
+]]></DESCRIPTION>
+  <FIN_FINANCIAL_ACCOUNT_ID><![CDATA[0D0000E0A27040E383D5B03755249B61]]></FIN_FINANCIAL_ACCOUNT_ID>
+  <C_DOCTYPE_ID><![CDATA[FF8080812C2ABFC6012C2B3BE4970093]]></C_DOCTYPE_ID>
+  <GENERATED_CREDIT><![CDATA[0]]></GENERATED_CREDIT>
+  <USED_CREDIT><![CDATA[0]]></USED_CREDIT>
+  <CREATEDBYALGORITHM><![CDATA[N]]></CREATEDBYALGORITHM>
+  <FINACC_TXN_CONVERT_RATE><![CDATA[1]]></FINACC_TXN_CONVERT_RATE>
+  <FINACC_TXN_AMOUNT><![CDATA[-4.14]]></FINACC_TXN_AMOUNT>
+  <EM_APRM_PROCESS_PAYMENT><![CDATA[RE]]></EM_APRM_PROCESS_PAYMENT>
+  <EM_APRM_RECONCILE_PAYMENT><![CDATA[N]]></EM_APRM_RECONCILE_PAYMENT>
+  <EM_APRM_ADD_SCHEDULEDPAYMENTS><![CDATA[N]]></EM_APRM_ADD_SCHEDULEDPAYMENTS>
+  <EM_APRM_EXECUTEPAYMENT><![CDATA[N]]></EM_APRM_EXECUTEPAYMENT>
+  <EM_APRM_REVERSEPAYMENT><![CDATA[N]]></EM_APRM_REVERSEPAYMENT>
+</FIN_PAYMENT>
+
+<FIN_PAYMENT>
   <FIN_PAYMENT_ID><![CDATA[E631FE70883943E9B4CEDE8860632EA0]]></FIN_PAYMENT_ID>
   <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
--- a/referencedata/sampledata/QA_Testing/FIN_PAYMENT_DETAIL.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/referencedata/sampledata/QA_Testing/FIN_PAYMENT_DETAIL.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -1,6 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <data>
 <FIN_PAYMENT_DETAIL>
+  <FIN_PAYMENT_DETAIL_ID><![CDATA[2866A573EFB94A4C813CAD570DD45CA7]]></FIN_PAYMENT_DETAIL_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <CREATED><![CDATA[2016-08-31 16:16:58.431]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-08-31 16:16:58.431]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <FIN_PAYMENT_ID><![CDATA[CC0C8F540692447B83D012B5266C1E02]]></FIN_PAYMENT_ID>
+  <AMOUNT><![CDATA[-4.14]]></AMOUNT>
+  <REFUND><![CDATA[N]]></REFUND>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <WRITEOFFAMT><![CDATA[0]]></WRITEOFFAMT>
+  <ISPREPAYMENT><![CDATA[Y]]></ISPREPAYMENT>
+</FIN_PAYMENT_DETAIL>
+
+<FIN_PAYMENT_DETAIL>
   <FIN_PAYMENT_DETAIL_ID><![CDATA[405F2898405D447BBB562F2C3DDD32B6]]></FIN_PAYMENT_DETAIL_ID>
   <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
@@ -81,6 +97,22 @@
 </FIN_PAYMENT_DETAIL>
 
 <FIN_PAYMENT_DETAIL>
+  <FIN_PAYMENT_DETAIL_ID><![CDATA[AE17896BB6154384AF71316A2185F91B]]></FIN_PAYMENT_DETAIL_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <CREATED><![CDATA[2016-08-31 16:16:58.448]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-08-31 16:16:58.448]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <FIN_PAYMENT_ID><![CDATA[CC0C8F540692447B83D012B5266C1E02]]></FIN_PAYMENT_ID>
+  <AMOUNT><![CDATA[4.14]]></AMOUNT>
+  <REFUND><![CDATA[N]]></REFUND>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <WRITEOFFAMT><![CDATA[0.00]]></WRITEOFFAMT>
+  <ISPREPAYMENT><![CDATA[Y]]></ISPREPAYMENT>
+</FIN_PAYMENT_DETAIL>
+
+<FIN_PAYMENT_DETAIL>
   <FIN_PAYMENT_DETAIL_ID><![CDATA[DAACF7D26EB341D3A55D86E797B37BD3]]></FIN_PAYMENT_DETAIL_ID>
   <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
--- a/referencedata/sampledata/QA_Testing/FIN_PAYMENT_SCHEDULE.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/referencedata/sampledata/QA_Testing/FIN_PAYMENT_SCHEDULE.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -6,15 +6,15 @@
   <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
   <CREATED><![CDATA[2013-07-04 23:38:18.23]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:18.23]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2016-08-31 23:00:00.796]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <C_INVOICE_ID><![CDATA[FF808081329052F3013290D2F413021A]]></C_INVOICE_ID>
   <DUEDATE><![CDATA[2011-05-02 00:00:00.0]]></DUEDATE>
   <FIN_PAYMENTMETHOD_ID><![CDATA[FF808081328278B5013282A0E03C009D]]></FIN_PAYMENTMETHOD_ID>
   <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
   <AMOUNT><![CDATA[60.00]]></AMOUNT>
-  <PAIDAMT><![CDATA[60.00]]></PAIDAMT>
-  <OUTSTANDINGAMT><![CDATA[0.00]]></OUTSTANDINGAMT>
+  <PAIDAMT><![CDATA[0]]></PAIDAMT>
+  <OUTSTANDINGAMT><![CDATA[60.00]]></OUTSTANDINGAMT>
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <UPDATE_PAYMENT_PLAN><![CDATA[Y]]></UPDATE_PAYMENT_PLAN>
   <EXPECTEDDATE><![CDATA[2011-05-02 00:00:00.0]]></EXPECTEDDATE>
@@ -50,15 +50,15 @@
   <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
   <CREATED><![CDATA[2013-07-04 23:38:18.235]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:18.235]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2016-08-31 23:00:00.506]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <C_INVOICE_ID><![CDATA[FF8080813285D49A013286574D8001FA]]></C_INVOICE_ID>
   <DUEDATE><![CDATA[2011-02-05 00:00:00.0]]></DUEDATE>
   <FIN_PAYMENTMETHOD_ID><![CDATA[FF808081328278B5013282894727003C]]></FIN_PAYMENTMETHOD_ID>
   <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
   <AMOUNT><![CDATA[100.00]]></AMOUNT>
-  <PAIDAMT><![CDATA[100.00]]></PAIDAMT>
-  <OUTSTANDINGAMT><![CDATA[0.00]]></OUTSTANDINGAMT>
+  <PAIDAMT><![CDATA[0]]></PAIDAMT>
+  <OUTSTANDINGAMT><![CDATA[100.00]]></OUTSTANDINGAMT>
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <UPDATE_PAYMENT_PLAN><![CDATA[Y]]></UPDATE_PAYMENT_PLAN>
   <EXPECTEDDATE><![CDATA[2011-02-05 00:00:00.0]]></EXPECTEDDATE>
@@ -72,15 +72,15 @@
   <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
   <CREATED><![CDATA[2013-07-04 23:38:18.227]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:18.227]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2016-08-31 23:00:00.529]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <C_INVOICE_ID><![CDATA[FF8080813285D49A0132874B35C7030C]]></C_INVOICE_ID>
   <DUEDATE><![CDATA[2011-02-05 00:00:00.0]]></DUEDATE>
   <FIN_PAYMENTMETHOD_ID><![CDATA[FF808081328278B50132829EEB930093]]></FIN_PAYMENTMETHOD_ID>
   <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
   <AMOUNT><![CDATA[146.00]]></AMOUNT>
-  <PAIDAMT><![CDATA[146.00]]></PAIDAMT>
-  <OUTSTANDINGAMT><![CDATA[0.00]]></OUTSTANDINGAMT>
+  <PAIDAMT><![CDATA[0]]></PAIDAMT>
+  <OUTSTANDINGAMT><![CDATA[146.00]]></OUTSTANDINGAMT>
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <UPDATE_PAYMENT_PLAN><![CDATA[Y]]></UPDATE_PAYMENT_PLAN>
   <EXPECTEDDATE><![CDATA[2011-02-05 00:00:00.0]]></EXPECTEDDATE>
@@ -138,15 +138,15 @@
   <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
   <CREATED><![CDATA[2013-07-04 23:38:18.229]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:18.229]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2016-08-31 23:00:00.77]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <C_INVOICE_ID><![CDATA[FF808081329052F3013290C7B0BE01CD]]></C_INVOICE_ID>
   <DUEDATE><![CDATA[2011-04-02 00:00:00.0]]></DUEDATE>
   <FIN_PAYMENTMETHOD_ID><![CDATA[FF808081328278B50132828BA27D0047]]></FIN_PAYMENTMETHOD_ID>
   <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
   <AMOUNT><![CDATA[30.00]]></AMOUNT>
-  <PAIDAMT><![CDATA[30.00]]></PAIDAMT>
-  <OUTSTANDINGAMT><![CDATA[0.00]]></OUTSTANDINGAMT>
+  <PAIDAMT><![CDATA[0]]></PAIDAMT>
+  <OUTSTANDINGAMT><![CDATA[30.00]]></OUTSTANDINGAMT>
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <UPDATE_PAYMENT_PLAN><![CDATA[Y]]></UPDATE_PAYMENT_PLAN>
   <EXPECTEDDATE><![CDATA[2011-04-02 00:00:00.0]]></EXPECTEDDATE>
@@ -160,15 +160,15 @@
   <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
   <CREATED><![CDATA[2013-07-04 23:38:18.227]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:18.227]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2016-08-31 23:00:00.81]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <C_INVOICE_ID><![CDATA[FF80808132916E850132917441200006]]></C_INVOICE_ID>
   <DUEDATE><![CDATA[2011-04-02 00:00:00.0]]></DUEDATE>
   <FIN_PAYMENTMETHOD_ID><![CDATA[FF808081328278B5013282878450002C]]></FIN_PAYMENTMETHOD_ID>
   <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
   <AMOUNT><![CDATA[50.00]]></AMOUNT>
-  <PAIDAMT><![CDATA[50.00]]></PAIDAMT>
-  <OUTSTANDINGAMT><![CDATA[0.00]]></OUTSTANDINGAMT>
+  <PAIDAMT><![CDATA[0]]></PAIDAMT>
+  <OUTSTANDINGAMT><![CDATA[50.00]]></OUTSTANDINGAMT>
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <UPDATE_PAYMENT_PLAN><![CDATA[Y]]></UPDATE_PAYMENT_PLAN>
   <EXPECTEDDATE><![CDATA[2011-04-02 00:00:00.0]]></EXPECTEDDATE>
@@ -182,15 +182,15 @@
   <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
   <CREATED><![CDATA[2013-07-04 23:38:18.232]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:18.232]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2016-08-31 23:00:00.654]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <C_INVOICE_ID><![CDATA[FF808081328B6AAC01328CF3E8B902C6]]></C_INVOICE_ID>
   <DUEDATE><![CDATA[2011-02-05 00:00:00.0]]></DUEDATE>
   <FIN_PAYMENTMETHOD_ID><![CDATA[FF808081328278B50132829EEB930093]]></FIN_PAYMENTMETHOD_ID>
   <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
   <AMOUNT><![CDATA[50.00]]></AMOUNT>
-  <PAIDAMT><![CDATA[50.00]]></PAIDAMT>
-  <OUTSTANDINGAMT><![CDATA[0.00]]></OUTSTANDINGAMT>
+  <PAIDAMT><![CDATA[0]]></PAIDAMT>
+  <OUTSTANDINGAMT><![CDATA[50.00]]></OUTSTANDINGAMT>
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <UPDATE_PAYMENT_PLAN><![CDATA[Y]]></UPDATE_PAYMENT_PLAN>
   <EXPECTEDDATE><![CDATA[2011-02-05 00:00:00.0]]></EXPECTEDDATE>
@@ -204,15 +204,15 @@
   <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
   <CREATED><![CDATA[2013-07-04 23:38:18.23]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:18.23]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2016-08-31 23:00:00.585]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <C_INVOICE_ID><![CDATA[FF808081328B6AAC01328B713A070013]]></C_INVOICE_ID>
   <DUEDATE><![CDATA[2011-03-05 00:00:00.0]]></DUEDATE>
   <FIN_PAYMENTMETHOD_ID><![CDATA[FF808081328278B5013282894727003C]]></FIN_PAYMENTMETHOD_ID>
   <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
   <AMOUNT><![CDATA[30.00]]></AMOUNT>
-  <PAIDAMT><![CDATA[30.00]]></PAIDAMT>
-  <OUTSTANDINGAMT><![CDATA[0.00]]></OUTSTANDINGAMT>
+  <PAIDAMT><![CDATA[0]]></PAIDAMT>
+  <OUTSTANDINGAMT><![CDATA[30.00]]></OUTSTANDINGAMT>
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <UPDATE_PAYMENT_PLAN><![CDATA[Y]]></UPDATE_PAYMENT_PLAN>
   <EXPECTEDDATE><![CDATA[2011-03-05 00:00:00.0]]></EXPECTEDDATE>
@@ -226,15 +226,15 @@
   <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
   <CREATED><![CDATA[2013-07-04 23:38:18.228]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:18.228]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2016-08-31 23:00:00.68]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <C_INVOICE_ID><![CDATA[FF808081329052F30132907743040063]]></C_INVOICE_ID>
   <DUEDATE><![CDATA[2011-04-05 00:00:00.0]]></DUEDATE>
   <FIN_PAYMENTMETHOD_ID><![CDATA[FF808081328278B5013282A0E03C009D]]></FIN_PAYMENTMETHOD_ID>
   <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
   <AMOUNT><![CDATA[40.00]]></AMOUNT>
-  <PAIDAMT><![CDATA[40.00]]></PAIDAMT>
-  <OUTSTANDINGAMT><![CDATA[0.00]]></OUTSTANDINGAMT>
+  <PAIDAMT><![CDATA[0]]></PAIDAMT>
+  <OUTSTANDINGAMT><![CDATA[40.00]]></OUTSTANDINGAMT>
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <UPDATE_PAYMENT_PLAN><![CDATA[Y]]></UPDATE_PAYMENT_PLAN>
   <EXPECTEDDATE><![CDATA[2011-04-05 00:00:00.0]]></EXPECTEDDATE>
@@ -248,15 +248,15 @@
   <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
   <CREATED><![CDATA[2013-07-04 23:38:18.23]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:18.23]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2016-08-31 23:00:00.838]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <C_INVOICE_ID><![CDATA[FF80808132916E850132918E22560070]]></C_INVOICE_ID>
   <DUEDATE><![CDATA[2011-04-02 00:00:00.0]]></DUEDATE>
   <FIN_PAYMENTMETHOD_ID><![CDATA[FF808081328278B501328284CA440021]]></FIN_PAYMENTMETHOD_ID>
   <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
   <AMOUNT><![CDATA[5.00]]></AMOUNT>
-  <PAIDAMT><![CDATA[5.00]]></PAIDAMT>
-  <OUTSTANDINGAMT><![CDATA[0.00]]></OUTSTANDINGAMT>
+  <PAIDAMT><![CDATA[0]]></PAIDAMT>
+  <OUTSTANDINGAMT><![CDATA[5.00]]></OUTSTANDINGAMT>
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <UPDATE_PAYMENT_PLAN><![CDATA[Y]]></UPDATE_PAYMENT_PLAN>
   <EXPECTEDDATE><![CDATA[2011-04-02 00:00:00.0]]></EXPECTEDDATE>
@@ -270,15 +270,15 @@
   <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
   <CREATED><![CDATA[2013-07-04 23:38:18.231]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:18.231]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2016-08-31 23:00:00.437]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <C_INVOICE_ID><![CDATA[FF808081328278B5013282A8444500DF]]></C_INVOICE_ID>
   <DUEDATE><![CDATA[2011-02-05 00:00:00.0]]></DUEDATE>
   <FIN_PAYMENTMETHOD_ID><![CDATA[FF808081328278B5013282878450002C]]></FIN_PAYMENTMETHOD_ID>
   <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
   <AMOUNT><![CDATA[150.00]]></AMOUNT>
-  <PAIDAMT><![CDATA[150.00]]></PAIDAMT>
-  <OUTSTANDINGAMT><![CDATA[0.00]]></OUTSTANDINGAMT>
+  <PAIDAMT><![CDATA[0]]></PAIDAMT>
+  <OUTSTANDINGAMT><![CDATA[150.00]]></OUTSTANDINGAMT>
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <UPDATE_PAYMENT_PLAN><![CDATA[Y]]></UPDATE_PAYMENT_PLAN>
   <EXPECTEDDATE><![CDATA[2011-02-05 00:00:00.0]]></EXPECTEDDATE>
@@ -292,15 +292,15 @@
   <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
   <CREATED><![CDATA[2013-07-04 23:38:18.227]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:18.227]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2016-08-31 23:00:00.695]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <C_INVOICE_ID><![CDATA[FF808081329052F30132909220150100]]></C_INVOICE_ID>
   <DUEDATE><![CDATA[2011-02-05 00:00:00.0]]></DUEDATE>
   <FIN_PAYMENTMETHOD_ID><![CDATA[FF808081328278B5013282894727003C]]></FIN_PAYMENTMETHOD_ID>
   <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
   <AMOUNT><![CDATA[110.00]]></AMOUNT>
-  <PAIDAMT><![CDATA[110.00]]></PAIDAMT>
-  <OUTSTANDINGAMT><![CDATA[0.00]]></OUTSTANDINGAMT>
+  <PAIDAMT><![CDATA[0]]></PAIDAMT>
+  <OUTSTANDINGAMT><![CDATA[110.00]]></OUTSTANDINGAMT>
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <UPDATE_PAYMENT_PLAN><![CDATA[Y]]></UPDATE_PAYMENT_PLAN>
   <EXPECTEDDATE><![CDATA[2011-02-05 00:00:00.0]]></EXPECTEDDATE>
@@ -336,15 +336,15 @@
   <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
   <CREATED><![CDATA[2013-07-04 23:38:18.235]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:18.235]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2016-08-31 23:00:00.596]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <C_INVOICE_ID><![CDATA[FF808081328B6AAC01328B91FE0F00D3]]></C_INVOICE_ID>
   <DUEDATE><![CDATA[2011-02-05 00:00:00.0]]></DUEDATE>
   <FIN_PAYMENTMETHOD_ID><![CDATA[FF808081328278B5013282A0E03C009D]]></FIN_PAYMENTMETHOD_ID>
   <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
   <AMOUNT><![CDATA[80.00]]></AMOUNT>
-  <PAIDAMT><![CDATA[80.00]]></PAIDAMT>
-  <OUTSTANDINGAMT><![CDATA[0.00]]></OUTSTANDINGAMT>
+  <PAIDAMT><![CDATA[0]]></PAIDAMT>
+  <OUTSTANDINGAMT><![CDATA[80.00]]></OUTSTANDINGAMT>
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <UPDATE_PAYMENT_PLAN><![CDATA[Y]]></UPDATE_PAYMENT_PLAN>
   <EXPECTEDDATE><![CDATA[2011-02-05 00:00:00.0]]></EXPECTEDDATE>
@@ -424,15 +424,15 @@
   <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
   <CREATED><![CDATA[2013-07-04 23:38:18.234]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:18.234]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2016-08-31 23:00:00.573]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <C_INVOICE_ID><![CDATA[FF808081328B2FE901328B5AE4030098]]></C_INVOICE_ID>
   <DUEDATE><![CDATA[2011-02-05 00:00:00.0]]></DUEDATE>
   <FIN_PAYMENTMETHOD_ID><![CDATA[FF808081328278B5013282878450002C]]></FIN_PAYMENTMETHOD_ID>
   <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
   <AMOUNT><![CDATA[50.00]]></AMOUNT>
-  <PAIDAMT><![CDATA[50.00]]></PAIDAMT>
-  <OUTSTANDINGAMT><![CDATA[0.00]]></OUTSTANDINGAMT>
+  <PAIDAMT><![CDATA[0]]></PAIDAMT>
+  <OUTSTANDINGAMT><![CDATA[50.00]]></OUTSTANDINGAMT>
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <UPDATE_PAYMENT_PLAN><![CDATA[Y]]></UPDATE_PAYMENT_PLAN>
   <EXPECTEDDATE><![CDATA[2011-02-05 00:00:00.0]]></EXPECTEDDATE>
@@ -446,15 +446,15 @@
   <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
   <CREATED><![CDATA[2013-07-04 23:38:18.234]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:18.234]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2016-08-31 23:00:00.562]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <C_INVOICE_ID><![CDATA[FF808081328B2FE901328B3AEAB90021]]></C_INVOICE_ID>
   <DUEDATE><![CDATA[2011-02-05 00:00:00.0]]></DUEDATE>
   <FIN_PAYMENTMETHOD_ID><![CDATA[FF808081328278B5013282A0E03C009D]]></FIN_PAYMENTMETHOD_ID>
   <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
   <AMOUNT><![CDATA[70.00]]></AMOUNT>
-  <PAIDAMT><![CDATA[70.00]]></PAIDAMT>
-  <OUTSTANDINGAMT><![CDATA[0.00]]></OUTSTANDINGAMT>
+  <PAIDAMT><![CDATA[0]]></PAIDAMT>
+  <OUTSTANDINGAMT><![CDATA[70.00]]></OUTSTANDINGAMT>
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <UPDATE_PAYMENT_PLAN><![CDATA[Y]]></UPDATE_PAYMENT_PLAN>
   <EXPECTEDDATE><![CDATA[2011-02-05 00:00:00.0]]></EXPECTEDDATE>
@@ -468,15 +468,15 @@
   <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
   <CREATED><![CDATA[2013-07-04 23:38:18.23]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:18.23]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2016-08-31 23:00:00.517]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <C_INVOICE_ID><![CDATA[FF8080813285D49A0132866BDE390275]]></C_INVOICE_ID>
   <DUEDATE><![CDATA[2011-02-05 00:00:00.0]]></DUEDATE>
   <FIN_PAYMENTMETHOD_ID><![CDATA[FF808081328278B501328284CA440021]]></FIN_PAYMENTMETHOD_ID>
   <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
   <AMOUNT><![CDATA[500.00]]></AMOUNT>
-  <PAIDAMT><![CDATA[500.00]]></PAIDAMT>
-  <OUTSTANDINGAMT><![CDATA[0.00]]></OUTSTANDINGAMT>
+  <PAIDAMT><![CDATA[0]]></PAIDAMT>
+  <OUTSTANDINGAMT><![CDATA[500.00]]></OUTSTANDINGAMT>
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <UPDATE_PAYMENT_PLAN><![CDATA[Y]]></UPDATE_PAYMENT_PLAN>
   <EXPECTEDDATE><![CDATA[2011-02-05 00:00:00.0]]></EXPECTEDDATE>
@@ -556,15 +556,15 @@
   <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
   <CREATED><![CDATA[2013-07-04 23:38:18.234]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:18.234]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2016-08-31 23:00:00.63]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <C_INVOICE_ID><![CDATA[FF808081328B6AAC01328CCFFBF90242]]></C_INVOICE_ID>
   <DUEDATE><![CDATA[2011-02-05 00:00:00.0]]></DUEDATE>
   <FIN_PAYMENTMETHOD_ID><![CDATA[FF808081328278B5013282878450002C]]></FIN_PAYMENTMETHOD_ID>
   <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
   <AMOUNT><![CDATA[10.00]]></AMOUNT>
-  <PAIDAMT><![CDATA[10.00]]></PAIDAMT>
-  <OUTSTANDINGAMT><![CDATA[0.00]]></OUTSTANDINGAMT>
+  <PAIDAMT><![CDATA[0]]></PAIDAMT>
+  <OUTSTANDINGAMT><![CDATA[10.00]]></OUTSTANDINGAMT>
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <UPDATE_PAYMENT_PLAN><![CDATA[Y]]></UPDATE_PAYMENT_PLAN>
   <EXPECTEDDATE><![CDATA[2011-02-05 00:00:00.0]]></EXPECTEDDATE>
@@ -600,15 +600,15 @@
   <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
   <CREATED><![CDATA[2013-07-04 23:38:18.229]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:18.229]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2016-08-31 23:00:00.425]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <C_INVOICE_ID><![CDATA[FF808081328278B5013282A1A35800A0]]></C_INVOICE_ID>
   <DUEDATE><![CDATA[2011-02-05 00:00:00.0]]></DUEDATE>
   <FIN_PAYMENTMETHOD_ID><![CDATA[FF808081328278B501328284CA440021]]></FIN_PAYMENTMETHOD_ID>
   <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
   <AMOUNT><![CDATA[100.00]]></AMOUNT>
-  <PAIDAMT><![CDATA[100.00]]></PAIDAMT>
-  <OUTSTANDINGAMT><![CDATA[0.00]]></OUTSTANDINGAMT>
+  <PAIDAMT><![CDATA[0]]></PAIDAMT>
+  <OUTSTANDINGAMT><![CDATA[100.00]]></OUTSTANDINGAMT>
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <UPDATE_PAYMENT_PLAN><![CDATA[Y]]></UPDATE_PAYMENT_PLAN>
   <EXPECTEDDATE><![CDATA[2011-02-05 00:00:00.0]]></EXPECTEDDATE>
@@ -622,15 +622,15 @@
   <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
   <CREATED><![CDATA[2013-07-04 23:38:18.232]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:18.232]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2016-08-31 23:00:00.783]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <C_INVOICE_ID><![CDATA[FF808081329052F3013290CDB59701F7]]></C_INVOICE_ID>
   <DUEDATE><![CDATA[2011-04-02 00:00:00.0]]></DUEDATE>
   <FIN_PAYMENTMETHOD_ID><![CDATA[FF808081328278B50132828DCBC1006B]]></FIN_PAYMENTMETHOD_ID>
   <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
   <AMOUNT><![CDATA[10.00]]></AMOUNT>
-  <PAIDAMT><![CDATA[10.00]]></PAIDAMT>
-  <OUTSTANDINGAMT><![CDATA[0.00]]></OUTSTANDINGAMT>
+  <PAIDAMT><![CDATA[0]]></PAIDAMT>
+  <OUTSTANDINGAMT><![CDATA[10.00]]></OUTSTANDINGAMT>
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <UPDATE_PAYMENT_PLAN><![CDATA[Y]]></UPDATE_PAYMENT_PLAN>
   <EXPECTEDDATE><![CDATA[2011-04-02 00:00:00.0]]></EXPECTEDDATE>
@@ -639,20 +639,42 @@
 </FIN_PAYMENT_SCHEDULE>
 
 <FIN_PAYMENT_SCHEDULE>
+  <FIN_PAYMENT_SCHEDULE_ID><![CDATA[5E218AD84D1540B6808A18ADD69F4D59]]></FIN_PAYMENT_SCHEDULE_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <CREATED><![CDATA[2016-08-31 16:16:58.0]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-08-31 16:16:58.0]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <C_ORDER_ID><![CDATA[A38BA8D9DB864C5DB9BB179BEDFAE585]]></C_ORDER_ID>
+  <DUEDATE><![CDATA[2016-08-31 16:16:46.834]]></DUEDATE>
+  <FIN_PAYMENTMETHOD_ID><![CDATA[42E87E97974E4B35849A430B8F6F2884]]></FIN_PAYMENTMETHOD_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+  <AMOUNT><![CDATA[8.28]]></AMOUNT>
+  <PAIDAMT><![CDATA[0]]></PAIDAMT>
+  <OUTSTANDINGAMT><![CDATA[8.28]]></OUTSTANDINGAMT>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <UPDATE_PAYMENT_PLAN><![CDATA[Y]]></UPDATE_PAYMENT_PLAN>
+  <EXPECTEDDATE><![CDATA[2016-08-31 16:16:46.834]]></EXPECTEDDATE>
+  <EM_APRM_MODIF_PAYM_SCHED><![CDATA[N]]></EM_APRM_MODIF_PAYM_SCHED>
+  <EM_APRM_MODIF_PAYM_OUT_SCHED><![CDATA[N]]></EM_APRM_MODIF_PAYM_OUT_SCHED>
+</FIN_PAYMENT_SCHEDULE>
+
+<FIN_PAYMENT_SCHEDULE>
   <FIN_PAYMENT_SCHEDULE_ID><![CDATA[60C30A4BC81F4FADA2462B74A699EE15]]></FIN_PAYMENT_SCHEDULE_ID>
   <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
   <CREATED><![CDATA[2013-07-04 23:38:18.233]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:18.233]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2016-08-31 23:00:00.551]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <C_INVOICE_ID><![CDATA[FF808081328B0DAC01328B2C62EA0026]]></C_INVOICE_ID>
   <DUEDATE><![CDATA[2011-02-05 00:00:00.0]]></DUEDATE>
   <FIN_PAYMENTMETHOD_ID><![CDATA[FF808081328278B50132829EEB930093]]></FIN_PAYMENTMETHOD_ID>
   <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
   <AMOUNT><![CDATA[50.00]]></AMOUNT>
-  <PAIDAMT><![CDATA[50.00]]></PAIDAMT>
-  <OUTSTANDINGAMT><![CDATA[0.00]]></OUTSTANDINGAMT>
+  <PAIDAMT><![CDATA[0]]></PAIDAMT>
+  <OUTSTANDINGAMT><![CDATA[50.00]]></OUTSTANDINGAMT>
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <UPDATE_PAYMENT_PLAN><![CDATA[Y]]></UPDATE_PAYMENT_PLAN>
   <EXPECTEDDATE><![CDATA[2011-02-05 00:00:00.0]]></EXPECTEDDATE>
@@ -688,15 +710,15 @@
   <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
   <CREATED><![CDATA[2013-07-04 23:38:18.228]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:18.228]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2016-08-31 23:00:00.851]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <C_INVOICE_ID><![CDATA[FF80808132916E85013291A601F000AB]]></C_INVOICE_ID>
   <DUEDATE><![CDATA[2011-04-02 00:00:00.0]]></DUEDATE>
   <FIN_PAYMENTMETHOD_ID><![CDATA[FF808081328278B50132829EEB930093]]></FIN_PAYMENTMETHOD_ID>
   <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
   <AMOUNT><![CDATA[2.00]]></AMOUNT>
-  <PAIDAMT><![CDATA[2.00]]></PAIDAMT>
-  <OUTSTANDINGAMT><![CDATA[0.00]]></OUTSTANDINGAMT>
+  <PAIDAMT><![CDATA[0]]></PAIDAMT>
+  <OUTSTANDINGAMT><![CDATA[2.00]]></OUTSTANDINGAMT>
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <UPDATE_PAYMENT_PLAN><![CDATA[Y]]></UPDATE_PAYMENT_PLAN>
   <EXPECTEDDATE><![CDATA[2011-04-02 00:00:00.0]]></EXPECTEDDATE>
@@ -776,15 +798,15 @@
   <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
   <CREATED><![CDATA[2013-07-04 23:38:18.233]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:18.233]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2016-08-31 23:00:00.608]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <C_INVOICE_ID><![CDATA[FF808081328B6AAC01328CC5BD96020F]]></C_INVOICE_ID>
   <DUEDATE><![CDATA[2011-02-05 00:00:00.0]]></DUEDATE>
   <FIN_PAYMENTMETHOD_ID><![CDATA[FF808081328278B5013282A0E03C009D]]></FIN_PAYMENTMETHOD_ID>
   <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
   <AMOUNT><![CDATA[20.00]]></AMOUNT>
-  <PAIDAMT><![CDATA[20.00]]></PAIDAMT>
-  <OUTSTANDINGAMT><![CDATA[0.00]]></OUTSTANDINGAMT>
+  <PAIDAMT><![CDATA[0]]></PAIDAMT>
+  <OUTSTANDINGAMT><![CDATA[20.00]]></OUTSTANDINGAMT>
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <UPDATE_PAYMENT_PLAN><![CDATA[Y]]></UPDATE_PAYMENT_PLAN>
   <EXPECTEDDATE><![CDATA[2011-02-05 00:00:00.0]]></EXPECTEDDATE>
@@ -798,15 +820,15 @@
   <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
   <CREATED><![CDATA[2013-07-04 23:38:18.229]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:18.229]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2016-08-31 23:00:00.484]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <C_INVOICE_ID><![CDATA[FF8080813285D49A013286017B1600C2]]></C_INVOICE_ID>
   <DUEDATE><![CDATA[2011-02-05 00:00:00.0]]></DUEDATE>
   <FIN_PAYMENTMETHOD_ID><![CDATA[FF808081328278B5013282894727003C]]></FIN_PAYMENTMETHOD_ID>
   <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
   <AMOUNT><![CDATA[50.00]]></AMOUNT>
-  <PAIDAMT><![CDATA[50.00]]></PAIDAMT>
-  <OUTSTANDINGAMT><![CDATA[0.00]]></OUTSTANDINGAMT>
+  <PAIDAMT><![CDATA[0]]></PAIDAMT>
+  <OUTSTANDINGAMT><![CDATA[50.00]]></OUTSTANDINGAMT>
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <UPDATE_PAYMENT_PLAN><![CDATA[Y]]></UPDATE_PAYMENT_PLAN>
   <EXPECTEDDATE><![CDATA[2011-02-05 00:00:00.0]]></EXPECTEDDATE>
@@ -820,15 +842,15 @@
   <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
   <CREATED><![CDATA[2013-07-04 23:38:18.233]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:18.233]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2016-08-31 23:00:00.472]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <C_INVOICE_ID><![CDATA[FF8080813282F9FE0132831277A700AD]]></C_INVOICE_ID>
   <DUEDATE><![CDATA[2011-02-05 00:00:00.0]]></DUEDATE>
   <FIN_PAYMENTMETHOD_ID><![CDATA[FF808081328278B50132829EEB930093]]></FIN_PAYMENTMETHOD_ID>
   <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
   <AMOUNT><![CDATA[100.00]]></AMOUNT>
-  <PAIDAMT><![CDATA[100.00]]></PAIDAMT>
-  <OUTSTANDINGAMT><![CDATA[0.00]]></OUTSTANDINGAMT>
+  <PAIDAMT><![CDATA[0]]></PAIDAMT>
+  <OUTSTANDINGAMT><![CDATA[100.00]]></OUTSTANDINGAMT>
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <UPDATE_PAYMENT_PLAN><![CDATA[Y]]></UPDATE_PAYMENT_PLAN>
   <EXPECTEDDATE><![CDATA[2011-02-05 00:00:00.0]]></EXPECTEDDATE>
@@ -886,15 +908,15 @@
   <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
   <CREATED><![CDATA[2013-07-04 23:38:18.228]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:18.228]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2016-08-31 23:00:00.619]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <C_INVOICE_ID><![CDATA[FF808081328B6AAC01328CCB93DE021E]]></C_INVOICE_ID>
   <DUEDATE><![CDATA[2011-02-05 00:00:00.0]]></DUEDATE>
   <FIN_PAYMENTMETHOD_ID><![CDATA[FF808081328278B5013282A0E03C009D]]></FIN_PAYMENTMETHOD_ID>
   <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
   <AMOUNT><![CDATA[30.00]]></AMOUNT>
-  <PAIDAMT><![CDATA[30.00]]></PAIDAMT>
-  <OUTSTANDINGAMT><![CDATA[0.00]]></OUTSTANDINGAMT>
+  <PAIDAMT><![CDATA[0]]></PAIDAMT>
+  <OUTSTANDINGAMT><![CDATA[30.00]]></OUTSTANDINGAMT>
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <UPDATE_PAYMENT_PLAN><![CDATA[Y]]></UPDATE_PAYMENT_PLAN>
   <EXPECTEDDATE><![CDATA[2011-02-05 00:00:00.0]]></EXPECTEDDATE>
@@ -930,15 +952,15 @@
   <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
   <CREATED><![CDATA[2013-07-04 23:38:18.229]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:18.229]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2016-08-31 23:00:00.824]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <C_INVOICE_ID><![CDATA[FF80808132916E850132917D21000034]]></C_INVOICE_ID>
   <DUEDATE><![CDATA[2011-04-02 00:00:00.0]]></DUEDATE>
   <FIN_PAYMENTMETHOD_ID><![CDATA[FF808081328278B5013282894727003C]]></FIN_PAYMENTMETHOD_ID>
   <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
   <AMOUNT><![CDATA[10.00]]></AMOUNT>
-  <PAIDAMT><![CDATA[10.00]]></PAIDAMT>
-  <OUTSTANDINGAMT><![CDATA[0.00]]></OUTSTANDINGAMT>
+  <PAIDAMT><![CDATA[0]]></PAIDAMT>
+  <OUTSTANDINGAMT><![CDATA[10.00]]></OUTSTANDINGAMT>
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <UPDATE_PAYMENT_PLAN><![CDATA[Y]]></UPDATE_PAYMENT_PLAN>
   <EXPECTEDDATE><![CDATA[2011-04-02 00:00:00.0]]></EXPECTEDDATE>
@@ -1035,20 +1057,42 @@
 </FIN_PAYMENT_SCHEDULE>
 
 <FIN_PAYMENT_SCHEDULE>
+  <FIN_PAYMENT_SCHEDULE_ID><![CDATA[86192AFC491F4B89BB06E1B95A72952A]]></FIN_PAYMENT_SCHEDULE_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <CREATED><![CDATA[2016-08-31 16:16:43.0]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-08-31 16:16:58.481]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <C_ORDER_ID><![CDATA[F939B53C0EBB4E5EA35636DCAF61BF6C]]></C_ORDER_ID>
+  <DUEDATE><![CDATA[2016-08-31 00:00:00.0]]></DUEDATE>
+  <FIN_PAYMENTMETHOD_ID><![CDATA[42E87E97974E4B35849A430B8F6F2884]]></FIN_PAYMENTMETHOD_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+  <AMOUNT><![CDATA[4.14]]></AMOUNT>
+  <PAIDAMT><![CDATA[4.14]]></PAIDAMT>
+  <OUTSTANDINGAMT><![CDATA[0.00]]></OUTSTANDINGAMT>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <UPDATE_PAYMENT_PLAN><![CDATA[Y]]></UPDATE_PAYMENT_PLAN>
+  <EXPECTEDDATE><![CDATA[2016-08-31 00:00:00.0]]></EXPECTEDDATE>
+  <EM_APRM_MODIF_PAYM_SCHED><![CDATA[N]]></EM_APRM_MODIF_PAYM_SCHED>
+  <EM_APRM_MODIF_PAYM_OUT_SCHED><![CDATA[N]]></EM_APRM_MODIF_PAYM_OUT_SCHED>
+</FIN_PAYMENT_SCHEDULE>
+
+<FIN_PAYMENT_SCHEDULE>
   <FIN_PAYMENT_SCHEDULE_ID><![CDATA[8649BD5827854037A2F0DC36E2F85545]]></FIN_PAYMENT_SCHEDULE_ID>
   <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
   <CREATED><![CDATA[2013-07-04 23:38:18.231]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:18.231]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2016-08-31 23:00:00.448]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <C_INVOICE_ID><![CDATA[FF8080813282F9FE0132830158E20024]]></C_INVOICE_ID>
   <DUEDATE><![CDATA[2011-02-05 00:00:00.0]]></DUEDATE>
   <FIN_PAYMENTMETHOD_ID><![CDATA[FF808081328278B50132828BA27D0047]]></FIN_PAYMENTMETHOD_ID>
   <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
   <AMOUNT><![CDATA[100.00]]></AMOUNT>
-  <PAIDAMT><![CDATA[100.00]]></PAIDAMT>
-  <OUTSTANDINGAMT><![CDATA[0.00]]></OUTSTANDINGAMT>
+  <PAIDAMT><![CDATA[0]]></PAIDAMT>
+  <OUTSTANDINGAMT><![CDATA[100.00]]></OUTSTANDINGAMT>
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <UPDATE_PAYMENT_PLAN><![CDATA[Y]]></UPDATE_PAYMENT_PLAN>
   <EXPECTEDDATE><![CDATA[2011-02-05 00:00:00.0]]></EXPECTEDDATE>
@@ -1211,6 +1255,29 @@
 </FIN_PAYMENT_SCHEDULE>
 
 <FIN_PAYMENT_SCHEDULE>
+  <FIN_PAYMENT_SCHEDULE_ID><![CDATA[A361EB4ABC28468EAA8B4F243B1A2700]]></FIN_PAYMENT_SCHEDULE_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <CREATED><![CDATA[2016-08-31 16:16:58.415]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-08-31 16:16:58.483]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <C_ORDER_ID><![CDATA[426BF309F4FB43A891331B9ADD9E03A0]]></C_ORDER_ID>
+  <DUEDATE><![CDATA[2016-08-31 00:00:00.0]]></DUEDATE>
+  <FIN_PAYMENTMETHOD_ID><![CDATA[42E87E97974E4B35849A430B8F6F2884]]></FIN_PAYMENTMETHOD_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+  <AMOUNT><![CDATA[-4.14]]></AMOUNT>
+  <PAIDAMT><![CDATA[-4.14]]></PAIDAMT>
+  <OUTSTANDINGAMT><![CDATA[0.00]]></OUTSTANDINGAMT>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <UPDATE_PAYMENT_PLAN><![CDATA[Y]]></UPDATE_PAYMENT_PLAN>
+  <ORIGDUEDATE><![CDATA[2016-08-31 00:00:00.0]]></ORIGDUEDATE>
+  <EXPECTEDDATE><![CDATA[2016-08-31 00:00:00.0]]></EXPECTEDDATE>
+  <EM_APRM_MODIF_PAYM_SCHED><![CDATA[N]]></EM_APRM_MODIF_PAYM_SCHED>
+  <EM_APRM_MODIF_PAYM_OUT_SCHED><![CDATA[N]]></EM_APRM_MODIF_PAYM_OUT_SCHED>
+</FIN_PAYMENT_SCHEDULE>
+
+<FIN_PAYMENT_SCHEDULE>
   <FIN_PAYMENT_SCHEDULE_ID><![CDATA[AC0203828FB442CA84C67421B0DC42BF]]></FIN_PAYMENT_SCHEDULE_ID>
   <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
@@ -1255,6 +1322,28 @@
 </FIN_PAYMENT_SCHEDULE>
 
 <FIN_PAYMENT_SCHEDULE>
+  <FIN_PAYMENT_SCHEDULE_ID><![CDATA[AF0477D8B7774C3689E5D577C4B87F4A]]></FIN_PAYMENT_SCHEDULE_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <CREATED><![CDATA[2016-09-01 08:22:16.0]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-09-01 08:22:16.0]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <C_ORDER_ID><![CDATA[F1AAB8C608AA434C9FC7FC1D685BA016]]></C_ORDER_ID>
+  <DUEDATE><![CDATA[2016-09-01 00:00:00.0]]></DUEDATE>
+  <FIN_PAYMENTMETHOD_ID><![CDATA[42E87E97974E4B35849A430B8F6F2884]]></FIN_PAYMENTMETHOD_ID>
+  <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
+  <AMOUNT><![CDATA[4.14]]></AMOUNT>
+  <PAIDAMT><![CDATA[0]]></PAIDAMT>
+  <OUTSTANDINGAMT><![CDATA[4.14]]></OUTSTANDINGAMT>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <UPDATE_PAYMENT_PLAN><![CDATA[Y]]></UPDATE_PAYMENT_PLAN>
+  <EXPECTEDDATE><![CDATA[2016-09-01 00:00:00.0]]></EXPECTEDDATE>
+  <EM_APRM_MODIF_PAYM_SCHED><![CDATA[N]]></EM_APRM_MODIF_PAYM_SCHED>
+  <EM_APRM_MODIF_PAYM_OUT_SCHED><![CDATA[N]]></EM_APRM_MODIF_PAYM_OUT_SCHED>
+</FIN_PAYMENT_SCHEDULE>
+
+<FIN_PAYMENT_SCHEDULE>
   <FIN_PAYMENT_SCHEDULE_ID><![CDATA[B115E0AB779749C6B2BE7996E3B6171A]]></FIN_PAYMENT_SCHEDULE_ID>
   <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
@@ -1282,15 +1371,15 @@
   <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
   <CREATED><![CDATA[2013-07-04 23:38:18.228]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:18.228]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2016-08-31 23:00:00.724]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <C_INVOICE_ID><![CDATA[FF808081329052F3013290A07580013C]]></C_INVOICE_ID>
   <DUEDATE><![CDATA[2011-04-02 00:00:00.0]]></DUEDATE>
   <FIN_PAYMENTMETHOD_ID><![CDATA[FF808081328278B5013282894727003C]]></FIN_PAYMENTMETHOD_ID>
   <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
   <AMOUNT><![CDATA[50.00]]></AMOUNT>
-  <PAIDAMT><![CDATA[50.00]]></PAIDAMT>
-  <OUTSTANDINGAMT><![CDATA[0.00]]></OUTSTANDINGAMT>
+  <PAIDAMT><![CDATA[0]]></PAIDAMT>
+  <OUTSTANDINGAMT><![CDATA[50.00]]></OUTSTANDINGAMT>
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <UPDATE_PAYMENT_PLAN><![CDATA[Y]]></UPDATE_PAYMENT_PLAN>
   <EXPECTEDDATE><![CDATA[2011-04-02 00:00:00.0]]></EXPECTEDDATE>
@@ -1304,15 +1393,15 @@
   <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
   <CREATED><![CDATA[2013-07-04 23:38:18.233]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:18.233]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2016-08-31 23:00:00.745]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <C_INVOICE_ID><![CDATA[FF808081329052F3013290AC3193016D]]></C_INVOICE_ID>
   <DUEDATE><![CDATA[2011-04-02 00:00:00.0]]></DUEDATE>
   <FIN_PAYMENTMETHOD_ID><![CDATA[FF808081328278B5013282878450002C]]></FIN_PAYMENTMETHOD_ID>
   <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
   <AMOUNT><![CDATA[20.00]]></AMOUNT>
-  <PAIDAMT><![CDATA[20.00]]></PAIDAMT>
-  <OUTSTANDINGAMT><![CDATA[0.00]]></OUTSTANDINGAMT>
+  <PAIDAMT><![CDATA[0]]></PAIDAMT>
+  <OUTSTANDINGAMT><![CDATA[20.00]]></OUTSTANDINGAMT>
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <UPDATE_PAYMENT_PLAN><![CDATA[Y]]></UPDATE_PAYMENT_PLAN>
   <EXPECTEDDATE><![CDATA[2011-04-02 00:00:00.0]]></EXPECTEDDATE>
@@ -1436,15 +1525,15 @@
   <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
   <CREATED><![CDATA[2013-07-04 23:38:18.226]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:18.226]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2016-08-31 23:00:00.54]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <C_INVOICE_ID><![CDATA[FF8080813285D49A0132875C1EF60374]]></C_INVOICE_ID>
   <DUEDATE><![CDATA[2011-02-05 00:00:00.0]]></DUEDATE>
   <FIN_PAYMENTMETHOD_ID><![CDATA[FF808081328278B5013282A0E03C009D]]></FIN_PAYMENTMETHOD_ID>
   <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
   <AMOUNT><![CDATA[30.00]]></AMOUNT>
-  <PAIDAMT><![CDATA[30.00]]></PAIDAMT>
-  <OUTSTANDINGAMT><![CDATA[0.00]]></OUTSTANDINGAMT>
+  <PAIDAMT><![CDATA[0]]></PAIDAMT>
+  <OUTSTANDINGAMT><![CDATA[30.00]]></OUTSTANDINGAMT>
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <UPDATE_PAYMENT_PLAN><![CDATA[Y]]></UPDATE_PAYMENT_PLAN>
   <EXPECTEDDATE><![CDATA[2011-02-05 00:00:00.0]]></EXPECTEDDATE>
@@ -1458,15 +1547,15 @@
   <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
   <CREATED><![CDATA[2013-07-04 23:38:18.232]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:18.232]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2016-08-31 23:00:00.642]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <C_INVOICE_ID><![CDATA[FF808081328B6AAC01328CDDEE790282]]></C_INVOICE_ID>
   <DUEDATE><![CDATA[2011-02-05 00:00:00.0]]></DUEDATE>
   <FIN_PAYMENTMETHOD_ID><![CDATA[FF808081328278B5013282878450002C]]></FIN_PAYMENTMETHOD_ID>
   <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
   <AMOUNT><![CDATA[30.00]]></AMOUNT>
-  <PAIDAMT><![CDATA[30.00]]></PAIDAMT>
-  <OUTSTANDINGAMT><![CDATA[0.00]]></OUTSTANDINGAMT>
+  <PAIDAMT><![CDATA[0]]></PAIDAMT>
+  <OUTSTANDINGAMT><![CDATA[30.00]]></OUTSTANDINGAMT>
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <UPDATE_PAYMENT_PLAN><![CDATA[Y]]></UPDATE_PAYMENT_PLAN>
   <EXPECTEDDATE><![CDATA[2011-02-05 00:00:00.0]]></EXPECTEDDATE>
@@ -1502,15 +1591,15 @@
   <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
   <CREATED><![CDATA[2013-07-04 23:38:18.229]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:18.229]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2016-08-31 23:00:00.46]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <C_INVOICE_ID><![CDATA[FF8080813282F9FE013283076174006C]]></C_INVOICE_ID>
   <DUEDATE><![CDATA[2011-02-05 00:00:00.0]]></DUEDATE>
   <FIN_PAYMENTMETHOD_ID><![CDATA[FF808081328278B50132828DCBC1006B]]></FIN_PAYMENTMETHOD_ID>
   <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
   <AMOUNT><![CDATA[200.00]]></AMOUNT>
-  <PAIDAMT><![CDATA[200.00]]></PAIDAMT>
-  <OUTSTANDINGAMT><![CDATA[0.00]]></OUTSTANDINGAMT>
+  <PAIDAMT><![CDATA[0]]></PAIDAMT>
+  <OUTSTANDINGAMT><![CDATA[200.00]]></OUTSTANDINGAMT>
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <UPDATE_PAYMENT_PLAN><![CDATA[Y]]></UPDATE_PAYMENT_PLAN>
   <EXPECTEDDATE><![CDATA[2011-02-05 00:00:00.0]]></EXPECTEDDATE>
@@ -1546,15 +1635,15 @@
   <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
   <CREATED><![CDATA[2013-07-04 23:38:18.232]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:18.232]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2016-08-31 23:00:00.758]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <C_INVOICE_ID><![CDATA[FF808081329052F3013290BB8250019E]]></C_INVOICE_ID>
   <DUEDATE><![CDATA[2011-04-02 00:00:00.0]]></DUEDATE>
   <FIN_PAYMENTMETHOD_ID><![CDATA[FF808081328278B5013282894727003C]]></FIN_PAYMENTMETHOD_ID>
   <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
   <AMOUNT><![CDATA[100.00]]></AMOUNT>
-  <PAIDAMT><![CDATA[100.00]]></PAIDAMT>
-  <OUTSTANDINGAMT><![CDATA[0.00]]></OUTSTANDINGAMT>
+  <PAIDAMT><![CDATA[0]]></PAIDAMT>
+  <OUTSTANDINGAMT><![CDATA[100.00]]></OUTSTANDINGAMT>
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <UPDATE_PAYMENT_PLAN><![CDATA[Y]]></UPDATE_PAYMENT_PLAN>
   <EXPECTEDDATE><![CDATA[2011-04-02 00:00:00.0]]></EXPECTEDDATE>
@@ -1634,15 +1723,15 @@
   <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
   <CREATED><![CDATA[2013-07-04 23:38:18.227]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:18.227]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2016-08-31 23:00:00.667]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <C_INVOICE_ID><![CDATA[FF808081329052F3013290671F680024]]></C_INVOICE_ID>
   <DUEDATE><![CDATA[2011-05-05 00:00:00.0]]></DUEDATE>
   <FIN_PAYMENTMETHOD_ID><![CDATA[FF808081328278B5013282A0E03C009D]]></FIN_PAYMENTMETHOD_ID>
   <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
   <AMOUNT><![CDATA[30.00]]></AMOUNT>
-  <PAIDAMT><![CDATA[30.00]]></PAIDAMT>
-  <OUTSTANDINGAMT><![CDATA[0.00]]></OUTSTANDINGAMT>
+  <PAIDAMT><![CDATA[0]]></PAIDAMT>
+  <OUTSTANDINGAMT><![CDATA[30.00]]></OUTSTANDINGAMT>
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <UPDATE_PAYMENT_PLAN><![CDATA[Y]]></UPDATE_PAYMENT_PLAN>
   <EXPECTEDDATE><![CDATA[2011-05-05 00:00:00.0]]></EXPECTEDDATE>
@@ -1656,15 +1745,15 @@
   <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
   <CREATED><![CDATA[2013-07-04 23:38:18.231]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:38:18.231]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2016-08-31 23:00:00.495]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <C_INVOICE_ID><![CDATA[FF8080813285D49A0132863740AB01AF]]></C_INVOICE_ID>
   <DUEDATE><![CDATA[2011-02-05 00:00:00.0]]></DUEDATE>
   <FIN_PAYMENTMETHOD_ID><![CDATA[FF808081328278B5013282878450002C]]></FIN_PAYMENTMETHOD_ID>
   <C_CURRENCY_ID><![CDATA[102]]></C_CURRENCY_ID>
   <AMOUNT><![CDATA[93.75]]></AMOUNT>
-  <PAIDAMT><![CDATA[93.75]]></PAIDAMT>
-  <OUTSTANDINGAMT><![CDATA[0.00]]></OUTSTANDINGAMT>
+  <PAIDAMT><![CDATA[0]]></PAIDAMT>
+  <OUTSTANDINGAMT><![CDATA[93.75]]></OUTSTANDINGAMT>
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <UPDATE_PAYMENT_PLAN><![CDATA[Y]]></UPDATE_PAYMENT_PLAN>
   <EXPECTEDDATE><![CDATA[2011-02-05 00:00:00.0]]></EXPECTEDDATE>
--- a/referencedata/sampledata/QA_Testing/FIN_PAYMENT_SCHEDULEDETAIL.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/referencedata/sampledata/QA_Testing/FIN_PAYMENT_SCHEDULEDETAIL.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -299,6 +299,7 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <WRITEOFFAMT><![CDATA[0]]></WRITEOFFAMT>
   <ISCANCELED><![CDATA[N]]></ISCANCELED>
+  <C_BPARTNER_ID><![CDATA[4028E6C72959682B01295F40C3CB02EC]]></C_BPARTNER_ID>
   <DOUBTFULDEBT_AMOUNT><![CDATA[0]]></DOUBTFULDEBT_AMOUNT>
   <ISINVOICEPAID><![CDATA[Y]]></ISINVOICEPAID>
 </FIN_PAYMENT_SCHEDULEDETAIL>
@@ -399,6 +400,24 @@
 </FIN_PAYMENT_SCHEDULEDETAIL>
 
 <FIN_PAYMENT_SCHEDULEDETAIL>
+  <FIN_PAYMENT_SCHEDULEDETAIL_ID><![CDATA[5C8B62A478C24075B6B4E2062F51A8A7]]></FIN_PAYMENT_SCHEDULEDETAIL_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <CREATED><![CDATA[2016-09-01 08:22:16.0]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-09-01 08:22:16.0]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <FIN_PAYMENT_SCHEDULE_ORDER><![CDATA[AF0477D8B7774C3689E5D577C4B87F4A]]></FIN_PAYMENT_SCHEDULE_ORDER>
+  <AMOUNT><![CDATA[4.14]]></AMOUNT>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <WRITEOFFAMT><![CDATA[0]]></WRITEOFFAMT>
+  <ISCANCELED><![CDATA[N]]></ISCANCELED>
+  <C_BPARTNER_ID><![CDATA[4028E6C72959682B01295F40C3CB02EC]]></C_BPARTNER_ID>
+  <DOUBTFULDEBT_AMOUNT><![CDATA[0]]></DOUBTFULDEBT_AMOUNT>
+  <ISINVOICEPAID><![CDATA[N]]></ISINVOICEPAID>
+</FIN_PAYMENT_SCHEDULEDETAIL>
+
+<FIN_PAYMENT_SCHEDULEDETAIL>
   <FIN_PAYMENT_SCHEDULEDETAIL_ID><![CDATA[5FA84B24D28A48AA87C64A750908EE0B]]></FIN_PAYMENT_SCHEDULEDETAIL_ID>
   <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
@@ -492,6 +511,25 @@
 </FIN_PAYMENT_SCHEDULEDETAIL>
 
 <FIN_PAYMENT_SCHEDULEDETAIL>
+  <FIN_PAYMENT_SCHEDULEDETAIL_ID><![CDATA[6EAF8C8493E9443C9E0B3976B63BBB9A]]></FIN_PAYMENT_SCHEDULEDETAIL_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <CREATED><![CDATA[2016-08-31 16:16:43.0]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-08-31 16:16:58.498]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <FIN_PAYMENT_DETAIL_ID><![CDATA[AE17896BB6154384AF71316A2185F91B]]></FIN_PAYMENT_DETAIL_ID>
+  <FIN_PAYMENT_SCHEDULE_ORDER><![CDATA[86192AFC491F4B89BB06E1B95A72952A]]></FIN_PAYMENT_SCHEDULE_ORDER>
+  <AMOUNT><![CDATA[4.14]]></AMOUNT>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <WRITEOFFAMT><![CDATA[0]]></WRITEOFFAMT>
+  <ISCANCELED><![CDATA[N]]></ISCANCELED>
+  <C_BPARTNER_ID><![CDATA[4028E6C72959682B01295F40C3CB02EC]]></C_BPARTNER_ID>
+  <DOUBTFULDEBT_AMOUNT><![CDATA[0]]></DOUBTFULDEBT_AMOUNT>
+  <ISINVOICEPAID><![CDATA[Y]]></ISINVOICEPAID>
+</FIN_PAYMENT_SCHEDULEDETAIL>
+
+<FIN_PAYMENT_SCHEDULEDETAIL>
   <FIN_PAYMENT_SCHEDULEDETAIL_ID><![CDATA[75BC8B8E3C8E4C5AAF88EAB4A4997EC8]]></FIN_PAYMENT_SCHEDULEDETAIL_ID>
   <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
@@ -696,6 +734,42 @@
 </FIN_PAYMENT_SCHEDULEDETAIL>
 
 <FIN_PAYMENT_SCHEDULEDETAIL>
+  <FIN_PAYMENT_SCHEDULEDETAIL_ID><![CDATA[97731D07BA894053A4254B56F5334A0C]]></FIN_PAYMENT_SCHEDULEDETAIL_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <CREATED><![CDATA[2016-08-31 16:16:58.418]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-08-31 16:16:58.485]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <FIN_PAYMENT_DETAIL_ID><![CDATA[2866A573EFB94A4C813CAD570DD45CA7]]></FIN_PAYMENT_DETAIL_ID>
+  <FIN_PAYMENT_SCHEDULE_ORDER><![CDATA[A361EB4ABC28468EAA8B4F243B1A2700]]></FIN_PAYMENT_SCHEDULE_ORDER>
+  <AMOUNT><![CDATA[-4.14]]></AMOUNT>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <WRITEOFFAMT><![CDATA[0]]></WRITEOFFAMT>
+  <ISCANCELED><![CDATA[N]]></ISCANCELED>
+  <DOUBTFULDEBT_AMOUNT><![CDATA[0]]></DOUBTFULDEBT_AMOUNT>
+  <ISINVOICEPAID><![CDATA[Y]]></ISINVOICEPAID>
+</FIN_PAYMENT_SCHEDULEDETAIL>
+
+<FIN_PAYMENT_SCHEDULEDETAIL>
+  <FIN_PAYMENT_SCHEDULEDETAIL_ID><![CDATA[9F3A4808D8444EA79F7E7F24AB67FFE9]]></FIN_PAYMENT_SCHEDULEDETAIL_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <CREATED><![CDATA[2016-08-31 16:16:58.0]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-08-31 16:16:58.0]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <FIN_PAYMENT_SCHEDULE_ORDER><![CDATA[5E218AD84D1540B6808A18ADD69F4D59]]></FIN_PAYMENT_SCHEDULE_ORDER>
+  <AMOUNT><![CDATA[8.28]]></AMOUNT>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <WRITEOFFAMT><![CDATA[0]]></WRITEOFFAMT>
+  <ISCANCELED><![CDATA[N]]></ISCANCELED>
+  <C_BPARTNER_ID><![CDATA[4028E6C72959682B01295F40C3CB02EC]]></C_BPARTNER_ID>
+  <DOUBTFULDEBT_AMOUNT><![CDATA[0]]></DOUBTFULDEBT_AMOUNT>
+  <ISINVOICEPAID><![CDATA[N]]></ISINVOICEPAID>
+</FIN_PAYMENT_SCHEDULEDETAIL>
+
+<FIN_PAYMENT_SCHEDULEDETAIL>
   <FIN_PAYMENT_SCHEDULEDETAIL_ID><![CDATA[A2909BCACCE2496D888B2DCAEB14E14B]]></FIN_PAYMENT_SCHEDULEDETAIL_ID>
   <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
@@ -1072,6 +1146,23 @@
 </FIN_PAYMENT_SCHEDULEDETAIL>
 
 <FIN_PAYMENT_SCHEDULEDETAIL>
+  <FIN_PAYMENT_SCHEDULEDETAIL_ID><![CDATA[DDC8709FB2E04F9C86F9EE0FF480449F]]></FIN_PAYMENT_SCHEDULEDETAIL_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <CREATED><![CDATA[2016-08-31 16:16:58.418]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-08-31 16:16:58.427]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <FIN_PAYMENT_SCHEDULE_ORDER><![CDATA[A361EB4ABC28468EAA8B4F243B1A2700]]></FIN_PAYMENT_SCHEDULE_ORDER>
+  <AMOUNT><![CDATA[4.14]]></AMOUNT>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <WRITEOFFAMT><![CDATA[0]]></WRITEOFFAMT>
+  <ISCANCELED><![CDATA[N]]></ISCANCELED>
+  <DOUBTFULDEBT_AMOUNT><![CDATA[0]]></DOUBTFULDEBT_AMOUNT>
+  <ISINVOICEPAID><![CDATA[N]]></ISINVOICEPAID>
+</FIN_PAYMENT_SCHEDULEDETAIL>
+
+<FIN_PAYMENT_SCHEDULEDETAIL>
   <FIN_PAYMENT_SCHEDULEDETAIL_ID><![CDATA[E4D1DDA17F3F4BAB9E62692CEF295AC9]]></FIN_PAYMENT_SCHEDULEDETAIL_ID>
   <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
--- a/referencedata/sampledata/QA_Testing/M_INOUT.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/referencedata/sampledata/QA_Testing/M_INOUT.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -789,45 +789,6 @@
 </M_INOUT>
 
 <M_INOUT>
-  <M_INOUT_ID><![CDATA[B0DA156990A0408AA65E0DF5AE8458EB]]></M_INOUT_ID>
-  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
-  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
-  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-  <CREATED><![CDATA[2015-03-12 15:15:18.0]]></CREATED>
-  <CREATEDBY><![CDATA[100]]></CREATEDBY>
-  <UPDATED><![CDATA[2015-03-12 15:15:18.0]]></UPDATED>
-  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
-  <ISSOTRX><![CDATA[Y]]></ISSOTRX>
-  <DOCUMENTNO><![CDATA[600000]]></DOCUMENTNO>
-  <DOCACTION><![CDATA[--]]></DOCACTION>
-  <DOCSTATUS><![CDATA[CO]]></DOCSTATUS>
-  <POSTED><![CDATA[N]]></POSTED>
-  <PROCESSING><![CDATA[N]]></PROCESSING>
-  <PROCESSED><![CDATA[Y]]></PROCESSED>
-  <C_DOCTYPE_ID><![CDATA[FF8080812C2ABFC6012C2B3BDF480046]]></C_DOCTYPE_ID>
-  <C_ORDER_ID><![CDATA[DC04CE3CE2EC4A878DE703F4E46B7C7D]]></C_ORDER_ID>
-  <DATEORDERED><![CDATA[2015-03-12 00:00:00.0]]></DATEORDERED>
-  <ISPRINTED><![CDATA[N]]></ISPRINTED>
-  <MOVEMENTTYPE><![CDATA[C-]]></MOVEMENTTYPE>
-  <MOVEMENTDATE><![CDATA[2015-03-12 00:00:00.0]]></MOVEMENTDATE>
-  <DATEACCT><![CDATA[2015-03-12 00:00:00.0]]></DATEACCT>
-  <C_BPARTNER_ID><![CDATA[4028E6C72959682B01295F40C3CB02EC]]></C_BPARTNER_ID>
-  <C_BPARTNER_LOCATION_ID><![CDATA[4028E6C72959682B01295F40C43802EE]]></C_BPARTNER_LOCATION_ID>
-  <M_WAREHOUSE_ID><![CDATA[4028E6C72959682B01295ECFEF4502A0]]></M_WAREHOUSE_ID>
-  <DELIVERYRULE><![CDATA[A]]></DELIVERYRULE>
-  <FREIGHTCOSTRULE><![CDATA[I]]></FREIGHTCOSTRULE>
-  <FREIGHTAMT><![CDATA[0]]></FREIGHTAMT>
-  <DELIVERYVIARULE><![CDATA[P]]></DELIVERYVIARULE>
-  <CHARGEAMT><![CDATA[0]]></CHARGEAMT>
-  <PRIORITYRULE><![CDATA[5]]></PRIORITYRULE>
-  <AD_USER_ID><![CDATA[4028E6C72959682B01295F40C43802EF]]></AD_USER_ID>
-  <UPDATELINES><![CDATA[N]]></UPDATELINES>
-  <ISLOGISTIC><![CDATA[N]]></ISLOGISTIC>
-  <GENERATELINES><![CDATA[N]]></GENERATELINES>
-  <PROCESS_GOODS_JAVA><![CDATA[--]]></PROCESS_GOODS_JAVA>
-</M_INOUT>
-
-<M_INOUT>
   <M_INOUT_ID><![CDATA[AB9230E0C7974BC4A6E5429673FF9460]]></M_INOUT_ID>
   <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[5EFF95EB540740A3B10510D9814EFAD5]]></AD_ORG_ID>
@@ -869,6 +830,45 @@
 </M_INOUT>
 
 <M_INOUT>
+  <M_INOUT_ID><![CDATA[B0DA156990A0408AA65E0DF5AE8458EB]]></M_INOUT_ID>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2015-03-12 15:15:18.0]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2015-03-12 15:15:18.0]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISSOTRX><![CDATA[Y]]></ISSOTRX>
+  <DOCUMENTNO><![CDATA[600000]]></DOCUMENTNO>
+  <DOCACTION><![CDATA[--]]></DOCACTION>
+  <DOCSTATUS><![CDATA[CO]]></DOCSTATUS>
+  <POSTED><![CDATA[N]]></POSTED>
+  <PROCESSING><![CDATA[N]]></PROCESSING>
+  <PROCESSED><![CDATA[Y]]></PROCESSED>
+  <C_DOCTYPE_ID><![CDATA[FF8080812C2ABFC6012C2B3BDF480046]]></C_DOCTYPE_ID>
+  <C_ORDER_ID><![CDATA[DC04CE3CE2EC4A878DE703F4E46B7C7D]]></C_ORDER_ID>
+  <DATEORDERED><![CDATA[2015-03-12 00:00:00.0]]></DATEORDERED>
+  <ISPRINTED><![CDATA[N]]></ISPRINTED>
+  <MOVEMENTTYPE><![CDATA[C-]]></MOVEMENTTYPE>
+  <MOVEMENTDATE><![CDATA[2015-03-12 00:00:00.0]]></MOVEMENTDATE>
+  <DATEACCT><![CDATA[2015-03-12 00:00:00.0]]></DATEACCT>
+  <C_BPARTNER_ID><![CDATA[4028E6C72959682B01295F40C3CB02EC]]></C_BPARTNER_ID>
+  <C_BPARTNER_LOCATION_ID><![CDATA[4028E6C72959682B01295F40C43802EE]]></C_BPARTNER_LOCATION_ID>
+  <M_WAREHOUSE_ID><![CDATA[4028E6C72959682B01295ECFEF4502A0]]></M_WAREHOUSE_ID>
+  <DELIVERYRULE><![CDATA[A]]></DELIVERYRULE>
+  <FREIGHTCOSTRULE><![CDATA[I]]></FREIGHTCOSTRULE>
+  <FREIGHTAMT><![CDATA[0]]></FREIGHTAMT>
+  <DELIVERYVIARULE><![CDATA[P]]></DELIVERYVIARULE>
+  <CHARGEAMT><![CDATA[0]]></CHARGEAMT>
+  <PRIORITYRULE><![CDATA[5]]></PRIORITYRULE>
+  <AD_USER_ID><![CDATA[4028E6C72959682B01295F40C43802EF]]></AD_USER_ID>
+  <UPDATELINES><![CDATA[N]]></UPDATELINES>
+  <ISLOGISTIC><![CDATA[N]]></ISLOGISTIC>
+  <GENERATELINES><![CDATA[N]]></GENERATELINES>
+  <PROCESS_GOODS_JAVA><![CDATA[--]]></PROCESS_GOODS_JAVA>
+</M_INOUT>
+
+<M_INOUT>
   <M_INOUT_ID><![CDATA[B783A4A7D9134CD8881DDDEEA3552538]]></M_INOUT_ID>
   <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
   <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
--- a/referencedata/sampledata/QA_Testing/M_STORAGE_PENDING.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/referencedata/sampledata/QA_Testing/M_STORAGE_PENDING.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -205,6 +205,23 @@
 </M_STORAGE_PENDING>
 
 <M_STORAGE_PENDING>
+  <M_PRODUCT_ID><![CDATA[4028E6C72959682B01295ADC1D07022A]]></M_PRODUCT_ID>
+  <M_WAREHOUSE_ID><![CDATA[4D7B97565A024DB7B4C61650FA2B9560]]></M_WAREHOUSE_ID>
+  <M_ATTRIBUTESETINSTANCE_ID><![CDATA[0]]></M_ATTRIBUTESETINSTANCE_ID>
+  <C_UOM_ID><![CDATA[4028E6C72959682B01295ADC1A380221]]></C_UOM_ID>
+  <QTYRESERVED><![CDATA[6]]></QTYRESERVED>
+  <QTYORDERED><![CDATA[0]]></QTYORDERED>
+  <AD_CLIENT_ID><![CDATA[4028E6C72959682B01295A070852010D]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[357947E87C284935AD1D783CF6F099A1]]></AD_ORG_ID>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+  <CREATED><![CDATA[2016-08-31 16:16:43.0]]></CREATED>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATED><![CDATA[2016-09-01 08:22:16.0]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <M_STORAGE_PENDING_ID><![CDATA[C6FF305BFE2D45EF8797B89CE388A15A]]></M_STORAGE_PENDING_ID>
+</M_STORAGE_PENDING>
+
+<M_STORAGE_PENDING>
   <M_PRODUCT_ID><![CDATA[EBCD272DC37B4ABBB12B96139E5837BF]]></M_PRODUCT_ID>
   <M_WAREHOUSE_ID><![CDATA[4028E6C72959682B01295ECFEF4502A0]]></M_WAREHOUSE_ID>
   <M_ATTRIBUTESETINSTANCE_ID><![CDATA[0]]></M_ATTRIBUTESETINSTANCE_ID>
--- a/src-db/database/model/functions/C_ORDER_POST1.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/src-db/database/model/functions/C_ORDER_POST1.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -1296,9 +1296,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'
@@ -1355,6 +1356,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;
@@ -1373,10 +1375,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/src-db/database/model/functions/M_INOUT_POST.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/src-db/database/model/functions/M_INOUT_POST.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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/src-db/database/model/tables/C_ORDERLINE.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/src-db/database/model/tables/C_ORDERLINE.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -285,6 +285,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/src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/src-db/database/model/tables/FIN_FINACC_TRANSACTION.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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/src-db/database/model/tables/FIN_PAYMENT_SCHEDULEDETAIL.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/src-db/database/model/tables/FIN_PAYMENT_SCHEDULEDETAIL.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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/src-db/database/model/triggers/C_BPARTNER_TRG.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/src-db/database/model/triggers/C_BPARTNER_TRG.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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/src-db/database/model/triggers/C_ORDER_CHK_RESTRINCTIONS_TRG.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/src-db/database/model/triggers/C_ORDER_CHK_RESTRINCTIONS_TRG.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -68,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/src-db/database/model/triggers/C_ORDLINE_CHK_RESTRICTIONS_TRG.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/src-db/database/model/triggers/C_ORDLINE_CHK_RESTRICTIONS_TRG.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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/src-db/database/model/views/FIN_PAYMENT_DETAIL_V.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/src-db/database/model/views/FIN_PAYMENT_DETAIL_V.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -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, CASE p.amount WHEN 0 THEN NULL ELSE p.fin_paymentmethod_id END AS fin_paymentmethod_id, CASE p.amount WHEN 0 THEN NULL ELSE p.fin_financial_account_id END AS 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/src-db/database/sourcedata/AD_COLUMN.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -32202,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>
@@ -32362,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>
@@ -32747,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>
@@ -33134,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>
@@ -44300,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>
@@ -57894,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>
@@ -68457,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>
@@ -68800,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>
@@ -68839,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>
@@ -121449,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>
@@ -247812,8 +247812,8 @@
 <!--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 cancelled]]></DESCRIPTION>
-<!--129F2530A63B4C7CA9AF17996732E6A4-->  <HELP><![CDATA[Link to the order that has been cancelled]]></HELP>
+<!--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>
@@ -266175,8 +266175,8 @@
 <!--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 cancelled order]]></DESCRIPTION>
-<!--51E299D6B5824EC480B524E1ED726985-->  <HELP><![CDATA[Button that confirms the temporal Order by closing it and creates a cancelled order]]></HELP>
+<!--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>
@@ -368901,7 +368901,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>
@@ -370045,8 +370045,8 @@
 <!--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]]></DESCRIPTION>
-<!--E61022D568524DD78F02815F50092DB8-->  <HELP><![CDATA[Link to the replacement order]]></HELP>
+<!--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>
@@ -374357,8 +374357,8 @@
 <!--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 cancelled or cancelled and replaced.]]></DESCRIPTION>
-<!--F54BEAEAA4C04BDD9DC1448954589ED0-->  <HELP><![CDATA[The Sales Order has been cancelled and cancelled 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-->  <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>
--- a/src-db/database/sourcedata/AD_ELEMENT.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -21126,8 +21126,8 @@
 <!--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]]></DESCRIPTION>
-<!--06D885749834459BABA740AA25636ECA-->  <HELP><![CDATA[Link to the replacement order]]></HELP>
+<!--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>
@@ -21463,8 +21463,8 @@
 <!--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 cancelled order]]></DESCRIPTION>
-<!--11F2729B6B6B452F854E4A3BA8EA732B-->  <HELP><![CDATA[Button that confirms the temporal Order by closing it and creates a cancelled order]]></HELP>
+<!--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>
@@ -25728,10 +25728,10 @@
 <!--5BD4AC040C044BB1A5817915C0961F35-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--5BD4AC040C044BB1A5817915C0961F35-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--5BD4AC040C044BB1A5817915C0961F35-->  <COLUMNNAME><![CDATA[Iscancelled]]></COLUMNNAME>
-<!--5BD4AC040C044BB1A5817915C0961F35-->  <NAME><![CDATA[Is Cancelled]]></NAME>
-<!--5BD4AC040C044BB1A5817915C0961F35-->  <PRINTNAME><![CDATA[Is Cancelled]]></PRINTNAME>
-<!--5BD4AC040C044BB1A5817915C0961F35-->  <DESCRIPTION><![CDATA[The Sales Order has been cancelled or cancelled and replaced.]]></DESCRIPTION>
-<!--5BD4AC040C044BB1A5817915C0961F35-->  <HELP><![CDATA[The Sales Order has been cancelled and cancelled 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-->  <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>
@@ -34151,6 +34151,20 @@
 <!--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>
+
+<!--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[Cancelled Order]]></NAME>
 <!--EB7F6DD0A85D48AD84ED48CF6D2C3776-->  <PRINTNAME><![CDATA[Cancelled Order]]></PRINTNAME>
 <!--EB7F6DD0A85D48AD84ED48CF6D2C3776-->  <DESCRIPTION><![CDATA[Link to the order that has been cancelled]]></DESCRIPTION>
--- a/src-db/database/sourcedata/AD_FIELD.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/src-db/database/sourcedata/AD_FIELD.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -180066,17 +180066,18 @@
 <!--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 Cancelled]]></NAME>
-<!--05E7C043CEC5432EBAFF1F3FD71A05E9-->  <DESCRIPTION><![CDATA[The Sales Order has been cancelled or cancelled and replaced.]]></DESCRIPTION>
-<!--05E7C043CEC5432EBAFF1F3FD71A05E9-->  <HELP><![CDATA[The Sales Order has been cancelled and cancelled 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-->  <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[135]]></SEQNO>
+<!--05E7C043CEC5432EBAFF1F3FD71A05E9-->  <SEQNO><![CDATA[580]]></SEQNO>
 <!--05E7C043CEC5432EBAFF1F3FD71A05E9-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--05E7C043CEC5432EBAFF1F3FD71A05E9-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--05E7C043CEC5432EBAFF1F3FD71A05E9-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -202240,18 +202241,19 @@
 <!--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[Cancelled Order]]></NAME>
-<!--3C2B8257EC414EFBB6BA098C8400D28A-->  <DESCRIPTION><![CDATA[Link to the order that has been cancelled]]></DESCRIPTION>
-<!--3C2B8257EC414EFBB6BA098C8400D28A-->  <HELP><![CDATA[Link to the order that has been cancelled]]></HELP>
+<!--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[125]]></SEQNO>
+<!--3C2B8257EC414EFBB6BA098C8400D28A-->  <SEQNO><![CDATA[550]]></SEQNO>
 <!--3C2B8257EC414EFBB6BA098C8400D28A-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--3C2B8257EC414EFBB6BA098C8400D28A-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--3C2B8257EC414EFBB6BA098C8400D28A-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -202503,7 +202505,7 @@
 <!--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']]></DISPLAYLOGIC>
+<!--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>
@@ -232701,17 +232703,18 @@
 <!--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]]></DESCRIPTION>
-<!--70B30B77B3F347D6A4CCE368FF95426B-->  <HELP><![CDATA[Link to the replacement order]]></HELP>
+<!--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[135]]></SEQNO>
+<!--70B30B77B3F347D6A4CCE368FF95426B-->  <SEQNO><![CDATA[570]]></SEQNO>
 <!--70B30B77B3F347D6A4CCE368FF95426B-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--70B30B77B3F347D6A4CCE368FF95426B-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--70B30B77B3F347D6A4CCE368FF95426B-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -303540,11 +303543,12 @@
 <!--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[130]]></SEQNO>
+<!--E7336543F2EA4658A48B719F833D43B6-->  <SEQNO><![CDATA[560]]></SEQNO>
 <!--E7336543F2EA4658A48B719F833D43B6-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--E7336543F2EA4658A48B719F833D43B6-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--E7336543F2EA4658A48B719F833D43B6-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -307236,14 +307240,14 @@
 <!--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 cancelled order]]></DESCRIPTION>
-<!--F0BF2E4561024D30B93AC7B471DBF5D7-->  <HELP><![CDATA[Button that confirms the temporal Order by closing it and creates a cancelled order]]></HELP>
+<!--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']]></DISPLAYLOGIC>
+<!--F0BF2E4561024D30B93AC7B471DBF5D7-->  <DISPLAYLOGIC><![CDATA[@DocStatus@='TMP' & @OrderType@='SO' & @EnableCanceAndReplace@!'']]></DISPLAYLOGIC>
 <!--F0BF2E4561024D30B93AC7B471DBF5D7-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
 <!--F0BF2E4561024D30B93AC7B471DBF5D7-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--F0BF2E4561024D30B93AC7B471DBF5D7-->  <SEQNO><![CDATA[2160]]></SEQNO>
--- a/src-db/database/sourcedata/AD_MESSAGE.xml	Wed Sep 14 13:39:12 2016 +0200
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml	Tue Sep 20 09:14:51 2016 +0200
@@ -19237,6 +19237,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>
@@ -20710,6 +20722,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>
@@ -21757,6 +21781,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>
@@ -23468,6 +23504,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>
@@ -24124,12 +24172,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 automaticall