Merge temporary head for 3.0PR16Q2.3
authorRM packaging bot <staff.rm@openbravo.com>
Tue, 04 Oct 2016 15:27:03 +0000
changeset 30636 5793983f84ef
parent 30616 538700cbd709 (diff)
parent 30635 70a8847bbdce (current diff)
child 30637 f2f2b793ef66
Merge temporary head for 3.0PR16Q2.3
.hgsigs
.hgtags
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/org/openbravo/advpaymentmngt/filterexpression/TransactionAddPaymentDefaultValues.java
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js
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_MODULE.xml
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
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/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_MESSAGE.xml
src-db/database/sourcedata/AD_MODULE.xml
src-db/database/sourcedata/AD_TAB.xml
src/org/openbravo/base/secureApp/LoginUtils.java
src/org/openbravo/costing/CostingRuleProcess.java
src/org/openbravo/costing/CostingUtils.java
src/org/openbravo/dal/core/OBContext.java
src/org/openbravo/dal/security/OrganizationStructureProvider.java
src/org/openbravo/erpCommon/ad_forms/AcctServer.java
src/org/openbravo/erpCommon/ad_forms/AcctServer_data.xsql
src/org/openbravo/erpCommon/utility/OBLedgerUtils.java
src/org/openbravo/materialmgmt/InventoryCountProcess.java
--- a/.hgsigs	Thu Sep 29 15:56:24 2016 +0000
+++ b/.hgsigs	Tue Oct 04 15:27:03 2016 +0000
@@ -189,5 +189,14 @@
 24d2967df096de06913c9991553c1d84b07df9b6 0 iEYEABECAAYFAla9YYIACgkQCX/oGf+2qkNH7wCfV32iOyR/TQKzW/mH1iHTir6f6h4AoIlh4QBWIShpJqbJvx2IhfARpvUZ
 f016ea545c924ad099e9e402689035f1dd73baa2 0 iEYEABECAAYFAlbTzQoACgkQCX/oGf+2qkP28wCdFpNqpw+ODgF0p3cMJAbTZy1IPfoAoNEuRHkZIM5bNJMjwU0/GhjCtwah
 a53670f00eb6c9225829a660075fcfffa1109a1e 0 iEYEABECAAYFAlbqRpEACgkQCX/oGf+2qkN5qQCgsO1APX5AJ4cpb0oJX5vUQnvPMusAoPoDaQxGDihvsB4BSGW60RIxBdGC
+bdeb5a373f19eb7a144377621926d877ae2322f1 0 iEYEABECAAYFAlcgSPgACgkQCX/oGf+2qkMPLwCgzV//EHUa2bHmP8FA2IwnrFWB1X4AnjGHHjYKfSwiucQhltXR9POZXGaX
 38ef1dc10aa3d6fb8210b85beab370f62a4545ca 0 iEYEABECAAYFAlbiTM0ACgkQCX/oGf+2qkNBDwCfXmKXkqNGsAsfiofYOBBdvjA/XgkAoIwLK3DkmHeM71JihwfVOWyB4hmj
+265e8eccf704614fe88220026f2e2bafcebaaf00 0 iEYEABECAAYFAlcgZEQACgkQCX/oGf+2qkPuZgCcDPuB9d77M+51AglMvvmtpCDtnvoAnjqst7QgD6IP3Sv21+4vlqEjLVqU
+98bdf9167a3d4ea9cb9b6f5e214a539220a3f3cb 0 iEYEABECAAYFAldD+MEACgkQCX/oGf+2qkPLHwCgngPaeyLsiGk2FhShX4/IzVARWN8AnRSCXIoWp6ruOcbEfIUFQiM9lY7f
+008d208ba1f60804fd852570f0cd7e985a4220da 0 iEYEABECAAYFAldQUXwACgkQCX/oGf+2qkOtLQCdEZMKf7VfsSt6iVUl59GzwNdr7C4AoK4B3pbbW23fqYd1qplclO3aGm1B
+91b0a6cc5947ea0958b3d677a3e76174fa0a045e 0 iEYEABECAAYFAldajXIACgkQCX/oGf+2qkMRiQCgread+PDPwOVh7Qu/IlmeCLDSPVQAn3cepToICm61fiNkrV+PmFen4bwd
+ac4b84085793438223d82a0024dd84d2268d0768 0 iEYEABECAAYFAld974YACgkQCX/oGf+2qkPrUgCg05BzCWexFGf76njdN2lBgPJn5uMAoIzGxA0dHD54Km07x2m9J1pgFcoW
+a98ba1097ffda83047f2824177bfd940fd9268b2 0 iEYEABECAAYFAlfAIacACgkQCX/oGf+2qkMeAwCgsAyLUenvqX0uAZTRjaUrUXZfcL0AoJg0tc+GlPLwfSGk9nCtgF8M3v5f
 c9da212632eaa8b5ad282ea755200a6761da6fa9 0 iEYEABECAAYFAlftOagACgkQCX/oGf+2qkMyVgCfXQS09IJiOH63CblJE5zX6Qn3TDQAoPZnadaVKBEfROW6Ma1feqUrUgY/
+159bac1903e52d4f6785d5e53405ae988c273975 0 iEYEABECAAYFAlejLbgACgkQCX/oGf+2qkOIMQCcDP51SEWDiDNBGTaEShgrqwhm7xYAoO/e+AXZ3cBSAhUb8CmIpJ0Rls82
+b91eab932a2640f7395e9c1b7d237c08303d0788 0 iEYEABECAAYFAlfGHnMACgkQCX/oGf+2qkNXHQCgysf6qFN75kW873qTx3i0S9a2qjAAoI0R/AZCW4a6RPrNiFfjaWsOE3+v
--- a/.hgtags	Thu Sep 29 15:56:24 2016 +0000
+++ b/.hgtags	Tue Oct 04 15:27:03 2016 +0000
@@ -200,5 +200,14 @@
 9985680adffaf70ffcc1f560860feb10f0ee6b33 3.0PR15Q4.3
 70df4e4c5cab6d37f10eceee6b66be039c381556 3.0PR15Q4.4
 21c8ed48293c94cbe5875a8edef08aca0efd2bf4 3.0PR15Q4.5
+8828e6e8e071247f329320c63da66e30c357da9f 3.0PR15Q4.6
 ee5383e071318afe8eece515b4b264cfb46c1a84 3.0PR16Q1
+d386f41fa755d23e0e23f881aece691009051ebd 3.0PR16Q1.1
+ec73935a2c83b6164a18cb70996226cb15672038 3.0PR16Q1.2
+208b773131650c3806cefa65b4d5df9bf1992821 3.0PR16Q1.3
+cfff3c184b53528cd71acfe21b15800db17b3436 3.0PR16Q2
+7667e8781815f8fa0bf2d3104aeb585cb2ce8681 3.0PR16Q2.1
+d40ef4d2ac507a87b46d3118841d03a6a54fec1e 3.0PR16Q2.2
 6db3d7641170254dbd658eb774e36b092c68dd04 3.0PR16Q2.3
+ec10d529b9bbe8caa83f2ea72b29b94bd3473cae 3.0PR16Q3
+d0dee6596f281e29afcd159544992498896e93ff 3.0PR16Q3.1
--- a/.settings/org.eclipse.jdt.core.prefs	Thu Sep 29 15:56:24 2016 +0000
+++ b/.settings/org.eclipse.jdt.core.prefs	Tue Oct 04 15:27:03 2016 +0000
@@ -1,4 +1,3 @@
-#Wed Jun 22 21:40:12 CEST 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
--- a/build.xml	Thu Sep 29 15:56:24 2016 +0000
+++ b/build.xml	Tue Oct 04 15:27:03 2016 +0000
@@ -103,7 +103,8 @@
   <property name="checkTranslationConsistency" value="true"/>
   <property name="buildValidation" value="true"/>
   <property name="disableCheckReferencedOrganizations" value="false"/>
-
+  <property name="modules" value=""/> 
+ 
   <available file=".hg" property="is.hg" />
 
   <condition property="calculate.core.rev">
@@ -633,9 +634,10 @@
                   stableDBdir="${stableDBdir}"
                   testDBdir="${basedir}"
                   verbosity="${bbdd.verbosity}"
+                  modules="${modules}"
     />    
   </target>
-
+  
   <target name="export.sample.data.old" depends="code.rev">
     <ant dir="${base.src}" target="export.sample.data.old" inheritAll="true" inheritRefs="true" />
   </target>
--- a/legal/Licensing.txt	Thu Sep 29 15:56:24 2016 +0000
+++ b/legal/Licensing.txt	Tue Oct 04 15:27:03 2016 +0000
@@ -160,7 +160,7 @@
 # poi-3.10.1.jar
 Under the Apache 2.0 license (included as Apache_poi_license.txt in this folder)
 
-# hibernate3.jar
+# hibernate3-patched.jar
 All files under the LGPL 2.1 (available at www.gnu.org/licenses/lgpl.html)
 
 # dom4j-1.6.1.jar
@@ -302,6 +302,9 @@
 Beautiful documentation, dynamically generated from source code in the browser.
 From the code-illuminated project at: http://code.google.com/p/code-illuminated/, under the MPL 1.1
 
+# jsbeautifier.py
+Under the MIT license (available at https://github.com/beautify-web/js-beautify/blob/master/LICENSE)
+
 The license files for this third party software are available in the legal
 folder of this distribution.
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/legal/MIT_license.txt	Tue Oct 04 15:27:03 2016 +0000
@@ -0,0 +1,9 @@
+The MIT License (MIT)
+
+Copyright (c) 2007-2013 Einar Lielmanis and contributors.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Binary file lib/runtime/hibernate3-patched.jar has changed
Binary file lib/runtime/hibernate3.jar has changed
Binary file modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/CreateAccountingConfiguration.class has changed
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	Thu Sep 29 15:56:24 2016 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml	Tue Oct 04 15:27:03 2016 +0000
@@ -61,8 +61,6 @@
 v_delete_paymentplan BOOLEAN := FALSE;
 v_Financial_Account_ID FIN_FINANCIAL_ACCOUNT.FIN_FINANCIAL_ACCOUNT_ID%TYPE;
 v_Financial_Account_Org VARCHAR2(32);
-v_CreatePayment CHAR(1):='N';
-v_CreateFinTransaction CHAR(1):='N';
 v_PaymentDocType_ID FIN_PAYMENT.C_DOCTYPE_ID%TYPE;
 v_PaymentDocumentNo FIN_PAYMENT.DOCUMENTNO%TYPE;
 v_FIN_PAYMENT_ID FIN_PAYMENT.FIN_PAYMENT_ID%TYPE;
@@ -93,7 +91,6 @@
 cur_PaymentScheduleOrder RECORD;
 cur_linktopayment_scheddetails RECORD;
 cur_update_scheddetails RECORD;
-cur_invoicepaid RECORD;
 
 v_paymentamt NUMBER:=0;
 v_depositamt NUMBER:=0;
@@ -229,15 +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 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;
 
@@ -334,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;
@@ -390,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
@@ -401,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/functions/APRM_ISPAYMENTCONFIRMED.xml	Thu Sep 29 15:56:24 2016 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml	Tue Oct 04 15:27:03 2016 +0000
@@ -19,20 +19,18 @@
 * 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-2015 Openbravo SLU
+* All portions are Copyright (C) 2011-2016 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
   v_Sql VARCHAR2(2000);
   v_count NUMBER;
   v_module   VARCHAR2(32);
-  v_dbprefix   VARCHAR2(7);
   v_isPaymentConfirmed CHAR(1) := 'N';
   v_isinvoicepaid CHAR(1):= 'N';
   v_referencelist VARCHAR2(32):='575BCB88A4694C27BC013DE9C73E6FE7';
   TYPE RECORD IS REF CURSOR;
   Cur_Dbprefix RECORD;
-  v_invoicepaidstatus  VARCHAR2(32);
   v_fin_payment_schedule_order VARCHAR(32);
   v_fin_payment_schedule_invoice VARCHAR(32);
   v_p_fin_psd_id VARCHAR(32);
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINACC_TRANSACTION.xml	Thu Sep 29 15:56:24 2016 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINACC_TRANSACTION.xml	Tue Oct 04 15:27:03 2016 +0000
@@ -13,5 +13,12 @@
         <default><![CDATA[P]]></default>
         <onCreateDefault><![CDATA['R']]></onCreateDefault>
       </column>
+      <column name="EM_APRM_FINACC_TRANS_ORIGIN" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <foreign-key foreignTable="FIN_FINACC_TRANSACTION" name="EM_APRM_FINACC_TRANS_ORIGIN_FK">
+        <reference local="EM_APRM_FINACC_TRANS_ORIGIN" foreign="FIN_FINACC_TRANSACTION_ID"/>
+      </foreign-key>
     </table>
   </database>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINANCIAL_ACCOUNT.xml	Thu Sep 29 15:56:24 2016 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINANCIAL_ACCOUNT.xml	Tue Oct 04 15:27:03 2016 +0000
@@ -33,5 +33,9 @@
         <default><![CDATA[N]]></default>
         <onCreateDefault/>
       </column>
+      <column name="EM_APRM_FUNDS_TRANS" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
     </table>
   </database>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_FINACC_TRAN_CHECK_TRG.xml	Thu Sep 29 15:56:24 2016 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_FINACC_TRAN_CHECK_TRG.xml	Tue Oct 04 15:27:03 2016 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
   <database name="TRIGGER APRM_FIN_FINACC_TRAN_CHECK_TRG">
-    <trigger name="APRM_FIN_FINACC_TRAN_CHECK_TRG" table="FIN_FINACC_TRANSACTION" fires="before" insert="true" update="true" delete="true" foreach="row">
+    <trigger name="APRM_FIN_FINACC_TRAN_CHECK_TRG" table="FIN_FINACC_TRANSACTION" fires="before" insert="false" update="true" delete="true" foreach="row">
       <body><![CDATA[
 
 /************************************************************************
@@ -15,7 +15,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2010-2013 Openbravo SLU
+* All portions are Copyright (C) 2010-2016 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 *************************************************************************/
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_PMT_CHECK_TRG.xml	Thu Sep 29 15:56:24 2016 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_PMT_CHECK_TRG.xml	Tue Oct 04 15:27:03 2016 +0000
@@ -15,7 +15,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2010-2011 Openbravo SLU
+* All portions are Copyright (C) 2010-2016 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 *************************************************************************/
@@ -46,6 +46,7 @@
       OR((COALESCE(:OLD.AMOUNT, 0) <> COALESCE(:NEW.AMOUNT, 0)
           AND COALESCE(:OLD.STATUS, '0') <> TO_CHAR('RPAE'))
           OR (COALESCE(:OLD.STATUS, '0') = TO_CHAR('RPAE')
+              AND COALESCE(:NEW.STATUS, '0') <> TO_CHAR('RPVOID')
               AND (COALESCE(:NEW.AMOUNT, 0) - COALESCE(:OLD.AMOUNT, 0))  <> (COALESCE(:NEW.GENERATED_CREDIT, 0) - COALESCE(:OLD.GENERATED_CREDIT, 0))))
       )) THEN
       RAISE_APPLICATION_ERROR(-20000, '@20501@');
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_RECON_CHECK_TRG.xml	Thu Sep 29 15:56:24 2016 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_RECON_CHECK_TRG.xml	Tue Oct 04 15:27:03 2016 +0000
@@ -15,12 +15,13 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2010 Openbravo SLU
+* All portions are Copyright (C) 2010-2016 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 *************************************************************************/
 
 v_DateNull DATE := TO_DATE('01-01-1900','DD-MM-YYYY');
+v_balance NUMBER;
   
 BEGIN
    
@@ -47,6 +48,19 @@
    IF(:OLD.PROCESSED='Y') THEN
      RAISE_APPLICATION_ERROR(-20000, '@20501@');
    END IF;
+
+   --Is necessary update starting and ending balances of subsequents reconciliations
+   SELECT endingbalance - startingbalance
+   INTO v_balance
+   FROM fin_reconciliation
+   WHERE fin_reconciliation_id = :old.fin_reconciliation_id;
+
+   UPDATE fin_reconciliation
+   SET startingbalance = startingbalance - v_balance,
+   endingbalance = endingbalance - v_balance
+   WHERE fin_financial_account_id = :old.fin_financial_account_id
+   AND statementdate > :old.statementdate;
+
   END IF;
 END APRM_FIN_RECON_CHECK_TRG
 ]]></body>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_AUXILIARINPUT.xml	Thu Sep 29 15:56:24 2016 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_AUXILIARINPUT.xml	Tue Oct 04 15:27:03 2016 +0000
@@ -71,7 +71,7 @@
 <!--874CCFB2FE7B40D79D2B0AE27951853F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--874CCFB2FE7B40D79D2B0AE27951853F-->  <AD_TAB_ID><![CDATA[294]]></AD_TAB_ID>
 <!--874CCFB2FE7B40D79D2B0AE27951853F-->  <NAME><![CDATA[APRM_OrderIsPaid]]></NAME>
-<!--874CCFB2FE7B40D79D2B0AE27951853F-->  <CODE><![CDATA[@SQL=select case when ps.outstandingamt > 0 then 'N' else 'Y' end
+<!--874CCFB2FE7B40D79D2B0AE27951853F-->  <CODE><![CDATA[@SQL=select case when ps.outstandingamt <> 0 then 'N' else 'Y' end
           from fin_payment_scheduledetail fpsd
               join fin_payment_detail fpd on fpsd.fin_payment_detail_id=fpd.fin_payment_detail_id
               join fin_payment fp on fpd.fin_payment_id=fp.fin_payment_id
@@ -101,7 +101,7 @@
 <!--9FF4321DE0E5487B8A649A444F3F64BC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--9FF4321DE0E5487B8A649A444F3F64BC-->  <AD_TAB_ID><![CDATA[186]]></AD_TAB_ID>
 <!--9FF4321DE0E5487B8A649A444F3F64BC-->  <NAME><![CDATA[APRM_OrderIsPaid]]></NAME>
-<!--9FF4321DE0E5487B8A649A444F3F64BC-->  <CODE><![CDATA[@SQL=select case when ps.outstandingamt > 0 then 'N' else 'Y' end
+<!--9FF4321DE0E5487B8A649A444F3F64BC-->  <CODE><![CDATA[@SQL=select case when ps.outstandingamt <> 0 then 'N' else 'Y' end
           from fin_payment_scheduledetail fpsd
               join fin_payment_detail fpd on fpsd.fin_payment_detail_id=fpd.fin_payment_detail_id
               join fin_payment fp on fpd.fin_payment_id=fp.fin_payment_id
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml	Thu Sep 29 15:56:24 2016 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml	Tue Oct 04 15:27:03 2016 +0000
@@ -36,6 +36,7 @@
 <!--0000F22EA60241B4A2FF5D45C83F8F66-->  <ENTITY_ALIAS><![CDATA[bp]]></ENTITY_ALIAS>
 <!--0000F22EA60241B4A2FF5D45C83F8F66-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--0000F22EA60241B4A2FF5D45C83F8F66-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--0000F22EA60241B4A2FF5D45C83F8F66-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--0000F22EA60241B4A2FF5D45C83F8F66--></AD_COLUMN>
 
 <!--02EF18D28F1B4C43ADF91B3E73C2BF12--><AD_COLUMN>
@@ -71,6 +72,7 @@
 <!--02EF18D28F1B4C43ADF91B3E73C2BF12-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--02EF18D28F1B4C43ADF91B3E73C2BF12-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--02EF18D28F1B4C43ADF91B3E73C2BF12-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--02EF18D28F1B4C43ADF91B3E73C2BF12-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--02EF18D28F1B4C43ADF91B3E73C2BF12--></AD_COLUMN>
 
 <!--038E6E9140CB4924B22060672E2847A2--><AD_COLUMN>
@@ -106,8 +108,55 @@
 <!--038E6E9140CB4924B22060672E2847A2-->  <ENTITY_ALIAS><![CDATA[bsl.id]]></ENTITY_ALIAS>
 <!--038E6E9140CB4924B22060672E2847A2-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--038E6E9140CB4924B22060672E2847A2-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--038E6E9140CB4924B22060672E2847A2-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--038E6E9140CB4924B22060672E2847A2--></AD_COLUMN>
 
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--><AD_COLUMN>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <AD_COLUMN_ID><![CDATA[03EBACA2EF974E3F9E58A6FE8EF8AECB]]></AD_COLUMN_ID>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <NAME><![CDATA[EM_APRM_FinancialAccount]]></NAME>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <DESCRIPTION><![CDATA[Financial Account in sales invoice details]]></DESCRIPTION>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <HELP><![CDATA[Financial Account in sales invoice details]]></HELP>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <COLUMNNAME><![CDATA[EM_APRM_FinancialAccount]]></COLUMNNAME>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <AD_TABLE_ID><![CDATA[C0233061EA504EFEAB0483E836BBAF31]]></AD_TABLE_ID>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <AD_REFERENCE_VALUE_ID><![CDATA[03D336BF39A7455C8FD64CBCCFB4FC1C]]></AD_REFERENCE_VALUE_ID>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <SEQNO><![CDATA[290]]></SEQNO>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <AD_ELEMENT_ID><![CDATA[D62D89A819A840B3978E4434C9B66C86]]></AD_ELEMENT_ID>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <SQLLOGIC><![CDATA[(select
+   case p.amount
+     when 0 then null
+     else p.fin_financial_account_id
+   end
+ from fin_payment_detail pd
+   join fin_payment p on p.fin_payment_id=pd.fin_payment_id
+ where pd.fin_payment_detail_id=fin_payment_detail_id)]]></SQLLOGIC>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--03EBACA2EF974E3F9E58A6FE8EF8AECB--></AD_COLUMN>
+
 <!--046498C716474A6EAAEA0CA26E09C69D--><AD_COLUMN>
 <!--046498C716474A6EAAEA0CA26E09C69D-->  <AD_COLUMN_ID><![CDATA[046498C716474A6EAAEA0CA26E09C69D]]></AD_COLUMN_ID>
 <!--046498C716474A6EAAEA0CA26E09C69D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -143,6 +192,7 @@
 <!--046498C716474A6EAAEA0CA26E09C69D-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--046498C716474A6EAAEA0CA26E09C69D-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--046498C716474A6EAAEA0CA26E09C69D-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--046498C716474A6EAAEA0CA26E09C69D-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--046498C716474A6EAAEA0CA26E09C69D--></AD_COLUMN>
 
 <!--04DCCC7AAEDF4296941DD5ACB9164734--><AD_COLUMN>
@@ -182,6 +232,7 @@
 <!--04DCCC7AAEDF4296941DD5ACB9164734-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--04DCCC7AAEDF4296941DD5ACB9164734-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--04DCCC7AAEDF4296941DD5ACB9164734-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--04DCCC7AAEDF4296941DD5ACB9164734-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--04DCCC7AAEDF4296941DD5ACB9164734--></AD_COLUMN>
 
 <!--07399F1520604AE6A4A48FF9F4221A10--><AD_COLUMN>
@@ -217,6 +268,7 @@
 <!--07399F1520604AE6A4A48FF9F4221A10-->  <ENTITY_ALIAS><![CDATA[e.id]]></ENTITY_ALIAS>
 <!--07399F1520604AE6A4A48FF9F4221A10-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--07399F1520604AE6A4A48FF9F4221A10-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--07399F1520604AE6A4A48FF9F4221A10-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--07399F1520604AE6A4A48FF9F4221A10--></AD_COLUMN>
 
 <!--0790053440214B14AF3610EE2739140E--><AD_COLUMN>
@@ -254,6 +306,7 @@
 <!--0790053440214B14AF3610EE2739140E-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--0790053440214B14AF3610EE2739140E-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--0790053440214B14AF3610EE2739140E-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--0790053440214B14AF3610EE2739140E-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--0790053440214B14AF3610EE2739140E--></AD_COLUMN>
 
 <!--07DD87B8F3BE41C18546260D616E1404--><AD_COLUMN>
@@ -289,6 +342,7 @@
 <!--07DD87B8F3BE41C18546260D616E1404-->  <SQLLOGIC><![CDATA[(SELECT count(*) FROM fin_bankstatementline bl, fin_bankstatement b, fin_reconciliation r WHERE (bl.fin_finacc_transaction_id IS NULL OR (EXISTS ( SELECT 1 FROM fin_finacc_transaction t, fin_reconciliation rec WHERE t.fin_reconciliation_id  = rec.fin_reconciliation_id AND bl.fin_finacc_transaction_id  = t.fin_finacc_transaction_id  AND t.fin_financial_account_id  = b.fin_financial_account_id  AND rec.created > r.created))) AND bl.datetrx <= r.dateto AND b.fin_bankstatement_id  = bl.fin_bankstatement_id AND b.fin_financial_account_id  = r.fin_financial_account_id and r.fin_reconciliation_id = fin_reconciliation_id)]]></SQLLOGIC>
 <!--07DD87B8F3BE41C18546260D616E1404-->  <ALLOWSORTING><![CDATA[N]]></ALLOWSORTING>
 <!--07DD87B8F3BE41C18546260D616E1404-->  <ALLOWFILTERING><![CDATA[N]]></ALLOWFILTERING>
+<!--07DD87B8F3BE41C18546260D616E1404-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--07DD87B8F3BE41C18546260D616E1404--></AD_COLUMN>
 
 <!--09A1C598D8134CAC92CB30E476A213B0--><AD_COLUMN>
@@ -326,6 +380,7 @@
 <!--09A1C598D8134CAC92CB30E476A213B0-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--09A1C598D8134CAC92CB30E476A213B0-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--09A1C598D8134CAC92CB30E476A213B0-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--09A1C598D8134CAC92CB30E476A213B0-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--09A1C598D8134CAC92CB30E476A213B0--></AD_COLUMN>
 
 <!--0CE41B7829C54AF3B7193B1FA52B3C62--><AD_COLUMN>
@@ -363,6 +418,7 @@
 <!--0CE41B7829C54AF3B7193B1FA52B3C62-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--0CE41B7829C54AF3B7193B1FA52B3C62-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--0CE41B7829C54AF3B7193B1FA52B3C62-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--0CE41B7829C54AF3B7193B1FA52B3C62-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--0CE41B7829C54AF3B7193B1FA52B3C62--></AD_COLUMN>
 
 <!--0F433074351F4A8CB69FDC3DF943C282--><AD_COLUMN>
@@ -400,6 +456,7 @@
 <!--0F433074351F4A8CB69FDC3DF943C282-->  <ENTITY_ALIAS><![CDATA[@writeoff@]]></ENTITY_ALIAS>
 <!--0F433074351F4A8CB69FDC3DF943C282-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--0F433074351F4A8CB69FDC3DF943C282-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--0F433074351F4A8CB69FDC3DF943C282-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--0F433074351F4A8CB69FDC3DF943C282--></AD_COLUMN>
 
 <!--0F5C7245380C4C96841D3452F3C1FE47--><AD_COLUMN>
@@ -437,6 +494,7 @@
 <!--0F5C7245380C4C96841D3452F3C1FE47-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--0F5C7245380C4C96841D3452F3C1FE47-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--0F5C7245380C4C96841D3452F3C1FE47-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--0F5C7245380C4C96841D3452F3C1FE47-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--0F5C7245380C4C96841D3452F3C1FE47-->  <EM_OBUIAPP_PROCESS_ID><![CDATA[E68790A7B65F4D45AB35E2BAE34C1F39]]></EM_OBUIAPP_PROCESS_ID>
 <!--0F5C7245380C4C96841D3452F3C1FE47--></AD_COLUMN>
 
@@ -475,6 +533,7 @@
 <!--11881AC652AE430D949736FDC7265A26-->  <ENTITY_ALIAS><![CDATA[receivedin]]></ENTITY_ALIAS>
 <!--11881AC652AE430D949736FDC7265A26-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--11881AC652AE430D949736FDC7265A26-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--11881AC652AE430D949736FDC7265A26-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--11881AC652AE430D949736FDC7265A26--></AD_COLUMN>
 
 <!--121298B6ACAE489D805166216681C6D4--><AD_COLUMN>
@@ -512,6 +571,7 @@
 <!--121298B6ACAE489D805166216681C6D4-->  <ENTITY_ALIAS><![CDATA[@paymentMethodName@]]></ENTITY_ALIAS>
 <!--121298B6ACAE489D805166216681C6D4-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--121298B6ACAE489D805166216681C6D4-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--121298B6ACAE489D805166216681C6D4-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--121298B6ACAE489D805166216681C6D4--></AD_COLUMN>
 
 <!--1309F42BE35D4E71A2185623688E5628--><AD_COLUMN>
@@ -549,6 +609,7 @@
 <!--1309F42BE35D4E71A2185623688E5628-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--1309F42BE35D4E71A2185623688E5628-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--1309F42BE35D4E71A2185623688E5628-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--1309F42BE35D4E71A2185623688E5628-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--1309F42BE35D4E71A2185623688E5628--></AD_COLUMN>
 
 <!--1336389E95FA4A2B801DEE8DE3D7C3D3--><AD_COLUMN>
@@ -587,6 +648,7 @@
 <!--1336389E95FA4A2B801DEE8DE3D7C3D3-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--1336389E95FA4A2B801DEE8DE3D7C3D3-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--1336389E95FA4A2B801DEE8DE3D7C3D3-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--1336389E95FA4A2B801DEE8DE3D7C3D3-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--1336389E95FA4A2B801DEE8DE3D7C3D3--></AD_COLUMN>
 
 <!--137DEB7F4BAF46A783F86044A1817D66--><AD_COLUMN>
@@ -626,6 +688,7 @@
 <!--137DEB7F4BAF46A783F86044A1817D66-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--137DEB7F4BAF46A783F86044A1817D66-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--137DEB7F4BAF46A783F86044A1817D66-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--137DEB7F4BAF46A783F86044A1817D66-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--137DEB7F4BAF46A783F86044A1817D66--></AD_COLUMN>
 
 <!--1678A44C2B7543DD8393C8E4E32D6F3E--><AD_COLUMN>
@@ -663,6 +726,7 @@
 <!--1678A44C2B7543DD8393C8E4E32D6F3E-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--1678A44C2B7543DD8393C8E4E32D6F3E-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--1678A44C2B7543DD8393C8E4E32D6F3E-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--1678A44C2B7543DD8393C8E4E32D6F3E-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--1678A44C2B7543DD8393C8E4E32D6F3E--></AD_COLUMN>
 
 <!--168A9EBEED3B444FAA83EDCCAE7716A9--><AD_COLUMN>
@@ -700,6 +764,7 @@
 <!--168A9EBEED3B444FAA83EDCCAE7716A9-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--168A9EBEED3B444FAA83EDCCAE7716A9-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--168A9EBEED3B444FAA83EDCCAE7716A9-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--168A9EBEED3B444FAA83EDCCAE7716A9-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--168A9EBEED3B444FAA83EDCCAE7716A9--></AD_COLUMN>
 
 <!--170284D098F547C69327DD057F08DEDA--><AD_COLUMN>
@@ -737,6 +802,7 @@
 <!--170284D098F547C69327DD057F08DEDA-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--170284D098F547C69327DD057F08DEDA-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--170284D098F547C69327DD057F08DEDA-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--170284D098F547C69327DD057F08DEDA-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--170284D098F547C69327DD057F08DEDA--></AD_COLUMN>
 
 <!--18096D8809024E67A36E636EA0D9D0E7--><AD_COLUMN>
@@ -778,6 +844,7 @@
 <!--18096D8809024E67A36E636EA0D9D0E7-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--18096D8809024E67A36E636EA0D9D0E7-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--18096D8809024E67A36E636EA0D9D0E7-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--18096D8809024E67A36E636EA0D9D0E7-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--18096D8809024E67A36E636EA0D9D0E7--></AD_COLUMN>
 
 <!--1CDAC09BBD9A46AE8FD9D5249092B6EF--><AD_COLUMN>
@@ -815,6 +882,7 @@
 <!--1CDAC09BBD9A46AE8FD9D5249092B6EF-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--1CDAC09BBD9A46AE8FD9D5249092B6EF-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--1CDAC09BBD9A46AE8FD9D5249092B6EF-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--1CDAC09BBD9A46AE8FD9D5249092B6EF-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--1CDAC09BBD9A46AE8FD9D5249092B6EF--></AD_COLUMN>
 
 <!--1D64AD4366EF4A209F2A462A8DE42735--><AD_COLUMN>
@@ -852,6 +920,7 @@
 <!--1D64AD4366EF4A209F2A462A8DE42735-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--1D64AD4366EF4A209F2A462A8DE42735-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--1D64AD4366EF4A209F2A462A8DE42735-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--1D64AD4366EF4A209F2A462A8DE42735-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--1D64AD4366EF4A209F2A462A8DE42735--></AD_COLUMN>
 
 <!--1FABC0F9275844369A2B97C3EF076229--><AD_COLUMN>
@@ -890,6 +959,7 @@
 <!--1FABC0F9275844369A2B97C3EF076229-->  <ENTITY_ALIAS><![CDATA[stDim]]></ENTITY_ALIAS>
 <!--1FABC0F9275844369A2B97C3EF076229-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--1FABC0F9275844369A2B97C3EF076229-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--1FABC0F9275844369A2B97C3EF076229-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--1FABC0F9275844369A2B97C3EF076229--></AD_COLUMN>
 
 <!--20F9FCA0D27C496EA46CDD4A7E5F56B9--><AD_COLUMN>
@@ -927,6 +997,7 @@
 <!--20F9FCA0D27C496EA46CDD4A7E5F56B9-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--20F9FCA0D27C496EA46CDD4A7E5F56B9-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--20F9FCA0D27C496EA46CDD4A7E5F56B9-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--20F9FCA0D27C496EA46CDD4A7E5F56B9-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--20F9FCA0D27C496EA46CDD4A7E5F56B9--></AD_COLUMN>
 
 <!--2198B37AF80C4020ACAADFA677917352--><AD_COLUMN>
@@ -962,6 +1033,7 @@
 <!--2198B37AF80C4020ACAADFA677917352-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--2198B37AF80C4020ACAADFA677917352-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--2198B37AF80C4020ACAADFA677917352-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--2198B37AF80C4020ACAADFA677917352-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--2198B37AF80C4020ACAADFA677917352--></AD_COLUMN>
 
 <!--2295DC7A28FE4F9DA842F453E2FF2F41--><AD_COLUMN>
@@ -996,9 +1068,10 @@
 <!--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>
 <!--2295DC7A28FE4F9DA842F453E2FF2F41--></AD_COLUMN>
 
 <!--2298A150A1A146FCB0D016E5BE55A607--><AD_COLUMN>
@@ -1036,6 +1109,7 @@
 <!--2298A150A1A146FCB0D016E5BE55A607-->  <ENTITY_ALIAS><![CDATA[@salesOrderNo@]]></ENTITY_ALIAS>
 <!--2298A150A1A146FCB0D016E5BE55A607-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--2298A150A1A146FCB0D016E5BE55A607-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--2298A150A1A146FCB0D016E5BE55A607-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--2298A150A1A146FCB0D016E5BE55A607--></AD_COLUMN>
 
 <!--236A1662276B4003A65D00B627269BCC--><AD_COLUMN>
@@ -1071,6 +1145,7 @@
 <!--236A1662276B4003A65D00B627269BCC-->  <ENTITY_ALIAS><![CDATA[glitem.name]]></ENTITY_ALIAS>
 <!--236A1662276B4003A65D00B627269BCC-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--236A1662276B4003A65D00B627269BCC-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--236A1662276B4003A65D00B627269BCC-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--236A1662276B4003A65D00B627269BCC--></AD_COLUMN>
 
 <!--245E331747AE48FD9677042751BB6918--><AD_COLUMN>
@@ -1106,6 +1181,7 @@
 <!--245E331747AE48FD9677042751BB6918-->  <ENTITY_ALIAS><![CDATA[e.depositAmount]]></ENTITY_ALIAS>
 <!--245E331747AE48FD9677042751BB6918-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--245E331747AE48FD9677042751BB6918-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--245E331747AE48FD9677042751BB6918-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--245E331747AE48FD9677042751BB6918--></AD_COLUMN>
 
 <!--248F6C6C2AF2435BA1AEDBEDFDEBC794--><AD_COLUMN>
@@ -1143,6 +1219,7 @@
 <!--248F6C6C2AF2435BA1AEDBEDFDEBC794-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--248F6C6C2AF2435BA1AEDBEDFDEBC794-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--248F6C6C2AF2435BA1AEDBEDFDEBC794-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--248F6C6C2AF2435BA1AEDBEDFDEBC794-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--248F6C6C2AF2435BA1AEDBEDFDEBC794--></AD_COLUMN>
 
 <!--24F844751D19499CA1215A76C9BC2543--><AD_COLUMN>
@@ -1179,6 +1256,7 @@
 <!--24F844751D19499CA1215A76C9BC2543-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--24F844751D19499CA1215A76C9BC2543-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--24F844751D19499CA1215A76C9BC2543-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--24F844751D19499CA1215A76C9BC2543-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--24F844751D19499CA1215A76C9BC2543--></AD_COLUMN>
 
 <!--25B321F4031646D2A8163BE1EE41AF34--><AD_COLUMN>
@@ -1217,6 +1295,7 @@
 <!--25B321F4031646D2A8163BE1EE41AF34-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--25B321F4031646D2A8163BE1EE41AF34-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--25B321F4031646D2A8163BE1EE41AF34-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--25B321F4031646D2A8163BE1EE41AF34-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--25B321F4031646D2A8163BE1EE41AF34--></AD_COLUMN>
 
 <!--26E3702BD6F345FB802CD410C12FC6EE--><AD_COLUMN>
@@ -1254,6 +1333,7 @@
 <!--26E3702BD6F345FB802CD410C12FC6EE-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--26E3702BD6F345FB802CD410C12FC6EE-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--26E3702BD6F345FB802CD410C12FC6EE-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--26E3702BD6F345FB802CD410C12FC6EE-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--26E3702BD6F345FB802CD410C12FC6EE--></AD_COLUMN>
 
 <!--28464321D72D4A609149332FD0B1977B--><AD_COLUMN>
@@ -1289,6 +1369,7 @@
 <!--28464321D72D4A609149332FD0B1977B-->  <ENTITY_ALIAS><![CDATA[case when fat is null then false else true end]]></ENTITY_ALIAS>
 <!--28464321D72D4A609149332FD0B1977B-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--28464321D72D4A609149332FD0B1977B-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--28464321D72D4A609149332FD0B1977B-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--28464321D72D4A609149332FD0B1977B--></AD_COLUMN>
 
 <!--289B006128184E18AD737308CE7C6981--><AD_COLUMN>
@@ -1326,6 +1407,7 @@
 <!--289B006128184E18AD737308CE7C6981-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--289B006128184E18AD737308CE7C6981-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--289B006128184E18AD737308CE7C6981-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--289B006128184E18AD737308CE7C6981-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--289B006128184E18AD737308CE7C6981--></AD_COLUMN>
 
 <!--28CE1AD2A23148A99EBE54CD7A4AA943--><AD_COLUMN>
@@ -1363,6 +1445,7 @@
 <!--28CE1AD2A23148A99EBE54CD7A4AA943-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--28CE1AD2A23148A99EBE54CD7A4AA943-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--28CE1AD2A23148A99EBE54CD7A4AA943-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--28CE1AD2A23148A99EBE54CD7A4AA943-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--28CE1AD2A23148A99EBE54CD7A4AA943--></AD_COLUMN>
 
 <!--29C236FD8850460C97C4D78FB374AA88--><AD_COLUMN>
@@ -1398,6 +1481,7 @@
 <!--29C236FD8850460C97C4D78FB374AA88-->  <ENTITY_ALIAS><![CDATA[fin_payment_detail_id]]></ENTITY_ALIAS>
 <!--29C236FD8850460C97C4D78FB374AA88-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--29C236FD8850460C97C4D78FB374AA88-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--29C236FD8850460C97C4D78FB374AA88-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--29C236FD8850460C97C4D78FB374AA88--></AD_COLUMN>
 
 <!--2AB8A3D42A4B4F2581FBFB9C9C4CA5D3--><AD_COLUMN>
@@ -1435,6 +1519,7 @@
 <!--2AB8A3D42A4B4F2581FBFB9C9C4CA5D3-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--2AB8A3D42A4B4F2581FBFB9C9C4CA5D3-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--2AB8A3D42A4B4F2581FBFB9C9C4CA5D3-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--2AB8A3D42A4B4F2581FBFB9C9C4CA5D3-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--2AB8A3D42A4B4F2581FBFB9C9C4CA5D3--></AD_COLUMN>
 
 <!--2AED8917359B404BB2FA91998B9DE185--><AD_COLUMN>
@@ -1472,6 +1557,7 @@
 <!--2AED8917359B404BB2FA91998B9DE185-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--2AED8917359B404BB2FA91998B9DE185-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--2AED8917359B404BB2FA91998B9DE185-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--2AED8917359B404BB2FA91998B9DE185-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--2AED8917359B404BB2FA91998B9DE185--></AD_COLUMN>
 
 <!--2B2E0238A7E443D9BD24FB5D15B1DD4A--><AD_COLUMN>
@@ -1509,6 +1595,7 @@
 <!--2B2E0238A7E443D9BD24FB5D15B1DD4A-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--2B2E0238A7E443D9BD24FB5D15B1DD4A-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--2B2E0238A7E443D9BD24FB5D15B1DD4A-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--2B2E0238A7E443D9BD24FB5D15B1DD4A-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--2B2E0238A7E443D9BD24FB5D15B1DD4A--></AD_COLUMN>
 
 <!--2B54EC3D70D743FBB55192C0EE3832A3--><AD_COLUMN>
@@ -1546,6 +1633,7 @@
 <!--2B54EC3D70D743FBB55192C0EE3832A3-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--2B54EC3D70D743FBB55192C0EE3832A3-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--2B54EC3D70D743FBB55192C0EE3832A3-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--2B54EC3D70D743FBB55192C0EE3832A3-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--2B54EC3D70D743FBB55192C0EE3832A3--></AD_COLUMN>
 
 <!--2B609CEE0C4E4DFBA000FFAFBC24917F--><AD_COLUMN>
@@ -1581,6 +1669,7 @@
 <!--2B609CEE0C4E4DFBA000FFAFBC24917F-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--2B609CEE0C4E4DFBA000FFAFBC24917F-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--2B609CEE0C4E4DFBA000FFAFBC24917F-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--2B609CEE0C4E4DFBA000FFAFBC24917F-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--2B609CEE0C4E4DFBA000FFAFBC24917F--></AD_COLUMN>
 
 <!--2DC02F74DA62406AACF3C3911C2AD807--><AD_COLUMN>
@@ -1618,6 +1707,7 @@
 <!--2DC02F74DA62406AACF3C3911C2AD807-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--2DC02F74DA62406AACF3C3911C2AD807-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--2DC02F74DA62406AACF3C3911C2AD807-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--2DC02F74DA62406AACF3C3911C2AD807-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--2DC02F74DA62406AACF3C3911C2AD807--></AD_COLUMN>
 
 <!--2F906856D85B4F87B0E9203A2AA25195--><AD_COLUMN>
@@ -1653,6 +1743,7 @@
 <!--2F906856D85B4F87B0E9203A2AA25195-->  <ENTITY_ALIAS><![CDATA[transactionGLItem.name]]></ENTITY_ALIAS>
 <!--2F906856D85B4F87B0E9203A2AA25195-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--2F906856D85B4F87B0E9203A2AA25195-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--2F906856D85B4F87B0E9203A2AA25195-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--2F906856D85B4F87B0E9203A2AA25195--></AD_COLUMN>
 
 <!--2FB2ED6DC8BD45D8881E50F5ABB122F2--><AD_COLUMN>
@@ -1689,6 +1780,7 @@
 <!--2FB2ED6DC8BD45D8881E50F5ABB122F2-->  <ENTITY_ALIAS><![CDATA[bsl.lineNo]]></ENTITY_ALIAS>
 <!--2FB2ED6DC8BD45D8881E50F5ABB122F2-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--2FB2ED6DC8BD45D8881E50F5ABB122F2-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--2FB2ED6DC8BD45D8881E50F5ABB122F2-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--2FB2ED6DC8BD45D8881E50F5ABB122F2--></AD_COLUMN>
 
 <!--3169AACB3F8948E0BF377EEE1AC2A5D1--><AD_COLUMN>
@@ -1724,6 +1816,7 @@
 <!--3169AACB3F8948E0BF377EEE1AC2A5D1-->  <ENTITY_ALIAS><![CDATA[bsl.transactionDate]]></ENTITY_ALIAS>
 <!--3169AACB3F8948E0BF377EEE1AC2A5D1-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--3169AACB3F8948E0BF377EEE1AC2A5D1-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--3169AACB3F8948E0BF377EEE1AC2A5D1-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--3169AACB3F8948E0BF377EEE1AC2A5D1--></AD_COLUMN>
 
 <!--31820F9EAD6B48489FC3875553CB6ED7--><AD_COLUMN>
@@ -1761,6 +1854,7 @@
 <!--31820F9EAD6B48489FC3875553CB6ED7-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--31820F9EAD6B48489FC3875553CB6ED7-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--31820F9EAD6B48489FC3875553CB6ED7-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--31820F9EAD6B48489FC3875553CB6ED7-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--31820F9EAD6B48489FC3875553CB6ED7--></AD_COLUMN>
 
 <!--3441F879B5DA4DB4BFAC1B8C5DEBF970--><AD_COLUMN>
@@ -1798,6 +1892,7 @@
 <!--3441F879B5DA4DB4BFAC1B8C5DEBF970-->  <ENTITY_ALIAS><![CDATA['0']]></ENTITY_ALIAS>
 <!--3441F879B5DA4DB4BFAC1B8C5DEBF970-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--3441F879B5DA4DB4BFAC1B8C5DEBF970-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--3441F879B5DA4DB4BFAC1B8C5DEBF970-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--3441F879B5DA4DB4BFAC1B8C5DEBF970--></AD_COLUMN>
 
 <!--35605F6EE878473E9ACCB9196452A4A6--><AD_COLUMN>
@@ -1833,6 +1928,7 @@
 <!--35605F6EE878473E9ACCB9196452A4A6-->  <ENTITY_ALIAS><![CDATA[@paymentScheduleDetail@]]></ENTITY_ALIAS>
 <!--35605F6EE878473E9ACCB9196452A4A6-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--35605F6EE878473E9ACCB9196452A4A6-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--35605F6EE878473E9ACCB9196452A4A6-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--35605F6EE878473E9ACCB9196452A4A6--></AD_COLUMN>
 
 <!--385DE6A637CD4D788AB480B3D1369E4F--><AD_COLUMN>
@@ -1869,6 +1965,7 @@
 <!--385DE6A637CD4D788AB480B3D1369E4F-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--385DE6A637CD4D788AB480B3D1369E4F-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--385DE6A637CD4D788AB480B3D1369E4F-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--385DE6A637CD4D788AB480B3D1369E4F-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--385DE6A637CD4D788AB480B3D1369E4F-->  <EM_OBUIAPP_PROCESS_ID><![CDATA[4EEB3497082C4F2182E16A4371CD5D96]]></EM_OBUIAPP_PROCESS_ID>
 <!--385DE6A637CD4D788AB480B3D1369E4F--></AD_COLUMN>
 
@@ -1907,6 +2004,7 @@
 <!--38816E45B3B3435BA5A9D7469352D5CE-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--38816E45B3B3435BA5A9D7469352D5CE-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--38816E45B3B3435BA5A9D7469352D5CE-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--38816E45B3B3435BA5A9D7469352D5CE-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--38816E45B3B3435BA5A9D7469352D5CE--></AD_COLUMN>
 
 <!--394FD1143C904A8C9E6A2AD42085CB9B--><AD_COLUMN>
@@ -1942,6 +2040,7 @@
 <!--394FD1143C904A8C9E6A2AD42085CB9B-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--394FD1143C904A8C9E6A2AD42085CB9B-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--394FD1143C904A8C9E6A2AD42085CB9B-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--394FD1143C904A8C9E6A2AD42085CB9B-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--394FD1143C904A8C9E6A2AD42085CB9B-->  <EM_OBUIAPP_PROCESS_ID><![CDATA[154CB4F9274A479CB38A285E16984539]]></EM_OBUIAPP_PROCESS_ID>
 <!--394FD1143C904A8C9E6A2AD42085CB9B--></AD_COLUMN>
 
@@ -1981,6 +2080,7 @@
 <!--3A586ACEBE4B4367B81088F1C796FF2E-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--3A586ACEBE4B4367B81088F1C796FF2E-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--3A586ACEBE4B4367B81088F1C796FF2E-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--3A586ACEBE4B4367B81088F1C796FF2E-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--3A586ACEBE4B4367B81088F1C796FF2E--></AD_COLUMN>
 
 <!--3B8D3FA314954D4C806DBD1184FCD854--><AD_COLUMN>
@@ -2018,6 +2118,7 @@
 <!--3B8D3FA314954D4C806DBD1184FCD854-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--3B8D3FA314954D4C806DBD1184FCD854-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--3B8D3FA314954D4C806DBD1184FCD854-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--3B8D3FA314954D4C806DBD1184FCD854-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--3B8D3FA314954D4C806DBD1184FCD854--></AD_COLUMN>
 
 <!--3C8BD38DB4024217A2E22406197C32E0--><AD_COLUMN>
@@ -2053,6 +2154,7 @@
 <!--3C8BD38DB4024217A2E22406197C32E0-->  <ENTITY_ALIAS><![CDATA[OB_Selected]]></ENTITY_ALIAS>
 <!--3C8BD38DB4024217A2E22406197C32E0-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--3C8BD38DB4024217A2E22406197C32E0-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--3C8BD38DB4024217A2E22406197C32E0-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--3C8BD38DB4024217A2E22406197C32E0--></AD_COLUMN>
 
 <!--3D63C1DAB18C459B8E2F8BCA88D15B87--><AD_COLUMN>
@@ -2090,6 +2192,7 @@
 <!--3D63C1DAB18C459B8E2F8BCA88D15B87-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--3D63C1DAB18C459B8E2F8BCA88D15B87-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--3D63C1DAB18C459B8E2F8BCA88D15B87-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--3D63C1DAB18C459B8E2F8BCA88D15B87-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--3D63C1DAB18C459B8E2F8BCA88D15B87--></AD_COLUMN>
 
 <!--3DA11F5BFCC849D28FE29D70F4B20AA9--><AD_COLUMN>
@@ -2128,6 +2231,7 @@
 <!--3DA11F5BFCC849D28FE29D70F4B20AA9-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--3DA11F5BFCC849D28FE29D70F4B20AA9-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--3DA11F5BFCC849D28FE29D70F4B20AA9-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--3DA11F5BFCC849D28FE29D70F4B20AA9-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--3DA11F5BFCC849D28FE29D70F4B20AA9--></AD_COLUMN>
 
 <!--3E146CEFE938427E8F8A15B89B4CF946--><AD_COLUMN>
@@ -2165,6 +2269,7 @@
 <!--3E146CEFE938427E8F8A15B89B4CF946-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--3E146CEFE938427E8F8A15B89B4CF946-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--3E146CEFE938427E8F8A15B89B4CF946-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--3E146CEFE938427E8F8A15B89B4CF946-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--3E146CEFE938427E8F8A15B89B4CF946--></AD_COLUMN>
 
 <!--3EADFCEF31404F94915D5B4CEB5BAD57--><AD_COLUMN>
@@ -2201,6 +2306,7 @@
 <!--3EADFCEF31404F94915D5B4CEB5BAD57-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--3EADFCEF31404F94915D5B4CEB5BAD57-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--3EADFCEF31404F94915D5B4CEB5BAD57-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--3EADFCEF31404F94915D5B4CEB5BAD57-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--3EADFCEF31404F94915D5B4CEB5BAD57-->  <EM_OBUIAPP_PROCESS_ID><![CDATA[6F87442DF7BC43AB8A666BDED2F7D64E]]></EM_OBUIAPP_PROCESS_ID>
 <!--3EADFCEF31404F94915D5B4CEB5BAD57--></AD_COLUMN>
 
@@ -2239,6 +2345,7 @@
 <!--3F41C500ECEB40D09089FEA4C3793F29-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--3F41C500ECEB40D09089FEA4C3793F29-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--3F41C500ECEB40D09089FEA4C3793F29-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--3F41C500ECEB40D09089FEA4C3793F29-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--3F41C500ECEB40D09089FEA4C3793F29--></AD_COLUMN>
 
 <!--3FE18B378FA24031A2E24B058414729F--><AD_COLUMN>
@@ -2274,6 +2381,7 @@
 <!--3FE18B378FA24031A2E24B058414729F-->  <SQLLOGIC><![CDATA[(SELECT COALESCE(sum(t.depositamt), 0) FROM fin_finacc_transaction t,  fin_reconciliation rec WHERE (t.fin_reconciliation_id IS NULL OR (EXISTS ( SELECT 1 FROM fin_reconciliation r WHERE r.dateto > rec.dateto AND t.fin_reconciliation_id  = r.fin_reconciliation_id ))) AND t.statementdate <= rec.dateto AND t.depositamt <> 0 AND t.fin_financial_account_id  = rec.fin_financial_account_id AND rec.fin_reconciliation_id = fin_reconciliation_id)]]></SQLLOGIC>
 <!--3FE18B378FA24031A2E24B058414729F-->  <ALLOWSORTING><![CDATA[N]]></ALLOWSORTING>
 <!--3FE18B378FA24031A2E24B058414729F-->  <ALLOWFILTERING><![CDATA[N]]></ALLOWFILTERING>
+<!--3FE18B378FA24031A2E24B058414729F-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--3FE18B378FA24031A2E24B058414729F--></AD_COLUMN>
 
 <!--40405759C1E1456E99B537D36A06F987--><AD_COLUMN>
@@ -2311,6 +2419,7 @@
 <!--40405759C1E1456E99B537D36A06F987-->  <ENTITY_ALIAS><![CDATA[fp.documentNo]]></ENTITY_ALIAS>
 <!--40405759C1E1456E99B537D36A06F987-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--40405759C1E1456E99B537D36A06F987-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--40405759C1E1456E99B537D36A06F987-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--40405759C1E1456E99B537D36A06F987--></AD_COLUMN>
 
 <!--40E02E5A0DCA4C7EA2CADBFA06D8EA39--><AD_COLUMN>
@@ -2348,6 +2457,7 @@
 <!--40E02E5A0DCA4C7EA2CADBFA06D8EA39-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--40E02E5A0DCA4C7EA2CADBFA06D8EA39-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--40E02E5A0DCA4C7EA2CADBFA06D8EA39-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--40E02E5A0DCA4C7EA2CADBFA06D8EA39-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--40E02E5A0DCA4C7EA2CADBFA06D8EA39--></AD_COLUMN>
 
 <!--41DAD5FF72274650A3C41D103F20C111--><AD_COLUMN>
@@ -2383,6 +2493,7 @@
 <!--41DAD5FF72274650A3C41D103F20C111-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--41DAD5FF72274650A3C41D103F20C111-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--41DAD5FF72274650A3C41D103F20C111-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--41DAD5FF72274650A3C41D103F20C111-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--41DAD5FF72274650A3C41D103F20C111--></AD_COLUMN>
 
 <!--422F3732DA324AE2AA34AE2E44D42037--><AD_COLUMN>
@@ -2422,6 +2533,7 @@
 <!--422F3732DA324AE2AA34AE2E44D42037-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--422F3732DA324AE2AA34AE2E44D42037-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--422F3732DA324AE2AA34AE2E44D42037-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--422F3732DA324AE2AA34AE2E44D42037-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--422F3732DA324AE2AA34AE2E44D42037--></AD_COLUMN>
 
 <!--42C6FD4ECBF6451F9D570317F4472FD7--><AD_COLUMN>
@@ -2459,6 +2571,7 @@
 <!--42C6FD4ECBF6451F9D570317F4472FD7-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--42C6FD4ECBF6451F9D570317F4472FD7-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--42C6FD4ECBF6451F9D570317F4472FD7-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--42C6FD4ECBF6451F9D570317F4472FD7-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--42C6FD4ECBF6451F9D570317F4472FD7--></AD_COLUMN>
 
 <!--437AA9021406408BA74FA0710375ECA5--><AD_COLUMN>
@@ -2497,6 +2610,7 @@
 <!--437AA9021406408BA74FA0710375ECA5-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--437AA9021406408BA74FA0710375ECA5-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--437AA9021406408BA74FA0710375ECA5-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--437AA9021406408BA74FA0710375ECA5-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--437AA9021406408BA74FA0710375ECA5--></AD_COLUMN>
 
 <!--4690710630824E3AB4FE825F17D9EA9B--><AD_COLUMN>
@@ -2535,6 +2649,7 @@
 <!--4690710630824E3AB4FE825F17D9EA9B-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--4690710630824E3AB4FE825F17D9EA9B-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--4690710630824E3AB4FE825F17D9EA9B-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--4690710630824E3AB4FE825F17D9EA9B-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--4690710630824E3AB4FE825F17D9EA9B--></AD_COLUMN>
 
 <!--46BDDEB8C59C4ADA9C4C9D837A10CD45--><AD_COLUMN>
@@ -2573,8 +2688,48 @@
 <!--46BDDEB8C59C4ADA9C4C9D837A10CD45-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--46BDDEB8C59C4ADA9C4C9D837A10CD45-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--46BDDEB8C59C4ADA9C4C9D837A10CD45-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--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>
@@ -2611,6 +2766,7 @@
 <!--49BEE6AEC60D4C61922B2B2DB42D7918-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--49BEE6AEC60D4C61922B2B2DB42D7918-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--49BEE6AEC60D4C61922B2B2DB42D7918-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--49BEE6AEC60D4C61922B2B2DB42D7918-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--49BEE6AEC60D4C61922B2B2DB42D7918--></AD_COLUMN>
 
 <!--4AE64134057846AFB053090561EA31D2--><AD_COLUMN>
@@ -2648,6 +2804,7 @@
 <!--4AE64134057846AFB053090561EA31D2-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--4AE64134057846AFB053090561EA31D2-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--4AE64134057846AFB053090561EA31D2-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--4AE64134057846AFB053090561EA31D2-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--4AE64134057846AFB053090561EA31D2--></AD_COLUMN>
 
 <!--4B7A211B9950467485608172B5D053F9--><AD_COLUMN>
@@ -2686,6 +2843,7 @@
 <!--4B7A211B9950467485608172B5D053F9-->  <ENTITY_ALIAS><![CDATA[bsl.matchingtype]]></ENTITY_ALIAS>
 <!--4B7A211B9950467485608172B5D053F9-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--4B7A211B9950467485608172B5D053F9-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--4B7A211B9950467485608172B5D053F9-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--4B7A211B9950467485608172B5D053F9--></AD_COLUMN>
 
 <!--4B98FCB4357B49DA9DB7D79FD28838AF--><AD_COLUMN>
@@ -2723,6 +2881,7 @@
 <!--4B98FCB4357B49DA9DB7D79FD28838AF-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--4B98FCB4357B49DA9DB7D79FD28838AF-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--4B98FCB4357B49DA9DB7D79FD28838AF-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--4B98FCB4357B49DA9DB7D79FD28838AF-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--4B98FCB4357B49DA9DB7D79FD28838AF--></AD_COLUMN>
 
 <!--4BC54D56C3014EF7A812CB5AFE860B66--><AD_COLUMN>
@@ -2760,6 +2919,7 @@
 <!--4BC54D56C3014EF7A812CB5AFE860B66-->  <ENTITY_ALIAS><![CDATA[pd.id]]></ENTITY_ALIAS>
 <!--4BC54D56C3014EF7A812CB5AFE860B66-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--4BC54D56C3014EF7A812CB5AFE860B66-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--4BC54D56C3014EF7A812CB5AFE860B66-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--4BC54D56C3014EF7A812CB5AFE860B66--></AD_COLUMN>
 
 <!--50301A7B213B468F9CFEBE289F6BA2B1--><AD_COLUMN>
@@ -2799,6 +2959,7 @@
 <!--50301A7B213B468F9CFEBE289F6BA2B1-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--50301A7B213B468F9CFEBE289F6BA2B1-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--50301A7B213B468F9CFEBE289F6BA2B1-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--50301A7B213B468F9CFEBE289F6BA2B1-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--50301A7B213B468F9CFEBE289F6BA2B1--></AD_COLUMN>
 
 <!--50D9D2D098E54FB7B5109C4BAA8977A5--><AD_COLUMN>
@@ -2837,6 +2998,7 @@
 <!--50D9D2D098E54FB7B5109C4BAA8977A5-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--50D9D2D098E54FB7B5109C4BAA8977A5-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--50D9D2D098E54FB7B5109C4BAA8977A5-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--50D9D2D098E54FB7B5109C4BAA8977A5-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--50D9D2D098E54FB7B5109C4BAA8977A5--></AD_COLUMN>
 
 <!--50F34D54648C483EB809647CB65D9368--><AD_COLUMN>
@@ -2874,6 +3036,7 @@
 <!--50F34D54648C483EB809647CB65D9368-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--50F34D54648C483EB809647CB65D9368-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--50F34D54648C483EB809647CB65D9368-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--50F34D54648C483EB809647CB65D9368-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--50F34D54648C483EB809647CB65D9368--></AD_COLUMN>
 
 <!--528EE4D486444C08A1CE90CAA066BA48--><AD_COLUMN>
@@ -2912,6 +3075,7 @@
 <!--528EE4D486444C08A1CE90CAA066BA48-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--528EE4D486444C08A1CE90CAA066BA48-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--528EE4D486444C08A1CE90CAA066BA48-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--528EE4D486444C08A1CE90CAA066BA48-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--528EE4D486444C08A1CE90CAA066BA48--></AD_COLUMN>
 
 <!--562395ACED3B4C2CB4F31FB3F412529A--><AD_COLUMN>
@@ -2950,6 +3114,7 @@
 <!--562395ACED3B4C2CB4F31FB3F412529A-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--562395ACED3B4C2CB4F31FB3F412529A-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--562395ACED3B4C2CB4F31FB3F412529A-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--562395ACED3B4C2CB4F31FB3F412529A-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--562395ACED3B4C2CB4F31FB3F412529A--></AD_COLUMN>
 
 <!--564CC927A56C4B69BD3E2EF32784E340--><AD_COLUMN>
@@ -2987,6 +3152,7 @@
 <!--564CC927A56C4B69BD3E2EF32784E340-->  <ENTITY_ALIAS><![CDATA[fat.depositAmount - fat.paymentAmount]]></ENTITY_ALIAS>
 <!--564CC927A56C4B69BD3E2EF32784E340-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--564CC927A56C4B69BD3E2EF32784E340-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--564CC927A56C4B69BD3E2EF32784E340-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--564CC927A56C4B69BD3E2EF32784E340--></AD_COLUMN>
 
 <!--56C419FF5BA0444181AF7DDB7BFF78A3--><AD_COLUMN>
@@ -3022,6 +3188,7 @@
 <!--56C419FF5BA0444181AF7DDB7BFF78A3-->  <ENTITY_ALIAS><![CDATA[@amount@]]></ENTITY_ALIAS>
 <!--56C419FF5BA0444181AF7DDB7BFF78A3-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--56C419FF5BA0444181AF7DDB7BFF78A3-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--56C419FF5BA0444181AF7DDB7BFF78A3-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--56C419FF5BA0444181AF7DDB7BFF78A3--></AD_COLUMN>
 
 <!--57D5BC1D263243128DCD16E2836AE3E1--><AD_COLUMN>
@@ -3057,6 +3224,7 @@
 <!--57D5BC1D263243128DCD16E2836AE3E1-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--57D5BC1D263243128DCD16E2836AE3E1-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--57D5BC1D263243128DCD16E2836AE3E1-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--57D5BC1D263243128DCD16E2836AE3E1-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--57D5BC1D263243128DCD16E2836AE3E1--></AD_COLUMN>
 
 <!--590088D9DDB34C1FB99E97CF50022B62--><AD_COLUMN>
@@ -3092,6 +3260,7 @@
 <!--590088D9DDB34C1FB99E97CF50022B62-->  <SQLLOGIC><![CDATA[( SELECT count(*) FROM fin_finacc_transaction WHERE fin_finacc_transaction.fin_reconciliation_id = fin_reconciliation_id)]]></SQLLOGIC>
 <!--590088D9DDB34C1FB99E97CF50022B62-->  <ALLOWSORTING><![CDATA[N]]></ALLOWSORTING>
 <!--590088D9DDB34C1FB99E97CF50022B62-->  <ALLOWFILTERING><![CDATA[N]]></ALLOWFILTERING>
+<!--590088D9DDB34C1FB99E97CF50022B62-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--590088D9DDB34C1FB99E97CF50022B62--></AD_COLUMN>
 
 <!--5961F18CC4934FCCA8AB18B2B3AFC960--><AD_COLUMN>
@@ -3127,6 +3296,7 @@
 <!--5961F18CC4934FCCA8AB18B2B3AFC960-->  <ENTITY_ALIAS><![CDATA[f.paymentDate]]></ENTITY_ALIAS>
 <!--5961F18CC4934FCCA8AB18B2B3AFC960-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--5961F18CC4934FCCA8AB18B2B3AFC960-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--5961F18CC4934FCCA8AB18B2B3AFC960-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--5961F18CC4934FCCA8AB18B2B3AFC960--></AD_COLUMN>
 
 <!--59B17ED569B444C5A27232D87DBFDC20--><AD_COLUMN>
@@ -3165,6 +3335,7 @@
 <!--59B17ED569B444C5A27232D87DBFDC20-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--59B17ED569B444C5A27232D87DBFDC20-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--59B17ED569B444C5A27232D87DBFDC20-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--59B17ED569B444C5A27232D87DBFDC20-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--59B17ED569B444C5A27232D87DBFDC20--></AD_COLUMN>
 
 <!--5B278C5EA0AC4FDAB225F6A7A61FC094--><AD_COLUMN>
@@ -3202,6 +3373,7 @@
 <!--5B278C5EA0AC4FDAB225F6A7A61FC094-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--5B278C5EA0AC4FDAB225F6A7A61FC094-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--5B278C5EA0AC4FDAB225F6A7A61FC094-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--5B278C5EA0AC4FDAB225F6A7A61FC094-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--5B278C5EA0AC4FDAB225F6A7A61FC094--></AD_COLUMN>
 
 <!--5BABDB890D8B4C3C95C01331BFA898E5--><AD_COLUMN>
@@ -3239,6 +3411,7 @@
 <!--5BABDB890D8B4C3C95C01331BFA898E5-->  <ENTITY_ALIAS><![CDATA[f.documentNo]]></ENTITY_ALIAS>
 <!--5BABDB890D8B4C3C95C01331BFA898E5-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--5BABDB890D8B4C3C95C01331BFA898E5-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--5BABDB890D8B4C3C95C01331BFA898E5-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--5BABDB890D8B4C3C95C01331BFA898E5--></AD_COLUMN>
 
 <!--5D8DC67BCE524D33B008CBC108394C9A--><AD_COLUMN>
@@ -3276,6 +3449,7 @@
 <!--5D8DC67BCE524D33B008CBC108394C9A-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--5D8DC67BCE524D33B008CBC108394C9A-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--5D8DC67BCE524D33B008CBC108394C9A-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--5D8DC67BCE524D33B008CBC108394C9A-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--5D8DC67BCE524D33B008CBC108394C9A--></AD_COLUMN>
 
 <!--5DB8B25CF75A4C24B87A2B3995F4913F--><AD_COLUMN>
@@ -3313,6 +3487,7 @@
 <!--5DB8B25CF75A4C24B87A2B3995F4913F-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--5DB8B25CF75A4C24B87A2B3995F4913F-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--5DB8B25CF75A4C24B87A2B3995F4913F-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--5DB8B25CF75A4C24B87A2B3995F4913F-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--5DB8B25CF75A4C24B87A2B3995F4913F--></AD_COLUMN>
 
 <!--5E1DCCB3DBB84CB6B1B98EA57D0968F3--><AD_COLUMN>
@@ -3350,6 +3525,7 @@
 <!--5E1DCCB3DBB84CB6B1B98EA57D0968F3-->  <ENTITY_ALIAS><![CDATA[e.transactionDate]]></ENTITY_ALIAS>
 <!--5E1DCCB3DBB84CB6B1B98EA57D0968F3-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--5E1DCCB3DBB84CB6B1B98EA57D0968F3-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--5E1DCCB3DBB84CB6B1B98EA57D0968F3-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--5E1DCCB3DBB84CB6B1B98EA57D0968F3--></AD_COLUMN>
 
 <!--5E5DE2BA02E744AFAFE782DD2AEA6B19--><AD_COLUMN>
@@ -3388,6 +3564,7 @@
 <!--5E5DE2BA02E744AFAFE782DD2AEA6B19-->  <ENTITY_ALIAS><![CDATA[prod]]></ENTITY_ALIAS>
 <!--5E5DE2BA02E744AFAFE782DD2AEA6B19-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--5E5DE2BA02E744AFAFE782DD2AEA6B19-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--5E5DE2BA02E744AFAFE782DD2AEA6B19-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--5E5DE2BA02E744AFAFE782DD2AEA6B19--></AD_COLUMN>
 
 <!--5E793CD24F2F4368858AB44CBADC39C2--><AD_COLUMN>
@@ -3425,6 +3602,7 @@
 <!--5E793CD24F2F4368858AB44CBADC39C2-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--5E793CD24F2F4368858AB44CBADC39C2-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--5E793CD24F2F4368858AB44CBADC39C2-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--5E793CD24F2F4368858AB44CBADC39C2-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--5E793CD24F2F4368858AB44CBADC39C2--></AD_COLUMN>
 
 <!--5F948F4973FD48719C2DE257132BE64B--><AD_COLUMN>
@@ -3462,6 +3640,7 @@
 <!--5F948F4973FD48719C2DE257132BE64B-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--5F948F4973FD48719C2DE257132BE64B-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--5F948F4973FD48719C2DE257132BE64B-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--5F948F4973FD48719C2DE257132BE64B-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--5F948F4973FD48719C2DE257132BE64B--></AD_COLUMN>
 
 <!--5FA17150E5214E589118DC77EE0F4042--><AD_COLUMN>
@@ -3499,6 +3678,7 @@
 <!--5FA17150E5214E589118DC77EE0F4042-->  <ENTITY_ALIAS><![CDATA[transactionBP.name]]></ENTITY_ALIAS>
 <!--5FA17150E5214E589118DC77EE0F4042-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--5FA17150E5214E589118DC77EE0F4042-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--5FA17150E5214E589118DC77EE0F4042-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--5FA17150E5214E589118DC77EE0F4042--></AD_COLUMN>
 
 <!--5FFA3BD7042D408289D0CA90D5DDA232--><AD_COLUMN>
@@ -3537,6 +3717,7 @@
 <!--5FFA3BD7042D408289D0CA90D5DDA232-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--5FFA3BD7042D408289D0CA90D5DDA232-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--5FFA3BD7042D408289D0CA90D5DDA232-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--5FFA3BD7042D408289D0CA90D5DDA232-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--5FFA3BD7042D408289D0CA90D5DDA232--></AD_COLUMN>
 
 <!--60E27C6694554EC5A5477D20D0ACDDB5--><AD_COLUMN>
@@ -3574,6 +3755,7 @@
 <!--60E27C6694554EC5A5477D20D0ACDDB5-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--60E27C6694554EC5A5477D20D0ACDDB5-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--60E27C6694554EC5A5477D20D0ACDDB5-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--60E27C6694554EC5A5477D20D0ACDDB5-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--60E27C6694554EC5A5477D20D0ACDDB5--></AD_COLUMN>
 
 <!--63454E73F07B4C908EB1268C41F5DE8A--><AD_COLUMN>
@@ -3613,6 +3795,7 @@
 <!--63454E73F07B4C908EB1268C41F5DE8A-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--63454E73F07B4C908EB1268C41F5DE8A-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--63454E73F07B4C908EB1268C41F5DE8A-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--63454E73F07B4C908EB1268C41F5DE8A-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--63454E73F07B4C908EB1268C41F5DE8A--></AD_COLUMN>
 
 <!--670423B76C554A6C957A58F1DA4A6D98--><AD_COLUMN>
@@ -3650,6 +3833,7 @@
 <!--670423B76C554A6C957A58F1DA4A6D98-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--670423B76C554A6C957A58F1DA4A6D98-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--670423B76C554A6C957A58F1DA4A6D98-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--670423B76C554A6C957A58F1DA4A6D98--></AD_COLUMN>
 
 <!--68C853FD393C4620A3947EC34C416B9A--><AD_COLUMN>
@@ -3687,6 +3871,7 @@
 <!--68C853FD393C4620A3947EC34C416B9A-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--68C853FD393C4620A3947EC34C416B9A-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--68C853FD393C4620A3947EC34C416B9A-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--68C853FD393C4620A3947EC34C416B9A-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--68C853FD393C4620A3947EC34C416B9A--></AD_COLUMN>
 
 <!--6B5C965B623748689A689838835C0AC2--><AD_COLUMN>
@@ -3725,6 +3910,7 @@
 <!--6B5C965B623748689A689838835C0AC2-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--6B5C965B623748689A689838835C0AC2-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--6B5C965B623748689A689838835C0AC2-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--6B5C965B623748689A689838835C0AC2-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--6B5C965B623748689A689838835C0AC2--></AD_COLUMN>
 
 <!--6BBCB749C7C640A08F573BF86D270171--><AD_COLUMN>
@@ -3763,6 +3949,7 @@
 <!--6BBCB749C7C640A08F573BF86D270171-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--6BBCB749C7C640A08F573BF86D270171-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--6BBCB749C7C640A08F573BF86D270171-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--6BBCB749C7C640A08F573BF86D270171-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--6BBCB749C7C640A08F573BF86D270171--></AD_COLUMN>
 
 <!--6C040C63A02E4BD2A157E89140FEA721--><AD_COLUMN>
@@ -3800,6 +3987,7 @@
 <!--6C040C63A02E4BD2A157E89140FEA721-->  <ENTITY_ALIAS><![CDATA[bp.name]]></ENTITY_ALIAS>
 <!--6C040C63A02E4BD2A157E89140FEA721-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--6C040C63A02E4BD2A157E89140FEA721-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--6C040C63A02E4BD2A157E89140FEA721-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--6C040C63A02E4BD2A157E89140FEA721--></AD_COLUMN>
 
 <!--6D279BA0C51142638249D649BD51AC34--><AD_COLUMN>
@@ -3839,6 +4027,7 @@
 <!--6D279BA0C51142638249D649BD51AC34-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--6D279BA0C51142638249D649BD51AC34-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--6D279BA0C51142638249D649BD51AC34-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--6D279BA0C51142638249D649BD51AC34-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--6D279BA0C51142638249D649BD51AC34--></AD_COLUMN>
 
 <!--6DE1A3BDE4AA4FE0846DCA436691F0BA--><AD_COLUMN>
@@ -3877,6 +4066,7 @@
 <!--6DE1A3BDE4AA4FE0846DCA436691F0BA-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--6DE1A3BDE4AA4FE0846DCA436691F0BA-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--6DE1A3BDE4AA4FE0846DCA436691F0BA-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--6DE1A3BDE4AA4FE0846DCA436691F0BA-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--6DE1A3BDE4AA4FE0846DCA436691F0BA--></AD_COLUMN>
 
 <!--6E9AB8CEF87240259FCB550A547D301B--><AD_COLUMN>
@@ -3915,6 +4105,7 @@
 <!--6E9AB8CEF87240259FCB550A547D301B-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--6E9AB8CEF87240259FCB550A547D301B-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--6E9AB8CEF87240259FCB550A547D301B-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--6E9AB8CEF87240259FCB550A547D301B-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--6E9AB8CEF87240259FCB550A547D301B--></AD_COLUMN>
 
 <!--7185C283E1AE417F8B6F47BCCB502DF6--><AD_COLUMN>
@@ -3952,6 +4143,7 @@
 <!--7185C283E1AE417F8B6F47BCCB502DF6-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--7185C283E1AE417F8B6F47BCCB502DF6-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--7185C283E1AE417F8B6F47BCCB502DF6-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--7185C283E1AE417F8B6F47BCCB502DF6-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--7185C283E1AE417F8B6F47BCCB502DF6--></AD_COLUMN>
 
 <!--728AC90019514EF5812A2B49A6B23780--><AD_COLUMN>
@@ -3989,6 +4181,7 @@
 <!--728AC90019514EF5812A2B49A6B23780-->  <ENTITY_ALIAS><![CDATA[f.generatedCredit - f.usedCredit]]></ENTITY_ALIAS>
 <!--728AC90019514EF5812A2B49A6B23780-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--728AC90019514EF5812A2B49A6B23780-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--728AC90019514EF5812A2B49A6B23780-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--728AC90019514EF5812A2B49A6B23780--></AD_COLUMN>
 
 <!--730009446F744A618995ABF5DA3F692E--><AD_COLUMN>
@@ -4024,6 +4217,7 @@
 <!--730009446F744A618995ABF5DA3F692E-->  <ENTITY_ALIAS><![CDATA[@paymentMethod@]]></ENTITY_ALIAS>
 <!--730009446F744A618995ABF5DA3F692E-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--730009446F744A618995ABF5DA3F692E-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--730009446F744A618995ABF5DA3F692E-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--730009446F744A618995ABF5DA3F692E--></AD_COLUMN>
 
 <!--74C8BD1CFDD44F86840A223FE75F63D7--><AD_COLUMN>
@@ -4063,6 +4257,7 @@
 <!--74C8BD1CFDD44F86840A223FE75F63D7-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--74C8BD1CFDD44F86840A223FE75F63D7-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--74C8BD1CFDD44F86840A223FE75F63D7-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--74C8BD1CFDD44F86840A223FE75F63D7-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--74C8BD1CFDD44F86840A223FE75F63D7--></AD_COLUMN>
 
 <!--7535FAF92D1D480D895710811C18A552--><AD_COLUMN>
@@ -4100,6 +4295,7 @@
 <!--7535FAF92D1D480D895710811C18A552-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--7535FAF92D1D480D895710811C18A552-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--7535FAF92D1D480D895710811C18A552-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--7535FAF92D1D480D895710811C18A552-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--7535FAF92D1D480D895710811C18A552--></AD_COLUMN>
 
 <!--76A20548884B489E88D731480658E2D1--><AD_COLUMN>
@@ -4138,6 +4334,7 @@
 <!--76A20548884B489E88D731480658E2D1-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--76A20548884B489E88D731480658E2D1-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--76A20548884B489E88D731480658E2D1-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--76A20548884B489E88D731480658E2D1-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--76A20548884B489E88D731480658E2D1--></AD_COLUMN>
 
 <!--76C4D6CDF96B4CB5B80967475AA3D2A9--><AD_COLUMN>
@@ -4175,6 +4372,7 @@
 <!--76C4D6CDF96B4CB5B80967475AA3D2A9-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--76C4D6CDF96B4CB5B80967475AA3D2A9-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--76C4D6CDF96B4CB5B80967475AA3D2A9-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--76C4D6CDF96B4CB5B80967475AA3D2A9-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--76C4D6CDF96B4CB5B80967475AA3D2A9--></AD_COLUMN>
 
 <!--7791426B8C214F0EB68C13D99A577229--><AD_COLUMN>
@@ -4210,6 +4408,7 @@
 <!--7791426B8C214F0EB68C13D99A577229-->  <SQLLOGIC><![CDATA[(SELECT COALESCE(sum(fin_finacc_transaction.depositamt - fin_finacc_transaction.paymentamt), 0) FROM fin_finacc_transaction WHERE fin_finacc_transaction.fin_reconciliation_id = fin_reconciliation_id)]]></SQLLOGIC>
 <!--7791426B8C214F0EB68C13D99A577229-->  <ALLOWSORTING><![CDATA[N]]></ALLOWSORTING>
 <!--7791426B8C214F0EB68C13D99A577229-->  <ALLOWFILTERING><![CDATA[N]]></ALLOWFILTERING>
+<!--7791426B8C214F0EB68C13D99A577229-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--7791426B8C214F0EB68C13D99A577229--></AD_COLUMN>
 
 <!--78A3367822B35459E040007F01012510--><AD_COLUMN>
@@ -4248,6 +4447,7 @@
 <!--78A3367822B35459E040007F01012510-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--78A3367822B35459E040007F01012510-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--78A3367822B35459E040007F01012510-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--78A3367822B35459E040007F01012510-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--78A3367822B35459E040007F01012510-->  <EM_OBUIAPP_PROCESS_ID><![CDATA[9BED7889E1034FE68BD85D5D16857320]]></EM_OBUIAPP_PROCESS_ID>
 <!--78A3367822B35459E040007F01012510--></AD_COLUMN>
 
@@ -4284,6 +4484,7 @@
 <!--7A86A285DAD44ECBAB04B052BEF6F76D-->  <ENTITY_ALIAS><![CDATA[fat]]></ENTITY_ALIAS>
 <!--7A86A285DAD44ECBAB04B052BEF6F76D-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--7A86A285DAD44ECBAB04B052BEF6F76D-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--7A86A285DAD44ECBAB04B052BEF6F76D-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--7A86A285DAD44ECBAB04B052BEF6F76D--></AD_COLUMN>
 
 <!--7C947F020859452883746030218158E0--><AD_COLUMN>
@@ -4321,6 +4522,7 @@
 <!--7C947F020859452883746030218158E0-->  <ENTITY_ALIAS><![CDATA[bsl.referenceNo]]></ENTITY_ALIAS>
 <!--7C947F020859452883746030218158E0-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--7C947F020859452883746030218158E0-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--7C947F020859452883746030218158E0-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--7C947F020859452883746030218158E0--></AD_COLUMN>
 
 <!--7CBC01AEEA28472AA5A73CAB6ECAE824--><AD_COLUMN>
@@ -4358,6 +4560,7 @@
 <!--7CBC01AEEA28472AA5A73CAB6ECAE824-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--7CBC01AEEA28472AA5A73CAB6ECAE824-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--7CBC01AEEA28472AA5A73CAB6ECAE824-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--7CBC01AEEA28472AA5A73CAB6ECAE824-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--7CBC01AEEA28472AA5A73CAB6ECAE824--></AD_COLUMN>
 
 <!--7DC34559B3F2B45BE040007F0100784A--><AD_COLUMN>
@@ -4396,6 +4599,7 @@
 <!--7DC34559B3F2B45BE040007F0100784A-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--7DC34559B3F2B45BE040007F0100784A-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--7DC34559B3F2B45BE040007F0100784A-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--7DC34559B3F2B45BE040007F0100784A-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--7DC34559B3F2B45BE040007F0100784A--></AD_COLUMN>
 
 <!--7DC34559B3F3B45BE040007F0100784A--><AD_COLUMN>
@@ -4431,6 +4635,7 @@
 <!--7DC34559B3F3B45BE040007F0100784A-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--7DC34559B3F3B45BE040007F0100784A-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--7DC34559B3F3B45BE040007F0100784A-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--7DC34559B3F3B45BE040007F0100784A-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--7DC34559B3F3B45BE040007F0100784A--></AD_COLUMN>
 
 <!--7EAACC5726724D16B8C92BA732BB566B--><AD_COLUMN>
@@ -4468,6 +4673,7 @@
 <!--7EAACC5726724D16B8C92BA732BB566B-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--7EAACC5726724D16B8C92BA732BB566B-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--7EAACC5726724D16B8C92BA732BB566B-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--7EAACC5726724D16B8C92BA732BB566B-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--7EAACC5726724D16B8C92BA732BB566B--></AD_COLUMN>
 
 <!--7FCAAFE989BCA375E040007F01007F0A--><AD_COLUMN>
@@ -4504,6 +4710,7 @@
 <!--7FCAAFE989BCA375E040007F01007F0A-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--7FCAAFE989BCA375E040007F01007F0A-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--7FCAAFE989BCA375E040007F01007F0A-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--7FCAAFE989BCA375E040007F01007F0A-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--7FCAAFE989BCA375E040007F01007F0A-->  <EM_OBUIAPP_PROCESS_ID><![CDATA[9BED7889E1034FE68BD85D5D16857320]]></EM_OBUIAPP_PROCESS_ID>
 <!--7FCAAFE989BCA375E040007F01007F0A--></AD_COLUMN>
 
@@ -4542,6 +4749,7 @@
 <!--806198F4784445109D9067A0C868701C-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--806198F4784445109D9067A0C868701C-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--806198F4784445109D9067A0C868701C-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--806198F4784445109D9067A0C868701C-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--806198F4784445109D9067A0C868701C--></AD_COLUMN>
 
 <!--8071EA28ABEA4E1E919AD14F3EE5B033--><AD_COLUMN>
@@ -4579,6 +4787,7 @@
 <!--8071EA28ABEA4E1E919AD14F3EE5B033-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--8071EA28ABEA4E1E919AD14F3EE5B033-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--8071EA28ABEA4E1E919AD14F3EE5B033-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--8071EA28ABEA4E1E919AD14F3EE5B033-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--8071EA28ABEA4E1E919AD14F3EE5B033--></AD_COLUMN>
 
 <!--81822D492C88480C8830E5059387A771--><AD_COLUMN>
@@ -4614,6 +4823,7 @@
 <!--81822D492C88480C8830E5059387A771-->  <SQLLOGIC><![CDATA[(SELECT count(*) FROM fin_finacc_transaction t,  fin_reconciliation rec WHERE (t.fin_reconciliation_id IS NULL OR (EXISTS ( SELECT 1 FROM fin_reconciliation r WHERE r.dateto > rec.dateto AND t.fin_reconciliation_id  = r.fin_reconciliation_id ))) AND t.statementdate <= rec.dateto AND t.depositamt <> 0 AND t.fin_financial_account_id  = rec.fin_financial_account_id AND rec.fin_reconciliation_id = fin_reconciliation_id) ]]></SQLLOGIC>
 <!--81822D492C88480C8830E5059387A771-->  <ALLOWSORTING><![CDATA[N]]></ALLOWSORTING>
 <!--81822D492C88480C8830E5059387A771-->  <ALLOWFILTERING><![CDATA[N]]></ALLOWFILTERING>
+<!--81822D492C88480C8830E5059387A771-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--81822D492C88480C8830E5059387A771--></AD_COLUMN>
 
 <!--82EFB8E4043C19C9E040007F01003778--><AD_COLUMN>
@@ -4651,6 +4861,7 @@
 <!--82EFB8E4043C19C9E040007F01003778-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--82EFB8E4043C19C9E040007F01003778-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--82EFB8E4043C19C9E040007F01003778-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--82EFB8E4043C19C9E040007F01003778-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--82EFB8E4043C19C9E040007F01003778--></AD_COLUMN>
 
 <!--82EFB8E4043D19C9E040007F01003778--><AD_COLUMN>
@@ -4690,6 +4901,7 @@
 <!--82EFB8E4043D19C9E040007F01003778-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--82EFB8E4043D19C9E040007F01003778-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--82EFB8E4043D19C9E040007F01003778-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--82EFB8E4043D19C9E040007F01003778-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--82EFB8E4043D19C9E040007F01003778--></AD_COLUMN>
 
 <!--82EFB8E4043E19C9E040007F01003778--><AD_COLUMN>
@@ -4729,6 +4941,7 @@
 <!--82EFB8E4043E19C9E040007F01003778-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--82EFB8E4043E19C9E040007F01003778-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--82EFB8E4043E19C9E040007F01003778-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--82EFB8E4043E19C9E040007F01003778-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--82EFB8E4043E19C9E040007F01003778--></AD_COLUMN>
 
 <!--82EFB8E4043F19C9E040007F01003778--><AD_COLUMN>
@@ -4766,6 +4979,7 @@
 <!--82EFB8E4043F19C9E040007F01003778-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--82EFB8E4043F19C9E040007F01003778-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--82EFB8E4043F19C9E040007F01003778-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--82EFB8E4043F19C9E040007F01003778-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--82EFB8E4043F19C9E040007F01003778--></AD_COLUMN>
 
 <!--82EFB8E4044019C9E040007F01003778--><AD_COLUMN>
@@ -4803,6 +5017,7 @@
 <!--82EFB8E4044019C9E040007F01003778-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--82EFB8E4044019C9E040007F01003778-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--82EFB8E4044019C9E040007F01003778-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--82EFB8E4044019C9E040007F01003778-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--82EFB8E4044019C9E040007F01003778--></AD_COLUMN>
 
 <!--82EFB8E4044119C9E040007F01003778--><AD_COLUMN>
@@ -4840,6 +5055,7 @@
 <!--82EFB8E4044119C9E040007F01003778-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--82EFB8E4044119C9E040007F01003778-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--82EFB8E4044119C9E040007F01003778-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--82EFB8E4044119C9E040007F01003778-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--82EFB8E4044119C9E040007F01003778--></AD_COLUMN>
 
 <!--82EFB8E4044219C9E040007F01003778--><AD_COLUMN>
@@ -4877,6 +5093,7 @@
 <!--82EFB8E4044219C9E040007F01003778-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--82EFB8E4044219C9E040007F01003778-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--82EFB8E4044219C9E040007F01003778-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--82EFB8E4044219C9E040007F01003778-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--82EFB8E4044219C9E040007F01003778--></AD_COLUMN>
 
 <!--82EFB8E4044319C9E040007F01003778--><AD_COLUMN>
@@ -4916,6 +5133,7 @@
 <!--82EFB8E4044319C9E040007F01003778-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--82EFB8E4044319C9E040007F01003778-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--82EFB8E4044319C9E040007F01003778-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--82EFB8E4044319C9E040007F01003778-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--82EFB8E4044319C9E040007F01003778--></AD_COLUMN>
 
 <!--82EFB8E4044419C9E040007F01003778--><AD_COLUMN>
@@ -4953,6 +5171,7 @@
 <!--82EFB8E4044419C9E040007F01003778-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--82EFB8E4044419C9E040007F01003778-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--82EFB8E4044419C9E040007F01003778-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--82EFB8E4044419C9E040007F01003778-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--82EFB8E4044419C9E040007F01003778--></AD_COLUMN>
 
 <!--82EFB8E4044519C9E040007F01003778--><AD_COLUMN>
@@ -4990,6 +5209,7 @@
 <!--82EFB8E4044519C9E040007F01003778-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--82EFB8E4044519C9E040007F01003778-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--82EFB8E4044519C9E040007F01003778-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--82EFB8E4044519C9E040007F01003778-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--82EFB8E4044519C9E040007F01003778--></AD_COLUMN>
 
 <!--82EFB8E4044819C9E040007F01003778--><AD_COLUMN>
@@ -5029,6 +5249,7 @@
 <!--82EFB8E4044819C9E040007F01003778-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--82EFB8E4044819C9E040007F01003778-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--82EFB8E4044819C9E040007F01003778-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--82EFB8E4044819C9E040007F01003778-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--82EFB8E4044819C9E040007F01003778--></AD_COLUMN>
 
 <!--82EFB8E4044919C9E040007F01003778--><AD_COLUMN>
@@ -5066,6 +5287,7 @@
 <!--82EFB8E4044919C9E040007F01003778-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--82EFB8E4044919C9E040007F01003778-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--82EFB8E4044919C9E040007F01003778-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--82EFB8E4044919C9E040007F01003778-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--82EFB8E4044919C9E040007F01003778--></AD_COLUMN>
 
 <!--82EFB8E4044A19C9E040007F01003778--><AD_COLUMN>
@@ -5103,6 +5325,7 @@
 <!--82EFB8E4044A19C9E040007F01003778-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--82EFB8E4044A19C9E040007F01003778-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--82EFB8E4044A19C9E040007F01003778-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--82EFB8E4044A19C9E040007F01003778-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--82EFB8E4044A19C9E040007F01003778--></AD_COLUMN>
 
 <!--82EFB8E4044B19C9E040007F01003778--><AD_COLUMN>
@@ -5140,6 +5363,7 @@
 <!--82EFB8E4044B19C9E040007F01003778-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--82EFB8E4044B19C9E040007F01003778-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--82EFB8E4044B19C9E040007F01003778-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--82EFB8E4044B19C9E040007F01003778-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--82EFB8E4044B19C9E040007F01003778--></AD_COLUMN>
 
 <!--82EFB8E4044C19C9E040007F01003778--><AD_COLUMN>
@@ -5177,6 +5401,7 @@
 <!--82EFB8E4044C19C9E040007F01003778-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--82EFB8E4044C19C9E040007F01003778-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--82EFB8E4044C19C9E040007F01003778-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--82EFB8E4044C19C9E040007F01003778-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--82EFB8E4044C19C9E040007F01003778--></AD_COLUMN>
 
 <!--82EFB8E4044D19C9E040007F01003778--><AD_COLUMN>
@@ -5215,6 +5440,7 @@
 <!--82EFB8E4044D19C9E040007F01003778-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--82EFB8E4044D19C9E040007F01003778-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--82EFB8E4044D19C9E040007F01003778-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--82EFB8E4044D19C9E040007F01003778-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--82EFB8E4044D19C9E040007F01003778--></AD_COLUMN>
 
 <!--82EFB8E4044E19C9E040007F01003778--><AD_COLUMN>
@@ -5252,6 +5478,7 @@
 <!--82EFB8E4044E19C9E040007F01003778-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--82EFB8E4044E19C9E040007F01003778-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--82EFB8E4044E19C9E040007F01003778-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--82EFB8E4044E19C9E040007F01003778-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--82EFB8E4044E19C9E040007F01003778--></AD_COLUMN>
 
 <!--82EFB8E4044F19C9E040007F01003778--><AD_COLUMN>
@@ -5289,6 +5516,7 @@
 <!--82EFB8E4044F19C9E040007F01003778-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--82EFB8E4044F19C9E040007F01003778-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--82EFB8E4044F19C9E040007F01003778-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--82EFB8E4044F19C9E040007F01003778-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--82EFB8E4044F19C9E040007F01003778--></AD_COLUMN>
 
 <!--82EFB8E4045019C9E040007F01003778--><AD_COLUMN>
@@ -5327,6 +5555,7 @@
 <!--82EFB8E4045019C9E040007F01003778-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--82EFB8E4045019C9E040007F01003778-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--82EFB8E4045019C9E040007F01003778-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--82EFB8E4045019C9E040007F01003778-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--82EFB8E4045019C9E040007F01003778--></AD_COLUMN>
 
 <!--82EFB8E4045119C9E040007F01003778--><AD_COLUMN>
@@ -5365,6 +5594,7 @@
 <!--82EFB8E4045119C9E040007F01003778-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--82EFB8E4045119C9E040007F01003778-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--82EFB8E4045119C9E040007F01003778-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--82EFB8E4045119C9E040007F01003778-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--82EFB8E4045119C9E040007F01003778--></AD_COLUMN>
 
 <!--82EFB8E4045219C9E040007F01003778--><AD_COLUMN>
@@ -5403,6 +5633,7 @@
 <!--82EFB8E4045219C9E040007F01003778-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--82EFB8E4045219C9E040007F01003778-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--82EFB8E4045219C9E040007F01003778-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--82EFB8E4045219C9E040007F01003778-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--82EFB8E4045219C9E040007F01003778--></AD_COLUMN>
 
 <!--82EFB8E4045319C9E040007F01003778--><AD_COLUMN>
@@ -5438,6 +5669,7 @@
 <!--82EFB8E4045319C9E040007F01003778-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--82EFB8E4045319C9E040007F01003778-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--82EFB8E4045319C9E040007F01003778-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--82EFB8E4045319C9E040007F01003778-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--82EFB8E4045319C9E040007F01003778--></AD_COLUMN>
 
 <!--82EFB8E4045419C9E040007F01003778--><AD_COLUMN>
@@ -5473,6 +5705,7 @@
 <!--82EFB8E4045419C9E040007F01003778-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--82EFB8E4045419C9E040007F01003778-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--82EFB8E4045419C9E040007F01003778-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--82EFB8E4045419C9E040007F01003778-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--82EFB8E4045419C9E040007F01003778--></AD_COLUMN>
 
 <!--82EFB8E4045519C9E040007F01003778--><AD_COLUMN>
@@ -5508,6 +5741,7 @@
 <!--82EFB8E4045519C9E040007F01003778-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--82EFB8E4045519C9E040007F01003778-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--82EFB8E4045519C9E040007F01003778-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--82EFB8E4045519C9E040007F01003778-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--82EFB8E4045519C9E040007F01003778--></AD_COLUMN>
 
 <!--82EFB8E4045619C9E040007F01003778--><AD_COLUMN>
@@ -5543,6 +5777,7 @@
 <!--82EFB8E4045619C9E040007F01003778-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--82EFB8E4045619C9E040007F01003778-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--82EFB8E4045619C9E040007F01003778-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--82EFB8E4045619C9E040007F01003778-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--82EFB8E4045619C9E040007F01003778--></AD_COLUMN>
 
 <!--82EFB8E4045719C9E040007F01003778--><AD_COLUMN>
@@ -5578,6 +5813,7 @@
 <!--82EFB8E4045719C9E040007F01003778-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--82EFB8E4045719C9E040007F01003778-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--82EFB8E4045719C9E040007F01003778-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--82EFB8E4045719C9E040007F01003778-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--82EFB8E4045719C9E040007F01003778--></AD_COLUMN>
 
 <!--82EFB8E4045819C9E040007F01003778--><AD_COLUMN>
@@ -5613,6 +5849,7 @@
 <!--82EFB8E4045819C9E040007F01003778-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--82EFB8E4045819C9E040007F01003778-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--82EFB8E4045819C9E040007F01003778-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--82EFB8E4045819C9E040007F01003778-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--82EFB8E4045819C9E040007F01003778--></AD_COLUMN>
 
 <!--82EFB8E4045919C9E040007F01003778--><AD_COLUMN>
@@ -5648,6 +5885,7 @@
 <!--82EFB8E4045919C9E040007F01003778-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--82EFB8E4045919C9E040007F01003778-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--82EFB8E4045919C9E040007F01003778-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--82EFB8E4045919C9E040007F01003778-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--82EFB8E4045919C9E040007F01003778--></AD_COLUMN>
 
 <!--82EFB8E4045A19C9E040007F01003778--><AD_COLUMN>
@@ -5683,6 +5921,7 @@
 <!--82EFB8E4045A19C9E040007F01003778-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--82EFB8E4045A19C9E040007F01003778-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--82EFB8E4045A19C9E040007F01003778-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--82EFB8E4045A19C9E040007F01003778-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--82EFB8E4045A19C9E040007F01003778--></AD_COLUMN>
 
 <!--840B34007A574CD783BFF66781E95BAF--><AD_COLUMN>
@@ -5720,6 +5959,7 @@
 <!--840B34007A574CD783BFF66781E95BAF-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--840B34007A574CD783BFF66781E95BAF-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--840B34007A574CD783BFF66781E95BAF-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--840B34007A574CD783BFF66781E95BAF-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--840B34007A574CD783BFF66781E95BAF--></AD_COLUMN>
 
 <!--8433416AB5284F71985361451272CDFB--><AD_COLUMN>
@@ -5755,6 +5995,7 @@
 <!--8433416AB5284F71985361451272CDFB-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--8433416AB5284F71985361451272CDFB-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--8433416AB5284F71985361451272CDFB-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--8433416AB5284F71985361451272CDFB-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--8433416AB5284F71985361451272CDFB--></AD_COLUMN>
 
 <!--8448D679EF655513E040007F01001B17--><AD_COLUMN>
@@ -5793,6 +6034,7 @@
 <!--8448D679EF655513E040007F01001B17-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--8448D679EF655513E040007F01001B17-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--8448D679EF655513E040007F01001B17-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--8448D679EF655513E040007F01001B17-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--8448D679EF655513E040007F01001B17--></AD_COLUMN>
 
 <!--844A91AC221A39D5E040007F01003A12--><AD_COLUMN>
@@ -5828,6 +6070,7 @@
 <!--844A91AC221A39D5E040007F01003A12-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--844A91AC221A39D5E040007F01003A12-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--844A91AC221A39D5E040007F01003A12-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--844A91AC221A39D5E040007F01003A12-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--844A91AC221A39D5E040007F01003A12--></AD_COLUMN>
 
 <!--8505522E56C849E1B76AD10840AB2AA8--><AD_COLUMN>
@@ -5867,6 +6110,7 @@
 <!--8505522E56C849E1B76AD10840AB2AA8-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--8505522E56C849E1B76AD10840AB2AA8-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--8505522E56C849E1B76AD10840AB2AA8-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--8505522E56C849E1B76AD10840AB2AA8-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--8505522E56C849E1B76AD10840AB2AA8--></AD_COLUMN>
 
 <!--8593F1CA9C1B4F47B65B579DB308432D--><AD_COLUMN>
@@ -5906,6 +6150,7 @@
 <!--8593F1CA9C1B4F47B65B579DB308432D-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--8593F1CA9C1B4F47B65B579DB308432D-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--8593F1CA9C1B4F47B65B579DB308432D-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--8593F1CA9C1B4F47B65B579DB308432D-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--8593F1CA9C1B4F47B65B579DB308432D--></AD_COLUMN>
 
 <!--85CFAF08A714472C82A6CC014B4F5B66--><AD_COLUMN>
@@ -5941,6 +6186,7 @@
 <!--85CFAF08A714472C82A6CC014B4F5B66-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--85CFAF08A714472C82A6CC014B4F5B66-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--85CFAF08A714472C82A6CC014B4F5B66-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--85CFAF08A714472C82A6CC014B4F5B66-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--85CFAF08A714472C82A6CC014B4F5B66--></AD_COLUMN>
 
 <!--8635C3EED34F4A28864E6F4C9A8FE957--><AD_COLUMN>
@@ -5978,6 +6224,7 @@
 <!--8635C3EED34F4A28864E6F4C9A8FE957-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--8635C3EED34F4A28864E6F4C9A8FE957-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--8635C3EED34F4A28864E6F4C9A8FE957-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--8635C3EED34F4A28864E6F4C9A8FE957-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--8635C3EED34F4A28864E6F4C9A8FE957--></AD_COLUMN>
 
 <!--87AA1068F10642CAE040007F010011D5--><AD_COLUMN>
@@ -6014,6 +6261,7 @@
 <!--87AA1068F10642CAE040007F010011D5-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--87AA1068F10642CAE040007F010011D5-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--87AA1068F10642CAE040007F010011D5-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--87AA1068F10642CAE040007F010011D5-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--87AA1068F10642CAE040007F010011D5--></AD_COLUMN>
 
 <!--87E684342B43AC4CE040007F010047EE--><AD_COLUMN>
@@ -6050,6 +6298,7 @@
 <!--87E684342B43AC4CE040007F010047EE-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--87E684342B43AC4CE040007F010047EE-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--87E684342B43AC4CE040007F010047EE-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--87E684342B43AC4CE040007F010047EE-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--87E684342B43AC4CE040007F010047EE--></AD_COLUMN>
 
 <!--88BA3C1BFC7D43B2A223EE749A88C554--><AD_COLUMN>
@@ -6087,6 +6336,7 @@
 <!--88BA3C1BFC7D43B2A223EE749A88C554-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--88BA3C1BFC7D43B2A223EE749A88C554-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--88BA3C1BFC7D43B2A223EE749A88C554-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--88BA3C1BFC7D43B2A223EE749A88C554-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--88BA3C1BFC7D43B2A223EE749A88C554--></AD_COLUMN>
 
 <!--89FF61CD0ABD41C6A65550990E1B0E66--><AD_COLUMN>
@@ -6123,6 +6373,7 @@
 <!--89FF61CD0ABD41C6A65550990E1B0E66-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--89FF61CD0ABD41C6A65550990E1B0E66-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--89FF61CD0ABD41C6A65550990E1B0E66-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--89FF61CD0ABD41C6A65550990E1B0E66-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--89FF61CD0ABD41C6A65550990E1B0E66-->  <EM_OBUIAPP_PROCESS_ID><![CDATA[4EEB3497082C4F2182E16A4371CD5D96]]></EM_OBUIAPP_PROCESS_ID>
 <!--89FF61CD0ABD41C6A65550990E1B0E66--></AD_COLUMN>
 
@@ -6162,6 +6413,7 @@
 <!--8B33BDCEC5CC255CE040007F01004CB5-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--8B33BDCEC5CC255CE040007F01004CB5-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--8B33BDCEC5CC255CE040007F01004CB5-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--8B33BDCEC5CC255CE040007F01004CB5-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--8B33BDCEC5CC255CE040007F01004CB5--></AD_COLUMN>
 
 <!--8BBA8047E1852A2FE040007F010030DC--><AD_COLUMN>
@@ -6197,6 +6449,7 @@
 <!--8BBA8047E1852A2FE040007F010030DC-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--8BBA8047E1852A2FE040007F010030DC-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--8BBA8047E1852A2FE040007F010030DC-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--8BBA8047E1852A2FE040007F010030DC-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--8BBA8047E1852A2FE040007F010030DC--></AD_COLUMN>
 
 <!--8BBA8047E1862A2FE040007F010030DC--><AD_COLUMN>
@@ -6236,6 +6489,7 @@
 <!--8BBA8047E1862A2FE040007F010030DC-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--8BBA8047E1862A2FE040007F010030DC-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--8BBA8047E1862A2FE040007F010030DC-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--8BBA8047E1862A2FE040007F010030DC-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--8BBA8047E1862A2FE040007F010030DC--></AD_COLUMN>
 
 <!--8BBA8047E1872A2FE040007F010030DC--><AD_COLUMN>
@@ -6275,6 +6529,7 @@
 <!--8BBA8047E1872A2FE040007F010030DC-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--8BBA8047E1872A2FE040007F010030DC-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--8BBA8047E1872A2FE040007F010030DC-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--8BBA8047E1872A2FE040007F010030DC-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--8BBA8047E1872A2FE040007F010030DC--></AD_COLUMN>
 
 <!--8BBA8047E1882A2FE040007F010030DC--><AD_COLUMN>
@@ -6313,6 +6568,7 @@
 <!--8BBA8047E1882A2FE040007F010030DC-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--8BBA8047E1882A2FE040007F010030DC-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--8BBA8047E1882A2FE040007F010030DC-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--8BBA8047E1882A2FE040007F010030DC-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--8BBA8047E1882A2FE040007F010030DC--></AD_COLUMN>
 
 <!--8BBA8047E1892A2FE040007F010030DC--><AD_COLUMN>
@@ -6350,6 +6606,7 @@
 <!--8BBA8047E1892A2FE040007F010030DC-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--8BBA8047E1892A2FE040007F010030DC-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--8BBA8047E1892A2FE040007F010030DC-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--8BBA8047E1892A2FE040007F010030DC-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--8BBA8047E1892A2FE040007F010030DC--></AD_COLUMN>
 
 <!--8BBA8047E18A2A2FE040007F010030DC--><AD_COLUMN>
@@ -6388,6 +6645,7 @@
 <!--8BBA8047E18A2A2FE040007F010030DC-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--8BBA8047E18A2A2FE040007F010030DC-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--8BBA8047E18A2A2FE040007F010030DC-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--8BBA8047E18A2A2FE040007F010030DC-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--8BBA8047E18A2A2FE040007F010030DC--></AD_COLUMN>
 
 <!--8BBA8047E18B2A2FE040007F010030DC--><AD_COLUMN>
@@ -6425,6 +6683,7 @@
 <!--8BBA8047E18B2A2FE040007F010030DC-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--8BBA8047E18B2A2FE040007F010030DC-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--8BBA8047E18B2A2FE040007F010030DC-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--8BBA8047E18B2A2FE040007F010030DC-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--8BBA8047E18B2A2FE040007F010030DC--></AD_COLUMN>
 
 <!--8BBA8047E18C2A2FE040007F010030DC--><AD_COLUMN>
@@ -6465,6 +6724,7 @@
 <!--8BBA8047E18C2A2FE040007F010030DC-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--8BBA8047E18C2A2FE040007F010030DC-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--8BBA8047E18C2A2FE040007F010030DC-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--8BBA8047E18C2A2FE040007F010030DC-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--8BBA8047E18C2A2FE040007F010030DC--></AD_COLUMN>
 
 <!--8BBA8047E18D2A2FE040007F010030DC--><AD_COLUMN>
@@ -6502,6 +6762,7 @@
 <!--8BBA8047E18D2A2FE040007F010030DC-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--8BBA8047E18D2A2FE040007F010030DC-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--8BBA8047E18D2A2FE040007F010030DC-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--8BBA8047E18D2A2FE040007F010030DC-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--8BBA8047E18D2A2FE040007F010030DC--></AD_COLUMN>
 
 <!--8BBA8047E18E2A2FE040007F010030DC--><AD_COLUMN>
@@ -6539,6 +6800,7 @@
 <!--8BBA8047E18E2A2FE040007F010030DC-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--8BBA8047E18E2A2FE040007F010030DC-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--8BBA8047E18E2A2FE040007F010030DC-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--8BBA8047E18E2A2FE040007F010030DC-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--8BBA8047E18E2A2FE040007F010030DC--></AD_COLUMN>
 
 <!--8BBA8047E18F2A2FE040007F010030DC--><AD_COLUMN>
@@ -6575,6 +6837,7 @@
 <!--8BBA8047E18F2A2FE040007F010030DC-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--8BBA8047E18F2A2FE040007F010030DC-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--8BBA8047E18F2A2FE040007F010030DC-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--8BBA8047E18F2A2FE040007F010030DC-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--8BBA8047E18F2A2FE040007F010030DC--></AD_COLUMN>
 
 <!--8BBA8047E1902A2FE040007F010030DC--><AD_COLUMN>
@@ -6613,6 +6876,7 @@
 <!--8BBA8047E1902A2FE040007F010030DC-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--8BBA8047E1902A2FE040007F010030DC-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--8BBA8047E1902A2FE040007F010030DC-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--8BBA8047E1902A2FE040007F010030DC-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--8BBA8047E1902A2FE040007F010030DC--></AD_COLUMN>
 
 <!--8BFE5B396F1743BBB9CDC7F821E5EF89--><AD_COLUMN>
@@ -6650,6 +6914,7 @@
 <!--8BFE5B396F1743BBB9CDC7F821E5EF89-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--8BFE5B396F1743BBB9CDC7F821E5EF89-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--8BFE5B396F1743BBB9CDC7F821E5EF89-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--8BFE5B396F1743BBB9CDC7F821E5EF89-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--8BFE5B396F1743BBB9CDC7F821E5EF89--></AD_COLUMN>
 
 <!--8CC5F550529A4F95AAC174A230361A08--><AD_COLUMN>
@@ -6686,6 +6951,7 @@
 <!--8CC5F550529A4F95AAC174A230361A08-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--8CC5F550529A4F95AAC174A230361A08-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--8CC5F550529A4F95AAC174A230361A08-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--8CC5F550529A4F95AAC174A230361A08-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--8CC5F550529A4F95AAC174A230361A08--></AD_COLUMN>
 
 <!--8DEAEE4918C64D0AA2CFE36695F4C3E4--><AD_COLUMN>
@@ -6723,6 +6989,7 @@
 <!--8DEAEE4918C64D0AA2CFE36695F4C3E4-->  <ENTITY_ALIAS><![CDATA[COALESCE(inv.businessPartner.id, ord.businessPartner.id)]]></ENTITY_ALIAS>
 <!--8DEAEE4918C64D0AA2CFE36695F4C3E4-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--8DEAEE4918C64D0AA2CFE36695F4C3E4-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--8DEAEE4918C64D0AA2CFE36695F4C3E4-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--8DEAEE4918C64D0AA2CFE36695F4C3E4--></AD_COLUMN>
 
 <!--90282A7E59A24C5AA3E030D91B622863--><AD_COLUMN>
@@ -6759,6 +7026,7 @@
 <!--90282A7E59A24C5AA3E030D91B622863-->  <ENTITY_ALIAS><![CDATA[@expectedAmount@]]></ENTITY_ALIAS>
 <!--90282A7E59A24C5AA3E030D91B622863-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--90282A7E59A24C5AA3E030D91B622863-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--90282A7E59A24C5AA3E030D91B622863-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--90282A7E59A24C5AA3E030D91B622863--></AD_COLUMN>
 
 <!--91BC2133F04647938F702192A5156C25--><AD_COLUMN>
@@ -6794,6 +7062,7 @@
 <!--91BC2133F04647938F702192A5156C25-->  <SQLLOGIC><![CDATA[(SELECT count(*) FROM fin_finacc_transaction t,  fin_reconciliation rec WHERE (t.fin_reconciliation_id IS NULL OR (EXISTS ( SELECT 1 FROM fin_reconciliation r WHERE r.dateto > rec.dateto AND t.fin_reconciliation_id  = r.fin_reconciliation_id ))) AND t.statementdate <= rec.dateto AND t.paymentamt <> 0 AND t.fin_financial_account_id  = rec.fin_financial_account_id AND rec.fin_reconciliation_id = fin_reconciliation_id) ]]></SQLLOGIC>
 <!--91BC2133F04647938F702192A5156C25-->  <ALLOWSORTING><![CDATA[N]]></ALLOWSORTING>
 <!--91BC2133F04647938F702192A5156C25-->  <ALLOWFILTERING><![CDATA[N]]></ALLOWFILTERING>
+<!--91BC2133F04647938F702192A5156C25-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--91BC2133F04647938F702192A5156C25--></AD_COLUMN>
 
 <!--923F5B228E5F4D2D96C00C206D47BC63--><AD_COLUMN>
@@ -6831,6 +7100,7 @@
 <!--923F5B228E5F4D2D96C00C206D47BC63-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--923F5B228E5F4D2D96C00C206D47BC63-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--923F5B228E5F4D2D96C00C206D47BC63-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--923F5B228E5F4D2D96C00C206D47BC63-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--923F5B228E5F4D2D96C00C206D47BC63--></AD_COLUMN>
 
 <!--93594C4F00A0493595AFD76D7BB64D06--><AD_COLUMN>
@@ -6868,6 +7138,7 @@
 <!--93594C4F00A0493595AFD76D7BB64D06-->  <ENTITY_ALIAS><![CDATA[e.description]]></ENTITY_ALIAS>
 <!--93594C4F00A0493595AFD76D7BB64D06-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--93594C4F00A0493595AFD76D7BB64D06-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--93594C4F00A0493595AFD76D7BB64D06-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--93594C4F00A0493595AFD76D7BB64D06--></AD_COLUMN>
 
 <!--93E0298CEA7A446B863D7D3456A1157E--><AD_COLUMN>
@@ -6905,6 +7176,7 @@
 <!--93E0298CEA7A446B863D7D3456A1157E-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--93E0298CEA7A446B863D7D3456A1157E-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--93E0298CEA7A446B863D7D3456A1157E-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--93E0298CEA7A446B863D7D3456A1157E-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--93E0298CEA7A446B863D7D3456A1157E--></AD_COLUMN>
 
 <!--952500641B5A4EC8883B5204EC4870ED--><AD_COLUMN>
@@ -6942,6 +7214,7 @@
 <!--952500641B5A4EC8883B5204EC4870ED-->  <ENTITY_ALIAS><![CDATA[bsl.bpartnername]]></ENTITY_ALIAS>
 <!--952500641B5A4EC8883B5204EC4870ED-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--952500641B5A4EC8883B5204EC4870ED-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--952500641B5A4EC8883B5204EC4870ED--></AD_COLUMN>
 
 <!--96221416E24540059B9BEFEC5F09D3FF--><AD_COLUMN>
@@ -6979,6 +7252,7 @@
 <!--96221416E24540059B9BEFEC5F09D3FF-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--96221416E24540059B9BEFEC5F09D3FF-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--96221416E24540059B9BEFEC5F09D3FF-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--96221416E24540059B9BEFEC5F09D3FF-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--96221416E24540059B9BEFEC5F09D3FF--></AD_COLUMN>
 
 <!--96D95B505F9A4FB69A8E0623DCA0B2F1--><AD_COLUMN>
@@ -7016,6 +7290,7 @@
 <!--96D95B505F9A4FB69A8E0623DCA0B2F1-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--96D95B505F9A4FB69A8E0623DCA0B2F1-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--96D95B505F9A4FB69A8E0623DCA0B2F1-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--96D95B505F9A4FB69A8E0623DCA0B2F1-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--96D95B505F9A4FB69A8E0623DCA0B2F1--></AD_COLUMN>
 
 <!--96FCBC023628449291C1F502F811E0A0--><AD_COLUMN>
@@ -7053,6 +7328,7 @@
 <!--96FCBC023628449291C1F502F811E0A0-->  <ENTITY_ALIAS><![CDATA[f.description]]></ENTITY_ALIAS>
 <!--96FCBC023628449291C1F502F811E0A0-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--96FCBC023628449291C1F502F811E0A0-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--96FCBC023628449291C1F502F811E0A0-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--96FCBC023628449291C1F502F811E0A0--></AD_COLUMN>
 
 <!--973EC2D699E948979150D33750F5D35D--><AD_COLUMN>
@@ -7090,6 +7366,7 @@
 <!--973EC2D699E948979150D33750F5D35D-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--973EC2D699E948979150D33750F5D35D-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--973EC2D699E948979150D33750F5D35D-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--973EC2D699E948979150D33750F5D35D-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--973EC2D699E948979150D33750F5D35D-->  <EM_OBUIAPP_PROCESS_ID><![CDATA[8D0D32CC819E449D9A08E0459B482963]]></EM_OBUIAPP_PROCESS_ID>
 <!--973EC2D699E948979150D33750F5D35D--></AD_COLUMN>
 
@@ -7123,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>
@@ -7131,6 +7408,7 @@
 <!--986B657361F64EB59F7991710E6CBD71-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--986B657361F64EB59F7991710E6CBD71-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--986B657361F64EB59F7991710E6CBD71-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--986B657361F64EB59F7991710E6CBD71-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--986B657361F64EB59F7991710E6CBD71--></AD_COLUMN>
 
 <!--996C9CE70A9241C1AECF8970F4C32B93--><AD_COLUMN>
@@ -7168,6 +7446,7 @@
 <!--996C9CE70A9241C1AECF8970F4C32B93-->  <ENTITY_ALIAS><![CDATA[case when bp is null then bsl.bpartnername  else bp.name end]]></ENTITY_ALIAS>
 <!--996C9CE70A9241C1AECF8970F4C32B93-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--996C9CE70A9241C1AECF8970F4C32B93-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--996C9CE70A9241C1AECF8970F4C32B93-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--996C9CE70A9241C1AECF8970F4C32B93--></AD_COLUMN>
 
 <!--9B79431378824521850D2764C348755B--><AD_COLUMN>
@@ -7203,6 +7482,7 @@
 <!--9B79431378824521850D2764C348755B-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--9B79431378824521850D2764C348755B-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--9B79431378824521850D2764C348755B-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--9B79431378824521850D2764C348755B-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--9B79431378824521850D2764C348755B--></AD_COLUMN>
 
 <!--9C433E7381EA44DF921BB340EE41BDEA--><AD_COLUMN>
@@ -7240,6 +7520,7 @@
 <!--9C433E7381EA44DF921BB340EE41BDEA-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--9C433E7381EA44DF921BB340EE41BDEA-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--9C433E7381EA44DF921BB340EE41BDEA-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--9C433E7381EA44DF921BB340EE41BDEA-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--9C433E7381EA44DF921BB340EE41BDEA--></AD_COLUMN>
 
 <!--9C4FD145923A42C5BE399865AA3A2602--><AD_COLUMN>
@@ -7277,6 +7558,7 @@
 <!--9C4FD145923A42C5BE399865AA3A2602-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--9C4FD145923A42C5BE399865AA3A2602-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--9C4FD145923A42C5BE399865AA3A2602-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--9C4FD145923A42C5BE399865AA3A2602-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--9C4FD145923A42C5BE399865AA3A2602--></AD_COLUMN>
 
 <!--9D382AE31EFB4496B0A531A0FD72E73B--><AD_COLUMN>
@@ -7314,6 +7596,7 @@
 <!--9D382AE31EFB4496B0A531A0FD72E73B-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--9D382AE31EFB4496B0A531A0FD72E73B-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--9D382AE31EFB4496B0A531A0FD72E73B-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--9D382AE31EFB4496B0A531A0FD72E73B-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--9D382AE31EFB4496B0A531A0FD72E73B--></AD_COLUMN>
 
 <!--9DC8500B414640E09BF61A3D14FE13D1--><AD_COLUMN>
@@ -7349,6 +7632,7 @@
 <!--9DC8500B414640E09BF61A3D14FE13D1-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--9DC8500B414640E09BF61A3D14FE13D1-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--9DC8500B414640E09BF61A3D14FE13D1-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--9DC8500B414640E09BF61A3D14FE13D1-->  <EM_OBUIAPP_PROCESS_ID><![CDATA[86F0B1EBE2BC48E3ACF458768D14CC99]]></EM_OBUIAPP_PROCESS_ID>
 <!--9DC8500B414640E09BF61A3D14FE13D1--></AD_COLUMN>
 
@@ -7384,6 +7668,7 @@
 <!--9E09394A2E0F402489D28053F5D3F111-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--9E09394A2E0F402489D28053F5D3F111-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--9E09394A2E0F402489D28053F5D3F111-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--9E09394A2E0F402489D28053F5D3F111-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--9E09394A2E0F402489D28053F5D3F111--></AD_COLUMN>
 
 <!--9F743BADE8594151A5A1F82F001DAA5F--><AD_COLUMN>
@@ -7422,6 +7707,7 @@
 <!--9F743BADE8594151A5A1F82F001DAA5F-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--9F743BADE8594151A5A1F82F001DAA5F-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--9F743BADE8594151A5A1F82F001DAA5F-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--9F743BADE8594151A5A1F82F001DAA5F-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--9F743BADE8594151A5A1F82F001DAA5F--></AD_COLUMN>
 
 <!--9F8A320C84EF4D0982F8F6D032789CE1--><AD_COLUMN>
@@ -7457,6 +7743,7 @@
 <!--9F8A320C84EF4D0982F8F6D032789CE1-->  <ENTITY_ALIAS><![CDATA[f.id]]></ENTITY_ALIAS>
 <!--9F8A320C84EF4D0982F8F6D032789CE1-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--9F8A320C84EF4D0982F8F6D032789CE1-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--9F8A320C84EF4D0982F8F6D032789CE1-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--9F8A320C84EF4D0982F8F6D032789CE1--></AD_COLUMN>
 
 <!--A028C06E679F6F62E040007F01007206--><AD_COLUMN>
@@ -7495,6 +7782,7 @@
 <!--A028C06E679F6F62E040007F01007206-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A028C06E679F6F62E040007F01007206-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A028C06E679F6F62E040007F01007206-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A028C06E679F6F62E040007F01007206-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A028C06E679F6F62E040007F01007206--></AD_COLUMN>
 
 <!--A028C07508878CB9E040007F01007210--><AD_COLUMN>
@@ -7532,6 +7820,7 @@
 <!--A028C07508878CB9E040007F01007210-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A028C07508878CB9E040007F01007210-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A028C07508878CB9E040007F01007210-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A028C07508878CB9E040007F01007210-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A028C07508878CB9E040007F01007210--></AD_COLUMN>
 
 <!--A04179EAC69DF848E040007F01004523--><AD_COLUMN>
@@ -7567,6 +7856,7 @@
 <!--A04179EAC69DF848E040007F01004523-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A04179EAC69DF848E040007F01004523-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A04179EAC69DF848E040007F01004523-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A04179EAC69DF848E040007F01004523-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A04179EAC69DF848E040007F01004523-->  <EM_OBUIAPP_PROCESS_ID><![CDATA[86F0B1EBE2BC48E3ACF458768D14CC99]]></EM_OBUIAPP_PROCESS_ID>
 <!--A04179EAC69DF848E040007F01004523--></AD_COLUMN>
 
@@ -7604,6 +7894,7 @@
 <!--A04179EAC69EF848E040007F01004523-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A04179EAC69EF848E040007F01004523-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A04179EAC69EF848E040007F01004523-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A04179EAC69EF848E040007F01004523-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A04179EAC69EF848E040007F01004523--></AD_COLUMN>
 
 <!--A04179EAC69FF848E040007F01004523--><AD_COLUMN>
@@ -7642,6 +7933,7 @@
 <!--A04179EAC69FF848E040007F01004523-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A04179EAC69FF848E040007F01004523-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A04179EAC69FF848E040007F01004523-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A04179EAC69FF848E040007F01004523-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A04179EAC69FF848E040007F01004523--></AD_COLUMN>
 
 <!--A13138E3D6E44C72A7F24B7AA9365B37--><AD_COLUMN>
@@ -7679,6 +7971,7 @@
 <!--A13138E3D6E44C72A7F24B7AA9365B37-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A13138E3D6E44C72A7F24B7AA9365B37-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A13138E3D6E44C72A7F24B7AA9365B37-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A13138E3D6E44C72A7F24B7AA9365B37-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A13138E3D6E44C72A7F24B7AA9365B37--></AD_COLUMN>
 
 <!--A2622D5C7B194885A112B0FC5765C55E--><AD_COLUMN>
@@ -7716,6 +8009,7 @@
 <!--A2622D5C7B194885A112B0FC5765C55E-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A2622D5C7B194885A112B0FC5765C55E-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A2622D5C7B194885A112B0FC5765C55E-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A2622D5C7B194885A112B0FC5765C55E-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A2622D5C7B194885A112B0FC5765C55E--></AD_COLUMN>
 
 <!--A28B0A82995C87F5E040007F010067A0--><AD_COLUMN>
@@ -7754,6 +8048,7 @@
 <!--A28B0A82995C87F5E040007F010067A0-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A28B0A82995C87F5E040007F010067A0-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A28B0A82995C87F5E040007F010067A0-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A28B0A82995C87F5E040007F010067A0-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A28B0A82995C87F5E040007F010067A0--></AD_COLUMN>
 
 <!--A37C6F84AA1E3F50E040007F01006E35--><AD_COLUMN>
@@ -7789,6 +8084,7 @@
 <!--A37C6F84AA1E3F50E040007F01006E35-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A37C6F84AA1E3F50E040007F01006E35-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A37C6F84AA1E3F50E040007F01006E35-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A37C6F84AA1E3F50E040007F01006E35-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A37C6F84AA1E3F50E040007F01006E35--></AD_COLUMN>
 
 <!--A37C6F84AA1F3F50E040007F01006E35--><AD_COLUMN>
@@ -7824,6 +8120,7 @@
 <!--A37C6F84AA1F3F50E040007F01006E35-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A37C6F84AA1F3F50E040007F01006E35-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A37C6F84AA1F3F50E040007F01006E35-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A37C6F84AA1F3F50E040007F01006E35-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A37C6F84AA1F3F50E040007F01006E35--></AD_COLUMN>
 
 <!--A37C6F84AA203F50E040007F01006E35--><AD_COLUMN>
@@ -7862,6 +8159,7 @@
 <!--A37C6F84AA203F50E040007F01006E35-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A37C6F84AA203F50E040007F01006E35-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A37C6F84AA203F50E040007F01006E35-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A37C6F84AA203F50E040007F01006E35-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A37C6F84AA203F50E040007F01006E35--></AD_COLUMN>
 
 <!--A37C6F84AA213F50E040007F01006E35--><AD_COLUMN>
@@ -7900,6 +8198,7 @@
 <!--A37C6F84AA213F50E040007F01006E35-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A37C6F84AA213F50E040007F01006E35-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A37C6F84AA213F50E040007F01006E35-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A37C6F84AA213F50E040007F01006E35-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A37C6F84AA213F50E040007F01006E35--></AD_COLUMN>
 
 <!--A37C6F84AA223F50E040007F01006E35--><AD_COLUMN>
@@ -7939,6 +8238,7 @@
 <!--A37C6F84AA223F50E040007F01006E35-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A37C6F84AA223F50E040007F01006E35-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A37C6F84AA223F50E040007F01006E35-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A37C6F84AA223F50E040007F01006E35-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A37C6F84AA223F50E040007F01006E35--></AD_COLUMN>
 
 <!--A37C6F84AA233F50E040007F01006E35--><AD_COLUMN>
@@ -7976,6 +8276,7 @@
 <!--A37C6F84AA233F50E040007F01006E35-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A37C6F84AA233F50E040007F01006E35-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A37C6F84AA233F50E040007F01006E35-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A37C6F84AA233F50E040007F01006E35-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A37C6F84AA233F50E040007F01006E35--></AD_COLUMN>
 
 <!--A37C6F84AA243F50E040007F01006E35--><AD_COLUMN>
@@ -8013,6 +8314,7 @@
 <!--A37C6F84AA243F50E040007F01006E35-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A37C6F84AA243F50E040007F01006E35-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A37C6F84AA243F50E040007F01006E35-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A37C6F84AA243F50E040007F01006E35-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A37C6F84AA243F50E040007F01006E35--></AD_COLUMN>
 
 <!--A37C6F84AA253F50E040007F01006E35--><AD_COLUMN>
@@ -8050,6 +8352,7 @@
 <!--A37C6F84AA253F50E040007F01006E35-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A37C6F84AA253F50E040007F01006E35-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A37C6F84AA253F50E040007F01006E35-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A37C6F84AA253F50E040007F01006E35-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A37C6F84AA253F50E040007F01006E35--></AD_COLUMN>
 
 <!--A37C6F84AA263F50E040007F01006E35--><AD_COLUMN>
@@ -8087,6 +8390,7 @@
 <!--A37C6F84AA263F50E040007F01006E35-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A37C6F84AA263F50E040007F01006E35-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A37C6F84AA263F50E040007F01006E35-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A37C6F84AA263F50E040007F01006E35-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A37C6F84AA263F50E040007F01006E35--></AD_COLUMN>
 
 <!--A37C6F84AA273F50E040007F01006E35--><AD_COLUMN>
@@ -8124,6 +8428,7 @@
 <!--A37C6F84AA273F50E040007F01006E35-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A37C6F84AA273F50E040007F01006E35-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A37C6F84AA273F50E040007F01006E35-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A37C6F84AA273F50E040007F01006E35-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A37C6F84AA273F50E040007F01006E35--></AD_COLUMN>
 
 <!--A37C6F84AA283F50E040007F01006E35--><AD_COLUMN>
@@ -8162,6 +8467,7 @@
 <!--A37C6F84AA283F50E040007F01006E35-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A37C6F84AA283F50E040007F01006E35-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A37C6F84AA283F50E040007F01006E35-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A37C6F84AA283F50E040007F01006E35-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A37C6F84AA283F50E040007F01006E35--></AD_COLUMN>
 
 <!--A37C6F84AA293F50E040007F01006E35--><AD_COLUMN>
@@ -8199,6 +8505,7 @@
 <!--A37C6F84AA293F50E040007F01006E35-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A37C6F84AA293F50E040007F01006E35-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A37C6F84AA293F50E040007F01006E35-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A37C6F84AA293F50E040007F01006E35-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A37C6F84AA293F50E040007F01006E35--></AD_COLUMN>
 
 <!--A37C6F84AA2A3F50E040007F01006E35--><AD_COLUMN>
@@ -8236,6 +8543,7 @@
 <!--A37C6F84AA2A3F50E040007F01006E35-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A37C6F84AA2A3F50E040007F01006E35-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A37C6F84AA2A3F50E040007F01006E35-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A37C6F84AA2A3F50E040007F01006E35-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A37C6F84AA2A3F50E040007F01006E35--></AD_COLUMN>
 
 <!--A37C6F84AA2B3F50E040007F01006E35--><AD_COLUMN>
@@ -8274,6 +8582,7 @@
 <!--A37C6F84AA2B3F50E040007F01006E35-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A37C6F84AA2B3F50E040007F01006E35-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A37C6F84AA2B3F50E040007F01006E35-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A37C6F84AA2B3F50E040007F01006E35-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A37C6F84AA2B3F50E040007F01006E35--></AD_COLUMN>
 
 <!--A37C6F84AA2C3F50E040007F01006E35--><AD_COLUMN>
@@ -8311,6 +8620,7 @@
 <!--A37C6F84AA2C3F50E040007F01006E35-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A37C6F84AA2C3F50E040007F01006E35-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A37C6F84AA2C3F50E040007F01006E35-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A37C6F84AA2C3F50E040007F01006E35-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A37C6F84AA2C3F50E040007F01006E35--></AD_COLUMN>
 
 <!--A37C6F84AA2D3F50E040007F01006E35--><AD_COLUMN>
@@ -8348,6 +8658,7 @@
 <!--A37C6F84AA2D3F50E040007F01006E35-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A37C6F84AA2D3F50E040007F01006E35-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A37C6F84AA2D3F50E040007F01006E35-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A37C6F84AA2D3F50E040007F01006E35-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A37C6F84AA2D3F50E040007F01006E35--></AD_COLUMN>
 
 <!--A37C6F84AA2E3F50E040007F01006E35--><AD_COLUMN>
@@ -8383,6 +8694,7 @@
 <!--A37C6F84AA2E3F50E040007F01006E35-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A37C6F84AA2E3F50E040007F01006E35-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A37C6F84AA2E3F50E040007F01006E35-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A37C6F84AA2E3F50E040007F01006E35-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A37C6F84AA2E3F50E040007F01006E35--></AD_COLUMN>
 
 <!--A37C6F84AA2F3F50E040007F01006E35--><AD_COLUMN>
@@ -8419,6 +8731,7 @@
 <!--A37C6F84AA2F3F50E040007F01006E35-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A37C6F84AA2F3F50E040007F01006E35-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A37C6F84AA2F3F50E040007F01006E35-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A37C6F84AA2F3F50E040007F01006E35-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A37C6F84AA2F3F50E040007F01006E35--></AD_COLUMN>
 
 <!--A37C6F84AA303F50E040007F01006E35--><AD_COLUMN>
@@ -8456,6 +8769,7 @@
 <!--A37C6F84AA303F50E040007F01006E35-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A37C6F84AA303F50E040007F01006E35-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A37C6F84AA303F50E040007F01006E35-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A37C6F84AA303F50E040007F01006E35-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A37C6F84AA303F50E040007F01006E35--></AD_COLUMN>
 
 <!--A37C6F84AA313F50E040007F01006E35--><AD_COLUMN>
@@ -8493,6 +8807,7 @@
 <!--A37C6F84AA313F50E040007F01006E35-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A37C6F84AA313F50E040007F01006E35-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A37C6F84AA313F50E040007F01006E35-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A37C6F84AA313F50E040007F01006E35-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A37C6F84AA313F50E040007F01006E35--></AD_COLUMN>
 
 <!--A37C6F84AA323F50E040007F01006E35--><AD_COLUMN>
@@ -8532,6 +8847,7 @@
 <!--A37C6F84AA323F50E040007F01006E35-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A37C6F84AA323F50E040007F01006E35-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A37C6F84AA323F50E040007F01006E35-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A37C6F84AA323F50E040007F01006E35-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A37C6F84AA323F50E040007F01006E35--></AD_COLUMN>
 
 <!--A37C6F84AA333F50E040007F01006E35--><AD_COLUMN>
@@ -8569,6 +8885,7 @@
 <!--A37C6F84AA333F50E040007F01006E35-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A37C6F84AA333F50E040007F01006E35-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A37C6F84AA333F50E040007F01006E35-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A37C6F84AA333F50E040007F01006E35-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A37C6F84AA333F50E040007F01006E35--></AD_COLUMN>
 
 <!--A37C6F84AA343F50E040007F01006E35--><AD_COLUMN>
@@ -8607,6 +8924,7 @@
 <!--A37C6F84AA343F50E040007F01006E35-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A37C6F84AA343F50E040007F01006E35-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A37C6F84AA343F50E040007F01006E35-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A37C6F84AA343F50E040007F01006E35-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A37C6F84AA343F50E040007F01006E35--></AD_COLUMN>
 
 <!--A37C6F84AA353F50E040007F01006E35--><AD_COLUMN>
@@ -8644,6 +8962,7 @@
 <!--A37C6F84AA353F50E040007F01006E35-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A37C6F84AA353F50E040007F01006E35-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A37C6F84AA353F50E040007F01006E35-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A37C6F84AA353F50E040007F01006E35-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A37C6F84AA353F50E040007F01006E35--></AD_COLUMN>
 
 <!--A37C6F84AA363F50E040007F01006E35--><AD_COLUMN>
@@ -8681,6 +9000,7 @@
 <!--A37C6F84AA363F50E040007F01006E35-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A37C6F84AA363F50E040007F01006E35-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A37C6F84AA363F50E040007F01006E35-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A37C6F84AA363F50E040007F01006E35-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A37C6F84AA363F50E040007F01006E35--></AD_COLUMN>
 
 <!--A37C6F84AA373F50E040007F01006E35--><AD_COLUMN>
@@ -8718,6 +9038,7 @@
 <!--A37C6F84AA373F50E040007F01006E35-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A37C6F84AA373F50E040007F01006E35-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A37C6F84AA373F50E040007F01006E35-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A37C6F84AA373F50E040007F01006E35-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A37C6F84AA373F50E040007F01006E35--></AD_COLUMN>
 
 <!--A37C6F84AA383F50E040007F01006E35--><AD_COLUMN>
@@ -8756,6 +9077,7 @@
 <!--A37C6F84AA383F50E040007F01006E35-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A37C6F84AA383F50E040007F01006E35-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A37C6F84AA383F50E040007F01006E35-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A37C6F84AA383F50E040007F01006E35-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A37C6F84AA383F50E040007F01006E35--></AD_COLUMN>
 
 <!--A37C6F84AA393F50E040007F01006E35--><AD_COLUMN>
@@ -8794,6 +9116,7 @@
 <!--A37C6F84AA393F50E040007F01006E35-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A37C6F84AA393F50E040007F01006E35-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A37C6F84AA393F50E040007F01006E35-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A37C6F84AA393F50E040007F01006E35-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A37C6F84AA393F50E040007F01006E35--></AD_COLUMN>
 
 <!--A37C6F84AA3A3F50E040007F01006E35--><AD_COLUMN>
@@ -8831,6 +9154,7 @@
 <!--A37C6F84AA3A3F50E040007F01006E35-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A37C6F84AA3A3F50E040007F01006E35-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A37C6F84AA3A3F50E040007F01006E35-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A37C6F84AA3A3F50E040007F01006E35-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A37C6F84AA3A3F50E040007F01006E35--></AD_COLUMN>
 
 <!--A37C6F84AA3B3F50E040007F01006E35--><AD_COLUMN>
@@ -8868,6 +9192,7 @@
 <!--A37C6F84AA3B3F50E040007F01006E35-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A37C6F84AA3B3F50E040007F01006E35-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A37C6F84AA3B3F50E040007F01006E35-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A37C6F84AA3B3F50E040007F01006E35-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A37C6F84AA3B3F50E040007F01006E35--></AD_COLUMN>
 
 <!--A37C6F84AA3C3F50E040007F01006E35--><AD_COLUMN>
@@ -8905,6 +9230,7 @@
 <!--A37C6F84AA3C3F50E040007F01006E35-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A37C6F84AA3C3F50E040007F01006E35-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A37C6F84AA3C3F50E040007F01006E35-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A37C6F84AA3C3F50E040007F01006E35-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A37C6F84AA3C3F50E040007F01006E35--></AD_COLUMN>
 
 <!--A37C6F84AA3D3F50E040007F01006E35--><AD_COLUMN>
@@ -8940,6 +9266,7 @@
 <!--A37C6F84AA3D3F50E040007F01006E35-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A37C6F84AA3D3F50E040007F01006E35-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A37C6F84AA3D3F50E040007F01006E35-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A37C6F84AA3D3F50E040007F01006E35-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A37C6F84AA3D3F50E040007F01006E35--></AD_COLUMN>
 
 <!--A37C6F84AA3E3F50E040007F01006E35--><AD_COLUMN>
@@ -8978,6 +9305,7 @@
 <!--A37C6F84AA3E3F50E040007F01006E35-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A37C6F84AA3E3F50E040007F01006E35-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A37C6F84AA3E3F50E040007F01006E35-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A37C6F84AA3E3F50E040007F01006E35-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A37C6F84AA3E3F50E040007F01006E35--></AD_COLUMN>
 
 <!--A37C6F84AA3F3F50E040007F01006E35--><AD_COLUMN>
@@ -9013,6 +9341,7 @@
 <!--A37C6F84AA3F3F50E040007F01006E35-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A37C6F84AA3F3F50E040007F01006E35-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A37C6F84AA3F3F50E040007F01006E35-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A37C6F84AA3F3F50E040007F01006E35-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A37C6F84AA3F3F50E040007F01006E35--></AD_COLUMN>
 
 <!--A37C6F84AA403F50E040007F01006E35--><AD_COLUMN>
@@ -9048,6 +9377,7 @@
 <!--A37C6F84AA403F50E040007F01006E35-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A37C6F84AA403F50E040007F01006E35-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A37C6F84AA403F50E040007F01006E35-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A37C6F84AA403F50E040007F01006E35-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A37C6F84AA403F50E040007F01006E35--></AD_COLUMN>
 
 <!--A37C6F84AA413F50E040007F01006E35--><AD_COLUMN>
@@ -9084,6 +9414,7 @@
 <!--A37C6F84AA413F50E040007F01006E35-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A37C6F84AA413F50E040007F01006E35-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A37C6F84AA413F50E040007F01006E35-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A37C6F84AA413F50E040007F01006E35-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A37C6F84AA413F50E040007F01006E35--></AD_COLUMN>
 
 <!--A3A1CA451F85C5FBE040007F0100386C--><AD_COLUMN>
@@ -9122,6 +9453,7 @@
 <!--A3A1CA451F85C5FBE040007F0100386C-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A3A1CA451F85C5FBE040007F0100386C-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A3A1CA451F85C5FBE040007F0100386C-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A3A1CA451F85C5FBE040007F0100386C-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A3A1CA451F85C5FBE040007F0100386C--></AD_COLUMN>
 
 <!--A6B405E9791D4BC685220C11CCA916C0--><AD_COLUMN>
@@ -9160,6 +9492,7 @@
 <!--A6B405E9791D4BC685220C11CCA916C0-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A6B405E9791D4BC685220C11CCA916C0-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A6B405E9791D4BC685220C11CCA916C0-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A6B405E9791D4BC685220C11CCA916C0-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A6B405E9791D4BC685220C11CCA916C0--></AD_COLUMN>
 
 <!--A6F530DEA28844FE90B788AD0E437106--><AD_COLUMN>
@@ -9198,6 +9531,7 @@
 <!--A6F530DEA28844FE90B788AD0E437106-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A6F530DEA28844FE90B788AD0E437106-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A6F530DEA28844FE90B788AD0E437106-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A6F530DEA28844FE90B788AD0E437106-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A6F530DEA28844FE90B788AD0E437106--></AD_COLUMN>
 
 <!--A7389A5DCC6D4D33B9ED1785EC5BA3A0--><AD_COLUMN>
@@ -9235,6 +9569,7 @@
 <!--A7389A5DCC6D4D33B9ED1785EC5BA3A0-->  <ENTITY_ALIAS><![CDATA[bsl.updated]]></ENTITY_ALIAS>
 <!--A7389A5DCC6D4D33B9ED1785EC5BA3A0-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A7389A5DCC6D4D33B9ED1785EC5BA3A0-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A7389A5DCC6D4D33B9ED1785EC5BA3A0-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A7389A5DCC6D4D33B9ED1785EC5BA3A0--></AD_COLUMN>
 
 <!--A7AA3F7ABB27453795B97A175662F61A--><AD_COLUMN>
@@ -9270,6 +9605,7 @@
 <!--A7AA3F7ABB27453795B97A175662F61A-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A7AA3F7ABB27453795B97A175662F61A-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A7AA3F7ABB27453795B97A175662F61A-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A7AA3F7ABB27453795B97A175662F61A-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A7AA3F7ABB27453795B97A175662F61A--></AD_COLUMN>
 
 <!--A819E4C5C1D36FEFE040007F010005F9--><AD_COLUMN>
@@ -9305,6 +9641,7 @@
 <!--A819E4C5C1D36FEFE040007F010005F9-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A819E4C5C1D36FEFE040007F010005F9-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A819E4C5C1D36FEFE040007F010005F9-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A819E4C5C1D36FEFE040007F010005F9-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A819E4C5C1D36FEFE040007F010005F9--></AD_COLUMN>
 
 <!--A9E1940399DD4CC99AD4DC19426AEF90--><AD_COLUMN>
@@ -9342,6 +9679,7 @@
 <!--A9E1940399DD4CC99AD4DC19426AEF90-->  <ENTITY_ALIAS><![CDATA[@expectedDate@]]></ENTITY_ALIAS>
 <!--A9E1940399DD4CC99AD4DC19426AEF90-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A9E1940399DD4CC99AD4DC19426AEF90-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A9E1940399DD4CC99AD4DC19426AEF90-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A9E1940399DD4CC99AD4DC19426AEF90--></AD_COLUMN>
 
 <!--A9FAC7D05AED45A28899DDFDF1D1D6E0--><AD_COLUMN>
@@ -9378,6 +9716,7 @@
 <!--A9FAC7D05AED45A28899DDFDF1D1D6E0-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--A9FAC7D05AED45A28899DDFDF1D1D6E0-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--A9FAC7D05AED45A28899DDFDF1D1D6E0-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A9FAC7D05AED45A28899DDFDF1D1D6E0-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A9FAC7D05AED45A28899DDFDF1D1D6E0--></AD_COLUMN>
 
 <!--AB67B03AC4A84D3F8CF236A16709D908--><AD_COLUMN>
@@ -9415,6 +9754,7 @@
 <!--AB67B03AC4A84D3F8CF236A16709D908-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--AB67B03AC4A84D3F8CF236A16709D908-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--AB67B03AC4A84D3F8CF236A16709D908-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--AB67B03AC4A84D3F8CF236A16709D908-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--AB67B03AC4A84D3F8CF236A16709D908--></AD_COLUMN>
 
 <!--AD49757BC503487E98EED911619FD63B--><AD_COLUMN>
@@ -9452,6 +9792,7 @@
 <!--AD49757BC503487E98EED911619FD63B-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--AD49757BC503487E98EED911619FD63B-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--AD49757BC503487E98EED911619FD63B-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--AD49757BC503487E98EED911619FD63B-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--AD49757BC503487E98EED911619FD63B--></AD_COLUMN>
 
 <!--AE6E63C1ADE84D5E890DA26711CD0AF5--><AD_COLUMN>
@@ -9489,6 +9830,7 @@
 <!--AE6E63C1ADE84D5E890DA26711CD0AF5-->  <ENTITY_ALIAS><![CDATA[@outstandingAmount@]]></ENTITY_ALIAS>
 <!--AE6E63C1ADE84D5E890DA26711CD0AF5-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--AE6E63C1ADE84D5E890DA26711CD0AF5-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--AE6E63C1ADE84D5E890DA26711CD0AF5-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--AE6E63C1ADE84D5E890DA26711CD0AF5--></AD_COLUMN>
 
 <!--AE840317B6694DBAA5DC6898969B8210--><AD_COLUMN>
@@ -9526,6 +9868,7 @@
 <!--AE840317B6694DBAA5DC6898969B8210-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--AE840317B6694DBAA5DC6898969B8210-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--AE840317B6694DBAA5DC6898969B8210-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--AE840317B6694DBAA5DC6898969B8210-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--AE840317B6694DBAA5DC6898969B8210--></AD_COLUMN>
 
 <!--AEF30836571D49FB96C42D7DD85FDDED--><AD_COLUMN>
@@ -9563,8 +9906,48 @@
 <!--AEF30836571D49FB96C42D7DD85FDDED-->  <ENTITY_ALIAS><![CDATA[@invoicedAmount@]]></ENTITY_ALIAS>
 <!--AEF30836571D49FB96C42D7DD85FDDED-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--AEF30836571D49FB96C42D7DD85FDDED-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--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>
@@ -9600,6 +9983,7 @@
 <!--B01D6A5AF6F14FD6947BDEEF22C35CF8-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--B01D6A5AF6F14FD6947BDEEF22C35CF8-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--B01D6A5AF6F14FD6947BDEEF22C35CF8-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--B01D6A5AF6F14FD6947BDEEF22C35CF8-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--B01D6A5AF6F14FD6947BDEEF22C35CF8--></AD_COLUMN>
 
 <!--B15C117EB160403FABAC34188650DAC6--><AD_COLUMN>
@@ -9636,6 +10020,7 @@
 <!--B15C117EB160403FABAC34188650DAC6-->  <ENTITY_ALIAS><![CDATA[bsl.matchedDocument]]></ENTITY_ALIAS>
 <!--B15C117EB160403FABAC34188650DAC6-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--B15C117EB160403FABAC34188650DAC6-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--B15C117EB160403FABAC34188650DAC6-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--B15C117EB160403FABAC34188650DAC6--></AD_COLUMN>
 
 <!--B3645A0D0F674CD3BC3FCB6225C4E1A6--><AD_COLUMN>
@@ -9673,6 +10058,7 @@
 <!--B3645A0D0F674CD3BC3FCB6225C4E1A6-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--B3645A0D0F674CD3BC3FCB6225C4E1A6-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--B3645A0D0F674CD3BC3FCB6225C4E1A6-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--B3645A0D0F674CD3BC3FCB6225C4E1A6-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--B3645A0D0F674CD3BC3FCB6225C4E1A6--></AD_COLUMN>
 
 <!--B44BDBCFCEC243179D78A333FA0497A5--><AD_COLUMN>
@@ -9711,6 +10097,7 @@
 <!--B44BDBCFCEC243179D78A333FA0497A5-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--B44BDBCFCEC243179D78A333FA0497A5-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--B44BDBCFCEC243179D78A333FA0497A5-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--B44BDBCFCEC243179D78A333FA0497A5--></AD_COLUMN>
 
 <!--B50241F11C4F404583CACB2A88CE875F--><AD_COLUMN>
@@ -9751,6 +10138,7 @@
 <!--B50241F11C4F404583CACB2A88CE875F-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--B50241F11C4F404583CACB2A88CE875F-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--B50241F11C4F404583CACB2A88CE875F-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--B50241F11C4F404583CACB2A88CE875F-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--B50241F11C4F404583CACB2A88CE875F--></AD_COLUMN>
 
 <!--B591815987C54A369525A5BA485F5FC0--><AD_COLUMN>
@@ -9788,6 +10176,7 @@
 <!--B591815987C54A369525A5BA485F5FC0-->  <ENTITY_ALIAS><![CDATA[gl.name]]></ENTITY_ALIAS>
 <!--B591815987C54A369525A5BA485F5FC0-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--B591815987C54A369525A5BA485F5FC0-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--B591815987C54A369525A5BA485F5FC0-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--B591815987C54A369525A5BA485F5FC0--></AD_COLUMN>
 
 <!--B6030F7885494DFC9B08C1649B388D5B--><AD_COLUMN>
@@ -9826,6 +10215,7 @@
 <!--B6030F7885494DFC9B08C1649B388D5B-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--B6030F7885494DFC9B08C1649B388D5B-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--B6030F7885494DFC9B08C1649B388D5B-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--B6030F7885494DFC9B08C1649B388D5B-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--B6030F7885494DFC9B08C1649B388D5B--></AD_COLUMN>
 
 <!--B664B25117244ED99118A33E5273C96B--><AD_COLUMN>
@@ -9861,6 +10251,7 @@
 <!--B664B25117244ED99118A33E5273C96B-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--B664B25117244ED99118A33E5273C96B-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--B664B25117244ED99118A33E5273C96B-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--B664B25117244ED99118A33E5273C96B-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--B664B25117244ED99118A33E5273C96B--></AD_COLUMN>
 
 <!--B6BE3D53F3334F04960A035C9F353752--><AD_COLUMN>
@@ -9898,6 +10289,7 @@
 <!--B6BE3D53F3334F04960A035C9F353752-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--B6BE3D53F3334F04960A035C9F353752-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--B6BE3D53F3334F04960A035C9F353752-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--B6BE3D53F3334F04960A035C9F353752-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--B6BE3D53F3334F04960A035C9F353752--></AD_COLUMN>
 
 <!--B7267890BB524DC1A09EDAAF7C63866C--><AD_COLUMN>
@@ -9935,6 +10327,7 @@
 <!--B7267890BB524DC1A09EDAAF7C63866C-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--B7267890BB524DC1A09EDAAF7C63866C-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--B7267890BB524DC1A09EDAAF7C63866C-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--B7267890BB524DC1A09EDAAF7C63866C-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--B7267890BB524DC1A09EDAAF7C63866C--></AD_COLUMN>
 
 <!--B75949E0E04D461CBACA1CBD00C9231F--><AD_COLUMN>
@@ -9972,6 +10365,7 @@
 <!--B75949E0E04D461CBACA1CBD00C9231F-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--B75949E0E04D461CBACA1CBD00C9231F-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--B75949E0E04D461CBACA1CBD00C9231F-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--B75949E0E04D461CBACA1CBD00C9231F-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--B75949E0E04D461CBACA1CBD00C9231F--></AD_COLUMN>
 
 <!--B88ABA24445C463A86300BBF6B6DE296--><AD_COLUMN>
@@ -10009,6 +10403,7 @@
 <!--B88ABA24445C463A86300BBF6B6DE296-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--B88ABA24445C463A86300BBF6B6DE296-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--B88ABA24445C463A86300BBF6B6DE296-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--B88ABA24445C463A86300BBF6B6DE296-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--B88ABA24445C463A86300BBF6B6DE296--></AD_COLUMN>
 
 <!--B8A0E2E81E294B2AB10F4325BD4B563C--><AD_COLUMN>
@@ -10046,6 +10441,7 @@
 <!--B8A0E2E81E294B2AB10F4325BD4B563C-->  <ENTITY_ALIAS><![CDATA[fat.transactionDate]]></ENTITY_ALIAS>
 <!--B8A0E2E81E294B2AB10F4325BD4B563C-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--B8A0E2E81E294B2AB10F4325BD4B563C-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--B8A0E2E81E294B2AB10F4325BD4B563C-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--B8A0E2E81E294B2AB10F4325BD4B563C--></AD_COLUMN>
 
 <!--B9DAC6015F8F4F94965030A72199BC55--><AD_COLUMN>
@@ -10083,6 +10479,7 @@
 <!--B9DAC6015F8F4F94965030A72199BC55-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--B9DAC6015F8F4F94965030A72199BC55-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--B9DAC6015F8F4F94965030A72199BC55-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--B9DAC6015F8F4F94965030A72199BC55-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--B9DAC6015F8F4F94965030A72199BC55--></AD_COLUMN>
 
 <!--BBA3DB68DBD844B29F1EEC9A04F112E8--><AD_COLUMN>
@@ -10121,6 +10518,7 @@
 <!--BBA3DB68DBD844B29F1EEC9A04F112E8-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--BBA3DB68DBD844B29F1EEC9A04F112E8-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--BBA3DB68DBD844B29F1EEC9A04F112E8-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--BBA3DB68DBD844B29F1EEC9A04F112E8-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--BBA3DB68DBD844B29F1EEC9A04F112E8--></AD_COLUMN>
 
 <!--BBCB292622D3418D9259381AC6961975--><AD_COLUMN>
@@ -10159,6 +10557,7 @@
 <!--BBCB292622D3418D9259381AC6961975-->  <ENTITY_ALIAS><![CDATA[ndDim]]></ENTITY_ALIAS>
 <!--BBCB292622D3418D9259381AC6961975-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--BBCB292622D3418D9259381AC6961975-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--BBCB292622D3418D9259381AC6961975-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--BBCB292622D3418D9259381AC6961975--></AD_COLUMN>
 
 <!--BBE36F9268AD4E4D9F8BD3E152E7D3BA--><AD_COLUMN>
@@ -10197,6 +10596,7 @@
 <!--BBE36F9268AD4E4D9F8BD3E152E7D3BA-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--BBE36F9268AD4E4D9F8BD3E152E7D3BA-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--BBE36F9268AD4E4D9F8BD3E152E7D3BA-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--BBE36F9268AD4E4D9F8BD3E152E7D3BA-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--BBE36F9268AD4E4D9F8BD3E152E7D3BA--></AD_COLUMN>
 
 <!--BBE47252ECEF4B5BA7116E0E23CA5D8D--><AD_COLUMN>
@@ -10232,6 +10632,7 @@
 <!--BBE47252ECEF4B5BA7116E0E23CA5D8D-->  <SQLLOGIC><![CDATA[(SELECT COALESCE(sum(t.paymentamt), 0) FROM fin_finacc_transaction t,  fin_reconciliation rec WHERE (t.fin_reconciliation_id IS NULL OR (EXISTS ( SELECT 1 FROM fin_reconciliation r WHERE r.dateto > rec.dateto AND t.fin_reconciliation_id  = r.fin_reconciliation_id ))) AND t.statementdate <= rec.dateto AND t.paymentamt <> 0 AND t.fin_financial_account_id  = rec.fin_financial_account_id AND rec.fin_reconciliation_id = fin_reconciliation_id)]]></SQLLOGIC>
 <!--BBE47252ECEF4B5BA7116E0E23CA5D8D-->  <ALLOWSORTING><![CDATA[N]]></ALLOWSORTING>
 <!--BBE47252ECEF4B5BA7116E0E23CA5D8D-->  <ALLOWFILTERING><![CDATA[N]]></ALLOWFILTERING>
+<!--BBE47252ECEF4B5BA7116E0E23CA5D8D-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--BBE47252ECEF4B5BA7116E0E23CA5D8D--></AD_COLUMN>
 
 <!--BC78354AB2F7403FA9725CDF267C0A70--><AD_COLUMN>
@@ -10271,6 +10672,7 @@
 <!--BC78354AB2F7403FA9725CDF267C0A70-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--BC78354AB2F7403FA9725CDF267C0A70-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--BC78354AB2F7403FA9725CDF267C0A70-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--BC78354AB2F7403FA9725CDF267C0A70-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--BC78354AB2F7403FA9725CDF267C0A70--></AD_COLUMN>
 
 <!--BCAAFCD921B345508B2793C73FC9E79C--><AD_COLUMN>
@@ -10306,6 +10708,7 @@
 <!--BCAAFCD921B345508B2793C73FC9E79C-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--BCAAFCD921B345508B2793C73FC9E79C-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--BCAAFCD921B345508B2793C73FC9E79C-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--BCAAFCD921B345508B2793C73FC9E79C-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--BCAAFCD921B345508B2793C73FC9E79C--></AD_COLUMN>
 
 <!--BD93C6642DFC4DACB8A1D4EFB3333530--><AD_COLUMN>
@@ -10343,6 +10746,7 @@
 <!--BD93C6642DFC4DACB8A1D4EFB3333530-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--BD93C6642DFC4DACB8A1D4EFB3333530-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--BD93C6642DFC4DACB8A1D4EFB3333530-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--BD93C6642DFC4DACB8A1D4EFB3333530-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--BD93C6642DFC4DACB8A1D4EFB3333530--></AD_COLUMN>
 
 <!--BDFC6B326633430292F1C59CEF831534--><AD_COLUMN>
@@ -10380,6 +10784,7 @@
 <!--BDFC6B326633430292F1C59CEF831534-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--BDFC6B326633430292F1C59CEF831534-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--BDFC6B326633430292F1C59CEF831534-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--BDFC6B326633430292F1C59CEF831534-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--BDFC6B326633430292F1C59CEF831534--></AD_COLUMN>
 
 <!--BF61CD8A1E034B32B4F7770EDA6064DF--><AD_COLUMN>
@@ -10417,6 +10822,7 @@
 <!--BF61CD8A1E034B32B4F7770EDA6064DF-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--BF61CD8A1E034B32B4F7770EDA6064DF-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--BF61CD8A1E034B32B4F7770EDA6064DF-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--BF61CD8A1E034B32B4F7770EDA6064DF-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--BF61CD8A1E034B32B4F7770EDA6064DF--></AD_COLUMN>
 
 <!--C09E190928152D28E040007F01002523--><AD_COLUMN>
@@ -10456,6 +10862,7 @@
 <!--C09E190928152D28E040007F01002523-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--C09E190928152D28E040007F01002523-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--C09E190928152D28E040007F01002523-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--C09E190928152D28E040007F01002523-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--C09E190928152D28E040007F01002523--></AD_COLUMN>
 
 <!--C2C87639AA9846F2955E7CB6862FA57B--><AD_COLUMN>
@@ -10494,6 +10901,7 @@
 <!--C2C87639AA9846F2955E7CB6862FA57B-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--C2C87639AA9846F2955E7CB6862FA57B-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--C2C87639AA9846F2955E7CB6862FA57B-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--C2C87639AA9846F2955E7CB6862FA57B-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--C2C87639AA9846F2955E7CB6862FA57B--></AD_COLUMN>
 
 <!--C39154FFAEE74ED78317163262927609--><AD_COLUMN>
@@ -10531,6 +10939,7 @@
 <!--C39154FFAEE74ED78317163262927609-->  <ENTITY_ALIAS><![CDATA[paidout]]></ENTITY_ALIAS>
 <!--C39154FFAEE74ED78317163262927609-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--C39154FFAEE74ED78317163262927609-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--C39154FFAEE74ED78317163262927609-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--C39154FFAEE74ED78317163262927609--></AD_COLUMN>
 
 <!--C40B1C60A6084CED9A9EF9D73DA2EC7B--><AD_COLUMN>
@@ -10569,6 +10978,7 @@
 <!--C40B1C60A6084CED9A9EF9D73DA2EC7B-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--C40B1C60A6084CED9A9EF9D73DA2EC7B-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--C40B1C60A6084CED9A9EF9D73DA2EC7B-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--C40B1C60A6084CED9A9EF9D73DA2EC7B-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--C40B1C60A6084CED9A9EF9D73DA2EC7B--></AD_COLUMN>
 
 <!--C4248185C139416FA0B6E1F11E4B3B29--><AD_COLUMN>
@@ -10604,6 +11014,7 @@
 <!--C4248185C139416FA0B6E1F11E4B3B29-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--C4248185C139416FA0B6E1F11E4B3B29-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--C4248185C139416FA0B6E1F11E4B3B29-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--C4248185C139416FA0B6E1F11E4B3B29-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--C4248185C139416FA0B6E1F11E4B3B29--></AD_COLUMN>
 
 <!--C5814D2F8ECC4DF798BEFA235A7352B9--><AD_COLUMN>
@@ -10641,6 +11052,7 @@
 <!--C5814D2F8ECC4DF798BEFA235A7352B9-->  <ENTITY_ALIAS><![CDATA[bsl.description]]></ENTITY_ALIAS>
 <!--C5814D2F8ECC4DF798BEFA235A7352B9-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--C5814D2F8ECC4DF798BEFA235A7352B9-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--C5814D2F8ECC4DF798BEFA235A7352B9-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--C5814D2F8ECC4DF798BEFA235A7352B9--></AD_COLUMN>
 
 <!--C72EC790B2EF4BEEA2A843D30770B85D--><AD_COLUMN>
@@ -10676,8 +11088,48 @@
 <!--C72EC790B2EF4BEEA2A843D30770B85D-->  <SQLLOGIC><![CDATA[(SELECT COALESCE(sum(bl.cramount - bl.dramount), 0) FROM fin_bankstatementline bl, fin_bankstatement b, fin_reconciliation r WHERE (bl.fin_finacc_transaction_id IS NULL OR (EXISTS ( SELECT 1 FROM fin_finacc_transaction t, fin_reconciliation rec WHERE t.fin_reconciliation_id  = rec.fin_reconciliation_id AND bl.fin_finacc_transaction_id  = t.fin_finacc_transaction_id  AND t.fin_financial_account_id  = b.fin_financial_account_id  AND rec.created > r.created))) AND bl.datetrx <= r.dateto AND b.fin_bankstatement_id  = bl.fin_bankstatement_id AND b.fin_financial_account_id  = r.fin_financial_account_id and r.fin_reconciliation_id = fin_reconciliation_id)]]></SQLLOGIC>
 <!--C72EC790B2EF4BEEA2A843D30770B85D-->  <ALLOWSORTING><![CDATA[N]]></ALLOWSORTING>
 <!--C72EC790B2EF4BEEA2A843D30770B85D-->  <ALLOWFILTERING><![CDATA[N]]></ALLOWFILTERING>
+<!--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>
@@ -10711,6 +11163,7 @@
 <!--C9FD369BECE545828033CC49CAB85D9D-->  <ENTITY_ALIAS><![CDATA[bsl.id]]></ENTITY_ALIAS>
 <!--C9FD369BECE545828033CC49CAB85D9D-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--C9FD369BECE545828033CC49CAB85D9D-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--C9FD369BECE545828033CC49CAB85D9D-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--C9FD369BECE545828033CC49CAB85D9D--></AD_COLUMN>
 
 <!--CBAF582C3F674FEEB1D38C2A10E03E2F--><AD_COLUMN>
@@ -10746,6 +11199,7 @@
 <!--CBAF582C3F674FEEB1D38C2A10E03E2F-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--CBAF582C3F674FEEB1D38C2A10E03E2F-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--CBAF582C3F674FEEB1D38C2A10E03E2F-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--CBAF582C3F674FEEB1D38C2A10E03E2F-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--CBAF582C3F674FEEB1D38C2A10E03E2F--></AD_COLUMN>
 
 <!--CD644D952B4945158005088D474CC529--><AD_COLUMN>
@@ -10784,6 +11238,7 @@
 <!--CD644D952B4945158005088D474CC529-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--CD644D952B4945158005088D474CC529-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--CD644D952B4945158005088D474CC529-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--CD644D952B4945158005088D474CC529-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--CD644D952B4945158005088D474CC529-->  <EM_OBUIAPP_PROCESS_ID><![CDATA[4CE463C04CA0412CAC57EF58FE0F8498]]></EM_OBUIAPP_PROCESS_ID>
 <!--CD644D952B4945158005088D474CC529--></AD_COLUMN>
 
@@ -10823,6 +11278,7 @@
 <!--D06818A44BBB4E2CA7463CB4F03F8C04-->  <ENTITY_ALIAS><![CDATA[case when bsl.cramount - bsl.dramount >0 then 'D' else 'P' end]]></ENTITY_ALIAS>
 <!--D06818A44BBB4E2CA7463CB4F03F8C04-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--D06818A44BBB4E2CA7463CB4F03F8C04-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--D06818A44BBB4E2CA7463CB4F03F8C04-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--D06818A44BBB4E2CA7463CB4F03F8C04--></AD_COLUMN>
 
 <!--D4C27D211DF9416DA498EEFB6C008B7B--><AD_COLUMN>
@@ -10860,8 +11316,49 @@
 <!--D4C27D211DF9416DA498EEFB6C008B7B-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--D4C27D211DF9416DA498EEFB6C008B7B-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--D4C27D211DF9416DA498EEFB6C008B7B-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--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>
@@ -10897,6 +11394,7 @@
 <!--D6A01A3BA0674CC49C7F17FA2251E7C6-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--D6A01A3BA0674CC49C7F17FA2251E7C6-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--D6A01A3BA0674CC49C7F17FA2251E7C6-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--D6A01A3BA0674CC49C7F17FA2251E7C6-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--D6A01A3BA0674CC49C7F17FA2251E7C6--></AD_COLUMN>
 
 <!--D6D697F7256941C8B2EFC6D5C04753CF--><AD_COLUMN>
@@ -10934,6 +11432,7 @@
 <!--D6D697F7256941C8B2EFC6D5C04753CF-->  <ENTITY_ALIAS><![CDATA[e.paymentAmount]]></ENTITY_ALIAS>
 <!--D6D697F7256941C8B2EFC6D5C04753CF-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--D6D697F7256941C8B2EFC6D5C04753CF-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--D6D697F7256941C8B2EFC6D5C04753CF-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--D6D697F7256941C8B2EFC6D5C04753CF--></AD_COLUMN>
 
 <!--D9CE146DA825427A9F0132F13599424B--><AD_COLUMN>
@@ -10972,6 +11471,7 @@
 <!--D9CE146DA825427A9F0132F13599424B-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--D9CE146DA825427A9F0132F13599424B-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--D9CE146DA825427A9F0132F13599424B-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--D9CE146DA825427A9F0132F13599424B-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--D9CE146DA825427A9F0132F13599424B--></AD_COLUMN>
 
 <!--DB65D341BFA24AC697482DCCE1731C6A--><AD_COLUMN>
@@ -11009,6 +11509,7 @@
 <!--DB65D341BFA24AC697482DCCE1731C6A-->  <ENTITY_ALIAS><![CDATA[fat.description]]></ENTITY_ALIAS>
 <!--DB65D341BFA24AC697482DCCE1731C6A-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--DB65D341BFA24AC697482DCCE1731C6A-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--DB65D341BFA24AC697482DCCE1731C6A--></AD_COLUMN>
 
 <!--E156A67751484C5A9D367C235769BB24--><AD_COLUMN>
@@ -11047,6 +11548,7 @@
 <!--E156A67751484C5A9D367C235769BB24-->  <ENTITY_ALIAS><![CDATA[gl]]></ENTITY_ALIAS>
 <!--E156A67751484C5A9D367C235769BB24-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--E156A67751484C5A9D367C235769BB24-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--E156A67751484C5A9D367C235769BB24-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--E156A67751484C5A9D367C235769BB24--></AD_COLUMN>
 
 <!--E206BFA90CC94498B257BC65C516B9C5--><AD_COLUMN>
@@ -11086,6 +11588,7 @@
 <!--E206BFA90CC94498B257BC65C516B9C5-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--E206BFA90CC94498B257BC65C516B9C5-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--E206BFA90CC94498B257BC65C516B9C5-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--E206BFA90CC94498B257BC65C516B9C5-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--E206BFA90CC94498B257BC65C516B9C5--></AD_COLUMN>
 
 <!--E3E034DC47244E1B9D20971FDAE3F453--><AD_COLUMN>
@@ -11124,6 +11627,7 @@
 <!--E3E034DC47244E1B9D20971FDAE3F453-->  <ENTITY_ALIAS><![CDATA[proj]]></ENTITY_ALIAS>
 <!--E3E034DC47244E1B9D20971FDAE3F453-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--E3E034DC47244E1B9D20971FDAE3F453-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--E3E034DC47244E1B9D20971FDAE3F453-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--E3E034DC47244E1B9D20971FDAE3F453--></AD_COLUMN>
 
 <!--E3E69DDF3725407BABA84827647EF002--><AD_COLUMN>
@@ -11161,6 +11665,7 @@
 <!--E3E69DDF3725407BABA84827647EF002-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--E3E69DDF3725407BABA84827647EF002-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--E3E69DDF3725407BABA84827647EF002-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--E3E69DDF3725407BABA84827647EF002-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--E3E69DDF3725407BABA84827647EF002--></AD_COLUMN>
 
 <!--E3FAD9EE133B47569BBDC6EFC9D3ABFA--><AD_COLUMN>
@@ -11199,6 +11704,7 @@
 <!--E3FAD9EE133B47569BBDC6EFC9D3ABFA-->  <ENTITY_ALIAS><![CDATA[cc]]></ENTITY_ALIAS>
 <!--E3FAD9EE133B47569BBDC6EFC9D3ABFA-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--E3FAD9EE133B47569BBDC6EFC9D3ABFA-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--E3FAD9EE133B47569BBDC6EFC9D3ABFA-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--E3FAD9EE133B47569BBDC6EFC9D3ABFA--></AD_COLUMN>
 
 <!--E3FB3DADBC5147BF822D807B1CBE3D39--><AD_COLUMN>
@@ -11234,6 +11740,7 @@
 <!--E3FB3DADBC5147BF822D807B1CBE3D39-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--E3FB3DADBC5147BF822D807B1CBE3D39-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--E3FB3DADBC5147BF822D807B1CBE3D39-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--E3FB3DADBC5147BF822D807B1CBE3D39-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--E3FB3DADBC5147BF822D807B1CBE3D39--></AD_COLUMN>
 
 <!--E6DB13E1516947B7A8DC5741D58A7AB2--><AD_COLUMN>
@@ -11271,8 +11778,55 @@
 <!--E6DB13E1516947B7A8DC5741D58A7AB2-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--E6DB13E1516947B7A8DC5741D58A7AB2-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--E6DB13E1516947B7A8DC5741D58A7AB2-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--E6DB13E1516947B7A8DC5741D58A7AB2-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--E6DB13E1516947B7A8DC5741D58A7AB2--></AD_COLUMN>
 
+<!--E73D535A7F9D4494AF132A66AE861168--><AD_COLUMN>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <AD_COLUMN_ID><![CDATA[E73D535A7F9D4494AF132A66AE861168]]></AD_COLUMN_ID>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <NAME><![CDATA[EM_APRM_PaymentMethod]]></NAME>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <DESCRIPTION><![CDATA[Payment Method in Sales Invoice]]></DESCRIPTION>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <HELP><![CDATA[Payment Method in Sales Invoice]]></HELP>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <COLUMNNAME><![CDATA[EM_APRM_PaymentMethod]]></COLUMNNAME>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <AD_TABLE_ID><![CDATA[C0233061EA504EFEAB0483E836BBAF31]]></AD_TABLE_ID>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <AD_REFERENCE_VALUE_ID><![CDATA[E664E415582A483DBBC91DEF256FB9E6]]></AD_REFERENCE_VALUE_ID>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <SEQNO><![CDATA[300]]></SEQNO>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <AD_ELEMENT_ID><![CDATA[2622EC9C32614ED692A415EC3F3DC3EF]]></AD_ELEMENT_ID>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <SQLLOGIC><![CDATA[(select
+   case p.amount
+     when 0 then null
+     else p.fin_paymentmethod_id
+   end
+ from fin_payment_detail pd
+   join fin_payment p on p.fin_payment_id = pd.fin_payment_id
+ where pd.fin_payment_detail_id = fin_payment_detail_id)]]></SQLLOGIC>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--E73D535A7F9D4494AF132A66AE861168-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--E73D535A7F9D4494AF132A66AE861168--></AD_COLUMN>
+
 <!--E88F9871B4184489A5B188A589FB8543--><AD_COLUMN>
 <!--E88F9871B4184489A5B188A589FB8543-->  <AD_COLUMN_ID><![CDATA[E88F9871B4184489A5B188A589FB8543]]></AD_COLUMN_ID>
 <!--E88F9871B4184489A5B188A589FB8543-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -11306,6 +11860,7 @@
 <!--E88F9871B4184489A5B188A589FB8543-->  <ENTITY_ALIAS><![CDATA[@invoiceNo@]]></ENTITY_ALIAS>
 <!--E88F9871B4184489A5B188A589FB8543-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--E88F9871B4184489A5B188A589FB8543-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--E88F9871B4184489A5B188A589FB8543-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--E88F9871B4184489A5B188A589FB8543--></AD_COLUMN>
 
 <!--EB274794018B468497657840626CEA1E--><AD_COLUMN>
@@ -11343,6 +11898,7 @@
 <!--EB274794018B468497657840626CEA1E-->  <ENTITY_ALIAS><![CDATA[bsl.cramount - bsl.dramount]]></ENTITY_ALIAS>
 <!--EB274794018B468497657840626CEA1E-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--EB274794018B468497657840626CEA1E-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--EB274794018B468497657840626CEA1E-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--EB274794018B468497657840626CEA1E--></AD_COLUMN>
 
 <!--EBF40746D2584CCC991B1F592C3A5DB9--><AD_COLUMN>
@@ -11380,6 +11936,7 @@
 <!--EBF40746D2584CCC991B1F592C3A5DB9-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--EBF40746D2584CCC991B1F592C3A5DB9-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--EBF40746D2584CCC991B1F592C3A5DB9-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--EBF40746D2584CCC991B1F592C3A5DB9-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--EBF40746D2584CCC991B1F592C3A5DB9--></AD_COLUMN>
 
 <!--EEA71E7532134B6BB905BF22652377CD--><AD_COLUMN>
@@ -11418,6 +11975,7 @@
 <!--EEA71E7532134B6BB905BF22652377CD-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--EEA71E7532134B6BB905BF22652377CD-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--EEA71E7532134B6BB905BF22652377CD-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--EEA71E7532134B6BB905BF22652377CD-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--EEA71E7532134B6BB905BF22652377CD--></AD_COLUMN>
 
 <!--F30A5F00B30D407B8C05119E8B91A275--><AD_COLUMN>
@@ -11455,6 +12013,7 @@
 <!--F30A5F00B30D407B8C05119E8B91A275-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--F30A5F00B30D407B8C05119E8B91A275-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--F30A5F00B30D407B8C05119E8B91A275-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--F30A5F00B30D407B8C05119E8B91A275-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--F30A5F00B30D407B8C05119E8B91A275--></AD_COLUMN>
 
 <!--F33C959602D6449CB6F5EAD34983D2C8--><AD_COLUMN>
@@ -11492,6 +12051,7 @@
 <!--F33C959602D6449CB6F5EAD34983D2C8-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--F33C959602D6449CB6F5EAD34983D2C8-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--F33C959602D6449CB6F5EAD34983D2C8-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--F33C959602D6449CB6F5EAD34983D2C8-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--F33C959602D6449CB6F5EAD34983D2C8--></AD_COLUMN>
 
 <!--F362B84F4718449EAD840F1C25667B37--><AD_COLUMN>
@@ -11532,6 +12092,7 @@
 <!--F362B84F4718449EAD840F1C25667B37-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--F362B84F4718449EAD840F1C25667B37-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--F362B84F4718449EAD840F1C25667B37-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--F362B84F4718449EAD840F1C25667B37-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--F362B84F4718449EAD840F1C25667B37--></AD_COLUMN>
 
 <!--F66DB06B6E26437CAB8726D761F4B509--><AD_COLUMN>
@@ -11569,6 +12130,7 @@
 <!--F66DB06B6E26437CAB8726D761F4B509-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--F66DB06B6E26437CAB8726D761F4B509-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--F66DB06B6E26437CAB8726D761F4B509-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--F66DB06B6E26437CAB8726D761F4B509-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--F66DB06B6E26437CAB8726D761F4B509--></AD_COLUMN>
 
 <!--F79D0173541B42CD9F41A58D53929BFA--><AD_COLUMN>
@@ -11607,6 +12169,7 @@
 <!--F79D0173541B42CD9F41A58D53929BFA-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--F79D0173541B42CD9F41A58D53929BFA-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--F79D0173541B42CD9F41A58D53929BFA-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--F79D0173541B42CD9F41A58D53929BFA-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--F79D0173541B42CD9F41A58D53929BFA--></AD_COLUMN>
 
 <!--F8F6A13C5682DC4DE040007F01000363--><AD_COLUMN>
@@ -11644,6 +12207,7 @@
 <!--F8F6A13C5682DC4DE040007F01000363-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--F8F6A13C5682DC4DE040007F01000363-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--F8F6A13C5682DC4DE040007F01000363-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--F8F6A13C5682DC4DE040007F01000363-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--F8F6A13C5682DC4DE040007F01000363-->  <EM_OBUIAPP_PROCESS_ID><![CDATA[9BED7889E1034FE68BD85D5D16857320]]></EM_OBUIAPP_PROCESS_ID>
 <!--F8F6A13C5682DC4DE040007F01000363--></AD_COLUMN>
 
@@ -11682,6 +12246,7 @@
 <!--FA5D73939D454F8E804DFACEE44D0C6E-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--FA5D73939D454F8E804DFACEE44D0C6E-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--FA5D73939D454F8E804DFACEE44D0C6E-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--FA5D73939D454F8E804DFACEE44D0C6E-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--FA5D73939D454F8E804DFACEE44D0C6E--></AD_COLUMN>
 
 <!--FA6349D74151420A86921C36A7977DF7--><AD_COLUMN>
@@ -11718,6 +12283,7 @@
 <!--FA6349D74151420A86921C36A7977DF7-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--FA6349D74151420A86921C36A7977DF7-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--FA6349D74151420A86921C36A7977DF7-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--FA6349D74151420A86921C36A7977DF7-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--FA6349D74151420A86921C36A7977DF7-->  <EM_OBUIAPP_PROCESS_ID><![CDATA[6F87442DF7BC43AB8A666BDED2F7D64E]]></EM_OBUIAPP_PROCESS_ID>
 <!--FA6349D74151420A86921C36A7977DF7--></AD_COLUMN>
 
@@ -11755,6 +12321,7 @@
 <!--FDE1E0795CDC4A00AC9D587E0D98D319-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--FDE1E0795CDC4A00AC9D587E0D98D319-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--FDE1E0795CDC4A00AC9D587E0D98D319-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--FDE1E0795CDC4A00AC9D587E0D98D319-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--FDE1E0795CDC4A00AC9D587E0D98D319--></AD_COLUMN>
 
 <!--FE24DEE7950D47A68BD883DF1F7BA506--><AD_COLUMN>
@@ -11790,6 +12357,7 @@
 <!--FE24DEE7950D47A68BD883DF1F7BA506-->  <ENTITY_ALIAS><![CDATA[bsl.matchingtype]]></ENTITY_ALIAS>
 <!--FE24DEE7950D47A68BD883DF1F7BA506-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--FE24DEE7950D47A68BD883DF1F7BA506-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--FE24DEE7950D47A68BD883DF1F7BA506-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--FE24DEE7950D47A68BD883DF1F7BA506--></AD_COLUMN>
 
 <!--FEB149D92A0E4F9E9532F0F78A16B0A8--><AD_COLUMN>
@@ -11827,6 +12395,7 @@
 <!--FEB149D92A0E4F9E9532F0F78A16B0A8-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--FEB149D92A0E4F9E9532F0F78A16B0A8-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--FEB149D92A0E4F9E9532F0F78A16B0A8-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--FEB149D92A0E4F9E9532F0F78A16B0A8-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--FEB149D92A0E4F9E9532F0F78A16B0A8--></AD_COLUMN>
 
 <!--FF082FD594D64E958DB1CE24B011C97B--><AD_COLUMN>
@@ -11864,6 +12433,7 @@
 <!--FF082FD594D64E958DB1CE24B011C97B-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--FF082FD594D64E958DB1CE24B011C97B-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--FF082FD594D64E958DB1CE24B011C97B-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--FF082FD594D64E958DB1CE24B011C97B-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--FF082FD594D64E958DB1CE24B011C97B--></AD_COLUMN>
 
 </data>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Sep 29 15:56:24 2016 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml	Tue Oct 04 15:27:03 2016 +0000
@@ -50,6 +50,20 @@
 <!--0CF797887AC9494F9C250A6B6EB5D60D-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--0CF797887AC9494F9C250A6B6EB5D60D--></AD_ELEMENT>
 
+<!--124C4AAA06BA4D939D862BEE389AB4DA--><AD_ELEMENT>
+<!--124C4AAA06BA4D939D862BEE389AB4DA-->  <AD_ELEMENT_ID><![CDATA[124C4AAA06BA4D939D862BEE389AB4DA]]></AD_ELEMENT_ID>
+<!--124C4AAA06BA4D939D862BEE389AB4DA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--124C4AAA06BA4D939D862BEE389AB4DA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--124C4AAA06BA4D939D862BEE389AB4DA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--124C4AAA06BA4D939D862BEE389AB4DA-->  <COLUMNNAME><![CDATA[EM_APRM_Displayed_Acc_ID]]></COLUMNNAME>
+<!--124C4AAA06BA4D939D862BEE389AB4DA-->  <NAME><![CDATA[Financial Account]]></NAME>
+<!--124C4AAA06BA4D939D862BEE389AB4DA-->  <PRINTNAME><![CDATA[Financial Account]]></PRINTNAME>
+<!--124C4AAA06BA4D939D862BEE389AB4DA-->  <DESCRIPTION><![CDATA[Displayed Financial Account field in Sales Order Payment Schedule Details tab. For netting payments the value displayed will be empty.]]></DESCRIPTION>
+<!--124C4AAA06BA4D939D862BEE389AB4DA-->  <HELP><![CDATA[Displayed Financial Account field in Sales Order Payment Schedule Details tab. For netting payments the value displayed will be empty.]]></HELP>
+<!--124C4AAA06BA4D939D862BEE389AB4DA-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--124C4AAA06BA4D939D862BEE389AB4DA-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--124C4AAA06BA4D939D862BEE389AB4DA--></AD_ELEMENT>
+
 <!--1C8028555014460F81C6ACC811CA74E2--><AD_ELEMENT>
 <!--1C8028555014460F81C6ACC811CA74E2-->  <AD_ELEMENT_ID><![CDATA[1C8028555014460F81C6ACC811CA74E2]]></AD_ELEMENT_ID>
 <!--1C8028555014460F81C6ACC811CA74E2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -86,6 +100,20 @@
 <!--256AB5C3D6144B2C9884CF0FA4D81911-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--256AB5C3D6144B2C9884CF0FA4D81911--></AD_ELEMENT>
 
+<!--2622EC9C32614ED692A415EC3F3DC3EF--><AD_ELEMENT>
+<!--2622EC9C32614ED692A415EC3F3DC3EF-->  <AD_ELEMENT_ID><![CDATA[2622EC9C32614ED692A415EC3F3DC3EF]]></AD_ELEMENT_ID>
+<!--2622EC9C32614ED692A415EC3F3DC3EF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2622EC9C32614ED692A415EC3F3DC3EF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2622EC9C32614ED692A415EC3F3DC3EF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2622EC9C32614ED692A415EC3F3DC3EF-->  <COLUMNNAME><![CDATA[EM_APRM_PaymentMethod]]></COLUMNNAME>
+<!--2622EC9C32614ED692A415EC3F3DC3EF-->  <NAME><![CDATA[Payment Method]]></NAME>
+<!--2622EC9C32614ED692A415EC3F3DC3EF-->  <PRINTNAME><![CDATA[Payment Method]]></PRINTNAME>
+<!--2622EC9C32614ED692A415EC3F3DC3EF-->  <DESCRIPTION><![CDATA[Payment Method in Sales Invoice]]></DESCRIPTION>
+<!--2622EC9C32614ED692A415EC3F3DC3EF-->  <HELP><![CDATA[Payment Method in Sales Invoice]]></HELP>
+<!--2622EC9C32614ED692A415EC3F3DC3EF-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--2622EC9C32614ED692A415EC3F3DC3EF-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--2622EC9C32614ED692A415EC3F3DC3EF--></AD_ELEMENT>
+
 <!--2C70D5BAFED340D68C564DA5C3F15A7E--><AD_ELEMENT>
 <!--2C70D5BAFED340D68C564DA5C3F15A7E-->  <AD_ELEMENT_ID><![CDATA[2C70D5BAFED340D68C564DA5C3F15A7E]]></AD_ELEMENT_ID>
 <!--2C70D5BAFED340D68C564DA5C3F15A7E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -123,7 +151,7 @@
 <!--2D1363BA8FFD443D89B0F2C92FD2BBC4-->  <NAME><![CDATA[Currency To]]></NAME>
 <!--2D1363BA8FFD443D89B0F2C92FD2BBC4-->  <PRINTNAME><![CDATA[Currency To]]></PRINTNAME>
 <!--2D1363BA8FFD443D89B0F2C92FD2BBC4-->  <DESCRIPTION><![CDATA[Target currency]]></DESCRIPTION>
-<!--2D1363BA8FFD443D89B0F2C92FD2BBC4-->  <HELP><![CDATA[The Currency To defines the target currency for this conversion rate.]]></HELP>
+<!--2D1363BA8FFD443D89B0F2C92FD2BBC4-->  <HELP><![CDATA[The Currency To defines the target currency for this conversion rate]]></HELP>
 <!--2D1363BA8FFD443D89B0F2C92FD2BBC4-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--2D1363BA8FFD443D89B0F2C92FD2BBC4-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--2D1363BA8FFD443D89B0F2C92FD2BBC4--></AD_ELEMENT>
@@ -182,6 +210,20 @@
 <!--3D4B985F137B47DCA7723991D1668C46-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--3D4B985F137B47DCA7723991D1668C46--></AD_ELEMENT>
 
+<!--3FD7BEBC464E44469550B39D5C48AE2C--><AD_ELEMENT>
+<!--3FD7BEBC464E44469550B39D5C48AE2C-->  <AD_ELEMENT_ID><![CDATA[3FD7BEBC464E44469550B39D5C48AE2C]]></AD_ELEMENT_ID>
+<!--3FD7BEBC464E44469550B39D5C48AE2C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3FD7BEBC464E44469550B39D5C48AE2C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3FD7BEBC464E44469550B39D5C48AE2C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3FD7BEBC464E44469550B39D5C48AE2C-->  <COLUMNNAME><![CDATA[trxdate]]></COLUMNNAME>
+<!--3FD7BEBC464E44469550B39D5C48AE2C-->  <NAME><![CDATA[Transaction Date]]></NAME>
+<!--3FD7BEBC464E44469550B39D5C48AE2C-->  <PRINTNAME><![CDATA[Transaction Date]]></PRINTNAME>
+<!--3FD7BEBC464E44469550B39D5C48AE2C-->  <DESCRIPTION><![CDATA[Date for the generated transactions]]></DESCRIPTION>
+<!--3FD7BEBC464E44469550B39D5C48AE2C-->  <HELP><![CDATA[Date for the generated transactions]]></HELP>
+<!--3FD7BEBC464E44469550B39D5C48AE2C-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--3FD7BEBC464E44469550B39D5C48AE2C-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--3FD7BEBC464E44469550B39D5C48AE2C--></AD_ELEMENT>
+
 <!--429B447E4FE9420287E1EEB75DC341E9--><AD_ELEMENT>
 <!--429B447E4FE9420287E1EEB75DC341E9-->  <AD_ELEMENT_ID><![CDATA[429B447E4FE9420287E1EEB75DC341E9]]></AD_ELEMENT_ID>
 <!--429B447E4FE9420287E1EEB75DC341E9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -236,6 +278,20 @@
 <!--4BFB1532D2684F2B9997BF3B5555BFCB-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--4BFB1532D2684F2B9997BF3B5555BFCB--></AD_ELEMENT>
 
+<!--4E2A12CBEE07461DAA355A0E0B81AA3B--><AD_ELEMENT>
+<!--4E2A12CBEE07461DAA355A0E0B81AA3B-->  <AD_ELEMENT_ID><![CDATA[4E2A12CBEE07461DAA355A0E0B81AA3B]]></AD_ELEMENT_ID>
+<!--4E2A12CBEE07461DAA355A0E0B81AA3B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4E2A12CBEE07461DAA355A0E0B81AA3B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4E2A12CBEE07461DAA355A0E0B81AA3B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4E2A12CBEE07461DAA355A0E0B81AA3B-->  <COLUMNNAME><![CDATA[bank_fee_to]]></COLUMNNAME>
+<!--4E2A12CBEE07461DAA355A0E0B81AA3B-->  <NAME><![CDATA[Bank Fee To]]></NAME>
+<!--4E2A12CBEE07461DAA355A0E0B81AA3B-->  <PRINTNAME><![CDATA[Bank Fee To]]></PRINTNAME>
+<!--4E2A12CBEE07461DAA355A0E0B81AA3B-->  <DESCRIPTION><![CDATA[Fee at the target Bank]]></DESCRIPTION>
+<!--4E2A12CBEE07461DAA355A0E0B81AA3B-->  <HELP><![CDATA[Fee at the target Bank]]></HELP>
+<!--4E2A12CBEE07461DAA355A0E0B81AA3B-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--4E2A12CBEE07461DAA355A0E0B81AA3B-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--4E2A12CBEE07461DAA355A0E0B81AA3B--></AD_ELEMENT>
+
 <!--51261A2D20064858BC608E7468B148D4--><AD_ELEMENT>
 <!--51261A2D20064858BC608E7468B148D4-->  <AD_ELEMENT_ID><![CDATA[51261A2D20064858BC608E7468B148D4]]></AD_ELEMENT_ID>
 <!--51261A2D20064858BC608E7468B148D4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -376,6 +432,34 @@
 <!--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>
+<!--5EE957873DEE4461A57BA8CAEAF50943-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5EE957873DEE4461A57BA8CAEAF50943-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5EE957873DEE4461A57BA8CAEAF50943-->  <COLUMNNAME><![CDATA[ad_org_id_process]]></COLUMNNAME>
+<!--5EE957873DEE4461A57BA8CAEAF50943-->  <NAME><![CDATA[Process Organization]]></NAME>
+<!--5EE957873DEE4461A57BA8CAEAF50943-->  <PRINTNAME><![CDATA[Process Organization]]></PRINTNAME>
+<!--5EE957873DEE4461A57BA8CAEAF50943-->  <DESCRIPTION><![CDATA[Parameter used to save value of current Process Definition ad_org_id parameter.]]></DESCRIPTION>
+<!--5EE957873DEE4461A57BA8CAEAF50943-->  <HELP><![CDATA[Parameter used to save value of current Process Definition ad_org_id parameter.]]></HELP>
+<!--5EE957873DEE4461A57BA8CAEAF50943-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--5EE957873DEE4461A57BA8CAEAF50943-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--5EE957873DEE4461A57BA8CAEAF50943--></AD_ELEMENT>
+
 <!--5FD519D1480447A092C2C08E6B462B8E--><AD_ELEMENT>
 <!--5FD519D1480447A092C2C08E6B462B8E-->  <AD_ELEMENT_ID><![CDATA[5FD519D1480447A092C2C08E6B462B8E]]></AD_ELEMENT_ID>
 <!--5FD519D1480447A092C2C08E6B462B8E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -402,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>
@@ -1010,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>
@@ -1188,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>
@@ -1310,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>
@@ -1350,6 +1502,34 @@
 <!--D51BEAD64B9C4D5FBC097873933ACEB3-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--D51BEAD64B9C4D5FBC097873933ACEB3--></AD_ELEMENT>
 
+<!--D521B46D67FA4014B71B52EE04B0492A--><AD_ELEMENT>
+<!--D521B46D67FA4014B71B52EE04B0492A-->  <AD_ELEMENT_ID><![CDATA[D521B46D67FA4014B71B52EE04B0492A]]></AD_ELEMENT_ID>
+<!--D521B46D67FA4014B71B52EE04B0492A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D521B46D67FA4014B71B52EE04B0492A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D521B46D67FA4014B71B52EE04B0492A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D521B46D67FA4014B71B52EE04B0492A-->  <COLUMNNAME><![CDATA[c_currency_from_id]]></COLUMNNAME>
+<!--D521B46D67FA4014B71B52EE04B0492A-->  <NAME><![CDATA[Currency From]]></NAME>
+<!--D521B46D67FA4014B71B52EE04B0492A-->  <PRINTNAME><![CDATA[Currency From]]></PRINTNAME>
+<!--D521B46D67FA4014B71B52EE04B0492A-->  <DESCRIPTION><![CDATA[The Currency From defines the source currency]]></DESCRIPTION>
+<!--D521B46D67FA4014B71B52EE04B0492A-->  <HELP><![CDATA[The Currency From defines the source currency]]></HELP>
+<!--D521B46D67FA4014B71B52EE04B0492A-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--D521B46D67FA4014B71B52EE04B0492A-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--D521B46D67FA4014B71B52EE04B0492A--></AD_ELEMENT>
+
+<!--D62D89A819A840B3978E4434C9B66C86--><AD_ELEMENT>
+<!--D62D89A819A840B3978E4434C9B66C86-->  <AD_ELEMENT_ID><![CDATA[D62D89A819A840B3978E4434C9B66C86]]></AD_ELEMENT_ID>
+<!--D62D89A819A840B3978E4434C9B66C86-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D62D89A819A840B3978E4434C9B66C86-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D62D89A819A840B3978E4434C9B66C86-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D62D89A819A840B3978E4434C9B66C86-->  <COLUMNNAME><![CDATA[EM_APRM_FinancialAccount]]></COLUMNNAME>
+<!--D62D89A819A840B3978E4434C9B66C86-->  <NAME><![CDATA[Financial Account]]></NAME>
+<!--D62D89A819A840B3978E4434C9B66C86-->  <PRINTNAME><![CDATA[Financial Account]]></PRINTNAME>
+<!--D62D89A819A840B3978E4434C9B66C86-->  <DESCRIPTION><![CDATA[Financial Account in sales invoice details]]></DESCRIPTION>
+<!--D62D89A819A840B3978E4434C9B66C86-->  <HELP><![CDATA[Financial Account in sales invoice details]]></HELP>
+<!--D62D89A819A840B3978E4434C9B66C86-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--D62D89A819A840B3978E4434C9B66C86-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--D62D89A819A840B3978E4434C9B66C86--></AD_ELEMENT>
+
 <!--D85187ABF8434C39A9A11EE8EFCF3DDE--><AD_ELEMENT>
 <!--D85187ABF8434C39A9A11EE8EFCF3DDE-->  <AD_ELEMENT_ID><![CDATA[D85187ABF8434C39A9A11EE8EFCF3DDE]]></AD_ELEMENT_ID>
 <!--D85187ABF8434C39A9A11EE8EFCF3DDE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml	Thu Sep 29 15:56:24 2016 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml	Tue Oct 04 15:27:03 2016 +0000
@@ -864,6 +864,35 @@
 <!--0A23152718D54E99B941D9AA1BF33734-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--0A23152718D54E99B941D9AA1BF33734--></AD_FIELD>
 
+<!--0A650E8E8BD944018FD4FD6866AF1481--><AD_FIELD>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <AD_FIELD_ID><![CDATA[0A650E8E8BD944018FD4FD6866AF1481]]></AD_FIELD_ID>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <NAME><![CDATA[Funds Transfer]]></NAME>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <DESCRIPTION><![CDATA[Transfer funds between Financial Accounts]]></DESCRIPTION>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <HELP><![CDATA[Transfer funds between Financial Accounts]]></HELP>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <AD_TAB_ID><![CDATA[2845D761A8394468BD3BA4710AA888D4]]></AD_TAB_ID>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <AD_COLUMN_ID><![CDATA[AFFEB1DBCEFF4A63871F1E214E01071C]]></AD_COLUMN_ID>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <SEQNO><![CDATA[440]]></SEQNO>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <GRID_SEQNO><![CDATA[100]]></GRID_SEQNO>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--0A650E8E8BD944018FD4FD6866AF1481-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--0A650E8E8BD944018FD4FD6866AF1481--></AD_FIELD>
+
 <!--0A6ECDB2025440518983B3B14BF1697B--><AD_FIELD>
 <!--0A6ECDB2025440518983B3B14BF1697B-->  <AD_FIELD_ID><![CDATA[0A6ECDB2025440518983B3B14BF1697B]]></AD_FIELD_ID>
 <!--0A6ECDB2025440518983B3B14BF1697B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -3718,6 +3747,35 @@
 <!--36A419B53C97486EAFE5FF25654058E4-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--36A419B53C97486EAFE5FF25654058E4--></AD_FIELD>
 
+<!--36B58B2BEF8448CA9D384A70E08B9E0E--><AD_FIELD>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <AD_FIELD_ID><![CDATA[36B58B2BEF8448CA9D384A70E08B9E0E]]></AD_FIELD_ID>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <NAME><![CDATA[Financial Account]]></NAME>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <DESCRIPTION><![CDATA[Displayed Financial Account field in Sales Order Payment Schedule Details tab. For netting payments the value displayed will be empty.]]></DESCRIPTION>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <HELP><![CDATA[Displayed Financial Account field in Sales Order Payment Schedule Details tab. For netting payments the value displayed will be empty.]]></HELP>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <AD_TAB_ID><![CDATA[B82C02920AA84E8DB57D553185BD2F06]]></AD_TAB_ID>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <AD_COLUMN_ID><![CDATA[47DC39551EA14F5E861296054B731B26]]></AD_COLUMN_ID>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <SEQNO><![CDATA[55]]></SEQNO>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <GRID_SEQNO><![CDATA[85]]></GRID_SEQNO>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <STARTNEWLINE><![CDATA[Y]]></STARTNEWLINE>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--36B58B2BEF8448CA9D384A70E08B9E0E--></AD_FIELD>
+
 <!--36C4188FB51E4D608C0F6538C8C29199--><AD_FIELD>
 <!--36C4188FB51E4D608C0F6538C8C29199-->  <AD_FIELD_ID><![CDATA[36C4188FB51E4D608C0F6538C8C29199]]></AD_FIELD_ID>
 <!--36C4188FB51E4D608C0F6538C8C29199-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -12558,14 +12616,14 @@
 <!--8C43882A0A404DA29F4C6DA95802CA1B-->  <AD_TAB_ID><![CDATA[B82C02920AA84E8DB57D553185BD2F06]]></AD_TAB_ID>
 <!--8C43882A0A404DA29F4C6DA95802CA1B-->  <AD_COLUMN_ID><![CDATA[7FF2234748F2844FE040007F01003861]]></AD_COLUMN_ID>
 <!--8C43882A0A404DA29F4C6DA95802CA1B-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--8C43882A0A404DA29F4C6DA95802CA1B-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--8C43882A0A404DA29F4C6DA95802CA1B-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
 <!--8C43882A0A404DA29F4C6DA95802CA1B-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
 <!--8C43882A0A404DA29F4C6DA95802CA1B-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--8C43882A0A404DA29F4C6DA95802CA1B-->  <SEQNO><![CDATA[50]]></SEQNO>
 <!--8C43882A0A404DA29F4C6DA95802CA1B-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--8C43882A0A404DA29F4C6DA95802CA1B-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--8C43882A0A404DA29F4C6DA95802CA1B-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--8C43882A0A404DA29F4C6DA95802CA1B-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--8C43882A0A404DA29F4C6DA95802CA1B-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--8C43882A0A404DA29F4C6DA95802CA1B-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--8C43882A0A404DA29F4C6DA95802CA1B-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--8C43882A0A404DA29F4C6DA95802CA1B-->  <GRID_SEQNO><![CDATA[80]]></GRID_SEQNO>
@@ -14001,6 +14059,35 @@
 <!--A19EFBCD4CEE48ADA318EB734806CFC5-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--A19EFBCD4CEE48ADA318EB734806CFC5--></AD_FIELD>
 
+<!--A27C0C1F043945BBAC61B8B8CB79098D--><AD_FIELD>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <AD_FIELD_ID><![CDATA[A27C0C1F043945BBAC61B8B8CB79098D]]></AD_FIELD_ID>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <NAME><![CDATA[Financial Account]]></NAME>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <DESCRIPTION><![CDATA[Financial Account in sales invoice details]]></DESCRIPTION>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <HELP><![CDATA[Financial Account in sales invoice details]]></HELP>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <AD_TAB_ID><![CDATA[F6C2283A21314407BBBB23FF14B85ED4]]></AD_TAB_ID>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <AD_COLUMN_ID><![CDATA[03EBACA2EF974E3F9E58A6FE8EF8AECB]]></AD_COLUMN_ID>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <IGNOREINWAD><![CDATA[Y]]></IGNOREINWAD>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <SEQNO><![CDATA[205]]></SEQNO>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <GRID_SEQNO><![CDATA[8]]></GRID_SEQNO>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--A27C0C1F043945BBAC61B8B8CB79098D-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--A27C0C1F043945BBAC61B8B8CB79098D--></AD_FIELD>
+
 <!--A28B0A82995D87F5E040007F010067A0--><AD_FIELD>
 <!--A28B0A82995D87F5E040007F010067A0-->  <AD_FIELD_ID><![CDATA[A28B0A82995D87F5E040007F010067A0]]></AD_FIELD_ID>
 <!--A28B0A82995D87F5E040007F010067A0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -15541,6 +15628,35 @@
 <!--A95A4F99B6CA47D48D8E430B5E6EF85B-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--A95A4F99B6CA47D48D8E430B5E6EF85B--></AD_FIELD>
 
+<!--A9FFD31F45874125989D273B69D76419--><AD_FIELD>
+<!--A9FFD31F45874125989D273B69D76419-->  <AD_FIELD_ID><![CDATA[A9FFD31F45874125989D273B69D76419]]></AD_FIELD_ID>
+<!--A9FFD31F45874125989D273B69D76419-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A9FFD31F45874125989D273B69D76419-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A9FFD31F45874125989D273B69D76419-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A9FFD31F45874125989D273B69D76419-->  <NAME><![CDATA[Payment Method]]></NAME>
+<!--A9FFD31F45874125989D273B69D76419-->  <DESCRIPTION><![CDATA[Payment Method in Sales Invoice]]></DESCRIPTION>
+<!--A9FFD31F45874125989D273B69D76419-->  <HELP><![CDATA[Payment Method in Sales Invoice]]></HELP>
+<!--A9FFD31F45874125989D273B69D76419-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--A9FFD31F45874125989D273B69D76419-->  <AD_TAB_ID><![CDATA[F6C2283A21314407BBBB23FF14B85ED4]]></AD_TAB_ID>
+<!--A9FFD31F45874125989D273B69D76419-->  <AD_COLUMN_ID><![CDATA[E73D535A7F9D4494AF132A66AE861168]]></AD_COLUMN_ID>
+<!--A9FFD31F45874125989D273B69D76419-->  <IGNOREINWAD><![CDATA[Y]]></IGNOREINWAD>
+<!--A9FFD31F45874125989D273B69D76419-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--A9FFD31F45874125989D273B69D76419-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--A9FFD31F45874125989D273B69D76419-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--A9FFD31F45874125989D273B69D76419-->  <SEQNO><![CDATA[185]]></SEQNO>
+<!--A9FFD31F45874125989D273B69D76419-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--A9FFD31F45874125989D273B69D76419-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--A9FFD31F45874125989D273B69D76419-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--A9FFD31F45874125989D273B69D76419-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--A9FFD31F45874125989D273B69D76419-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--A9FFD31F45874125989D273B69D76419-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--A9FFD31F45874125989D273B69D76419-->  <GRID_SEQNO><![CDATA[4]]></GRID_SEQNO>
+<!--A9FFD31F45874125989D273B69D76419-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--A9FFD31F45874125989D273B69D76419-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--A9FFD31F45874125989D273B69D76419-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--A9FFD31F45874125989D273B69D76419-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--A9FFD31F45874125989D273B69D76419--></AD_FIELD>
+
 <!--AA2A1A994B4B430EB0E4B1592A07D4EC--><AD_FIELD>
 <!--AA2A1A994B4B430EB0E4B1592A07D4EC-->  <AD_FIELD_ID><![CDATA[AA2A1A994B4B430EB0E4B1592A07D4EC]]></AD_FIELD_ID>
 <!--AA2A1A994B4B430EB0E4B1592A07D4EC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -17460,17 +17576,16 @@
 <!--B712FAD6A5C843A6A8204FDFB4435580-->  <AD_COLUMN_ID><![CDATA[7DC34559B3F1B45BE040007F0100784A]]></AD_COLUMN_ID>
 <!--B712FAD6A5C843A6A8204FDFB4435580-->  <PROPERTY><![CDATA[paymentDetails.finPayment.paymentMethod]]></PROPERTY>
 <!--B712FAD6A5C843A6A8204FDFB4435580-->  <IGNOREINWAD><![CDATA[Y]]></IGNOREINWAD>
-<!--B712FAD6A5C843A6A8204FDFB4435580-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--B712FAD6A5C843A6A8204FDFB4435580-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
 <!--B712FAD6A5C843A6A8204FDFB4435580-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--B712FAD6A5C843A6A8204FDFB4435580-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--B712FAD6A5C843A6A8204FDFB4435580-->  <SEQNO><![CDATA[180]]></SEQNO>
 <!--B712FAD6A5C843A6A8204FDFB4435580-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--B712FAD6A5C843A6A8204FDFB4435580-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--B712FAD6A5C843A6A8204FDFB4435580-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--B712FAD6A5C843A6A8204FDFB4435580-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--B712FAD6A5C843A6A8204FDFB4435580-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--B712FAD6A5C843A6A8204FDFB4435580-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--B712FAD6A5C843A6A8204FDFB4435580-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--B712FAD6A5C843A6A8204FDFB4435580-->  <GRID_SEQNO><![CDATA[4]]></GRID_SEQNO>
 <!--B712FAD6A5C843A6A8204FDFB4435580-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--B712FAD6A5C843A6A8204FDFB4435580-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--B712FAD6A5C843A6A8204FDFB4435580-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -20762,14 +20877,14 @@
 <!--E5F642615018457ABD72FB6C4957A3C8-->  <AD_TAB_ID><![CDATA[B82C02920AA84E8DB57D553185BD2F06]]></AD_TAB_ID>
 <!--E5F642615018457ABD72FB6C4957A3C8-->  <AD_COLUMN_ID><![CDATA[7DC34559B3F7B45BE040007F0100784A]]></AD_COLUMN_ID>
 <!--E5F642615018457ABD72FB6C4957A3C8-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--E5F642615018457ABD72FB6C4957A3C8-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--E5F642615018457ABD72FB6C4957A3C8-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
 <!--E5F642615018457ABD72FB6C4957A3C8-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
 <!--E5F642615018457ABD72FB6C4957A3C8-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--E5F642615018457ABD72FB6C4957A3C8-->  <SEQNO><![CDATA[40]]></SEQNO>
 <!--E5F642615018457ABD72FB6C4957A3C8-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--E5F642615018457ABD72FB6C4957A3C8-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--E5F642615018457ABD72FB6C4957A3C8-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--E5F642615018457ABD72FB6C4957A3C8-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--E5F642615018457ABD72FB6C4957A3C8-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--E5F642615018457ABD72FB6C4957A3C8-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--E5F642615018457ABD72FB6C4957A3C8-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--E5F642615018457ABD72FB6C4957A3C8-->  <GRID_SEQNO><![CDATA[40]]></GRID_SEQNO>
@@ -21040,17 +21155,16 @@
 <!--E8276CA9F9DA475CA56ABE47A470ABB2-->  <AD_COLUMN_ID><![CDATA[03276FB53CC54CC1829E0AA6EC0F2EE6]]></AD_COLUMN_ID>
 <!--E8276CA9F9DA475CA56ABE47A470ABB2-->  <PROPERTY><![CDATA[paymentDetails.finPayment.account]]></PROPERTY>
 <!--E8276CA9F9DA475CA56ABE47A470ABB2-->  <IGNOREINWAD><![CDATA[Y]]></IGNOREINWAD>
-<!--E8276CA9F9DA475CA56ABE47A470ABB2-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--E8276CA9F9DA475CA56ABE47A470ABB2-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
 <!--E8276CA9F9DA475CA56ABE47A470ABB2-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--E8276CA9F9DA475CA56ABE47A470ABB2-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--E8276CA9F9DA475CA56ABE47A470ABB2-->  <SEQNO><![CDATA[200]]></SEQNO>
 <!--E8276CA9F9DA475CA56ABE47A470ABB2-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--E8276CA9F9DA475CA56ABE47A470ABB2-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--E8276CA9F9DA475CA56ABE47A470ABB2-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--E8276CA9F9DA475CA56ABE47A470ABB2-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--E8276CA9F9DA475CA56ABE47A470ABB2-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--E8276CA9F9DA475CA56ABE47A470ABB2-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--E8276CA9F9DA475CA56ABE47A470ABB2-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--E8276CA9F9DA475CA56ABE47A470ABB2-->  <GRID_SEQNO><![CDATA[8]]></GRID_SEQNO>
 <!--E8276CA9F9DA475CA56ABE47A470ABB2-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--E8276CA9F9DA475CA56ABE47A470ABB2-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--E8276CA9F9DA475CA56ABE47A470ABB2-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -21534,6 +21648,35 @@
 <!--F195EACFC9FD47C6BA15B51B6A10F25E-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--F195EACFC9FD47C6BA15B51B6A10F25E--></AD_FIELD>
 
+<!--F2650368C73341B0B6794287FA5C23C2--><AD_FIELD>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <AD_FIELD_ID><![CDATA[F2650368C73341B0B6794287FA5C23C2]]></AD_FIELD_ID>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <NAME><![CDATA[Payment Method]]></NAME>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <DESCRIPTION><![CDATA[Displayed Payment Method field in Sales Order Payment Schedule Details tab. For netting payments the value displayed will be empty.]]></DESCRIPTION>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <HELP><![CDATA[Displayed Payment Method field in Sales Order Payment Schedule Details tab. For netting payments the value displayed will be empty.]]></HELP>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <AD_TAB_ID><![CDATA[B82C02920AA84E8DB57D553185BD2F06]]></AD_TAB_ID>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <AD_COLUMN_ID><![CDATA[C8B98FF8B51C43F7B12E8C448B0A2725]]></AD_COLUMN_ID>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <SEQNO><![CDATA[45]]></SEQNO>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <GRID_SEQNO><![CDATA[45]]></GRID_SEQNO>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--F2650368C73341B0B6794287FA5C23C2-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--F2650368C73341B0B6794287FA5C23C2--></AD_FIELD>
+
 <!--F26956BDA9F147249DDC8195C303BAA2--><AD_FIELD>
 <!--F26956BDA9F147249DDC8195C303BAA2-->  <AD_FIELD_ID><![CDATA[F26956BDA9F147249DDC8195C303BAA2]]></AD_FIELD_ID>
 <!--F26956BDA9F147249DDC8195C303BAA2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -22347,6 +22490,35 @@
 <!--FBB3EED14BE0419CA1B33A0944486071-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--FBB3EED14BE0419CA1B33A0944486071--></AD_FIELD>
 
+<!--FBEA6835AE0543FE8821B907BD5D0F0B--><AD_FIELD>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <AD_FIELD_ID><![CDATA[FBEA6835AE0543FE8821B907BD5D0F0B]]></AD_FIELD_ID>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <NAME><![CDATA[Origin Financial Account]]></NAME>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <DESCRIPTION><![CDATA[Financial Account from where the funds were transferred]]></DESCRIPTION>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <HELP><![CDATA[Financial Account from where the funds were transferred]]></HELP>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <AD_TAB_ID><![CDATA[23691259D1BD4496BCC5F32645BCA4B9]]></AD_TAB_ID>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <AD_COLUMN_ID><![CDATA[D5B4BD05344C4B44AB7ED2F6CF9C86F6]]></AD_COLUMN_ID>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <DISPLAYLOGIC><![CDATA[@EM_Aprm_Finacc_Trans_Origin@!'']]></DISPLAYLOGIC>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <SEQNO><![CDATA[80]]></SEQNO>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--FBEA6835AE0543FE8821B907BD5D0F0B--></AD_FIELD>
+
 <!--FBED2B2835ED4230B93D4792FBAB4CC3--><AD_FIELD>
 <!--FBED2B2835ED4230B93D4792FBAB4CC3-->  <AD_FIELD_ID><![CDATA[FBED2B2835ED4230B93D4792FBAB4CC3]]></AD_FIELD_ID>
 <!--FBED2B2835ED4230B93D4792FBAB4CC3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml	Thu Sep 29 15:56:24 2016 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml	Tue Oct 04 15:27:03 2016 +0000
@@ -96,6 +96,18 @@
 <!--12A17D39C7664BDE8B1A0F079D44591E-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--12A17D39C7664BDE8B1A0F079D44591E--></AD_MESSAGE>
 
+<!--12FBA6D054F04E6BA11C7CB00A0B70BA--><AD_MESSAGE>
+<!--12FBA6D054F04E6BA11C7CB00A0B70BA-->  <AD_MESSAGE_ID><![CDATA[12FBA6D054F04E6BA11C7CB00A0B70BA]]></AD_MESSAGE_ID>
+<!--12FBA6D054F04E6BA11C7CB00A0B70BA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--12FBA6D054F04E6BA11C7CB00A0B70BA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--12FBA6D054F04E6BA11C7CB00A0B70BA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--12FBA6D054F04E6BA11C7CB00A0B70BA-->  <VALUE><![CDATA[APRM_remline_finpayschdet]]></VALUE>
+<!--12FBA6D054F04E6BA11C7CB00A0B70BA-->  <MSGTEXT><![CDATA[The invoice is already included in a Remittance.]]></MSGTEXT>
+<!--12FBA6D054F04E6BA11C7CB00A0B70BA-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--12FBA6D054F04E6BA11C7CB00A0B70BA-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--12FBA6D054F04E6BA11C7CB00A0B70BA-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--12FBA6D054F04E6BA11C7CB00A0B70BA--></AD_MESSAGE>
+
 <!--1405C086998B431D80615A4FB8EC783B--><AD_MESSAGE>
 <!--1405C086998B431D80615A4FB8EC783B-->  <AD_MESSAGE_ID><![CDATA[1405C086998B431D80615A4FB8EC783B]]></AD_MESSAGE_ID>
 <!--1405C086998B431D80615A4FB8EC783B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -228,6 +240,18 @@
 <!--2118F382AC3646CA8D8F2EAE6504B876-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--2118F382AC3646CA8D8F2EAE6504B876--></AD_MESSAGE>
 
+<!--241C4E48E3E74768952D73702771DA9C--><AD_MESSAGE>
+<!--241C4E48E3E74768952D73702771DA9C-->  <AD_MESSAGE_ID><![CDATA[241C4E48E3E74768952D73702771DA9C]]></AD_MESSAGE_ID>
+<!--241C4E48E3E74768952D73702771DA9C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--241C4E48E3E74768952D73702771DA9C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--241C4E48E3E74768952D73702771DA9C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--241C4E48E3E74768952D73702771DA9C-->  <VALUE><![CDATA[APRM_UnknownError]]></VALUE>
+<!--241C4E48E3E74768952D73702771DA9C-->  <MSGTEXT><![CDATA[An unknown error has occurred.]]></MSGTEXT>
+<!--241C4E48E3E74768952D73702771DA9C-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--241C4E48E3E74768952D73702771DA9C-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--241C4E48E3E74768952D73702771DA9C-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--241C4E48E3E74768952D73702771DA9C--></AD_MESSAGE>
+
 <!--247F96A9D1AB44C2B24CD06B4B05068B--><AD_MESSAGE>
 <!--247F96A9D1AB44C2B24CD06B4B05068B-->  <AD_MESSAGE_ID><![CDATA[247F96A9D1AB44C2B24CD06B4B05068B]]></AD_MESSAGE_ID>
 <!--247F96A9D1AB44C2B24CD06B4B05068B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1225,6 +1249,18 @@
 <!--BE7AE60244C34C8AB03616F5A70B45D2-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--BE7AE60244C34C8AB03616F5A70B45D2--></AD_MESSAGE>
 
+<!--C05265FE175B42248130883AACF2BD20--><AD_MESSAGE>
+<!--C05265FE175B42248130883AACF2BD20-->  <AD_MESSAGE_ID><![CDATA[C05265FE175B42248130883AACF2BD20]]></AD_MESSAGE_ID>
+<!--C05265FE175B42248130883AACF2BD20-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C05265FE175B42248130883AACF2BD20-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C05265FE175B42248130883AACF2BD20-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C05265FE175B42248130883AACF2BD20-->  <VALUE><![CDATA[APRM_AutomaticExecutionProcess]]></VALUE>
+<!--C05265FE175B42248130883AACF2BD20-->  <MSGTEXT><![CDATA[It is not possible to process a transaction with a payment having an automatic execution process payment method. Please, execute the payment in Payment In/Out window first.]]></MSGTEXT>
+<!--C05265FE175B42248130883AACF2BD20-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--C05265FE175B42248130883AACF2BD20-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--C05265FE175B42248130883AACF2BD20-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--C05265FE175B42248130883AACF2BD20--></AD_MESSAGE>
+
 <!--C36865A47B99485980CC8B56AAF59057--><AD_MESSAGE>
 <!--C36865A47B99485980CC8B56AAF59057-->  <AD_MESSAGE_ID><![CDATA[C36865A47B99485980CC8B56AAF59057]]></AD_MESSAGE_ID>
 <!--C36865A47B99485980CC8B56AAF59057-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1393,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>
@@ -1471,7 +1519,7 @@
 <!--EF56DCF572A94E6CAFE4F13948268050-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--EF56DCF572A94E6CAFE4F13948268050-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--EF56DCF572A94E6CAFE4F13948268050-->  <VALUE><![CDATA[APRM_SplitBankStatementLineConfirm]]></VALUE>
-<!--EF56DCF572A94E6CAFE4F13948268050-->  <MSGTEXT><![CDATA[Bank statement line and transaction amount does not match. Do you want to perform a partial match?]]></MSGTEXT>
+<!--EF56DCF572A94E6CAFE4F13948268050-->  <MSGTEXT><![CDATA[Bank statement line amount [%0] and transaction amount [%1] does not match. Do you want to perform a partial match?]]></MSGTEXT>
 <!--EF56DCF572A94E6CAFE4F13948268050-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
 <!--EF56DCF572A94E6CAFE4F13948268050-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--EF56DCF572A94E6CAFE4F13948268050-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Thu Sep 29 15:56:24 2016 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Tue Oct 04 15:27:03 2016 +0000
@@ -6,7 +6,7 @@
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></NAME>
-<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.28899]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.30351]]></VERSION>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <DESCRIPTION><![CDATA[Managing your finances with an ERP does not have to be difficult. Enjoy a radically improved user experience that combines the power of an enterprise grade financial application with the simplicity and ease of a web 2.0 personal accounting service.]]></DESCRIPTION>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <HELP><![CDATA[Advanced Payables and Receivables Management simplifies and automates the business processes around the management of financial accounts, from the receipt and issue of payment, to the reconciliation of those events with bank statements.
 If you would like to help shape this module you are welcome to take part in the forum discussions or register feature requests or issues in the corresponding (Forum and Bug Tracking) sections in the Advanced Payables and Receivable project in the OB Forge.]]></HELP>
@@ -25,7 +25,7 @@
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <UPDATEINFO><![CDATA[Fixed issue with document sequence numbers reset in case of applying dataset second time.
 Fixed issue 15305.]]></UPDATEINFO>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <REFERENCEDATAINFO><![CDATA[Document types and default algorithm for bank statement auto matching]]></REFERENCEDATAINFO>
-<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION_LABEL><![CDATA[PR16Q2.3]]></VERSION_LABEL>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--A918E3331C404B889D69AA9BFAFB23AC--></AD_MODULE>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Sep 29 15:56:24 2016 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Oct 04 15:27:03 2016 +0000
@@ -7,7 +7,7 @@
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID>
-<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.28899]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.30351]]></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.28899]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->  <STARTVERSION><![CDATA[3.0.30351]]></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	Thu Sep 29 15:56:24 2016 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml	Tue Oct 04 15:27:03 2016 +0000
@@ -300,6 +300,18 @@
 <!--8D551C48949841EC84D4FA693C4D7AE3-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
 <!--8D551C48949841EC84D4FA693C4D7AE3--></AD_REFERENCE>
 
+<!--98E0BF0783E44EFABE2F2BDDE866D6AE--><AD_REFERENCE>
+<!--98E0BF0783E44EFABE2F2BDDE866D6AE-->  <AD_REFERENCE_ID><![CDATA[98E0BF0783E44EFABE2F2BDDE866D6AE]]></AD_REFERENCE_ID>
+<!--98E0BF0783E44EFABE2F2BDDE866D6AE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--98E0BF0783E44EFABE2F2BDDE866D6AE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--98E0BF0783E44EFABE2F2BDDE866D6AE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--98E0BF0783E44EFABE2F2BDDE866D6AE-->  <NAME><![CDATA[FIN_Finacc_Transaction selector]]></NAME>
+<!--98E0BF0783E44EFABE2F2BDDE866D6AE-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--98E0BF0783E44EFABE2F2BDDE866D6AE-->  <ISBASEREFERENCE><![CDATA[N]]></ISBASEREFERENCE>
+<!--98E0BF0783E44EFABE2F2BDDE866D6AE-->  <PARENTREFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></PARENTREFERENCE_ID>
+<!--98E0BF0783E44EFABE2F2BDDE866D6AE-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
+<!--98E0BF0783E44EFABE2F2BDDE866D6AE--></AD_REFERENCE>
+
 <!--B8C833E4F0A44A2DA5FC7606F3CD9439--><AD_REFERENCE>
 <!--B8C833E4F0A44A2DA5FC7606F3CD9439-->  <AD_REFERENCE_ID><![CDATA[B8C833E4F0A44A2DA5FC7606F3CD9439]]></AD_REFERENCE_ID>
 <!--B8C833E4F0A44A2DA5FC7606F3CD9439-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml	Thu Sep 29 15:56:24 2016 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml	Tue Oct 04 15:27:03 2016 +0000
@@ -609,7 +609,7 @@
 <!--B6049E97C1254A1092C883EA59172013-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
 <!--B6049E97C1254A1092C883EA59172013-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
 <!--B6049E97C1254A1092C883EA59172013-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
-<!--B6049E97C1254A1092C883EA59172013-->  <EM_OBUIAPP_SELECTION_TYPE><![CDATA[S]]></EM_OBUIAPP_SELECTION_TYPE>
+<!--B6049E97C1254A1092C883EA59172013-->  <EM_OBUIAPP_SELECTION_TYPE><![CDATA[M]]></EM_OBUIAPP_SELECTION_TYPE>
 <!--B6049E97C1254A1092C883EA59172013--></AD_TAB>
 
 <!--B82C02920AA84E8DB57D553185BD2F06--><AD_TAB>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml	Thu Sep 29 15:56:24 2016 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml	Tue Oct 04 15:27:03 2016 +0000
@@ -69,14 +69,13 @@
 <!--58AF4D3E594B421A9A7307480736F03E-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--58AF4D3E594B421A9A7307480736F03E-->  <HQLQUERY><![CDATA[select @selectClause@
 from FIN_Payment_ScheduleDetail as psd
+join psd.businessPartner as bp
 left outer join psd.orderPaymentSchedule as ops  
 left outer join ops.order as ord @joinClauseOrder@
-left outer join ord.businessPartner as ordbp
 left outer join ops.fINPaymentPriority as opriority 
 left outer join ops.finPaymentmethod opsfp
 left outer join psd.invoicePaymentSchedule as ips  
 left outer join ips.invoice as inv @joinClauseInvoice@
-left outer join inv.businessPartner as invbp
 left outer join ips.fINPaymentPriority as ipriority 
 left outer join ips.finPaymentmethod as ipsfp
 left outer join psd.organization as org 
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_VAL_RULE.xml	Thu Sep 29 15:56:24 2016 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_VAL_RULE.xml	Tue Oct 04 15:27:03 2016 +0000
@@ -88,6 +88,17 @@
 <!--575E470ABADB4C278132C957A78C47E3-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--575E470ABADB4C278132C957A78C47E3--></AD_VAL_RULE>
 
+<!--8CEAB789915E4575BDEB66F1930067BA--><AD_VAL_RULE>
+<!--8CEAB789915E4575BDEB66F1930067BA-->  <AD_VAL_RULE_ID><![CDATA[8CEAB789915E4575BDEB66F1930067BA]]></AD_VAL_RULE_ID>
+<!--8CEAB789915E4575BDEB66F1930067BA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8CEAB789915E4575BDEB66F1930067BA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8CEAB789915E4575BDEB66F1930067BA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8CEAB789915E4575BDEB66F1930067BA-->  <NAME><![CDATA[Not selected FIN_Financial_Account]]></NAME>
+<!--8CEAB789915E4575BDEB66F1930067BA-->  <TYPE><![CDATA[HQL_JS]]></TYPE>
+<!--8CEAB789915E4575BDEB66F1930067BA-->  <CODE><![CDATA["e.id != '" + OB.getParameters().get('inpfinFinancialAccountId') + "'"]]></CODE>
+<!--8CEAB789915E4575BDEB66F1930067BA-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--8CEAB789915E4575BDEB66F1930067BA--></AD_VAL_RULE>
+
 <!--959ADF046AFE4F509ABC6E2F41F9DB04--><AD_VAL_RULE>
 <!--959ADF046AFE4F509ABC6E2F41F9DB04-->  <AD_VAL_RULE_ID><![CDATA[959ADF046AFE4F509ABC6E2F41F9DB04]]></AD_VAL_RULE_ID>
 <!--959ADF046AFE4F509ABC6E2F41F9DB04-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml	Thu Sep 29 15:56:24 2016 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml	Tue Oct 04 15:27:03 2016 +0000
@@ -24,6 +24,7 @@
 <!--0461CA0B15F14B81AE85FD2C81AA514A-->  <DISPLAYLOGIC><![CDATA[false]]></DISPLAYLOGIC>
 <!--0461CA0B15F14B81AE85FD2C81AA514A-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--0461CA0B15F14B81AE85FD2C81AA514A-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--0461CA0B15F14B81AE85FD2C81AA514A-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--0461CA0B15F14B81AE85FD2C81AA514A--></OBUIAPP_PARAMETER>
 
 <!--0586B9F7ED4147758536007BF402F1DF--><OBUIAPP_PARAMETER>
@@ -47,6 +48,7 @@
 <!--0586B9F7ED4147758536007BF402F1DF-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
 <!--0586B9F7ED4147758536007BF402F1DF-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--0586B9F7ED4147758536007BF402F1DF-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
+<!--0586B9F7ED4147758536007BF402F1DF-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--0586B9F7ED4147758536007BF402F1DF--></OBUIAPP_PARAMETER>
 
 <!--075F4BA7A03F4548A7A501BAFD073DEE--><OBUIAPP_PARAMETER>
@@ -73,6 +75,7 @@
 <!--075F4BA7A03F4548A7A501BAFD073DEE-->  <DISPLAYLOGIC><![CDATA[false]]></DISPLAYLOGIC>
 <!--075F4BA7A03F4548A7A501BAFD073DEE-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--075F4BA7A03F4548A7A501BAFD073DEE-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--075F4BA7A03F4548A7A501BAFD073DEE-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--075F4BA7A03F4548A7A501BAFD073DEE--></OBUIAPP_PARAMETER>
 
 <!--0B13DC2C52424F36BDAFC790A0AB5886--><OBUIAPP_PARAMETER>
@@ -99,6 +102,7 @@
 <!--0B13DC2C52424F36BDAFC790A0AB5886-->  <DISPLAYLOGIC><![CDATA[false]]></DISPLAYLOGIC>
 <!--0B13DC2C52424F36BDAFC790A0AB5886-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--0B13DC2C52424F36BDAFC790A0AB5886-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--0B13DC2C52424F36BDAFC790A0AB5886-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--0B13DC2C52424F36BDAFC790A0AB5886--></OBUIAPP_PARAMETER>
 
 <!--0E081905DD9646A2AFB296F81C1AA62E--><OBUIAPP_PARAMETER>
@@ -126,6 +130,7 @@
 <!--0E081905DD9646A2AFB296F81C1AA62E-->  <ONCHANGEFUNCTION><![CDATA[OB.APRM.AddPayment.convertedAmountOnChange]]></ONCHANGEFUNCTION>
 <!--0E081905DD9646A2AFB296F81C1AA62E-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--0E081905DD9646A2AFB296F81C1AA62E-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
+<!--0E081905DD9646A2AFB296F81C1AA62E-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--0E081905DD9646A2AFB296F81C1AA62E--></OBUIAPP_PARAMETER>
 
 <!--0E18ACB41550424A83A62E33C2D83FB3--><OBUIAPP_PARAMETER>
@@ -149,6 +154,7 @@
 <!--0E18ACB41550424A83A62E33C2D83FB3-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
 <!--0E18ACB41550424A83A62E33C2D83FB3-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--0E18ACB41550424A83A62E33C2D83FB3-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
+<!--0E18ACB41550424A83A62E33C2D83FB3-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--0E18ACB41550424A83A62E33C2D83FB3--></OBUIAPP_PARAMETER>
 
 <!--0F44A3B0971F47A1B509A50377BEB383--><OBUIAPP_PARAMETER>
@@ -174,6 +180,7 @@
 <!--0F44A3B0971F47A1B509A50377BEB383-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
 <!--0F44A3B0971F47A1B509A50377BEB383-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--0F44A3B0971F47A1B509A50377BEB383-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--0F44A3B0971F47A1B509A50377BEB383-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--0F44A3B0971F47A1B509A50377BEB383--></OBUIAPP_PARAMETER>
 
 <!--111000BF6C4445E785AA08331A268E1B--><OBUIAPP_PARAMETER>
@@ -197,6 +204,7 @@
 <!--111000BF6C4445E785AA08331A268E1B-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
 <!--111000BF6C4445E785AA08331A268E1B-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--111000BF6C4445E785AA08331A268E1B-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
+<!--111000BF6C4445E785AA08331A268E1B-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--111000BF6C4445E785AA08331A268E1B--></OBUIAPP_PARAMETER>
 
 <!--12DDAD2FBC404963B7A49D2E54985DF9--><OBUIAPP_PARAMETER>
@@ -224,6 +232,7 @@
 <!--12DDAD2FBC404963B7A49D2E54985DF9-->  <ONCHANGEFUNCTION><![CDATA[OB.APRM.AddTransaction.trxTypeOnChangeFunction]]></ONCHANGEFUNCTION>
 <!--12DDAD2FBC404963B7A49D2E54985DF9-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--12DDAD2FBC404963B7A49D2E54985DF9-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--12DDAD2FBC404963B7A49D2E54985DF9-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--12DDAD2FBC404963B7A49D2E54985DF9--></OBUIAPP_PARAMETER>
 
 <!--12F5A54CF6FA4702B147CC08BC664051--><OBUIAPP_PARAMETER>
@@ -251,6 +260,7 @@
 <!--12F5A54CF6FA4702B147CC08BC664051-->  <DISPLAYEDROWS><![CDATA[10]]></DISPLAYEDROWS>
 <!--12F5A54CF6FA4702B147CC08BC664051-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
 <!--12F5A54CF6FA4702B147CC08BC664051-->  <ONGRIDLOADFUNCTION><![CDATA[OB.APRM.AddPayment.orderInvoiceOnLoadGrid]]></ONGRIDLOADFUNCTION>
+<!--12F5A54CF6FA4702B147CC08BC664051-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--12F5A54CF6FA4702B147CC08BC664051--></OBUIAPP_PARAMETER>
 
 <!--155F39F5EB144A648F409C115D61A489--><OBUIAPP_PARAMETER>
@@ -277,6 +287,7 @@
 <!--155F39F5EB144A648F409C115D61A489-->  <DISPLAYLOGIC><![CDATA[false]]></DISPLAYLOGIC>
 <!--155F39F5EB144A648F409C115D61A489-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--155F39F5EB144A648F409C115D61A489-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--155F39F5EB144A648F409C115D61A489-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--155F39F5EB144A648F409C115D61A489--></OBUIAPP_PARAMETER>
 
 <!--1CB6D915777343F4BD3317532345B658--><OBUIAPP_PARAMETER>
@@ -303,6 +314,7 @@
 <!--1CB6D915777343F4BD3317532345B658-->  <DISPLAYLOGIC><![CDATA[false]]></DISPLAYLOGIC>
 <!--1CB6D915777343F4BD3317532345B658-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--1CB6D915777343F4BD3317532345B658-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--1CB6D915777343F4BD3317532345B658-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--1CB6D915777343F4BD3317532345B658--></OBUIAPP_PARAMETER>
 
 <!--1D16F7BDCDD04F3A9AD259E84811AA41--><OBUIAPP_PARAMETER>
@@ -331,6 +343,7 @@
 <!--1D16F7BDCDD04F3A9AD259E84811AA41-->  <ONCHANGEFUNCTION><![CDATA[OB.APRM.AddPayment.financialAccountOnChange]]></ONCHANGEFUNCTION>
 <!--1D16F7BDCDD04F3A9AD259E84811AA41-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--1D16F7BDCDD04F3A9AD259E84811AA41-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
+<!--1D16F7BDCDD04F3A9AD259E84811AA41-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--1D16F7BDCDD04F3A9AD259E84811AA41--></OBUIAPP_PARAMETER>
 
 <!--1FBAFF7137454F30AD8922DE75D5273F--><OBUIAPP_PARAMETER>
@@ -358,6 +371,7 @@
 <!--1FBAFF7137454F30AD8922DE75D5273F-->  <ONCHANGEFUNCTION><![CDATA[OB.APRM.AddPayment.glItemTotalAmountOnChange]]></ONCHANGEFUNCTION>
 <!--1FBAFF7137454F30AD8922DE75D5273F-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--1FBAFF7137454F30AD8922DE75D5273F-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
+<!--1FBAFF7137454F30AD8922DE75D5273F-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--1FBAFF7137454F30AD8922DE75D5273F--></OBUIAPP_PARAMETER>
 
 <!--200C902859B746D5BDDC773D0C91C1BB--><OBUIAPP_PARAMETER>
@@ -386,6 +400,7 @@
 <!--200C902859B746D5BDDC773D0C91C1BB-->  <ONCHANGEFUNCTION><![CDATA[OB.APRM.AddPayment.conversionRateOnChange]]></ONCHANGEFUNCTION>
 <!--200C902859B746D5BDDC773D0C91C1BB-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--200C902859B746D5BDDC773D0C91C1BB-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
+<!--200C902859B746D5BDDC773D0C91C1BB-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--200C902859B746D5BDDC773D0C91C1BB--></OBUIAPP_PARAMETER>
 
 <!--2AC4B53D136E4167B673265DAF6660DA--><OBUIAPP_PARAMETER>
@@ -411,6 +426,7 @@
 <!--2AC4B53D136E4167B673265DAF6660DA-->  <READONLYLOGIC><![CDATA[true]]></READONLYLOGIC>
 <!--2AC4B53D136E4167B673265DAF6660DA-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--2AC4B53D136E4167B673265DAF6660DA-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--2AC4B53D136E4167B673265DAF6660DA-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--2AC4B53D136E4167B673265DAF6660DA--></OBUIAPP_PARAMETER>
 
 <!--383A1B1C19674F23AF643521AEE759D8--><OBUIAPP_PARAMETER>
@@ -438,8 +454,35 @@
 <!--383A1B1C19674F23AF643521AEE759D8-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--383A1B1C19674F23AF643521AEE759D8-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
 <!--383A1B1C19674F23AF643521AEE759D8-->  <ONGRIDLOADFUNCTION><![CDATA[OB.APRM.AddPayment.glitemsOnLoadGrid]]></ONGRIDLOADFUNCTION>
+<!--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>
@@ -463,6 +506,7 @@
 <!--43F72D96CBDB467A900294090A3A03D7-->  <READONLYLOGIC><![CDATA[true]]></READONLYLOGIC>
 <!--43F72D96CBDB467A900294090A3A03D7-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--43F72D96CBDB467A900294090A3A03D7-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--43F72D96CBDB467A900294090A3A03D7-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--43F72D96CBDB467A900294090A3A03D7--></OBUIAPP_PARAMETER>
 
 <!--4C09892656344AB1ACF988D57D84B96B--><OBUIAPP_PARAMETER>
@@ -473,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>
@@ -490,6 +534,7 @@
 <!--4C09892656344AB1ACF988D57D84B96B-->  <READONLYLOGIC><![CDATA[true]]></READONLYLOGIC>
 <!--4C09892656344AB1ACF988D57D84B96B-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--4C09892656344AB1ACF988D57D84B96B-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
+<!--4C09892656344AB1ACF988D57D84B96B-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--4C09892656344AB1ACF988D57D84B96B--></OBUIAPP_PARAMETER>
 
 <!--4CDE749FE6D341B4BCC128ADDAEE6068--><OBUIAPP_PARAMETER>
@@ -516,6 +561,7 @@
 <!--4CDE749FE6D341B4BCC128ADDAEE6068-->  <DISPLAYLOGIC><![CDATA[false]]></DISPLAYLOGIC>
 <!--4CDE749FE6D341B4BCC128ADDAEE6068-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--4CDE749FE6D341B4BCC128ADDAEE6068-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--4CDE749FE6D341B4BCC128ADDAEE6068-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--4CDE749FE6D341B4BCC128ADDAEE6068--></OBUIAPP_PARAMETER>
 
 <!--4DB168F8AC3B4A4CB543489EDFF76AED--><OBUIAPP_PARAMETER>
@@ -541,8 +587,10 @@
 <!--4DB168F8AC3B4A4CB543489EDFF76AED-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
 <!--4DB168F8AC3B4A4CB543489EDFF76AED-->  <DISPLAYLOGIC><![CDATA[@$Element_MC@='Y' & @trxtype@!'']]></DISPLAYLOGIC>
 <!--4DB168F8AC3B4A4CB543489EDFF76AED-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
+<!--4DB168F8AC3B4A4CB543489EDFF76AED-->  <READONLYLOGIC><![CDATA[@fin_payment_id@!null & @fin_payment_id@!undefined & @fin_payment_id@!'']]></READONLYLOGIC>
 <!--4DB168F8AC3B4A4CB543489EDFF76AED-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--4DB168F8AC3B4A4CB543489EDFF76AED-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--4DB168F8AC3B4A4CB543489EDFF76AED-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--4DB168F8AC3B4A4CB543489EDFF76AED--></OBUIAPP_PARAMETER>
 
 <!--4EDC18E376BB4EEB937AE1F1EF4EB8B1--><OBUIAPP_PARAMETER>
@@ -566,6 +614,7 @@
 <!--4EDC18E376BB4EEB937AE1F1EF4EB8B1-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
 <!--4EDC18E376BB4EEB937AE1F1EF4EB8B1-->  <DISPLAYEDROWS><![CDATA[8]]></DISPLAYEDROWS>
 <!--4EDC18E376BB4EEB937AE1F1EF4EB8B1-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
+<!--4EDC18E376BB4EEB937AE1F1EF4EB8B1-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--4EDC18E376BB4EEB937AE1F1EF4EB8B1--></OBUIAPP_PARAMETER>
 
 <!--513B4F068F454ACE9A55553D389A1DEA--><OBUIAPP_PARAMETER>
@@ -592,6 +641,7 @@
 <!--513B4F068F454ACE9A55553D389A1DEA-->  <DISPLAYLOGIC><![CDATA[false]]></DISPLAYLOGIC>
 <!--513B4F068F454ACE9A55553D389A1DEA-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--513B4F068F454ACE9A55553D389A1DEA-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--513B4F068F454ACE9A55553D389A1DEA-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--513B4F068F454ACE9A55553D389A1DEA--></OBUIAPP_PARAMETER>
 
 <!--52BD390363394BE980D0A55AFC4CDBB9--><OBUIAPP_PARAMETER>
@@ -618,6 +668,7 @@
 <!--52BD390363394BE980D0A55AFC4CDBB9-->  <NUMCOLUMN><![CDATA[1]]></NUMCOLUMN>
 <!--52BD390363394BE980D0A55AFC4CDBB9-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--52BD390363394BE980D0A55AFC4CDBB9-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--52BD390363394BE980D0A55AFC4CDBB9-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--52BD390363394BE980D0A55AFC4CDBB9--></OBUIAPP_PARAMETER>
 
 <!--5AA317DFDE564327BD5051B52939574E--><OBUIAPP_PARAMETER>
@@ -644,6 +695,7 @@
 <!--5AA317DFDE564327BD5051B52939574E-->  <DISPLAYLOGIC><![CDATA[false]]></DISPLAYLOGIC>
 <!--5AA317DFDE564327BD5051B52939574E-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--5AA317DFDE564327BD5051B52939574E-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
+<!--5AA317DFDE564327BD5051B52939574E-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--5AA317DFDE564327BD5051B52939574E--></OBUIAPP_PARAMETER>
 
 <!--60C455BF16B6481D8ED5336CAA3C85C7--><OBUIAPP_PARAMETER>
@@ -670,6 +722,7 @@
 <!--60C455BF16B6481D8ED5336CAA3C85C7-->  <READONLYLOGIC><![CDATA[true]]></READONLYLOGIC>
 <!--60C455BF16B6481D8ED5336CAA3C85C7-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--60C455BF16B6481D8ED5336CAA3C85C7-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--60C455BF16B6481D8ED5336CAA3C85C7-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--60C455BF16B6481D8ED5336CAA3C85C7--></OBUIAPP_PARAMETER>
 
 <!--61059745E59240A998ED90DC83E5DA4F--><OBUIAPP_PARAMETER>
@@ -696,6 +749,7 @@
 <!--61059745E59240A998ED90DC83E5DA4F-->  <DISPLAYLOGIC><![CDATA[false]]></DISPLAYLOGIC>
 <!--61059745E59240A998ED90DC83E5DA4F-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--61059745E59240A998ED90DC83E5DA4F-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
+<!--61059745E59240A998ED90DC83E5DA4F-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--61059745E59240A998ED90DC83E5DA4F--></OBUIAPP_PARAMETER>
 
 <!--65AFBD9140014688A842ACF5ECF9E5A1--><OBUIAPP_PARAMETER>
@@ -721,8 +775,35 @@
 <!--65AFBD9140014688A842ACF5ECF9E5A1-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
 <!--65AFBD9140014688A842ACF5ECF9E5A1-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--65AFBD9140014688A842ACF5ECF9E5A1-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--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>
@@ -747,6 +828,7 @@
 <!--6AF091FD5F1440BB9F0E0C674A168144-->  <DISPLAYLOGIC><![CDATA[false]]></DISPLAYLOGIC>
 <!--6AF091FD5F1440BB9F0E0C674A168144-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--6AF091FD5F1440BB9F0E0C674A168144-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--6AF091FD5F1440BB9F0E0C674A168144-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--6AF091FD5F1440BB9F0E0C674A168144--></OBUIAPP_PARAMETER>
 
 <!--6BBDFF5E4AF944CB8AE94FE3D638BC49--><OBUIAPP_PARAMETER>
@@ -772,8 +854,10 @@
 <!--6BBDFF5E4AF944CB8AE94FE3D638BC49-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
 <!--6BBDFF5E4AF944CB8AE94FE3D638BC49-->  <DISPLAYLOGIC><![CDATA[@$Element_AY@='Y' & @trxtype@!'']]></DISPLAYLOGIC>
 <!--6BBDFF5E4AF944CB8AE94FE3D638BC49-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
+<!--6BBDFF5E4AF944CB8AE94FE3D638BC49-->  <READONLYLOGIC><![CDATA[@fin_payment_id@!null & @fin_payment_id@!undefined & @fin_payment_id@!'']]></READONLYLOGIC>
 <!--6BBDFF5E4AF944CB8AE94FE3D638BC49-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--6BBDFF5E4AF944CB8AE94FE3D638BC49-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--6BBDFF5E4AF944CB8AE94FE3D638BC49-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--6BBDFF5E4AF944CB8AE94FE3D638BC49--></OBUIAPP_PARAMETER>
 
 <!--6E03D970D07D4753941F7B06DAF197F3--><OBUIAPP_PARAMETER>
@@ -800,6 +884,7 @@
 <!--6E03D970D07D4753941F7B06DAF197F3-->  <ONCHANGEFUNCTION><![CDATA[OB.APRM.AddPayment.documentOnChange]]></ONCHANGEFUNCTION>
 <!--6E03D970D07D4753941F7B06DAF197F3-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--6E03D970D07D4753941F7B06DAF197F3-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--6E03D970D07D4753941F7B06DAF197F3-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--6E03D970D07D4753941F7B06DAF197F3--></OBUIAPP_PARAMETER>
 
 <!--6F1DACE3F9744318948C5A0154FAFEF2--><OBUIAPP_PARAMETER>
@@ -827,6 +912,7 @@
 <!--6F1DACE3F9744318948C5A0154FAFEF2-->  <ONCHANGEFUNCTION><![CDATA[OB.APRM.AddTransaction.paymentOnChangeFunction]]></ONCHANGEFUNCTION>
 <!--6F1DACE3F9744318948C5A0154FAFEF2-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--6F1DACE3F9744318948C5A0154FAFEF2-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--6F1DACE3F9744318948C5A0154FAFEF2-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--6F1DACE3F9744318948C5A0154FAFEF2--></OBUIAPP_PARAMETER>
 
 <!--74479AE073FF4FA5A527DC79EC0A1C82--><OBUIAPP_PARAMETER>
@@ -850,6 +936,7 @@
 <!--74479AE073FF4FA5A527DC79EC0A1C82-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
 <!--74479AE073FF4FA5A527DC79EC0A1C82-->  <DISPLAYEDROWS><![CDATA[18]]></DISPLAYEDROWS>
 <!--74479AE073FF4FA5A527DC79EC0A1C82-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
+<!--74479AE073FF4FA5A527DC79EC0A1C82-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--74479AE073FF4FA5A527DC79EC0A1C82--></OBUIAPP_PARAMETER>
 
 <!--76E43D5C34244BBDA6FE6678F94C3B7C--><OBUIAPP_PARAMETER>
@@ -875,6 +962,7 @@
 <!--76E43D5C34244BBDA6FE6678F94C3B7C-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
 <!--76E43D5C34244BBDA6FE6678F94C3B7C-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--76E43D5C34244BBDA6FE6678F94C3B7C-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--76E43D5C34244BBDA6FE6678F94C3B7C-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--76E43D5C34244BBDA6FE6678F94C3B7C--></OBUIAPP_PARAMETER>
 
 <!--7783E23035DA4DBC8DD694EBBD4A1E5F--><OBUIAPP_PARAMETER>
@@ -899,6 +987,7 @@
 <!--7783E23035DA4DBC8DD694EBBD4A1E5F-->  <READONLYLOGIC><![CDATA[true]]></READONLYLOGIC>
 <!--7783E23035DA4DBC8DD694EBBD4A1E5F-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--7783E23035DA4DBC8DD694EBBD4A1E5F-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
+<!--7783E23035DA4DBC8DD694EBBD4A1E5F-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--7783E23035DA4DBC8DD694EBBD4A1E5F--></OBUIAPP_PARAMETER>
 
 <!--792B32539A0540A2932293A050DD3BF1--><OBUIAPP_PARAMETER>
@@ -923,6 +1012,7 @@
 <!--792B32539A0540A2932293A050DD3BF1-->  <DISPLAYLOGIC><![CDATA[false]]></DISPLAYLOGIC>
 <!--792B32539A0540A2932293A050DD3BF1-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--792B32539A0540A2932293A050DD3BF1-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--792B32539A0540A2932293A050DD3BF1-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--792B32539A0540A2932293A050DD3BF1--></OBUIAPP_PARAMETER>
 
 <!--7B2AE9099ECB4CE9B80C665D7662FA03--><OBUIAPP_PARAMETER>
@@ -948,8 +1038,35 @@
 <!--7B2AE9099ECB4CE9B80C665D7662FA03-->  <READONLYLOGIC><![CDATA[@trxtype@='BPW']]></READONLYLOGIC>
 <!--7B2AE9099ECB4CE9B80C665D7662FA03-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--7B2AE9099ECB4CE9B80C665D7662FA03-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--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>
@@ -974,6 +1091,7 @@
 <!--7F740AFA59DB483FB1BBDD79E066C543-->  <READONLYLOGIC><![CDATA[true]]></READONLYLOGIC>
 <!--7F740AFA59DB483FB1BBDD79E066C543-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--7F740AFA59DB483FB1BBDD79E066C543-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
+<!--7F740AFA59DB483FB1BBDD79E066C543-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--7F740AFA59DB483FB1BBDD79E066C543--></OBUIAPP_PARAMETER>
 
 <!--80465B6CEEB84046955FD51F38FC2804--><OBUIAPP_PARAMETER>
@@ -999,6 +1117,7 @@
 <!--80465B6CEEB84046955FD51F38FC2804-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
 <!--80465B6CEEB84046955FD51F38FC2804-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--80465B6CEEB84046955FD51F38FC2804-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
+<!--80465B6CEEB84046955FD51F38FC2804-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--80465B6CEEB84046955FD51F38FC2804--></OBUIAPP_PARAMETER>
 
 <!--838EF92641044D038600E4C1B6F1C4CB--><OBUIAPP_PARAMETER>
@@ -1026,6 +1145,7 @@
 <!--838EF92641044D038600E4C1B6F1C4CB-->  <ONCHANGEFUNCTION><![CDATA[OB.APRM.AddPayment.paymentMethodOnChange]]></ONCHANGEFUNCTION>
 <!--838EF92641044D038600E4C1B6F1C4CB-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--838EF92641044D038600E4C1B6F1C4CB-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
+<!--838EF92641044D038600E4C1B6F1C4CB-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--838EF92641044D038600E4C1B6F1C4CB--></OBUIAPP_PARAMETER>
 
 <!--8424D0FA373945708522DA3720F27BC4--><OBUIAPP_PARAMETER>
@@ -1049,6 +1169,7 @@
 <!--8424D0FA373945708522DA3720F27BC4-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
 <!--8424D0FA373945708522DA3720F27BC4-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--8424D0FA373945708522DA3720F27BC4-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
+<!--8424D0FA373945708522DA3720F27BC4-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--8424D0FA373945708522DA3720F27BC4--></OBUIAPP_PARAMETER>
 
 <!--854F44975FB84D20AE8E8DA02999747E--><OBUIAPP_PARAMETER>
@@ -1072,6 +1193,7 @@
 <!--854F44975FB84D20AE8E8DA02999747E-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
 <!--854F44975FB84D20AE8E8DA02999747E-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--854F44975FB84D20AE8E8DA02999747E-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
+<!--854F44975FB84D20AE8E8DA02999747E-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--854F44975FB84D20AE8E8DA02999747E--></OBUIAPP_PARAMETER>
 
 <!--871DE320B33C4B83BDB4894EE99536E5--><OBUIAPP_PARAMETER>
@@ -1098,6 +1220,7 @@
 <!--871DE320B33C4B83BDB4894EE99536E5-->  <DISPLAYLOGIC><![CDATA[false]]></DISPLAYLOGIC>
 <!--871DE320B33C4B83BDB4894EE99536E5-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--871DE320B33C4B83BDB4894EE99536E5-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--871DE320B33C4B83BDB4894EE99536E5-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--871DE320B33C4B83BDB4894EE99536E5--></OBUIAPP_PARAMETER>
 
 <!--878E7842FC524139BBEE0CAE0C1F3E17--><OBUIAPP_PARAMETER>
@@ -1121,6 +1244,7 @@
 <!--878E7842FC524139BBEE0CAE0C1F3E17-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
 <!--878E7842FC524139BBEE0CAE0C1F3E17-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--878E7842FC524139BBEE0CAE0C1F3E17-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
+<!--878E7842FC524139BBEE0CAE0C1F3E17-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--878E7842FC524139BBEE0CAE0C1F3E17--></OBUIAPP_PARAMETER>
 
 <!--8A2B3B1A41364852ACD2804CF86A69F5--><OBUIAPP_PARAMETER>
@@ -1148,6 +1272,7 @@
 <!--8A2B3B1A41364852ACD2804CF86A69F5-->  <NUMCOLUMN><![CDATA[2]]></NUMCOLUMN>
 <!--8A2B3B1A41364852ACD2804CF86A69F5-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--8A2B3B1A41364852ACD2804CF86A69F5-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--8A2B3B1A41364852ACD2804CF86A69F5-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--8A2B3B1A41364852ACD2804CF86A69F5--></OBUIAPP_PARAMETER>
 
 <!--8B738077BBF041E88B843AB9D98B12B0--><OBUIAPP_PARAMETER>
@@ -1174,6 +1299,7 @@
 <!--8B738077BBF041E88B843AB9D98B12B0-->  <DISPLAYLOGIC><![CDATA[false]]></DISPLAYLOGIC>
 <!--8B738077BBF041E88B843AB9D98B12B0-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--8B738077BBF041E88B843AB9D98B12B0-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--8B738077BBF041E88B843AB9D98B12B0-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--8B738077BBF041E88B843AB9D98B12B0--></OBUIAPP_PARAMETER>
 
 <!--91BE9BC9D1FE44C2A4CD631AE2474EAD--><OBUIAPP_PARAMETER>
@@ -1200,6 +1326,7 @@
 <!--91BE9BC9D1FE44C2A4CD631AE2474EAD-->  <DISPLAYLOGIC><![CDATA[false]]></DISPLAYLOGIC>
 <!--91BE9BC9D1FE44C2A4CD631AE2474EAD-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--91BE9BC9D1FE44C2A4CD631AE2474EAD-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--91BE9BC9D1FE44C2A4CD631AE2474EAD-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--91BE9BC9D1FE44C2A4CD631AE2474EAD--></OBUIAPP_PARAMETER>
 
 <!--93DC15C203EB4205BDE0D87AFE185D5C--><OBUIAPP_PARAMETER>
@@ -1226,8 +1353,36 @@
 <!--93DC15C203EB4205BDE0D87AFE185D5C-->  <DISPLAYLOGIC><![CDATA[false]]></DISPLAYLOGIC>
 <!--93DC15C203EB4205BDE0D87AFE185D5C-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--93DC15C203EB4205BDE0D87AFE185D5C-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
+<!--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>
@@ -1254,6 +1409,7 @@
 <!--94DAEE7477AF40ED9B40E3A546EACD02-->  <ONCHANGEFUNCTION><![CDATA[OB.APRM.AddPayment.organizationOnChange]]></ONCHANGEFUNCTION>
 <!--94DAEE7477AF40ED9B40E3A546EACD02-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--94DAEE7477AF40ED9B40E3A546EACD02-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--94DAEE7477AF40ED9B40E3A546EACD02-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--94DAEE7477AF40ED9B40E3A546EACD02--></OBUIAPP_PARAMETER>
 
 <!--967CEF7421094B06B089DEA1D1F6C37D--><OBUIAPP_PARAMETER>
@@ -1280,6 +1436,7 @@
 <!--967CEF7421094B06B089DEA1D1F6C37D-->  <DISPLAYLOGIC><![CDATA[false]]></DISPLAYLOGIC>
 <!--967CEF7421094B06B089DEA1D1F6C37D-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--967CEF7421094B06B089DEA1D1F6C37D-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--967CEF7421094B06B089DEA1D1F6C37D-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--967CEF7421094B06B089DEA1D1F6C37D--></OBUIAPP_PARAMETER>
 
 <!--97DD674259364196944B4C02B0278305--><OBUIAPP_PARAMETER>
@@ -1306,6 +1463,7 @@
 <!--97DD674259364196944B4C02B0278305-->  <DISPLAYLOGIC><![CDATA[false]]></DISPLAYLOGIC>
 <!--97DD674259364196944B4C02B0278305-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--97DD674259364196944B4C02B0278305-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--97DD674259364196944B4C02B0278305-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--97DD674259364196944B4C02B0278305--></OBUIAPP_PARAMETER>
 
 <!--9E82150797C64125965C9BA668C2D2B4--><OBUIAPP_PARAMETER>
@@ -1332,6 +1490,7 @@
 <!--9E82150797C64125965C9BA668C2D2B4-->  <DISPLAYLOGIC><![CDATA[false]]></DISPLAYLOGIC>
 <!--9E82150797C64125965C9BA668C2D2B4-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--9E82150797C64125965C9BA668C2D2B4-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
+<!--9E82150797C64125965C9BA668C2D2B4-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--9E82150797C64125965C9BA668C2D2B4--></OBUIAPP_PARAMETER>
 
 <!--9F106995848F42F385EBCB01526E439B--><OBUIAPP_PARAMETER>
@@ -1358,6 +1517,7 @@
 <!--9F106995848F42F385EBCB01526E439B-->  <ONCHANGEFUNCTION><![CDATA[OB.APRM.AddTransaction.trxDateOnChangeFunction]]></ONCHANGEFUNCTION>
 <!--9F106995848F42F385EBCB01526E439B-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--9F106995848F42F385EBCB01526E439B-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--9F106995848F42F385EBCB01526E439B-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--9F106995848F42F385EBCB01526E439B--></OBUIAPP_PARAMETER>
 
 <!--A04480811ECA42F4B3B7E036001787FF--><OBUIAPP_PARAMETER>
@@ -1383,6 +1543,7 @@
 <!--A04480811ECA42F4B3B7E036001787FF-->  <DISPLAYLOGIC><![CDATA[false]]></DISPLAYLOGIC>
 <!--A04480811ECA42F4B3B7E036001787FF-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--A04480811ECA42F4B3B7E036001787FF-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--A04480811ECA42F4B3B7E036001787FF-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--A04480811ECA42F4B3B7E036001787FF--></OBUIAPP_PARAMETER>
 
 <!--A801DA25DEAA404A8C651626CA31B22F--><OBUIAPP_PARAMETER>
@@ -1411,6 +1572,7 @@
 <!--A801DA25DEAA404A8C651626CA31B22F-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--A801DA25DEAA404A8C651626CA31B22F-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
 <!--A801DA25DEAA404A8C651626CA31B22F-->  <ONGRIDLOADFUNCTION><![CDATA[OB.APRM.AddPayment.creditOnLoadGrid]]></ONGRIDLOADFUNCTION>
+<!--A801DA25DEAA404A8C651626CA31B22F-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--A801DA25DEAA404A8C651626CA31B22F--></OBUIAPP_PARAMETER>
 
 <!--A95732C0B3794D79B2E945D50872D931--><OBUIAPP_PARAMETER>
@@ -1438,6 +1600,7 @@
 <!--A95732C0B3794D79B2E945D50872D931-->  <ONCHANGEFUNCTION><![CDATA[OB.APRM.AddPayment.actualPaymentOnChange]]></ONCHANGEFUNCTION>
 <!--A95732C0B3794D79B2E945D50872D931-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--A95732C0B3794D79B2E945D50872D931-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
+<!--A95732C0B3794D79B2E945D50872D931-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--A95732C0B3794D79B2E945D50872D931--></OBUIAPP_PARAMETER>
 
 <!--AC203DDD5CF1459AA36DC7769ED15567--><OBUIAPP_PARAMETER>
@@ -1464,6 +1627,7 @@
 <!--AC203DDD5CF1459AA36DC7769ED15567-->  <READONLYLOGIC><![CDATA[@trxtype@='BPD']]></READONLYLOGIC>
 <!--AC203DDD5CF1459AA36DC7769ED15567-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--AC203DDD5CF1459AA36DC7769ED15567-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--AC203DDD5CF1459AA36DC7769ED15567-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--AC203DDD5CF1459AA36DC7769ED15567--></OBUIAPP_PARAMETER>
 
 <!--ACCFACE260B24599969EC724A567EB28--><OBUIAPP_PARAMETER>
@@ -1491,8 +1655,35 @@
 <!--ACCFACE260B24599969EC724A567EB28-->  <READONLYLOGIC><![CDATA[true]]></READONLYLOGIC>
 <!--ACCFACE260B24599969EC724A567EB28-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--ACCFACE260B24599969EC724A567EB28-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--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>
@@ -1517,6 +1708,7 @@
 <!--B2E975E0ADE3445C90DA81F0F492EA1C-->  <DISPLAYLOGIC><![CDATA[false]]></DISPLAYLOGIC>
 <!--B2E975E0ADE3445C90DA81F0F492EA1C-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--B2E975E0ADE3445C90DA81F0F492EA1C-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--B2E975E0ADE3445C90DA81F0F492EA1C-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--B2E975E0ADE3445C90DA81F0F492EA1C--></OBUIAPP_PARAMETER>
 
 <!--B86607BED54F45B89718C80C61878093--><OBUIAPP_PARAMETER>
@@ -1543,6 +1735,7 @@
 <!--B86607BED54F45B89718C80C61878093-->  <DISPLAYLOGIC><![CDATA[false]]></DISPLAYLOGIC>
 <!--B86607BED54F45B89718C80C61878093-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--B86607BED54F45B89718C80C61878093-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--B86607BED54F45B89718C80C61878093-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--B86607BED54F45B89718C80C61878093--></OBUIAPP_PARAMETER>
 
 <!--B8ECE87414564F1D8B974572A458E98A--><OBUIAPP_PARAMETER>
@@ -1569,6 +1762,7 @@
 <!--B8ECE87414564F1D8B974572A458E98A-->  <DISPLAYLOGIC><![CDATA[false]]></DISPLAYLOGIC>
 <!--B8ECE87414564F1D8B974572A458E98A-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--B8ECE87414564F1D8B974572A458E98A-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--B8ECE87414564F1D8B974572A458E98A-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--B8ECE87414564F1D8B974572A458E98A--></OBUIAPP_PARAMETER>
 
 <!--BAD646D5B19945A9B5DB573C35ABF2C5--><OBUIAPP_PARAMETER>
@@ -1594,8 +1788,10 @@
 <!--BAD646D5B19945A9B5DB573C35ABF2C5-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
 <!--BAD646D5B19945A9B5DB573C35ABF2C5-->  <DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@ & @trxtype@!'']]></DISPLAYLOGIC>
 <!--BAD646D5B19945A9B5DB573C35ABF2C5-->  <AD_FIELDGROUP_ID><![CDATA[BB8B7EB290B94CA1A0D4F8F9983AE76D]]></AD_FIELDGROUP_ID>
+<!--BAD646D5B19945A9B5DB573C35ABF2C5-->  <READONLYLOGIC><![CDATA[@fin_payment_id@!null & @fin_payment_id@!undefined & @fin_payment_id@!'']]></READONLYLOGIC>
 <!--BAD646D5B19945A9B5DB573C35ABF2C5-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--BAD646D5B19945A9B5DB573C35ABF2C5-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--BAD646D5B19945A9B5DB573C35ABF2C5-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--BAD646D5B19945A9B5DB573C35ABF2C5--></OBUIAPP_PARAMETER>
 
 <!--BC5E638E184C4F3AB36B9DA574E0E8BB--><OBUIAPP_PARAMETER>
@@ -1619,8 +1815,35 @@
 <!--BC5E638E184C4F3AB36B9DA574E0E8BB-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
 <!--BC5E638E184C4F3AB36B9DA574E0E8BB-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--BC5E638E184C4F3AB36B9DA574E0E8BB-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
+<!--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>
@@ -1644,6 +1867,7 @@
 <!--C0BB1F1D542A41DC9FE160E3A19CADC9-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
 <!--C0BB1F1D542A41DC9FE160E3A19CADC9-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--C0BB1F1D542A41DC9FE160E3A19CADC9-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--C0BB1F1D542A41DC9FE160E3A19CADC9-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--C0BB1F1D542A41DC9FE160E3A19CADC9--></OBUIAPP_PARAMETER>
 
 <!--C11C22D9EDD3481981FEDC94B977E6F4--><OBUIAPP_PARAMETER>
@@ -1669,8 +1893,10 @@
 <!--C11C22D9EDD3481981FEDC94B977E6F4-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
 <!--C11C22D9EDD3481981FEDC94B977E6F4-->  <DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@ & @trxtype@!'']]></DISPLAYLOGIC>
 <!--C11C22D9EDD3481981FEDC94B977E6F4-->  <AD_FIELDGROUP_ID><![CDATA[BB8B7EB290B94CA1A0D4F8F9983AE76D]]></AD_FIELDGROUP_ID>
+<!--C11C22D9EDD3481981FEDC94B977E6F4-->  <READONLYLOGIC><![CDATA[@fin_payment_id@!null & @fin_payment_id@!undefined & @fin_payment_id@!'']]></READONLYLOGIC>
 <!--C11C22D9EDD3481981FEDC94B977E6F4-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--C11C22D9EDD3481981FEDC94B977E6F4-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--C11C22D9EDD3481981FEDC94B977E6F4-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--C11C22D9EDD3481981FEDC94B977E6F4--></OBUIAPP_PARAMETER>
 
 <!--C347724D91C74BC4A92A64F66966702F--><OBUIAPP_PARAMETER>
@@ -1699,6 +1925,7 @@
 <!--C347724D91C74BC4A92A64F66966702F-->  <READONLYLOGIC><![CDATA[true]]></READONLYLOGIC>
 <!--C347724D91C74BC4A92A64F66966702F-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--C347724D91C74BC4A92A64F66966702F-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--C347724D91C74BC4A92A64F66966702F-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--C347724D91C74BC4A92A64F66966702F--></OBUIAPP_PARAMETER>
 
 <!--C511B1965C2A46C2BD8144DB918CD17B--><OBUIAPP_PARAMETER>
@@ -1725,8 +1952,11 @@
 <!--C511B1965C2A46C2BD8144DB918CD17B-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
 <!--C511B1965C2A46C2BD8144DB918CD17B-->  <DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@ & @trxtype@!'']]></DISPLAYLOGIC>
 <!--C511B1965C2A46C2BD8144DB918CD17B-->  <AD_FIELDGROUP_ID><![CDATA[BB8B7EB290B94CA1A0D4F8F9983AE76D]]></AD_FIELDGROUP_ID>
+<!--C511B1965C2A46C2BD8144DB918CD17B-->  <READONLYLOGIC><![CDATA[@fin_payment_id@!null & @fin_payment_id@!undefined & @fin_payment_id@!'']]></READONLYLOGIC>
+<!--C511B1965C2A46C2BD8144DB918CD17B-->  <ONCHANGEFUNCTION><![CDATA[OB.APRM.AddTransaction.organizationOnChangeFunction]]></ONCHANGEFUNCTION>
 <!--C511B1965C2A46C2BD8144DB918CD17B-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--C511B1965C2A46C2BD8144DB918CD17B-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--C511B1965C2A46C2BD8144DB918CD17B-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--C511B1965C2A46C2BD8144DB918CD17B--></OBUIAPP_PARAMETER>
 
 <!--C722D23258B64E50A9137C73598C418F--><OBUIAPP_PARAMETER>
@@ -1750,8 +1980,32 @@
 <!--C722D23258B64E50A9137C73598C418F-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
 <!--C722D23258B64E50A9137C73598C418F-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--C722D23258B64E50A9137C73598C418F-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--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>
@@ -1775,6 +2029,7 @@
 <!--D2F76322DF994A58B49D62E79944C219-->  <READONLYLOGIC><![CDATA[true]]></READONLYLOGIC>
 <!--D2F76322DF994A58B49D62E79944C219-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--D2F76322DF994A58B49D62E79944C219-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
+<!--D2F76322DF994A58B49D62E79944C219-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--D2F76322DF994A58B49D62E79944C219--></OBUIAPP_PARAMETER>
 
 <!--D58EE6F45C72436DB613C79F5FE8A37C--><OBUIAPP_PARAMETER>
@@ -1801,10 +2056,38 @@
 <!--D58EE6F45C72436DB613C79F5FE8A37C-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
 <!--D58EE6F45C72436DB613C79F5FE8A37C-->  <DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@ & @trxtype@!'']]></DISPLAYLOGIC>
 <!--D58EE6F45C72436DB613C79F5FE8A37C-->  <AD_FIELDGROUP_ID><![CDATA[BB8B7EB290B94CA1A0D4F8F9983AE76D]]></AD_FIELDGROUP_ID>
+<!--D58EE6F45C72436DB613C79F5FE8A37C-->  <READONLYLOGIC><![CDATA[@fin_payment_id@!null & @fin_payment_id@!undefined & @fin_payment_id@!'']]></READONLYLOGIC>
 <!--D58EE6F45C72436DB613C79F5FE8A37C-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--D58EE6F45C72436DB613C79F5FE8A37C-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--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>
@@ -1828,8 +2111,10 @@
 <!--DA22BED18BD944C9B6252B8400B89934-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
 <!--DA22BED18BD944C9B6252B8400B89934-->  <DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@ & @trxtype@!'']]></DISPLAYLOGIC>
 <!--DA22BED18BD944C9B6252B8400B89934-->  <AD_FIELDGROUP_ID><![CDATA[BB8B7EB290B94CA1A0D4F8F9983AE76D]]></AD_FIELDGROUP_ID>
+<!--DA22BED18BD944C9B6252B8400B89934-->  <READONLYLOGIC><![CDATA[@fin_payment_id@!null & @fin_payment_id@!undefined & @fin_payment_id@!'']]></READONLYLOGIC>
 <!--DA22BED18BD944C9B6252B8400B89934-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--DA22BED18BD944C9B6252B8400B89934-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--DA22BED18BD944C9B6252B8400B89934-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--DA22BED18BD944C9B6252B8400B89934--></OBUIAPP_PARAMETER>
 
 <!--DF292864DA82439793FB760E6D5A1FCC--><OBUIAPP_PARAMETER>
@@ -1854,6 +2139,7 @@
 <!--DF292864DA82439793FB760E6D5A1FCC-->  <DISPLAYLOGIC><![CDATA[false]]></DISPLAYLOGIC>
 <!--DF292864DA82439793FB760E6D5A1FCC-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--DF292864DA82439793FB760E6D5A1FCC-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--DF292864DA82439793FB760E6D5A1FCC-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--DF292864DA82439793FB760E6D5A1FCC--></OBUIAPP_PARAMETER>
 
 <!--E2FB4840B65A44D4B3090A7E3C95FD95--><OBUIAPP_PARAMETER>
@@ -1880,6 +2166,7 @@
 <!--E2FB4840B65A44D4B3090A7E3C95FD95-->  <READONLYLOGIC><![CDATA[@payment_date_readonly_logic@ == 'Y']]></READONLYLOGIC>
 <!--E2FB4840B65A44D4B3090A7E3C95FD95-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--E2FB4840B65A44D4B3090A7E3C95FD95-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
+<!--E2FB4840B65A44D4B3090A7E3C95FD95-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--E2FB4840B65A44D4B3090A7E3C95FD95--></OBUIAPP_PARAMETER>
 
 <!--E3019D02BA14437A9BE0948000062776--><OBUIAPP_PARAMETER>
@@ -1905,9 +2192,11 @@
 <!--E3019D02BA14437A9BE0948000062776-->  <OBUIAPP_PROCESS_ID><![CDATA[E68790A7B65F4D45AB35E2BAE34C1F39]]></OBUIAPP_PROCESS_ID>
 <!--E3019D02BA14437A9BE0948000062776-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
 <!--E3019D02BA14437A9BE0948000062776-->  <DISPLAYLOGIC><![CDATA[(@fin_payment_id@==null | @fin_payment_id@==undefined | @fin_payment_id@=='') & @trxtype@!'' & @trxtype@!'BF']]></DISPLAYLOGIC>
+<!--E3019D02BA14437A9BE0948000062776-->  <READONLYLOGIC><![CDATA[@fin_payment_id@!null & @fin_payment_id@!undefined & @fin_payment_id@!'']]></READONLYLOGIC>
 <!--E3019D02BA14437A9BE0948000062776-->  <ONCHANGEFUNCTION><![CDATA[OB.APRM.AddTransaction.glitemOnChangeFunction]]></ONCHANGEFUNCTION>
 <!--E3019D02BA14437A9BE0948000062776-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--E3019D02BA14437A9BE0948000062776-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--E3019D02BA14437A9BE0948000062776-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--E3019D02BA14437A9BE0948000062776--></OBUIAPP_PARAMETER>
 
 <!--E91BA4DAF60B44F38D28FFFDD18F0C33--><OBUIAPP_PARAMETER>
@@ -1935,6 +2224,7 @@
 <!--E91BA4DAF60B44F38D28FFFDD18F0C33-->  <ONCHANGEFUNCTION><![CDATA[OB.APRM.AddPayment.orderInvoiceTotalAmountOnChange]]></ONCHANGEFUNCTION>
 <!--E91BA4DAF60B44F38D28FFFDD18F0C33-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--E91BA4DAF60B44F38D28FFFDD18F0C33-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
+<!--E91BA4DAF60B44F38D28FFFDD18F0C33-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--E91BA4DAF60B44F38D28FFFDD18F0C33--></OBUIAPP_PARAMETER>
 
 <!--EA236C2D265845E6A3E2AE5A5A7A7AB2--><OBUIAPP_PARAMETER>
@@ -1963,6 +2253,7 @@
 <!--EA236C2D265845E6A3E2AE5A5A7A7AB2-->  <ONCHANGEFUNCTION><![CDATA[OB.APRM.AddPayment.currencyOnChange ]]></ONCHANGEFUNCTION>
 <!--EA236C2D265845E6A3E2AE5A5A7A7AB2-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--EA236C2D265845E6A3E2AE5A5A7A7AB2-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
+<!--EA236C2D265845E6A3E2AE5A5A7A7AB2-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--EA236C2D265845E6A3E2AE5A5A7A7AB2--></OBUIAPP_PARAMETER>
 
 <!--EB46162236C04DC2812C7095A88FA708--><OBUIAPP_PARAMETER>
@@ -1992,6 +2283,7 @@
 <!--EB46162236C04DC2812C7095A88FA708-->  <ONCHANGEFUNCTION><![CDATA[OB.APRM.AddPayment.receivedFromOnChange]]></ONCHANGEFUNCTION>
 <!--EB46162236C04DC2812C7095A88FA708-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--EB46162236C04DC2812C7095A88FA708-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
+<!--EB46162236C04DC2812C7095A88FA708-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--EB46162236C04DC2812C7095A88FA708--></OBUIAPP_PARAMETER>
 
 <!--EE38C8A62FDC4554A241D5C590AD30B0--><OBUIAPP_PARAMETER>
@@ -2017,8 +2309,10 @@
 <!--EE38C8A62FDC4554A241D5C590AD30B0-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
 <!--EE38C8A62FDC4554A241D5C590AD30B0-->  <DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@ & @trxtype@!'']]></DISPLAYLOGIC>
 <!--EE38C8A62FDC4554A241D5C590AD30B0-->  <AD_FIELDGROUP_ID><![CDATA[BB8B7EB290B94CA1A0D4F8F9983AE76D]]></AD_FIELDGROUP_ID>
+<!--EE38C8A62FDC4554A241D5C590AD30B0-->  <READONLYLOGIC><![CDATA[@fin_payment_id@!null & @fin_payment_id@!undefined & @fin_payment_id@!'']]></READONLYLOGIC>
 <!--EE38C8A62FDC4554A241D5C590AD30B0-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--EE38C8A62FDC4554A241D5C590AD30B0-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--EE38C8A62FDC4554A241D5C590AD30B0-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--EE38C8A62FDC4554A241D5C590AD30B0--></OBUIAPP_PARAMETER>
 
 <!--F1D97E6ABE584F209CFCEEF4C6FE4A3E--><OBUIAPP_PARAMETER>
@@ -2045,6 +2339,7 @@
 <!--F1D97E6ABE584F209CFCEEF4C6FE4A3E-->  <DISPLAYLOGIC><![CDATA[false]]></DISPLAYLOGIC>
 <!--F1D97E6ABE584F209CFCEEF4C6FE4A3E-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--F1D97E6ABE584F209CFCEEF4C6FE4A3E-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--F1D97E6ABE584F209CFCEEF4C6FE4A3E-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--F1D97E6ABE584F209CFCEEF4C6FE4A3E--></OBUIAPP_PARAMETER>
 
 <!--F2C546F2C45C4AB58494B2D384E6A8E8--><OBUIAPP_PARAMETER>
@@ -2071,8 +2366,37 @@
 <!--F2C546F2C45C4AB58494B2D384E6A8E8-->  <READONLYLOGIC><![CDATA[@payment_documentno_readonly_logic@ == 'Y']]></READONLYLOGIC>
 <!--F2C546F2C45C4AB58494B2D384E6A8E8-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--F2C546F2C45C4AB58494B2D384E6A8E8-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
+<!--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>
@@ -2096,8 +2420,10 @@
 <!--F627024CD1994930A448FD641C7BB43F-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
 <!--F627024CD1994930A448FD641C7BB43F-->  <DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@ & @trxtype@!'']]></DISPLAYLOGIC>
 <!--F627024CD1994930A448FD641C7BB43F-->  <AD_FIELDGROUP_ID><![CDATA[BB8B7EB290B94CA1A0D4F8F9983AE76D]]></AD_FIELDGROUP_ID>
+<!--F627024CD1994930A448FD641C7BB43F-->  <READONLYLOGIC><![CDATA[@fin_payment_id@!null & @fin_payment_id@!undefined & @fin_payment_id@!'']]></READONLYLOGIC>
 <!--F627024CD1994930A448FD641C7BB43F-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--F627024CD1994930A448FD641C7BB43F-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--F627024CD1994930A448FD641C7BB43F-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--F627024CD1994930A448FD641C7BB43F--></OBUIAPP_PARAMETER>
 
 <!--F83C096DBCD64007B2A5E517D2C81BFC--><OBUIAPP_PARAMETER>
@@ -2123,8 +2449,10 @@
 <!--F83C096DBCD64007B2A5E517D2C81BFC-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
 <!--F83C096DBCD64007B2A5E517D2C81BFC-->  <DISPLAYLOGIC><![CDATA[@$Element_SR@='Y' & @trxtype@!'']]></DISPLAYLOGIC>
 <!--F83C096DBCD64007B2A5E517D2C81BFC-->  <AD_FIELDGROUP_ID><![CDATA[BB8B7EB290B94CA1A0D4F8F9983AE76D]]></AD_FIELDGROUP_ID>
+<!--F83C096DBCD64007B2A5E517D2C81BFC-->  <READONLYLOGIC><![CDATA[@fin_payment_id@!null & @fin_payment_id@!undefined & @fin_payment_id@!'']]></READONLYLOGIC>
 <!--F83C096DBCD64007B2A5E517D2C81BFC-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--F83C096DBCD64007B2A5E517D2C81BFC-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--F83C096DBCD64007B2A5E517D2C81BFC-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--F83C096DBCD64007B2A5E517D2C81BFC--></OBUIAPP_PARAMETER>
 
 <!--FB975E5F2AE3405197173B0DFB172ECC--><OBUIAPP_PARAMETER>
@@ -2153,8 +2481,37 @@
 <!--FB975E5F2AE3405197173B0DFB172ECC-->  <ONCHANGEFUNCTION><![CDATA[OB.APRM.AddPayment.transactionTypeOnChangeFunction]]></ONCHANGEFUNCTION>
 <!--FB975E5F2AE3405197173B0DFB172ECC-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--FB975E5F2AE3405197173B0DFB172ECC-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
+<!--FB975E5F2AE3405197173B0DFB172ECC-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--FB975E5F2AE3405197173B0DFB172ECC--></OBUIAPP_PARAMETER>
 
+<!--FC511079CF1244BD80683D66D25A153D--><OBUIAPP_PARAMETER>
+<!--FC511079CF1244BD80683D66D25A153D-->  <OBUIAPP_PARAMETER_ID><![CDATA[FC511079CF1244BD80683D66D25A153D]]></OBUIAPP_PARAMETER_ID>
+<!--FC511079CF1244BD80683D66D25A153D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FC511079CF1244BD80683D66D25A153D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FC511079CF1244BD80683D66D25A153D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FC511079CF1244BD80683D66D25A153D-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--FC511079CF1244BD80683D66D25A153D-->  <NAME><![CDATA[Process Organization]]></NAME>
+<!--FC511079CF1244BD80683D66D25A153D-->  <DESCRIPTION><![CDATA[Parameter used to save value of current Process Definition ad_org_id parameter.]]></DESCRIPTION>
+<!--FC511079CF1244BD80683D66D25A153D-->  <HELP><![CDATA[Parameter used to save value of current Process Definition ad_org_id parameter.]]></HELP>
+<!--FC511079CF1244BD80683D66D25A153D-->  <SEQNO><![CDATA[220]]></SEQNO>
+<!--FC511079CF1244BD80683D66D25A153D-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--FC511079CF1244BD80683D66D25A153D-->  <AD_REFERENCE_VALUE_ID><![CDATA[1221BEA5C19F4FA89D3565CA8877A82E]]></AD_REFERENCE_VALUE_ID>
+<!--FC511079CF1244BD80683D66D25A153D-->  <COLUMNNAME><![CDATA[ad_org_id_process]]></COLUMNNAME>
+<!--FC511079CF1244BD80683D66D25A153D-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--FC511079CF1244BD80683D66D25A153D-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
+<!--FC511079CF1244BD80683D66D25A153D-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--FC511079CF1244BD80683D66D25A153D-->  <AD_ELEMENT_ID><![CDATA[5EE957873DEE4461A57BA8CAEAF50943]]></AD_ELEMENT_ID>
+<!--FC511079CF1244BD80683D66D25A153D-->  <ISFIXED><![CDATA[N]]></ISFIXED>
+<!--FC511079CF1244BD80683D66D25A153D-->  <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE>
+<!--FC511079CF1244BD80683D66D25A153D-->  <OBUIAPP_PROCESS_ID><![CDATA[E68790A7B65F4D45AB35E2BAE34C1F39]]></OBUIAPP_PROCESS_ID>
+<!--FC511079CF1244BD80683D66D25A153D-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
+<!--FC511079CF1244BD80683D66D25A153D-->  <DISPLAYLOGIC><![CDATA[false]]></DISPLAYLOGIC>
+<!--FC511079CF1244BD80683D66D25A153D-->  <AD_FIELDGROUP_ID><![CDATA[BB8B7EB290B94CA1A0D4F8F9983AE76D]]></AD_FIELDGROUP_ID>
+<!--FC511079CF1244BD80683D66D25A153D-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
+<!--FC511079CF1244BD80683D66D25A153D-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--FC511079CF1244BD80683D66D25A153D-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
+<!--FC511079CF1244BD80683D66D25A153D--></OBUIAPP_PARAMETER>
+
 <!--FDF5AB17A1154D6AB440E1F5A02B45F5--><OBUIAPP_PARAMETER>
 <!--FDF5AB17A1154D6AB440E1F5A02B45F5-->  <OBUIAPP_PARAMETER_ID><![CDATA[FDF5AB17A1154D6AB440E1F5A02B45F5]]></OBUIAPP_PARAMETER_ID>
 <!--FDF5AB17A1154D6AB440E1F5A02B45F5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2179,6 +2536,35 @@
 <!--FDF5AB17A1154D6AB440E1F5A02B45F5-->  <DISPLAYLOGIC><![CDATA[false]]></DISPLAYLOGIC>
 <!--FDF5AB17A1154D6AB440E1F5A02B45F5-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--FDF5AB17A1154D6AB440E1F5A02B45F5-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--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	Thu Sep 29 15:56:24 2016 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PROCESS.xml	Tue Oct 04 15:27:03 2016 +0000
@@ -138,6 +138,26 @@
 <!--9BED7889E1034FE68BD85D5D16857320-->  <ISCANADDRECORDSTOSELECTOR><![CDATA[Y]]></ISCANADDRECORDSTOSELECTOR>
 <!--9BED7889E1034FE68BD85D5D16857320--></OBUIAPP_PROCESS>
 
+<!--CC73C4845CDC487395804946EACB225F--><OBUIAPP_PROCESS>
+<!--CC73C4845CDC487395804946EACB225F-->  <OBUIAPP_PROCESS_ID><![CDATA[CC73C4845CDC487395804946EACB225F]]></OBUIAPP_PROCESS_ID>
+<!--CC73C4845CDC487395804946EACB225F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--CC73C4845CDC487395804946EACB225F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--CC73C4845CDC487395804946EACB225F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--CC73C4845CDC487395804946EACB225F-->  <VALUE><![CDATA[Funds Transfer]]></VALUE>
+<!--CC73C4845CDC487395804946EACB225F-->  <NAME><![CDATA[Funds Transfer]]></NAME>
+<!--CC73C4845CDC487395804946EACB225F-->  <DESCRIPTION><![CDATA[Transfer funds between Financial Accounts]]></DESCRIPTION>
+<!--CC73C4845CDC487395804946EACB225F-->  <HELP><![CDATA[Transfer funds between Financial Accounts]]></HELP>
+<!--CC73C4845CDC487395804946EACB225F-->  <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
+<!--CC73C4845CDC487395804946EACB225F-->  <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.actionHandler.FundsTransferActionHandler]]></CLASSNAME>
+<!--CC73C4845CDC487395804946EACB225F-->  <ISBACKGROUND><![CDATA[N]]></ISBACKGROUND>
+<!--CC73C4845CDC487395804946EACB225F-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--CC73C4845CDC487395804946EACB225F-->  <UIPATTERN><![CDATA[OBUIAPP_PickAndExecute]]></UIPATTERN>
+<!--CC73C4845CDC487395804946EACB225F-->  <ISMULTIRECORD><![CDATA[N]]></ISMULTIRECORD>
+<!--CC73C4845CDC487395804946EACB225F-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
+<!--CC73C4845CDC487395804946EACB225F-->  <ISGRIDLEGACY><![CDATA[N]]></ISGRIDLEGACY>
+<!--CC73C4845CDC487395804946EACB225F-->  <ISCANADDRECORDSTOSELECTOR><![CDATA[N]]></ISCANADDRECORDSTOSELECTOR>
+<!--CC73C4845CDC487395804946EACB225F--></OBUIAPP_PROCESS>
+
 <!--E68790A7B65F4D45AB35E2BAE34C1F39--><OBUIAPP_PROCESS>
 <!--E68790A7B65F4D45AB35E2BAE34C1F39-->  <OBUIAPP_PROCESS_ID><![CDATA[E68790A7B65F4D45AB35E2BAE34C1F39]]></OBUIAPP_PROCESS_ID>
 <!--E68790A7B65F4D45AB35E2BAE34C1F39-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml	Thu Sep 29 15:56:24 2016 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml	Tue Oct 04 15:27:03 2016 +0000
@@ -99,6 +99,22 @@
 <!--7811D4DBBB734D5ABB5DCC0CFDA21B88-->  <CUSTOM_QUERY><![CDATA[N]]></CUSTOM_QUERY>
 <!--7811D4DBBB734D5ABB5DCC0CFDA21B88--></OBUISEL_SELECTOR>
 
+<!--8E06629A43A84B099387466818B1C54F--><OBUISEL_SELECTOR>
+<!--8E06629A43A84B099387466818B1C54F-->  <OBUISEL_SELECTOR_ID><![CDATA[8E06629A43A84B099387466818B1C54F]]></OBUISEL_SELECTOR_ID>
+<!--8E06629A43A84B099387466818B1C54F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8E06629A43A84B099387466818B1C54F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8E06629A43A84B099387466818B1C54F-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--8E06629A43A84B099387466818B1C54F-->  <NAME><![CDATA[FIN_Finacc_Transaction Selector]]></NAME>
+<!--8E06629A43A84B099387466818B1C54F-->  <AD_REFERENCE_ID><![CDATA[98E0BF0783E44EFABE2F2BDDE866D6AE]]></AD_REFERENCE_ID>
+<!--8E06629A43A84B099387466818B1C54F-->  <AD_TABLE_ID><![CDATA[4D8C3B3C31D1410DA046140C9F024D17]]></AD_TABLE_ID>
+<!--8E06629A43A84B099387466818B1C54F-->  <AD_COLUMN_ID><![CDATA[7891269C840E655DE040007F010155CE]]></AD_COLUMN_ID>
+<!--8E06629A43A84B099387466818B1C54F-->  <OBCLKER_TEMPLATE_ID><![CDATA[9314DE8599AD44E7BFC4CC50699042AB]]></OBCLKER_TEMPLATE_ID>
+<!--8E06629A43A84B099387466818B1C54F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8E06629A43A84B099387466818B1C54F-->  <SUGGESTIONTEXTMATCHSTYLE><![CDATA[startsWith]]></SUGGESTIONTEXTMATCHSTYLE>
+<!--8E06629A43A84B099387466818B1C54F-->  <POPUPTEXTMATCHSTYLE><![CDATA[startsWith]]></POPUPTEXTMATCHSTYLE>
+<!--8E06629A43A84B099387466818B1C54F-->  <CUSTOM_QUERY><![CDATA[N]]></CUSTOM_QUERY>
+<!--8E06629A43A84B099387466818B1C54F--></OBUISEL_SELECTOR>
+
 <!--9FAD469CE4414A25974CF45C0AD22D35--><OBUISEL_SELECTOR>
 <!--9FAD469CE4414A25974CF45C0AD22D35-->  <OBUISEL_SELECTOR_ID><![CDATA[9FAD469CE4414A25974CF45C0AD22D35]]></OBUISEL_SELECTOR_ID>
 <!--9FAD469CE4414A25974CF45C0AD22D35-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -219,7 +235,7 @@
 <!--EE54530EA4884AD5A10365E480015325-->  <NAME><![CDATA[Payment Selector Transaction for Parameter Window]]></NAME>
 <!--EE54530EA4884AD5A10365E480015325-->  <AD_REFERENCE_ID><![CDATA[3F7FDB0EAC9A42B69E8238335FFA59EC]]></AD_REFERENCE_ID>
 <!--EE54530EA4884AD5A10365E480015325-->  <AD_TABLE_ID><![CDATA[D1A97202E832470285C9B1EB026D54E2]]></AD_TABLE_ID>
-<!--EE54530EA4884AD5A10365E480015325-->  <WHERECLAUSE><![CDATA[e.status in ('RPR', 'PPM') and e.amount <>0 and exists ( select 1 from FinancialMgmtFinAccPaymentMethod as  fapm join fapm.account as fa where fapm.paymentMethod = e.paymentMethod and fa.id = @Fin_Financial_Account_ID@ and (case when e.receipt = true then fapm.payinAllow else fapm.payoutAllow end) = true and fa.currency = e.account.currency) and not exists (select 1 from FIN_Finacc_Transaction as ft where e = ft.finPayment) and AD_ISORGINCLUDED(e.organization.id,@inpadOrgId@,e.client.id)<>-1]]></WHERECLAUSE>
+<!--EE54530EA4884AD5A10365E480015325-->  <WHERECLAUSE><![CDATA[e.status in ('RPR', 'PPM') and e.amount <>0 and exists ( select 1 from FinancialMgmtFinAccPaymentMethod as  fapm join fapm.account as fa where fapm.paymentMethod = e.paymentMethod and fa.id = @Fin_Financial_Account_ID@ and (case when e.receipt = true then fapm.payinAllow else fapm.payoutAllow end) = true and fa.currency = e.account.currency) and not exists (select 1 from FIN_Finacc_Transaction as ft where e = ft.finPayment) and AD_ISORGINCLUDED(e.organization.id,@ad_org_id_process@,e.client.id)<>-1]]></WHERECLAUSE>
 <!--EE54530EA4884AD5A10365E480015325-->  <OBCLKER_TEMPLATE_ID><![CDATA[9314DE8599AD44E7BFC4CC50699042AB]]></OBCLKER_TEMPLATE_ID>
 <!--EE54530EA4884AD5A10365E480015325-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--EE54530EA4884AD5A10365E480015325-->  <SUGGESTIONTEXTMATCHSTYLE><![CDATA[substring]]></SUGGESTIONTEXTMATCHSTYLE>
--- a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/AllTests.java	Thu Sep 29 15:56:24 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-/*
- *************************************************************************
- * 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) 2011-2014 Openbravo SLU 
- * All Rights Reserved. 
- * Contributor(s):  ______________________________________.
- ************************************************************************
- */
-
-package org.openbravo.advpaymentmngt.test.draft;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.openbravo.advpaymentmngt.test.draft.FinancialAccountTest;
-import org.openbravo.advpaymentmngt.test.draft.PaymentMethodTest;
-import org.openbravo.advpaymentmngt.test.draft.PaymentTest_01;
-import org.openbravo.advpaymentmngt.test.draft.PaymentTest_02;
-import org.openbravo.advpaymentmngt.test.draft.PaymentTest_03;
-import org.openbravo.advpaymentmngt.test.draft.PaymentTest_04;
-import org.openbravo.advpaymentmngt.test.draft.PaymentTest_05;
-import org.openbravo.advpaymentmngt.test.draft.PaymentTest_06;
-import org.openbravo.advpaymentmngt.test.draft.PaymentTest_07;
-import org.openbravo.advpaymentmngt.test.draft.PaymentTest_08;
-import org.openbravo.advpaymentmngt.test.draft.PaymentTest_09;
-import org.openbravo.advpaymentmngt.test.draft.PaymentTest_10;
-import org.openbravo.advpaymentmngt.test.draft.PaymentTest_11;
-
-/**
- * 
- * Test for org.openbravo.advpaymentmngt
- * 
- */
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-  
-    // Master Data Configuration
-    FinancialAccountTest.class, //
-    PaymentMethodTest.class,
-    
-    // Payment scenarios
-    PaymentTest_01.class, //
-    PaymentTest_02.class, //
-    PaymentTest_03.class, //
-    PaymentTest_04.class, //
-    PaymentTest_05.class, //
-    PaymentTest_06.class, //
-    PaymentTest_07.class, //
-    PaymentTest_08.class, //
-    PaymentTest_09.class, //
-    PaymentTest_10.class, //
-    PaymentTest_11.class })
-public class AllTests {
-
-}
--- a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/FinancialAccountTest.java	Thu Sep 29 15:56:24 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +0,0 @@
-/*
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.0  (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) 2010-2014 Openbravo SLU
- * All Rights Reserved.
- * Contributor(s):  ______________________________________.
- *************************************************************************
- */
-
-package org.openbravo.advpaymentmngt.test.draft;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-import org.hibernate.criterion.Restrictions;
-import org.junit.Before;
-import org.junit.Test;
-import org.openbravo.dal.service.OBCriteria;
-import org.openbravo.dal.service.OBDal;
-import org.openbravo.model.common.businesspartner.BusinessPartner;
-import org.openbravo.model.common.currency.Currency;
-import org.openbravo.model.common.geography.Location;
-import org.openbravo.model.financialmgmt.payment.FIN_FinancialAccount;
-import org.openbravo.test.base.OBBaseTest;
-
-public class FinancialAccountTest extends OBBaseTest {
-
-  private static final String BANK = "B";
-  private static final String CASH = "C";
-  private static final String STANDARD_DESCRIPTION = "JUnit Test";
-
-  /**
-   * This before method is named setUpF() to avoid overwriting the super 
-   * setUp method that is invoke automatically before this one.
-   */
-  @Before
-  public void setUpF() throws Exception {
-    TestUtility.setTestContext();
-  }
-
-  @Test
-  public void testAddFinancialAccountValid1() {
-    TestUtility.insertFinancialAccount("APRM_FINANCIAL_ACCOUNT_1", STANDARD_DESCRIPTION,
-        getOneInstance(Currency.class), CASH, false, getOneInstance(Location.class),
-        getOneInstance(BusinessPartner.class), null, null, null, null, null, null, null, null,
-        null, BigDecimal.ZERO, BigDecimal.ZERO, null, true, false);
-  }
-
-  // Pre-requisite: at least one Matching Algorithm created
-  @Test
-  public void testAddFinancialAccountValid2() {
-    TestUtility.insertFinancialAccount("APRM_FINANCIAL_ACCOUNT_2", STANDARD_DESCRIPTION,
-        getOneInstance(Currency.class), BANK, false, getOneInstance(Location.class),
-        getOneInstance(BusinessPartner.class), "2054", "4321", "1", null, null, null, "123456789",
-        null, null, BigDecimal.ZERO, BigDecimal.ZERO,
-        null/* getOneInstance(MatchingAlgorithm.class) */, true, false);
-  }
-
-  @Test
-  public void testAddFinancialAccountValid3() {
-    TestUtility.insertFinancialAccount("APRM_FINANCIAL_ACCOUNT_3", STANDARD_DESCRIPTION,
-        getOneInstance(Currency.class), BANK, false, getOneInstance(Location.class),
-        getOneInstance(BusinessPartner.class), "2054", null, null, null, null, null, null, null,
-        null, BigDecimal.ZERO, BigDecimal.ZERO, null, true, false);
-  }
-
-  /**
-   * Currency is mandatory
-   */
-  @Test
-  public void testAddFinancialAccountNotValid1() {
-    TestUtility.insertFinancialAccount("APRM_FINANCIAL_ACCOUNT_4", STANDARD_DESCRIPTION, null,
-        BANK, false, getOneInstance(Location.class), getOneInstance(BusinessPartner.class), "2054",
-        null, null, null, null, null, null, null, null, BigDecimal.ZERO, BigDecimal.ZERO, null,
-        false, false);
-  }
-
-  /**
-   * Deletes all the Payment Methods created for testing
-   */
-  @Test
-  public void testDeleteFinancialAccounts() {
-    final OBCriteria<FIN_FinancialAccount> obCriteria = OBDal.getInstance().createCriteria(
-        FIN_FinancialAccount.class);
-    obCriteria
-        .add(Restrictions.eq(FIN_FinancialAccount.PROPERTY_DESCRIPTION, STANDARD_DESCRIPTION));
-    final List<FIN_FinancialAccount> finAccs = obCriteria.list();
-    for (FIN_FinancialAccount fa : finAccs) {
-      OBDal.getInstance().remove(fa);
-    }
-  }
-
-}
--- a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentMethodTest.java	Thu Sep 29 15:56:24 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,105 +0,0 @@
-/*
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.0  (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) 2010-2014 Openbravo SLU
- * All Rights Reserved.
- * Contributor(s):  ______________________________________.
- *************************************************************************
- */
-
-package org.openbravo.advpaymentmngt.test.draft;
-
-import java.util.List;
-
-import org.hibernate.criterion.Restrictions;
-import org.junit.Before;
-import org.junit.Test;
-import org.openbravo.dal.service.OBCriteria;
-import org.openbravo.dal.service.OBDal;
-import org.openbravo.model.financialmgmt.payment.FIN_PaymentMethod;
-import org.openbravo.test.base.OBBaseTest;
-
-public class PaymentMethodTest extends OBBaseTest {
-
-  private static final String AUTOMATIC_EXECUTION = "A";
-  private static final String MANUAL_EXECUTION = "M";
-  private static final String CLEARED_ACCOUNT = "CLE";
-  private static final String IN_TRANSIT_ACCOUNT = "INT";
-  private static final String WITHDRAWN_ACCOUNT = "WIT";
-  private static final String DEPOSIT_ACCOUNT = "DEP";
-  private static final String STANDARD_DESCRIPTION = "JUnit Test";
-
-  /**
-   * This before method is named setUpP() to avoid overwriting the super 
-   * setUp method that is invoke automatically before this one.
-   */
-  @Before
-  public void setUpP() throws Exception {
-    TestUtility.setTestContext();
-  }
-
-  @Test
-  public void testAddPaymentMethodValid1() {
-    TestUtility.insertPaymentMethod("APRM_PAYMENT_METHOD_1", STANDARD_DESCRIPTION, true, false,
-        false, MANUAL_EXECUTION, null, false, IN_TRANSIT_ACCOUNT, DEPOSIT_ACCOUNT, CLEARED_ACCOUNT,
-        true, false, false, MANUAL_EXECUTION, null, false, IN_TRANSIT_ACCOUNT, WITHDRAWN_ACCOUNT,
-        CLEARED_ACCOUNT, true, false);
-  }
-
-  @Test
-  public void testAddPaymentMethodValid2() {
-    TestUtility.insertPaymentMethod("APRM_PAYMENT_METHOD_2", STANDARD_DESCRIPTION, true, false,
-        false, AUTOMATIC_EXECUTION, null, false, IN_TRANSIT_ACCOUNT, DEPOSIT_ACCOUNT,
-        CLEARED_ACCOUNT, true, false, false, AUTOMATIC_EXECUTION, null, false, IN_TRANSIT_ACCOUNT,
-        WITHDRAWN_ACCOUNT, CLEARED_ACCOUNT, true, false);
-  }
-
-  @Test
-  public void testAddPaymentMethodValid3() {
-    TestUtility.insertPaymentMethod("APRM_PAYMENT_METHOD_3", STANDARD_DESCRIPTION, true, false,
-        false, MANUAL_EXECUTION, null, false, null, null, null, true, false, false,
-        MANUAL_EXECUTION, null, false, null, null, null, true, false);
-  }
-
-  @Test
-  public void testAddPaymentMethodValid4() {
-    TestUtility.insertPaymentMethod("APRM_PAYMENT_METHOD_4", STANDARD_DESCRIPTION, true, true,
-        true, MANUAL_EXECUTION, null, false, null, null, null, true, true, true, MANUAL_EXECUTION,
-        null, false, null, null, null, true, false);
-  }
-
-  // Requisite: at least one Execution Process created
-  @Test
-  public void testAddPaymentMethodValid5() {
-    TestUtility.insertPaymentMethod("APRM_PAYMENT_METHOD_5", STANDARD_DESCRIPTION, true, false,
-        false, AUTOMATIC_EXECUTION, /* getOneInstance(PaymentExecutionProcess.class) */null, false,
-        IN_TRANSIT_ACCOUNT, DEPOSIT_ACCOUNT, CLEARED_ACCOUNT, true, false, false,
-        AUTOMATIC_EXECUTION,
-        /* getOneInstance(PaymentExecutionProcess.class) */null, false, IN_TRANSIT_ACCOUNT,
-        WITHDRAWN_ACCOUNT, CLEARED_ACCOUNT, true, false);
-  }
-
-  /**
-   * Deletes all the Payment Methods created for testing
-   */
-  @Test
-  public void testDeletePaymentMethod() {
-    final OBCriteria<FIN_PaymentMethod> obCriteria = OBDal.getInstance().createCriteria(
-        FIN_PaymentMethod.class);
-    obCriteria.add(Restrictions.eq(FIN_PaymentMethod.PROPERTY_DESCRIPTION, STANDARD_DESCRIPTION));
-    final List<FIN_PaymentMethod> paymentMethods = obCriteria.list();
-    for (FIN_PaymentMethod pm : paymentMethods) {
-      OBDal.getInstance().remove(pm);
-    }
-  }
-}
\ No newline at end of file
--- a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_01.java	Thu Sep 29 15:56:24 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,236 +0,0 @@
-/*
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.0  (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) 2010-2014 Openbravo SLU
- * All Rights Reserved.
- * Contributor(s):  ______________________________________.
- *************************************************************************
- */
-
-package org.openbravo.advpaymentmngt.test.draft;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-import org.apache.log4j.Logger;
-import org.junit.Before;
-import org.junit.Test;
-import org.openbravo.advpaymentmngt.utility.FIN_Utility;
-import org.openbravo.dal.core.OBContext;
-import org.openbravo.dal.service.OBDal;
-import org.openbravo.model.common.businesspartner.BusinessPartner;
-import org.openbravo.model.common.businesspartner.Location;
-import org.openbravo.model.common.currency.Currency;
-import org.openbravo.model.common.enterprise.DocumentType;
-import org.openbravo.model.common.invoice.Invoice;
-import org.openbravo.model.common.plm.Product;
-import org.openbravo.model.common.uom.UOM;
-import org.openbravo.model.financialmgmt.payment.FIN_FinancialAccount;
-import org.openbravo.model.financialmgmt.payment.FIN_Payment;
-import org.openbravo.model.financialmgmt.payment.FIN_PaymentDetail;
-import org.openbravo.model.financialmgmt.payment.FIN_PaymentMethod;
-import org.openbravo.model.financialmgmt.payment.FIN_PaymentScheduleDetail;
-import org.openbravo.model.financialmgmt.payment.FinAccPaymentMethod;
-import org.openbravo.model.financialmgmt.payment.PaymentTerm;
-import org.openbravo.model.financialmgmt.tax.TaxRate;
-import org.openbravo.model.pricing.pricelist.PriceList;
-import org.openbravo.test.base.OBBaseTest;
-
-public class PaymentTest_01 extends OBBaseTest {
-
-  private static final Logger log = Logger.getLogger(PaymentTest_01.class);
-
-  private static final String MANUAL_EXECUTION = "M";
-  private static final String CLEARED_ACCOUNT = "CLE";
-  private static final String IN_TRANSIT_ACCOUNT = "INT";
-  private static final String WITHDRAWN_ACCOUNT = "WIT";
-  private static final String DEPOSIT_ACCOUNT = "DEP";
-  private static final String CASH = "C";
-  private static final String STANDARD_DESCRIPTION = "JUnit Test Payment_01";
-
-  private String financialAccountId;
-
-  /**
-   * Initial Set up.
-   *  
-   * This before method is named setUpP01() to avoid overwriting the super 
-   * setUp method that is invoke automatically before this one.
-   * 
-   */
-  @Before
-  public void setUpP01() throws Exception {
-    TestUtility.setTestContext();
-  }
-
-  @Test
-  public void testRunPayment_01() {
-    boolean exception = false;
-    Invoice invoice = null;
-    FIN_Payment payment = null;
-
-    try {
-
-      // DATA SETUP
-      invoice = dataSetup();
-
-      // PAY COMPLETELY THE INVOICE
-      invoice = OBDal.getInstance().get(Invoice.class, invoice.getId());
-      payment = TestUtility.addPaymentFromInvoice(invoice,
-          OBDal.getInstance().get(FIN_FinancialAccount.class, financialAccountId),
-          invoice.getGrandTotalAmount(), false);
-
-      // PROCESS THE PAYMENT
-      TestUtility.processPayment(payment, "P");
-
-      // CHECK OUTPUT DATA
-      OBContext.setAdminMode();
-      try {
-        FIN_PaymentScheduleDetail psd = TestUtility.getOneInstance(FIN_PaymentScheduleDetail.class,
-            new Value(FIN_PaymentScheduleDetail.PROPERTY_INVOICEPAYMENTSCHEDULE, invoice
-                .getFINPaymentScheduleList().get(0)));
-
-        assertTrue(
-            "Payment Schedule Outstanding Amount != 0",
-            BigDecimal.ZERO.compareTo(invoice.getFINPaymentScheduleList().get(0)
-                .getOutstandingAmount()) == 0);
-        assertTrue(
-            "Payment Schedule Received Amount != Total Amount",
-            invoice.getGrandTotalAmount().compareTo(
-                invoice.getFINPaymentScheduleList().get(0).getPaidAmount()) == 0);
-
-        assertTrue("Payment Schedule Deatail Amount != Total Amount", invoice.getGrandTotalAmount()
-            .compareTo(psd.getAmount()) == 0);
-        assertTrue("Payment Schedule Detail Write-off Amount != 0",
-            BigDecimal.ZERO.compareTo(psd.getWriteoffAmount()) == 0);
-
-        assertTrue("Payment Amount != Total Amount",
-            invoice.getGrandTotalAmount().compareTo(payment.getAmount()) == 0);
-        assertTrue("Status != Payment Received", "RPR".equals(payment.getStatus()));
-        assertTrue("Payment Line Amount != Total Amount",
-            invoice.getGrandTotalAmount().compareTo(psd.getPaymentDetails().getAmount()) == 0);
-        assertTrue("Payment Line Write-off Amount != 0",
-            BigDecimal.ZERO.compareTo(psd.getPaymentDetails().getWriteoffAmount()) == 0);
-
-      } finally {
-        OBContext.restorePreviousMode();
-      }
-
-      // REACTIVATE
-      TestUtility.processPayment(payment, "R");
-
-      // CHECK OUTPUT DATA AFTER REACTIVATION
-      OBContext.setAdminMode();
-      try {
-        FIN_PaymentScheduleDetail psd = TestUtility.getOneInstance(FIN_PaymentScheduleDetail.class,
-            new Value(FIN_PaymentScheduleDetail.PROPERTY_INVOICEPAYMENTSCHEDULE, invoice
-                .getFINPaymentScheduleList().get(0)));
-
-        assertTrue(
-            "Expected Amount != Total Amount",
-            invoice.getGrandTotalAmount().compareTo(
-                invoice.getFINPaymentScheduleList().get(0).getAmount()) == 0);
-        assertTrue(
-            "Outstanding Amount != Total Amount",
-            invoice.getGrandTotalAmount().compareTo(
-                invoice.getFINPaymentScheduleList().get(0).getOutstandingAmount()) == 0);
-        assertTrue(
-            "Received Amount != 0",
-            BigDecimal.ZERO.compareTo(invoice.getFINPaymentScheduleList().get(0).getPaidAmount()) == 0);
-
-        assertTrue("Payment Schedule Deatail Amount != 0",
-            invoice.getGrandTotalAmount().compareTo(psd.getAmount()) == 0);
-        assertTrue("Payment Schedule Detail Write-off Amount != 0",
-            BigDecimal.ZERO.compareTo(psd.getWriteoffAmount()) == 0);
-
-        assertTrue("Payment Amount != 0", BigDecimal.ZERO.compareTo(payment.getAmount()) == 0);
-        assertTrue("Status != Awaiting Payment", "RPAP".equals(payment.getStatus()));
-
-        assertTrue("There are Payment Lines for this payment",
-            TestUtility.getOneInstance(FIN_PaymentDetail.class, new Value(
-                FIN_PaymentDetail.PROPERTY_FINPAYMENT, payment)) == null);
-      } finally {
-        OBContext.restorePreviousMode();
-      }
-
-    } catch (Exception e) {
-      e.printStackTrace();
-      log.error(FIN_Utility.getExceptionMessage(e));
-      exception = true;
-    }
-
-    assertFalse(exception);
-
-  }
-
-  private Invoice dataSetup() throws Exception {
-
-    // DATA SETUP
-    String bpartnerId = "8A64B71A2B0B2946012B0FE1E51401C1"; // Sleep Well Hotel
-    String priceListId = "8A64B71A2B0B2946012B0BD96E850150"; // General Sales
-    String paymentTermId = "3F22D83730EE4FD5AE42542A2839DAC4"; // 30 days
-    String currencyId = "102"; // EUR
-    String productId = "8A64B71A2B0B2946012B0BC4345000FB"; // Ale Beer
-    String taxId = "1FE610D3A8844F85B17CA32525C15353"; // NY Sales Tax
-    String docTypeId = "C99C4AE941E1460B91BC97665BE5D141"; // AR Invoice
-    BigDecimal invoicedQuantity = new BigDecimal("5");
-    BigDecimal netUnitPrice = new BigDecimal("2.04");
-    BigDecimal netListPrice = new BigDecimal("2.04");
-    BigDecimal lineNetAmount = new BigDecimal("10.20");
-    BigDecimal priceLimit = new BigDecimal("1");
-
-    PriceList testPriceList = OBDal.getInstance().get(PriceList.class, priceListId);
-    BusinessPartner testBusinessPartner = OBDal.getInstance()
-        .get(BusinessPartner.class, bpartnerId);
-    Location location = TestUtility.getOneInstance(Location.class, new Value(
-        Location.PROPERTY_BUSINESSPARTNER, testBusinessPartner));
-    PaymentTerm testPaymentTerm = OBDal.getInstance().get(PaymentTerm.class, paymentTermId);
-    Currency testCurrency = OBDal.getInstance().get(Currency.class, currencyId);
-    Product testProduct = OBDal.getInstance().get(Product.class, productId);
-    UOM uom = TestUtility.getOneInstance(UOM.class, new Value(UOM.PROPERTY_NAME, testProduct
-        .getUOM().getName()));
-    TaxRate testTaxRate = OBDal.getInstance().get(TaxRate.class, taxId);
-    DocumentType testDocumentType = OBDal.getInstance().get(DocumentType.class, docTypeId);
-
-    FIN_FinancialAccount testAccount = TestUtility.insertFinancialAccount("APRM_FINACC_PAYMENT_01",
-        STANDARD_DESCRIPTION, testCurrency, CASH, false,
-        getOneInstance(org.openbravo.model.common.geography.Location.class), testBusinessPartner,
-        null, null, null, null, null, null, null, null, null, BigDecimal.ZERO, BigDecimal.ZERO,
-        null, true, true);
-
-    FIN_PaymentMethod testPaymentMethod = TestUtility.insertPaymentMethod("APRM_PM_PAYMENT_01",
-        STANDARD_DESCRIPTION, true, false, false, MANUAL_EXECUTION, null, false,
-        IN_TRANSIT_ACCOUNT, DEPOSIT_ACCOUNT, CLEARED_ACCOUNT, true, false, false, MANUAL_EXECUTION,
-        null, false, IN_TRANSIT_ACCOUNT, WITHDRAWN_ACCOUNT, CLEARED_ACCOUNT, true, true);
-
-    FinAccPaymentMethod existAssociation = TestUtility.getOneInstance(FinAccPaymentMethod.class,
-        new Value(FinAccPaymentMethod.PROPERTY_ACCOUNT, testAccount), new Value(
-            FinAccPaymentMethod.PROPERTY_PAYMENTMETHOD, testPaymentMethod));
-
-    if (existAssociation == null)
-      TestUtility.associatePaymentMethod(testAccount, testPaymentMethod);
-    this.financialAccountId = testAccount.getId();
-
-    Invoice invoice = TestUtility.createNewInvoice(OBContext.getOBContext().getCurrentClient(),
-        OBContext.getOBContext().getCurrentOrganization(), new Date(), new Date(), new Date(),
-        testDocumentType, testBusinessPartner, location, testPriceList, testCurrency,
-        testPaymentMethod, testPaymentTerm, testProduct, uom, invoicedQuantity, netUnitPrice,
-        netListPrice, priceLimit, testTaxRate, lineNetAmount, true);
-
-    TestUtility.processInvoice(invoice);
-
-    return invoice;
-  }
-}
--- a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_02.java	Thu Sep 29 15:56:24 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,238 +0,0 @@
-/*
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.0  (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) 2010-2014 Openbravo SLU
- * All Rights Reserved.
- * Contributor(s):  ______________________________________.
- *************************************************************************
- */
-
-package org.openbravo.advpaymentmngt.test.draft;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-import org.apache.log4j.Logger;
-import org.junit.Before;
-import org.openbravo.advpaymentmngt.utility.FIN_Utility;
-import org.openbravo.dal.core.OBContext;
-import org.openbravo.dal.service.OBDal;
-import org.openbravo.model.common.businesspartner.BusinessPartner;
-import org.openbravo.model.common.businesspartner.Location;
-import org.openbravo.model.common.currency.Currency;
-import org.openbravo.model.common.enterprise.DocumentType;
-import org.openbravo.model.common.invoice.Invoice;
-import org.openbravo.model.common.plm.Product;
-import org.openbravo.model.common.uom.UOM;
-import org.openbravo.model.financialmgmt.payment.FIN_FinancialAccount;
-import org.openbravo.model.financialmgmt.payment.FIN_Payment;
-import org.openbravo.model.financialmgmt.payment.FIN_PaymentDetail;
-import org.openbravo.model.financialmgmt.payment.FIN_PaymentMethod;
-import org.openbravo.model.financialmgmt.payment.FIN_PaymentScheduleDetail;
-import org.openbravo.model.financialmgmt.payment.FinAccPaymentMethod;
-import org.openbravo.model.financialmgmt.payment.PaymentTerm;
-import org.openbravo.model.financialmgmt.tax.TaxRate;
-import org.openbravo.model.pricing.pricelist.PriceList;
-import org.openbravo.test.base.OBBaseTest;
-
-/**
- * The PaymentTest_02 class used to test the partial payment document generation and reactivating
- * the in APRM.
- * 
- */
-public class PaymentTest_02 extends OBBaseTest {
-
-  private static final Logger log = Logger.getLogger(PaymentTest_01.class);
-
-  private static final String MANUAL_EXECUTION = "M";
-  private static final String CLEARED_ACCOUNT = "CLE";
-  private static final String IN_TRANSIT_ACCOUNT = "INT";
-  private static final String WITHDRAWN_ACCOUNT = "WIT";
-  private static final String DEPOSIT_ACCOUNT = "DEP";
-  private static final String CASH = "C";
-  private static final String STANDARD_DESCRIPTION = "JUnit Test Payment_02";
-
-  private String financialAccountId;
-
-  /**
-   * Initial Set up.
-   * 
-   * This before method is named setUpP02() to avoid overwriting the super 
-   * setUp method that is invoke automatically before this one.
-   * 
-   */
-  @Before
-  public void setUpP02() throws Exception {
-    TestUtility.setTestContext();
-  }
-
-  public void testRunPayment_02() {
-    boolean exception = false;
-    Invoice invoice = null;
-    FIN_Payment payment = null;
-
-    try {
-
-      // DATA SETUP
-      invoice = dataSetup();
-
-      // PAY PARTIALLY THE INVOICE
-      invoice = OBDal.getInstance().get(Invoice.class, invoice.getId());
-      BigDecimal divisor = new BigDecimal("2.0");
-      BigDecimal paymentAmount = invoice.getGrandTotalAmount().divide(divisor, 2);
-      payment = TestUtility.addPaymentFromInvoice(invoice,
-          OBDal.getInstance().get(FIN_FinancialAccount.class, financialAccountId), paymentAmount,
-          false);
-
-      // PROCESS THE PAYMENT
-      TestUtility.processPayment(payment, "P");
-
-      // CHECK OUTPUT DATA
-      OBContext.setAdminMode();
-      try {
-        FIN_PaymentScheduleDetail psd = TestUtility.getOneInstance(FIN_PaymentScheduleDetail.class,
-            new Value(FIN_PaymentScheduleDetail.PROPERTY_INVOICEPAYMENTSCHEDULE, invoice
-                .getFINPaymentScheduleList().get(0)));
-
-        assertTrue("Payment Schedule Outstanding Amount ("
-            + invoice.getFINPaymentScheduleList().get(0).getOutstandingAmount().toPlainString()
-            + ") != " + paymentAmount.toPlainString(), invoice.getFINPaymentScheduleList().get(0)
-            .getOutstandingAmount().compareTo(paymentAmount) == 0);
-
-        assertTrue(
-            "Payment Schedule Received Amount != Total Amount",
-            invoice.getGrandTotalAmount().compareTo(
-                invoice.getFINPaymentScheduleList().get(0).getPaidAmount()) != 0);
-
-        assertTrue("Payment Schedule Deatail Amount != Total Amount", invoice.getGrandTotalAmount()
-            .compareTo(psd.getAmount()) != 0);
-
-        assertTrue("Payment Schedule Detail Write-off Amount == 0",
-            BigDecimal.ZERO.compareTo(psd.getWriteoffAmount()) == 0);
-
-        assertTrue("Payment Amount != Total Amount",
-            invoice.getGrandTotalAmount().compareTo(payment.getAmount()) != 0);
-        assertTrue("Status != Payment Received", "RPR".equals(payment.getStatus()));
-      } finally {
-        OBContext.restorePreviousMode();
-      }
-
-      // REACTIVATE
-      TestUtility.processPayment(payment, "R");
-
-      // CHECK OUTPUT DATA AFTER REACTIVATION
-      OBContext.setAdminMode();
-      try {
-        FIN_PaymentScheduleDetail psd = TestUtility.getOneInstance(FIN_PaymentScheduleDetail.class,
-            new Value(FIN_PaymentScheduleDetail.PROPERTY_INVOICEPAYMENTSCHEDULE, invoice
-                .getFINPaymentScheduleList().get(0)));
-
-        assertTrue(
-            "Expected Amount != Total Amount",
-            invoice.getGrandTotalAmount().compareTo(
-                invoice.getFINPaymentScheduleList().get(0).getAmount()) == 0);
-        assertTrue(
-            "Outstanding Amount != Total Amount",
-            invoice.getGrandTotalAmount().compareTo(
-                invoice.getFINPaymentScheduleList().get(0).getOutstandingAmount()) == 0);
-        assertTrue(
-            "Received Amount != 0",
-            BigDecimal.ZERO.compareTo(invoice.getFINPaymentScheduleList().get(0).getPaidAmount()) == 0);
-
-        assertTrue("Payment Schedule Detail Amount != 0",
-            invoice.getGrandTotalAmount().compareTo(psd.getAmount()) == 0);
-        assertTrue("Payment Schedule Detail Write-off Amount == 0",
-            BigDecimal.ZERO.compareTo(psd.getWriteoffAmount()) == 0);
-
-        assertTrue("Payment Amount != 0", BigDecimal.ZERO.compareTo(payment.getAmount()) == 0);
-        assertTrue("Status != Awaiting Payment", "RPAP".equals(payment.getStatus()));
-
-        assertTrue("There are Payment Lines for this payment",
-            TestUtility.getOneInstance(FIN_PaymentDetail.class, new Value(
-                FIN_PaymentDetail.PROPERTY_FINPAYMENT, payment)) == null);
-      } finally {
-        OBContext.restorePreviousMode();
-      }
-    } catch (Exception e) {
-      e.printStackTrace();
-      log.error(FIN_Utility.getExceptionMessage(e));
-      exception = true;
-    }
-
-    assertFalse(exception);
-
-  }
-
-  private Invoice dataSetup() throws Exception {
-
-    // DATA SETUP
-    String bpartnerId = "8A64B71A2B0B2946012B0FE1E51401C1"; // Sleep Well Hotel
-    String priceListId = "8A64B71A2B0B2946012B0BD96E850150"; // General Sales
-    String paymentTermId = "3F22D83730EE4FD5AE42542A2839DAC4"; // 30 days
-    String currencyId = "102"; // EUR
-    String productId = "8A64B71A2B0B2946012B0BC4345000FB"; // Ale Beer
-    String taxId = "1FE610D3A8844F85B17CA32525C15353"; // NY Sales Tax
-    String docTypeId = "C99C4AE941E1460B91BC97665BE5D141"; // AR Invoice
-    BigDecimal invoicedQuantity = new BigDecimal("5");
-    BigDecimal netUnitPrice = new BigDecimal("2");
-    BigDecimal netListPrice = new BigDecimal("2");
-    BigDecimal lineNetAmount = new BigDecimal("1");
-    BigDecimal priceLimit = new BigDecimal("1");
-
-    PriceList testPriceList = OBDal.getInstance().get(PriceList.class, priceListId);
-    BusinessPartner testBusinessPartner = OBDal.getInstance()
-        .get(BusinessPartner.class, bpartnerId);
-    Location location = TestUtility.getOneInstance(Location.class, new Value(
-        Location.PROPERTY_BUSINESSPARTNER, testBusinessPartner));
-    PaymentTerm testPaymentTerm = OBDal.getInstance().get(PaymentTerm.class, paymentTermId);
-    Currency testCurrency = OBDal.getInstance().get(Currency.class, currencyId);
-    Product testProduct = OBDal.getInstance().get(Product.class, productId);
-    UOM uom = TestUtility.getOneInstance(UOM.class, new Value(UOM.PROPERTY_NAME, testProduct
-        .getUOM().getName()));
-    TaxRate testTaxRate = OBDal.getInstance().get(TaxRate.class, taxId);
-    DocumentType testDocumentType = OBDal.getInstance().get(DocumentType.class, docTypeId);
-
-    FIN_FinancialAccount testAccount = TestUtility.insertFinancialAccount("APRM_FINACC_PAYMENT_01",
-        STANDARD_DESCRIPTION, testCurrency, CASH, false,
-        getOneInstance(org.openbravo.model.common.geography.Location.class), testBusinessPartner,
-        null, null, null, null, null, null, null, null, null, BigDecimal.ZERO, BigDecimal.ZERO,
-        null, true, true);
-
-    FIN_PaymentMethod testPaymentMethod = TestUtility.insertPaymentMethod("APRM_PM_PAYMENT_01",
-        STANDARD_DESCRIPTION, true, false, false, MANUAL_EXECUTION, null, false,
-        IN_TRANSIT_ACCOUNT, DEPOSIT_ACCOUNT, CLEARED_ACCOUNT, true, false, false, MANUAL_EXECUTION,
-        null, false, IN_TRANSIT_ACCOUNT, WITHDRAWN_ACCOUNT, CLEARED_ACCOUNT, true, true);
-
-    FinAccPaymentMethod existAssociation = TestUtility.getOneInstance(FinAccPaymentMethod.class,
-        new Value(FinAccPaymentMethod.PROPERTY_ACCOUNT, testAccount), new Value(
-            FinAccPaymentMethod.PROPERTY_PAYMENTMETHOD, testPaymentMethod));
-
-    if (existAssociation == null)
-      TestUtility.associatePaymentMethod(testAccount, testPaymentMethod);
-    this.financialAccountId = testAccount.getId();
-
-    Invoice invoice = TestUtility.createNewInvoice(OBContext.getOBContext().getCurrentClient(),
-        OBContext.getOBContext().getCurrentOrganization(), new Date(), new Date(), new Date(),
-        testDocumentType, testBusinessPartner, location, testPriceList, testCurrency,
-        testPaymentMethod, testPaymentTerm, testProduct, uom, invoicedQuantity, netUnitPrice,
-        netListPrice, priceLimit, testTaxRate, lineNetAmount, true);
-
-    TestUtility.processInvoice(invoice);
-
-    return invoice;
-  }
-
-}
--- a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_03.java	Thu Sep 29 15:56:24 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,236 +0,0 @@
-/*
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.0  (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) 2010-2014 Openbravo SLU
- * All Rights Reserved.
- * Contributor(s):  ______________________________________.
- *************************************************************************
- */
-
-package org.openbravo.advpaymentmngt.test.draft;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-import org.apache.log4j.Logger;
-import org.junit.Before;
-import org.junit.Test;
-import org.openbravo.advpaymentmngt.utility.FIN_Utility;
-import org.openbravo.dal.core.OBContext;
-import org.openbravo.dal.service.OBDal;
-import org.openbravo.model.common.businesspartner.BusinessPartner;
-import org.openbravo.model.common.businesspartner.Location;
-import org.openbravo.model.common.currency.Currency;
-import org.openbravo.model.common.enterprise.DocumentType;
-import org.openbravo.model.common.invoice.Invoice;
-import org.openbravo.model.common.plm.Product;
-import org.openbravo.model.common.uom.UOM;
-import org.openbravo.model.financialmgmt.payment.FIN_FinancialAccount;
-import org.openbravo.model.financialmgmt.payment.FIN_Payment;
-import org.openbravo.model.financialmgmt.payment.FIN_PaymentDetail;
-import org.openbravo.model.financialmgmt.payment.FIN_PaymentMethod;
-import org.openbravo.model.financialmgmt.payment.FIN_PaymentScheduleDetail;
-import org.openbravo.model.financialmgmt.payment.FinAccPaymentMethod;
-import org.openbravo.model.financialmgmt.payment.PaymentTerm;
-import org.openbravo.model.financialmgmt.tax.TaxRate;
-import org.openbravo.model.pricing.pricelist.PriceList;
-import org.openbravo.test.base.OBBaseTest;
-
-/**
- * The PaymentTest_03 class used to test the payment document generation and reactivation with
- * write-off option.
- */
-public class PaymentTest_03 extends OBBaseTest {
-
-  private static final Logger log = Logger.getLogger(PaymentTest_01.class);
-
-  private static final String MANUAL_EXECUTION = "M";
-  private static final String CLEARED_ACCOUNT = "CLE";
-  private static final String IN_TRANSIT_ACCOUNT = "INT";
-  private static final String WITHDRAWN_ACCOUNT = "WIT";
-  private static final String DEPOSIT_ACCOUNT = "DEP";
-  private static final String CASH = "C";
-  private static final String STANDARD_DESCRIPTION = "JUnit Test Payment_03";
-
-  private String financialAccountId;
-
-  /**
-   * Initial Set up.
-   * 
-   * This before method is named setUpP03() to avoid overwriting the super 
-   * setUp method that is invoke automatically before this one.
-   * 
-   */
-  @Before
-  public void setUpP03() throws Exception {
-    TestUtility.setTestContext();
-  }
-
-  @Test
-  public void testRunPayment_03() {
-    boolean exception = false;
-    Invoice invoice = null;
-    FIN_Payment payment = null;
-
-    try {
-
-      // DATA SETUP
-      invoice = dataSetup();
-
-      // PAY PARTIALLY THE INVOICE
-      invoice = OBDal.getInstance().get(Invoice.class, invoice.getId());
-      BigDecimal writeOffAmt = new BigDecimal("2.0");
-      BigDecimal paymentAmount = invoice.getGrandTotalAmount().subtract(writeOffAmt);
-      payment = TestUtility.addPaymentFromInvoice(invoice,
-          OBDal.getInstance().get(FIN_FinancialAccount.class, financialAccountId), paymentAmount,
-          true);
-
-      // PROCESS THE PAYMENT
-      TestUtility.processPayment(payment, "P");
-
-      // CHECK OUTPUT DATA
-      OBContext.setAdminMode();
-      try {
-        FIN_PaymentScheduleDetail psd = TestUtility.getOneInstance(FIN_PaymentScheduleDetail.class,
-            new Value(FIN_PaymentScheduleDetail.PROPERTY_INVOICEPAYMENTSCHEDULE, invoice
-                .getFINPaymentScheduleList().get(0)));
-
-        assertTrue("Payment Schedule Outstanding Amount != 0", invoice.getFINPaymentScheduleList()
-            .get(0).getOutstandingAmount().compareTo(psd.getAmount()) != 0);
-
-        assertTrue(
-            "Payment Schedule Received Amount == Total Amount",
-            invoice.getGrandTotalAmount().compareTo(
-                invoice.getFINPaymentScheduleList().get(0).getPaidAmount()) == 0);
-
-        assertTrue("Payment Schedule Detail Amount != Total Amount", invoice.getGrandTotalAmount()
-            .compareTo(psd.getAmount()) != 0);
-
-        assertTrue("Payment Schedule Detail Write-off Amount != 0",
-            BigDecimal.ZERO.compareTo(psd.getWriteoffAmount()) != 0);
-
-        assertTrue("Payment Amount != Total Amount",
-            invoice.getGrandTotalAmount().compareTo(payment.getAmount()) != 0);
-        assertTrue("Status == Payment Received", "RPR".equals(payment.getStatus()));
-      } finally {
-        OBContext.restorePreviousMode();
-      }
-
-      // REACTIVATE
-      TestUtility.processPayment(payment, "R");
-
-      // CHECK OUTPUT DATA AFTER REACTIVATION
-      OBContext.setAdminMode();
-      try {
-        FIN_PaymentScheduleDetail psd = TestUtility.getOneInstance(FIN_PaymentScheduleDetail.class,
-            new Value(FIN_PaymentScheduleDetail.PROPERTY_INVOICEPAYMENTSCHEDULE, invoice
-                .getFINPaymentScheduleList().get(0)));
-
-        assertTrue(
-            "Expected Amount != Total Amount",
-            invoice.getGrandTotalAmount().compareTo(
-                invoice.getFINPaymentScheduleList().get(0).getAmount()) == 0);
-        assertTrue(
-            "Outstanding Amount != Total Amount",
-            invoice.getGrandTotalAmount().compareTo(
-                invoice.getFINPaymentScheduleList().get(0).getOutstandingAmount()) == 0);
-        assertTrue(
-            "Received Amount != 0",
-            BigDecimal.ZERO.compareTo(invoice.getFINPaymentScheduleList().get(0).getPaidAmount()) == 0);
-
-        assertTrue("Payment Schedule Detail Amount != 0",
-            invoice.getGrandTotalAmount().compareTo(psd.getAmount()) == 0);
-        assertTrue("Payment Schedule Detail Write-off Amount == 0",
-            BigDecimal.ZERO.compareTo(psd.getWriteoffAmount()) == 0);
-
-        assertTrue("Payment Amount != 0", BigDecimal.ZERO.compareTo(payment.getAmount()) == 0);
-        assertTrue("Status != Awaiting Payment", "RPAP".equals(payment.getStatus()));
-
-        assertTrue("There are Payment Lines for this payment",
-            TestUtility.getOneInstance(FIN_PaymentDetail.class, new Value(
-                FIN_PaymentDetail.PROPERTY_FINPAYMENT, payment)) == null);
-      } finally {
-        OBContext.restorePreviousMode();
-      }
-    } catch (Exception e) {
-      e.printStackTrace();
-      log.error(FIN_Utility.getExceptionMessage(e));
-      exception = true;
-    }
-
-    assertFalse(exception);
-
-  }
-
-  private Invoice dataSetup() throws Exception {
-
-    // DATA SETUP
-    String bpartnerId = "8A64B71A2B0B2946012B0FE1E51401C1"; // Sleep Well Hotel
-    String priceListId = "8A64B71A2B0B2946012B0BD96E850150"; // General Sales
-    String paymentTermId = "3F22D83730EE4FD5AE42542A2839DAC4"; // 30 days
-    String currencyId = "102"; // EUR
-    String productId = "8A64B71A2B0B2946012B0BC4345000FB"; // Ale Beer
-    String taxId = "1FE610D3A8844F85B17CA32525C15353"; // NY Sales Tax
-    String docTypeId = "C99C4AE941E1460B91BC97665BE5D141"; // AR Invoice
-    BigDecimal invoicedQuantity = new BigDecimal("5");
-    BigDecimal netUnitPrice = new BigDecimal("2.04");
-    BigDecimal netListPrice = new BigDecimal("2.04");
-    BigDecimal lineNetAmount = new BigDecimal("10.20");
-    BigDecimal priceLimit = new BigDecimal("1");
-
-    PriceList testPriceList = OBDal.getInstance().get(PriceList.class, priceListId);
-    BusinessPartner testBusinessPartner = OBDal.getInstance()
-        .get(BusinessPartner.class, bpartnerId);
-    Location location = TestUtility.getOneInstance(Location.class, new Value(
-        Location.PROPERTY_BUSINESSPARTNER, testBusinessPartner));
-    PaymentTerm testPaymentTerm = OBDal.getInstance().get(PaymentTerm.class, paymentTermId);
-    Currency testCurrency = OBDal.getInstance().get(Currency.class, currencyId);
-    Product testProduct = OBDal.getInstance().get(Product.class, productId);
-    UOM uom = TestUtility.getOneInstance(UOM.class, new Value(UOM.PROPERTY_NAME, testProduct
-        .getUOM().getName()));
-    TaxRate testTaxRate = OBDal.getInstance().get(TaxRate.class, taxId);
-    DocumentType testDocumentType = OBDal.getInstance().get(DocumentType.class, docTypeId);
-
-    FIN_FinancialAccount testAccount = TestUtility.insertFinancialAccount("APRM_FINACC_PAYMENT_01",
-        STANDARD_DESCRIPTION, testCurrency, CASH, false,
-        getOneInstance(org.openbravo.model.common.geography.Location.class), testBusinessPartner,
-        null, null, null, null, null, null, null, null, null, BigDecimal.ZERO, BigDecimal.ZERO,
-        null, true, true);
-
-    FIN_PaymentMethod testPaymentMethod = TestUtility.insertPaymentMethod("APRM_PM_PAYMENT_01",
-        STANDARD_DESCRIPTION, true, false, false, MANUAL_EXECUTION, null, false,
-        IN_TRANSIT_ACCOUNT, DEPOSIT_ACCOUNT, CLEARED_ACCOUNT, true, false, false, MANUAL_EXECUTION,
-        null, false, IN_TRANSIT_ACCOUNT, WITHDRAWN_ACCOUNT, CLEARED_ACCOUNT, true, true);
-
-    FinAccPaymentMethod existAssociation = TestUtility.getOneInstance(FinAccPaymentMethod.class,
-        new Value(FinAccPaymentMethod.PROPERTY_ACCOUNT, testAccount), new Value(
-            FinAccPaymentMethod.PROPERTY_PAYMENTMETHOD, testPaymentMethod));
-
-    if (existAssociation == null)
-      TestUtility.associatePaymentMethod(testAccount, testPaymentMethod);
-    this.financialAccountId = testAccount.getId();
-
-    Invoice invoice = TestUtility.createNewInvoice(OBContext.getOBContext().getCurrentClient(),
-        OBContext.getOBContext().getCurrentOrganization(), new Date(), new Date(), new Date(),
-        testDocumentType, testBusinessPartner, location, testPriceList, testCurrency,
-        testPaymentMethod, testPaymentTerm, testProduct, uom, invoicedQuantity, netUnitPrice,
-        netListPrice, priceLimit, testTaxRate, lineNetAmount, true);
-
-    TestUtility.processInvoice(invoice);
-
-    return invoice;
-  }
-}
--- a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_04.java	Thu Sep 29 15:56:24 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,215 +0,0 @@
-/*
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.0  (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) 2010-2014 Openbravo SLU
- * All Rights Reserved.
- * Contributor(s):  ______________________________________.
- *************************************************************************
- */
-
-package org.openbravo.advpaymentmngt.test.draft;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-import org.apache.log4j.Logger;
-import org.junit.Before;
-import org.junit.Test;
-import org.openbravo.advpaymentmngt.utility.FIN_Utility;
-import org.openbravo.dal.core.OBContext;
-import org.openbravo.dal.service.OBDal;
-import org.openbravo.model.common.businesspartner.BusinessPartner;
-import org.openbravo.model.common.businesspartner.Location;
-import org.openbravo.model.common.currency.Currency;
-import org.openbravo.model.common.enterprise.DocumentType;
-import org.openbravo.model.common.invoice.Invoice;
-import org.openbravo.model.common.plm.Product;
-import org.openbravo.model.common.uom.UOM;
-import org.openbravo.model.financialmgmt.payment.FIN_FinancialAccount;
-import org.openbravo.model.financialmgmt.payment.FIN_Payment;
-import org.openbravo.model.financialmgmt.payment.FIN_PaymentMethod;
-import org.openbravo.model.financialmgmt.payment.FIN_PaymentScheduleDetail;
-import org.openbravo.model.financialmgmt.payment.FinAccPaymentMethod;
-import org.openbravo.model.financialmgmt.payment.PaymentTerm;
-import org.openbravo.model.financialmgmt.tax.TaxRate;
-import org.openbravo.model.pricing.pricelist.PriceList;
-import org.openbravo.test.base.OBBaseTest;
-
-/**
- * The PaymentTest_04 class used to test the payment document generation with Refund option.
- */
-public class PaymentTest_04 extends OBBaseTest {
-
-  private static final Logger log = Logger.getLogger(PaymentTest_04.class);
-
-  private static final String MANUAL_EXECUTION = "M";
-  private static final String CLEARED_ACCOUNT = "CLE";
-  private static final String IN_TRANSIT_ACCOUNT = "INT";
-  private static final String WITHDRAWN_ACCOUNT = "WIT";
-  private static final String DEPOSIT_ACCOUNT = "DEP";
-  private static final String CASH = "C";
-  private static final String STANDARD_DESCRIPTION = "JUnit Test Payment_04";
-
-  private String financialAccountId;
-
-  /**
-   * Initial Set up.
-   * 
-   * This before method is named setUpP04() to avoid overwriting the super 
-   * setUp method that is invoke automatically before this one.
-   * 
-   */
-  @Before
-  public void setUpP04() throws Exception {
-    TestUtility.setTestContext();
-  }
-
-  @Test
-  public void testRunPayment_04() {
-    boolean exception = false;
-    Invoice invoice = null;
-    FIN_Payment payment = null;
-
-    try {
-
-      // DATA SETUP
-      invoice = dataSetup();
-
-      // PAY PARTIALLY THE INVOICE
-      invoice = OBDal.getInstance().get(Invoice.class, invoice.getId());
-      BigDecimal refundAmt = new BigDecimal("20.0");
-      BigDecimal paymentAmount = invoice.getGrandTotalAmount();
-      payment = TestUtility.addPaymentFromInvoice(invoice,
-          OBDal.getInstance().get(FIN_FinancialAccount.class, financialAccountId), paymentAmount,
-          false);
-
-      // PROCESS THE PAYMENT
-      TestUtility.processPayment(payment, "P");
-
-      // REFUNDING THE PAYMENT
-      FIN_Payment refundPayment = TestUtility.createRefundPayment(payment, refundAmt);
-
-      OBContext.setAdminMode();
-      try {
-        // PROCESSING THE REFUND PAYMENT
-        TestUtility.processPayment(refundPayment, "P");
-      } finally {
-        OBContext.restorePreviousMode();
-      }
-
-      // CHECK OUTPUT DATA
-      OBContext.setAdminMode();
-      try {
-        FIN_PaymentScheduleDetail psd = TestUtility.getOneInstance(FIN_PaymentScheduleDetail.class,
-            new Value(FIN_PaymentScheduleDetail.PROPERTY_INVOICEPAYMENTSCHEDULE, invoice
-                .getFINPaymentScheduleList().get(0)));
-
-        assertTrue("Payment Schedule Outstanding Amount == 0", invoice.getFINPaymentScheduleList()
-            .get(0).getOutstandingAmount().compareTo(psd.getAmount()) != 0);
-
-        assertTrue(
-            "Payment Schedule Received Amount == Total Amount",
-            invoice.getGrandTotalAmount().compareTo(
-                invoice.getFINPaymentScheduleList().get(0).getPaidAmount()) == 0);
-
-        assertTrue("Payment Schedule Detail Amount == Total Amount", invoice.getGrandTotalAmount()
-            .compareTo(psd.getAmount()) == 0);
-
-        assertTrue("Payment Schedule Detail Write-off Amount == 0",
-            BigDecimal.ZERO.compareTo(psd.getWriteoffAmount()) == 0);
-
-        assertTrue("Payment Amount == Total Amount",
-            invoice.getGrandTotalAmount().compareTo(payment.getAmount()) == 0);
-        assertTrue("Status == Payment Received", "RPR".equals(payment.getStatus()));
-
-        assertTrue("Payment Amount == Refund Amount",
-            refundAmt.negate().compareTo(refundPayment.getAmount()) == 0);
-
-        assertTrue("Payment Used Credit == Used Credit",
-            refundAmt.compareTo(refundPayment.getUsedCredit()) == 0);
-
-      } finally {
-        OBContext.restorePreviousMode();
-      }
-    } catch (Exception e) {
-      e.printStackTrace();
-      log.error(FIN_Utility.getExceptionMessage(e));
-      exception = true;
-    }
-
-    assertFalse(exception);
-
-  }
-
-  private Invoice dataSetup() throws Exception {
-
-    // DATA SETUP
-    String bpartnerId = "8A64B71A2B0B2946012B0FE1E51401C1"; // Sleep Well Hotel
-    String priceListId = "8A64B71A2B0B2946012B0BD96E850150"; // General Sales
-    String paymentTermId = "3F22D83730EE4FD5AE42542A2839DAC4"; // 30 days
-    String currencyId = "102"; // EUR
-    String productId = "8A64B71A2B0B2946012B0BC4345000FB"; // Ale Beer
-    String taxId = "1FE610D3A8844F85B17CA32525C15353"; // NY Sales Tax
-    String docTypeId = "C99C4AE941E1460B91BC97665BE5D141"; // AR Invoice
-    BigDecimal invoicedQuantity = new BigDecimal("5");
-    BigDecimal netUnitPrice = new BigDecimal("2.04");
-    BigDecimal netListPrice = new BigDecimal("2.04");
-    BigDecimal lineNetAmount = new BigDecimal("10.20");
-    BigDecimal priceLimit = new BigDecimal("1");
-
-    PriceList testPriceList = OBDal.getInstance().get(PriceList.class, priceListId);
-    BusinessPartner testBusinessPartner = OBDal.getInstance()
-        .get(BusinessPartner.class, bpartnerId);
-    Location location = TestUtility.getOneInstance(Location.class, new Value(
-        Location.PROPERTY_BUSINESSPARTNER, testBusinessPartner));
-    PaymentTerm testPaymentTerm = OBDal.getInstance().get(PaymentTerm.class, paymentTermId);
-    Currency testCurrency = OBDal.getInstance().get(Currency.class, currencyId);
-    Product testProduct = OBDal.getInstance().get(Product.class, productId);
-    UOM uom = TestUtility.getOneInstance(UOM.class, new Value(UOM.PROPERTY_NAME, testProduct
-        .getUOM().getName()));
-    TaxRate testTaxRate = OBDal.getInstance().get(TaxRate.class, taxId);
-    DocumentType testDocumentType = OBDal.getInstance().get(DocumentType.class, docTypeId);
-
-    FIN_FinancialAccount testAccount = TestUtility.insertFinancialAccount("APRM_FINACC_PAYMENT_01",
-        STANDARD_DESCRIPTION, testCurrency, CASH, false,
-        getOneInstance(org.openbravo.model.common.geography.Location.class), testBusinessPartner,
-        null, null, null, null, null, null, null, null, null, BigDecimal.ZERO, BigDecimal.ZERO,
-        null, true, true);
-
-    FIN_PaymentMethod testPaymentMethod = TestUtility.insertPaymentMethod("APRM_PM_PAYMENT_01",
-        STANDARD_DESCRIPTION, true, false, false, MANUAL_EXECUTION, null, false,
-        IN_TRANSIT_ACCOUNT, DEPOSIT_ACCOUNT, CLEARED_ACCOUNT, true, false, false, MANUAL_EXECUTION,
-        null, false, IN_TRANSIT_ACCOUNT, WITHDRAWN_ACCOUNT, CLEARED_ACCOUNT, true, true);
-
-    FinAccPaymentMethod existAssociation = TestUtility.getOneInstance(FinAccPaymentMethod.class,
-        new Value(FinAccPaymentMethod.PROPERTY_ACCOUNT, testAccount), new Value(
-            FinAccPaymentMethod.PROPERTY_PAYMENTMETHOD, testPaymentMethod));
-
-    if (existAssociation == null)
-      TestUtility.associatePaymentMethod(testAccount, testPaymentMethod);
-    this.financialAccountId = testAccount.getId();
-
-    Invoice invoice = TestUtility.createNewInvoice(OBContext.getOBContext().getCurrentClient(),
-        OBContext.getOBContext().getCurrentOrganization(), new Date(), new Date(), new Date(),
-        testDocumentType, testBusinessPartner, location, testPriceList, testCurrency,
-        testPaymentMethod, testPaymentTerm, testProduct, uom, invoicedQuantity, netUnitPrice,
-        netListPrice, priceLimit, testTaxRate, lineNetAmount, true);
-
-    TestUtility.processInvoice(invoice);
-
-    return invoice;
-  }
-}
\ No newline at end of file
--- a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_05.java	Thu Sep 29 15:56:24 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,205 +0,0 @@
-/*
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.0  (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) 2010-2014 Openbravo SLU
- * All Rights Reserved.
- * Contributor(s):  ______________________________________.
- *************************************************************************
- */
-
-package org.openbravo.advpaymentmngt.test.draft;
-
-import static org.junit.Assert.assertFalse;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-
-import org.apache.log4j.Logger;
-import org.junit.Before;
-import org.junit.Test;
-import org.openbravo.advpaymentmngt.dao.AdvPaymentMngtDao;
-import org.openbravo.advpaymentmngt.process.FIN_AddPayment;
-import org.openbravo.advpaymentmngt.utility.FIN_Utility;
-import org.openbravo.dal.core.OBContext;
-import org.openbravo.dal.service.OBDal;
-import org.openbravo.model.common.businesspartner.BusinessPartner;
-import org.openbravo.model.common.businesspartner.Location;
-import org.openbravo.model.common.currency.Currency;
-import org.openbravo.model.common.enterprise.DocumentType;
-import org.openbravo.model.common.invoice.Invoice;
-import org.openbravo.model.common.plm.Product;
-import org.openbravo.model.common.uom.UOM;
-import org.openbravo.model.financialmgmt.payment.FIN_FinancialAccount;
-import org.openbravo.model.financialmgmt.payment.FIN_PaymentMethod;
-import org.openbravo.model.financialmgmt.payment.FIN_PaymentProposal;
-import org.openbravo.model.financialmgmt.payment.FIN_PaymentScheduleDetail;
-import org.openbravo.model.financialmgmt.payment.FinAccPaymentMethod;
-import org.openbravo.model.financialmgmt.payment.PaymentTerm;
-import org.openbravo.model.financialmgmt.tax.TaxRate;
-import org.openbravo.model.pricing.pricelist.PriceList;
-import org.openbravo.test.base.OBBaseTest;
-
-/**
- * The PaymentTest_03 class used to test the payment document generation and reactivation with
- * write-off option.
- */
-public class PaymentTest_05 extends OBBaseTest {
-
-  private static final Logger log = Logger.getLogger(PaymentTest_05.class);
-
-  private static final String MANUAL_EXECUTION = "M";
-  private static final String CLEARED_ACCOUNT = "CLE";
-  private static final String IN_TRANSIT_ACCOUNT = "INT";
-  private static final String WITHDRAWN_ACCOUNT = "WIT";
-  private static final String DEPOSIT_ACCOUNT = "DEP";
-  private static final String CASH = "C";
-  private static final String STANDARD_DESCRIPTION = "JUnit Test Payment_05";
-
-  private String financialAccountId;
-  private String paymentMethodId;
-
-  /**
-   * Initial Set up.
-   * 
-   * This before method is named setUpP05() to avoid overwriting the super 
-   * setUp method that is invoke automatically before this one.
-   * 
-   */
-  @Before
-  public void setUpP05() throws Exception {
-    TestUtility.setTestContext();
-  }
-
-  /**
-   * Payment Proposal with two invoices of different business partner partially paid.
-   */
-  @Test
-  public void testRunPayment_05() {
-    String fruitBio = "8A64B71A2B0B2946012B0FE1E45F01B0";
-    String happyDrinks = "8A64B71A2B0B2946012B0FE1E37001AB";
-    String currencyId = "102"; // EUR
-    Invoice inv1;
-    Invoice inv2;
-    AdvPaymentMngtDao dao = new AdvPaymentMngtDao();
-    boolean exception = false;
-
-    try {
-      inv1 = createPurchaseInvoice(fruitBio);
-      inv2 = createPurchaseInvoice(happyDrinks);
-
-      inv1 = OBDal.getInstance().get(Invoice.class, inv1.getId());
-      inv2 = OBDal.getInstance().get(Invoice.class, inv2.getId());
-
-      FIN_PaymentProposal paymentProposal = TestUtility.createNewPaymentProposal(OBContext
-          .getOBContext().getCurrentClient(), OBContext.getOBContext().getCurrentOrganization(),
-          OBDal.getInstance().get(FIN_FinancialAccount.class, financialAccountId), OBDal
-              .getInstance().get(Currency.class, currencyId),
-          OBDal.getInstance().get(FIN_PaymentMethod.class, paymentMethodId));
-
-      List<FIN_PaymentScheduleDetail> scheduleDetails1 = dao
-          .getInvoicePendingScheduledPaymentDetails(inv1);
-      List<FIN_PaymentScheduleDetail> scheduleDetails2 = dao
-          .getInvoicePendingScheduledPaymentDetails(inv2);
-
-      List<FIN_PaymentScheduleDetail> mergeScheduleDetails = new ArrayList<FIN_PaymentScheduleDetail>();
-      mergeScheduleDetails.add(scheduleDetails1.get(0));
-      mergeScheduleDetails.add(scheduleDetails2.get(0));
-
-      HashMap<String, BigDecimal> amounts = new HashMap<String, BigDecimal>();
-      amounts.put(scheduleDetails1.get(0).getId(), new BigDecimal("5"));
-      amounts.put(scheduleDetails2.get(0).getId(), new BigDecimal("5"));
-
-      OBContext.setAdminMode(true);
-      try {
-        // ORA-01779: cannot modify a column which maps to a non key-preserved table
-        FIN_AddPayment.savePaymentProposal(paymentProposal, new BigDecimal("10"),
-            mergeScheduleDetails, amounts, null);
-      } finally {
-        OBContext.restorePreviousMode();
-      }
-
-      TestUtility.processPaymentProposal(paymentProposal, "GSP");
-
-    } catch (Exception e) {
-      e.printStackTrace();
-      log.error(FIN_Utility.getExceptionMessage(e));
-      exception = true;
-    }
-
-    assertFalse(exception);
-
-  }
-
-  private Invoice createPurchaseInvoice(String businessPartnerId) throws Exception {
-
-    // DATA SETUP
-    String priceListId = "8A64B71A2B0B2946012B0BD96C470131"; // Happy Drinks Price List
-    String paymentTermId = "3F22D83730EE4FD5AE42542A2839DAC4"; // 30 days
-    String currencyId = "102"; // EUR
-    String productId = "8A64B71A2B0B2946012B0BC4345000FB"; // Ale Beer
-    String taxId = "1FE610D3A8844F85B17CA32525C15353"; // NY Sales Tax
-    String docTypeId = "71F835BC045742ADAAF5B6856914BB26"; // US AP Invoice
-    BigDecimal invoicedQuantity = new BigDecimal("5");
-    BigDecimal netUnitPrice = new BigDecimal("1.36");
-    BigDecimal netListPrice = new BigDecimal("1.36");
-    BigDecimal lineNetAmount = new BigDecimal("6.80");
-    BigDecimal priceLimit = new BigDecimal("1");
-
-    PriceList testPriceList = OBDal.getInstance().get(PriceList.class, priceListId);
-    BusinessPartner testBusinessPartner = OBDal.getInstance().get(BusinessPartner.class,
-        businessPartnerId);
-    Location location = TestUtility.getOneInstance(Location.class, new Value(
-        Location.PROPERTY_BUSINESSPARTNER, testBusinessPartner));
-    PaymentTerm testPaymentTerm = OBDal.getInstance().get(PaymentTerm.class, paymentTermId);
-    Currency testCurrency = OBDal.getInstance().get(Currency.class, currencyId);
-    Product testProduct = OBDal.getInstance().get(Product.class, productId);
-    UOM uom = TestUtility.getOneInstance(UOM.class, new Value(UOM.PROPERTY_NAME, testProduct
-        .getUOM().getName()));
-    TaxRate testTaxRate = OBDal.getInstance().get(TaxRate.class, taxId);
-    DocumentType testDocumentType = OBDal.getInstance().get(DocumentType.class, docTypeId);
-
-    FIN_FinancialAccount testAccount = TestUtility.insertFinancialAccount("APRM_FINACC_PAYMENT_01",
-        STANDARD_DESCRIPTION, testCurrency, CASH, false,
-        getOneInstance(org.openbravo.model.common.geography.Location.class), testBusinessPartner,
-        null, null, null, null, null, null, null, null, null, BigDecimal.ZERO, BigDecimal.ZERO,
-        null, true, true);
-
-    FIN_PaymentMethod testPaymentMethod = TestUtility.insertPaymentMethod("APRM_PM_PAYMENT_01",
-        STANDARD_DESCRIPTION, true, false, false, MANUAL_EXECUTION, null, false,
-        IN_TRANSIT_ACCOUNT, DEPOSIT_ACCOUNT, CLEARED_ACCOUNT, true, false, false, MANUAL_EXECUTION,
-        null, false, IN_TRANSIT_ACCOUNT, WITHDRAWN_ACCOUNT, CLEARED_ACCOUNT, true, true);
-
-    FinAccPaymentMethod existAssociation = TestUtility.getOneInstance(FinAccPaymentMethod.class,
-        new Value(FinAccPaymentMethod.PROPERTY_ACCOUNT, testAccount), new Value(
-            FinAccPaymentMethod.PROPERTY_PAYMENTMETHOD, testPaymentMethod));
-
-    if (existAssociation == null)
-      TestUtility.associatePaymentMethod(testAccount, testPaymentMethod);
-
-    this.financialAccountId = testAccount.getId();
-    this.paymentMethodId = testPaymentMethod.getId();
-
-    Invoice invoice = TestUtility.createNewInvoice(OBContext.getOBContext().getCurrentClient(),
-        OBContext.getOBContext().getCurrentOrganization(), new Date(), new Date(), new Date(),
-        testDocumentType, testBusinessPartner, location, testPriceList, testCurrency,
-        testPaymentMethod, testPaymentTerm, testProduct, uom, invoicedQuantity, netUnitPrice,
-        netListPrice, priceLimit, testTaxRate, lineNetAmount, false);
-
-    TestUtility.processInvoice(invoice);
-
-    return invoice;
-  }
-}
--- a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_06.java	Thu Sep 29 15:56:24 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,247 +0,0 @@
-/*
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.0  (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) 2010-2014 Openbravo SLU
- * All Rights Reserved.
- * Contributor(s):  ______________________________________.
- *************************************************************************
- */
-
-package org.openbravo.advpaymentmngt.test.draft;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-import org.apache.log4j.Logger;
-import org.junit.Before;
-import org.junit.Test;
-import org.openbravo.advpaymentmngt.utility.FIN_Utility;
-import org.openbravo.dal.core.OBContext;
-import org.openbravo.dal.service.OBDal;
-import org.openbravo.model.common.businesspartner.BusinessPartner;
-import org.openbravo.model.common.businesspartner.Location;
-import org.openbravo.model.common.currency.Currency;
-import org.openbravo.model.common.enterprise.DocumentType;
-import org.openbravo.model.common.invoice.Invoice;
-import org.openbravo.model.common.plm.Product;
-import org.openbravo.model.common.uom.UOM;
-import org.openbravo.model.financialmgmt.payment.FIN_FinancialAccount;
-import org.openbravo.model.financialmgmt.payment.FIN_Payment;
-import org.openbravo.model.financialmgmt.payment.FIN_PaymentDetail;
-import org.openbravo.model.financialmgmt.payment.FIN_PaymentMethod;
-import org.openbravo.model.financialmgmt.payment.FIN_PaymentScheduleDetail;
-import org.openbravo.model.financialmgmt.payment.FinAccPaymentMethod;
-import org.openbravo.model.financialmgmt.payment.PaymentExecutionProcess;
-import org.openbravo.model.financialmgmt.payment.PaymentTerm;
-import org.openbravo.model.financialmgmt.tax.TaxRate;
-import org.openbravo.model.pricing.pricelist.PriceList;
-import org.openbravo.test.base.OBBaseTest;
-
-/**
- * The PaymentTest_06 class used to test the payment document generation with execution process.
- */
-public class PaymentTest_06 extends OBBaseTest {
-
-  private static final Logger log = Logger.getLogger(PaymentTest_06.class);
-
-  private static final String AUTOMATIC_EXECUTION = "A";
-  private static final String CLEARED_ACCOUNT = "CLE";
-  private static final String IN_TRANSIT_ACCOUNT = "INT";
-  private static final String WITHDRAWN_ACCOUNT = "WIT";
-  private static final String DEPOSIT_ACCOUNT = "DEP";
-  private static final String CASH = "C";
-  private static final String STANDARD_DESCRIPTION = "JUnit Test Payment_06";
-
-  private String financialAccountId;
-
-  /**
-   * Initial Set up.
-   * 
-   * This before method is named setUpP06() to avoid overwriting the super 
-   * setUp method that is invoke automatically before this one.
-   * 
-   */
-  @Before
-  public void setUpP06() throws Exception {
-    TestUtility.setTestContext();
-  }
-
-  @Test
-  public void testRunPayment_06() {
-    boolean exception = false;
-    Invoice invoice = null;
-    FIN_Payment payment = null;
-
-    try {
-
-      // DATA SETUP
-      invoice = dataSetup();
-
-      // PAY COMPLETELY THE INVOICE
-      invoice = OBDal.getInstance().get(Invoice.class, invoice.getId());
-      payment = TestUtility.addPaymentFromInvoice(invoice,
-          OBDal.getInstance().get(FIN_FinancialAccount.class, financialAccountId),
-          invoice.getGrandTotalAmount(), false);
-
-      // PROCESS THE PAYMENT
-      TestUtility.processPayment(payment, "P");
-
-      // CHECK OUTPUT DATA
-      OBContext.setAdminMode();
-      try {
-        FIN_PaymentScheduleDetail psd = TestUtility.getOneInstance(FIN_PaymentScheduleDetail.class,
-            new Value(FIN_PaymentScheduleDetail.PROPERTY_INVOICEPAYMENTSCHEDULE, invoice
-                .getFINPaymentScheduleList().get(0)));
-
-        assertTrue(
-            "Payment Schedule Outstanding Amount ("
-                + invoice.getFINPaymentScheduleList().get(0).getOutstandingAmount().toPlainString()
-                + ") != Total Amount (" + invoice.getGrandTotalAmount().toPlainString() + ")",
-            invoice.getGrandTotalAmount().compareTo(
-                invoice.getFINPaymentScheduleList().get(0).getOutstandingAmount()) == 0);
-        assertTrue(
-            "Payment Schedule Received Amount != 0",
-            BigDecimal.ZERO.compareTo(invoice.getFINPaymentScheduleList().get(0).getPaidAmount()) == 0);
-
-        assertTrue("Payment Schedule Detail Amount != Total Amount", invoice.getGrandTotalAmount()
-            .compareTo(psd.getAmount()) == 0);
-        assertTrue("Payment Schedule Detail Write-off Amount != 0",
-            BigDecimal.ZERO.compareTo(psd.getWriteoffAmount()) == 0);
-
-        assertTrue("Payment Amount != Total Amount",
-            invoice.getGrandTotalAmount().compareTo(payment.getAmount()) == 0);
-        assertTrue("Status != Receivable Payables Awaiting  Execution",
-            "RPAE".equals(payment.getStatus()));
-        assertTrue("Payment Line Amount != Total Amount",
-            invoice.getGrandTotalAmount().compareTo(psd.getPaymentDetails().getAmount()) == 0);
-        assertTrue("Payment Line Write-off Amount != 0",
-            BigDecimal.ZERO.compareTo(psd.getPaymentDetails().getWriteoffAmount()) == 0);
-
-      } finally {
-        OBContext.restorePreviousMode();
-      }
-
-      // REACTIVATE
-      TestUtility.processPayment(payment, "R");
-
-      // CHECK OUTPUT DATA AFTER REACTIVATION
-      OBContext.setAdminMode();
-      try {
-        FIN_PaymentScheduleDetail psd = TestUtility.getOneInstance(FIN_PaymentScheduleDetail.class,
-            new Value(FIN_PaymentScheduleDetail.PROPERTY_INVOICEPAYMENTSCHEDULE, invoice
-                .getFINPaymentScheduleList().get(0)));
-
-        assertTrue(
-            "Expected Amount != Total Amount",
-            invoice.getGrandTotalAmount().compareTo(
-                invoice.getFINPaymentScheduleList().get(0).getAmount()) == 0);
-        assertTrue(
-            "Outstanding Amount != Total Amount",
-            invoice.getGrandTotalAmount().compareTo(
-                invoice.getFINPaymentScheduleList().get(0).getOutstandingAmount()) == 0);
-        assertTrue(
-            "Received Amount != 0",
-            BigDecimal.ZERO.compareTo(invoice.getFINPaymentScheduleList().get(0).getPaidAmount()) == 0);
-
-        assertTrue("Payment Schedule Deatail Amount != 0",
-            invoice.getGrandTotalAmount().compareTo(psd.getAmount()) == 0);
-        assertTrue("Payment Schedule Detail Write-off Amount != 0",
-            BigDecimal.ZERO.compareTo(psd.getWriteoffAmount()) == 0);
-
-        assertTrue("Payment Amount != 0", BigDecimal.ZERO.compareTo(payment.getAmount()) == 0);
-        assertTrue("Status != Receivable Payment Awaiting Payment",
-            "RPAP".equals(payment.getStatus()));
-
-        assertTrue("There are Payment Lines for this payment",
-            TestUtility.getOneInstance(FIN_PaymentDetail.class, new Value(
-                FIN_PaymentDetail.PROPERTY_FINPAYMENT, payment)) == null);
-      } finally {
-        OBContext.restorePreviousMode();
-      }
-
-    } catch (Exception e) {
-      e.printStackTrace();
-      log.error(FIN_Utility.getExceptionMessage(e));
-      exception = true;
-    }
-
-    assertFalse(exception);
-
-  }
-
-  private Invoice dataSetup() throws Exception {
-
-    // DATA SETUP
-    String bpartnerId = "8A64B71A2B0B2946012B0FE1E51401C1"; // Sleep Well Hotel
-    String priceListId = "8A64B71A2B0B2946012B0BD96E850150"; // General Sales
-    String paymentTermId = "3F22D83730EE4FD5AE42542A2839DAC4"; // 30 days
-    String currencyId = "102"; // EUR
-    String productId = "8A64B71A2B0B2946012B0BC4345000FB"; // Ale Beer
-    String taxId = "1FE610D3A8844F85B17CA32525C15353"; // NY Sales Tax
-    String docTypeId = "C99C4AE941E1460B91BC97665BE5D141"; // AR Invoice
-    BigDecimal invoicedQuantity = new BigDecimal("5");
-    BigDecimal netUnitPrice = new BigDecimal("2.04");
-    BigDecimal netListPrice = new BigDecimal("2.04");
-    BigDecimal lineNetAmount = new BigDecimal("10.20");
-    BigDecimal priceLimit = new BigDecimal("1");
-    String executionProcessId = "717D521D5F454FAD9199B831001BB4E0"; // Simple Execution Process
-
-    PriceList testPriceList = OBDal.getInstance().get(PriceList.class, priceListId);
-    BusinessPartner testBusinessPartner = OBDal.getInstance()
-        .get(BusinessPartner.class, bpartnerId);
-    Location location = TestUtility.getOneInstance(Location.class, new Value(
-        Location.PROPERTY_BUSINESSPARTNER, testBusinessPartner));
-    PaymentTerm testPaymentTerm = OBDal.getInstance().get(PaymentTerm.class, paymentTermId);
-    Currency testCurrency = OBDal.getInstance().get(Currency.class, currencyId);
-    Product testProduct = OBDal.getInstance().get(Product.class, productId);
-    UOM uom = TestUtility.getOneInstance(UOM.class, new Value(UOM.PROPERTY_NAME, testProduct
-        .getUOM().getName()));
-    TaxRate testTaxRate = OBDal.getInstance().get(TaxRate.class, taxId);
-    DocumentType testDocumentType = OBDal.getInstance().get(DocumentType.class, docTypeId);
-    PaymentExecutionProcess pmtExecProcess = OBDal.getInstance().get(PaymentExecutionProcess.class,
-        executionProcessId);
-
-    FIN_FinancialAccount testAccount = TestUtility.insertFinancialAccount("APRM_FINACC_PAYMENT_02",
-        STANDARD_DESCRIPTION, testCurrency, CASH, false,
-        getOneInstance(org.openbravo.model.common.geography.Location.class), testBusinessPartner,
-        null, null, null, null, null, null, null, null, null, BigDecimal.ZERO, BigDecimal.ZERO,
-        null, true, true);
-
-    FIN_PaymentMethod testPaymentMethod = TestUtility.insertPaymentMethod("APRM_PM_PAYMENT_02",
-        STANDARD_DESCRIPTION, true, false, false, AUTOMATIC_EXECUTION, pmtExecProcess, true,
-        IN_TRANSIT_ACCOUNT, DEPOSIT_ACCOUNT, CLEARED_ACCOUNT, true, false, false,
-        AUTOMATIC_EXECUTION, pmtExecProcess, true, IN_TRANSIT_ACCOUNT, WITHDRAWN_ACCOUNT,
-        CLEARED_ACCOUNT, true, true);
-
-    FinAccPaymentMethod existAssociation = TestUtility.getOneInstance(FinAccPaymentMethod.class,
-        new Value(FinAccPaymentMethod.PROPERTY_ACCOUNT, testAccount), new Value(
-            FinAccPaymentMethod.PROPERTY_PAYMENTMETHOD, testPaymentMethod));
-
-    if (existAssociation == null)
-      TestUtility.associatePaymentMethod(testAccount, testPaymentMethod);
-    this.financialAccountId = testAccount.getId();
-
-    Invoice invoice = TestUtility.createNewInvoice(OBContext.getOBContext().getCurrentClient(),
-        OBContext.getOBContext().getCurrentOrganization(), new Date(), new Date(), new Date(),
-        testDocumentType, testBusinessPartner, location, testPriceList, testCurrency,
-        testPaymentMethod, testPaymentTerm, testProduct, uom, invoicedQuantity, netUnitPrice,
-        netListPrice, priceLimit, testTaxRate, lineNetAmount, true);
-
-    TestUtility.processInvoice(invoice);
-
-    return invoice;
-  }
-}
--- a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_07.java	Thu Sep 29 15:56:24 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,338 +0,0 @@
-/*
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.0  (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) 2011-2014 Openbravo SLU
- * All Rights Reserved.
- * Contributor(s):  ______________________________________.
- *************************************************************************
- */
-
-package org.openbravo.advpaymentmngt.test.draft;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import org.apache.log4j.Logger;
-import org.junit.Before;
-import org.junit.Test;
-import org.openbravo.advpaymentmngt.process.FIN_ExecutePayment;
-import org.openbravo.advpaymentmngt.utility.FIN_Utility;
-import org.openbravo.dal.core.OBContext;
-import org.openbravo.dal.service.OBDal;
-import org.openbravo.erpCommon.utility.OBError;
-import org.openbravo.model.common.businesspartner.BusinessPartner;
-import org.openbravo.model.common.businesspartner.Location;
-import org.openbravo.model.common.currency.Currency;
-import org.openbravo.model.common.enterprise.DocumentType;
-import org.openbravo.model.common.enterprise.Warehouse;
-import org.openbravo.model.common.invoice.Invoice;
-import org.openbravo.model.common.invoice.InvoiceLine;
-import org.openbravo.model.common.order.Order;
-import org.openbravo.model.common.plm.Product;
-import org.openbravo.model.common.uom.UOM;
-import org.openbravo.model.financialmgmt.payment.FIN_FinancialAccount;
-import org.openbravo.model.financialmgmt.payment.FIN_Payment;
-import org.openbravo.model.financialmgmt.payment.FIN_PaymentMethod;
-import org.openbravo.model.financialmgmt.payment.FIN_PaymentSchedule;
-import org.openbravo.model.financialmgmt.payment.FIN_PaymentScheduleDetail;
-import org.openbravo.model.financialmgmt.payment.FinAccPaymentMethod;
-import org.openbravo.model.financialmgmt.payment.PaymentExecutionProcess;
-import org.openbravo.model.financialmgmt.payment.PaymentTerm;
-import org.openbravo.model.financialmgmt.tax.TaxRate;
-import org.openbravo.model.pricing.pricelist.PriceList;
-import org.openbravo.test.base.OBBaseTest;
-
-public class PaymentTest_07 extends OBBaseTest {
-
-  // 1) Create an order with discount
-  // 2) Add a partial payment but do not execute it
-  // 3) Invoice the complete order (without discount) using an automatic receipt payment method
-  // 4) Review payment info
-  // 5) Execute payment
-  // 6) Review payment info
-
-  private static final Logger log = Logger.getLogger(PaymentTest_07.class);
-
-  private static final String MANUAL_EXECUTION = "M";
-  private static final String AUTOMATIC_EXECUTION = "A";
-  private static final String CLEARED_ACCOUNT = "CLE";
-  private static final String IN_TRANSIT_ACCOUNT = "INT";
-  private static final String WITHDRAWN_ACCOUNT = "WIT";
-  private static final String DEPOSIT_ACCOUNT = "DEP";
-  private static final String CASH = "C";
-  private static final String STANDARD_DESCRIPTION = "JUnit Test Payment_07";
-  private static final String SIMPLE_EXECUTION_PROCESS = "717D521D5F454FAD9199B831001BB4E0";
-
-  private String financialAccountId;
-
-  /**
-   * Initial Set up.
-   * 
-   * This before method is named setUpP07() to avoid overwriting the super 
-   * setUp method that is invoke automatically before this one.
-   * 
-   */
-  @Before
-  public void setUpP07() throws Exception {
-    TestUtility.setTestContextSpain();
-  }
-
-  @Test
-  public void testRunPayment_07() {
-    boolean exception = false;
-    try {
-      OBContext.setAdminMode();
-      try {
-        // DATA SETUP
-        Invoice invoice = dataSetup();
-        FIN_Payment payment = null;
-        for (FIN_PaymentScheduleDetail psd : invoice.getFINPaymentScheduleList().get(0)
-            .getFINPaymentScheduleDetailInvoicePaymentScheduleList()) {
-          if ("RPAE".equals(psd.getPaymentDetails().getFinPayment().getStatus())) {
-            payment = psd.getPaymentDetails().getFinPayment();
-          }
-        }
-        FIN_ExecutePayment executePayment = new FIN_ExecutePayment();
-        List<FIN_Payment> payments = new ArrayList<FIN_Payment>();
-        payments.add(payment);
-        executePayment.init("OTHER",
-            OBDal.getInstance().get(PaymentExecutionProcess.class, SIMPLE_EXECUTION_PROCESS),
-            payments, null, payment.getOrganization());
-        OBError result = executePayment.execute();
-        // CHECK PAYMENT EXECUTION
-        assertTrue("Payment error while executing", !"Error".equals(result.getType()));
-
-        Order order = invoice.getSalesOrder();
-        // CHECK OUTPUT DATA ORDER
-        assertTrue(
-            "Order Payment Schedule Outstanding Amount ("
-                + order.getFINPaymentScheduleList().get(0).getOutstandingAmount() + ") != 0",
-            BigDecimal.ZERO.compareTo(order.getFINPaymentScheduleList().get(0)
-                .getOutstandingAmount()) == 0);
-        assertTrue(
-            "Order Payment Schedule Received Amount ("
-                + getPaidAmount(order.getFINPaymentScheduleList()).toPlainString()
-                + ") != Total Amount (" + order.getGrandTotalAmount().toPlainString(),
-            order.getGrandTotalAmount().compareTo(getPaidAmount(order.getFINPaymentScheduleList())) == 0);
-        assertTrue("Status != Payment Received", "RPR".equals(payment.getStatus()));
-        // CHECK OUTPUT DATA INVOICE
-        assertTrue(
-            "Invoice Payment Schedule Outstanding Amount != 0",
-            BigDecimal.ZERO.compareTo(invoice.getFINPaymentScheduleList().get(0)
-                .getOutstandingAmount()) == 0);
-        assertTrue("Invoice remains not paid", invoice.isPaymentComplete());
-        assertTrue(
-            "Invoice Payment Schedule Received Amount != Total Amount",
-            invoice.getGrandTotalAmount().compareTo(
-                getPaidAmount(invoice.getFINPaymentScheduleList())) == 0);
-        // CHECK OUTPUT DATA PAYMENT
-        assertTrue("Status != Payment Received", "RPR".equals(payment.getStatus()));
-
-      } finally {
-        OBContext.restorePreviousMode();
-      }
-
-    } catch (Exception e) {
-      e.printStackTrace();
-      log.error(FIN_Utility.getExceptionMessage(e));
-      exception = true;
-    }
-
-    assertFalse(exception);
-
-  }
-
-  private Invoice dataSetup() throws Exception {
-
-    // DATA SETUP
-    String bpartnerId = "8A64B71A2B0B2946012B0FE1E8B50200"; // Alimentos y Supermercados, S.A.
-    String priceListId = "8A64B71A2B0B2946012B0BD97324018A"; // Precios de Venta
-    String paymentTermId = "3F22D83730EE4FD5AE42542A2839DAC4"; // 30 days
-    String currencyId = "102"; // EUR
-    String productId = "8A64B71A2B0B2946012B0BC438410118"; // Vino Tinto 0,75L
-    String taxId = "F27A37C66749487A876F4DA0EF7467E3"; // Ventas Exentas
-    String docTypeId = "40EE9B1CD3B345FABEFDA62B407B407F"; // AR Invoice
-    String orderDocTypeId = "CB6EEA256BBC41109911215C5A14D39B"; // Standard Order
-    String warehouseId = "71B43F2AAE3641CA849B131960BCEFF4";
-
-    // Process
-    BigDecimal quantity = new BigDecimal("10");
-    BigDecimal invoicedQuantity = new BigDecimal("10");
-    BigDecimal netUnitPrice = new BigDecimal("10");
-    BigDecimal netListPrice = new BigDecimal("10");
-    BigDecimal lineNetAmount = new BigDecimal("100");
-    BigDecimal invoiceLineNetAmount = new BigDecimal("100");
-    BigDecimal priceLimit = new BigDecimal("10");
-
-    PriceList testPriceList = OBDal.getInstance().get(PriceList.class, priceListId);
-    BusinessPartner testBusinessPartner = OBDal.getInstance()
-        .get(BusinessPartner.class, bpartnerId);
-    Location location = TestUtility.getOneInstance(Location.class, new Value(
-        Location.PROPERTY_BUSINESSPARTNER, testBusinessPartner));
-    PaymentTerm testPaymentTerm = OBDal.getInstance().get(PaymentTerm.class, paymentTermId);
-    Currency testCurrency = OBDal.getInstance().get(Currency.class, currencyId);
-    Product testProduct = OBDal.getInstance().get(Product.class, productId);
-    UOM uom = TestUtility.getOneInstance(UOM.class, new Value(UOM.PROPERTY_NAME, testProduct
-        .getUOM().getName()));
-    TaxRate testTaxRate = OBDal.getInstance().get(TaxRate.class, taxId);
-    DocumentType testDocumentType = OBDal.getInstance().get(DocumentType.class, docTypeId);
-    DocumentType testOrderDocumentType = OBDal.getInstance()
-        .get(DocumentType.class, orderDocTypeId);
-    FIN_FinancialAccount testAccount = TestUtility.insertFinancialAccount("APRM_FINACC_PAYMENT_07",
-        STANDARD_DESCRIPTION, testCurrency, CASH, false,
-        getOneInstance(org.openbravo.model.common.geography.Location.class), null, null, null,
-        null, null, null, null, null, null, null, BigDecimal.ZERO, BigDecimal.ZERO, null, true,
-        true);
-
-    FIN_PaymentMethod testPaymentMethod = TestUtility.insertPaymentMethod("APRM_PM_PAYMENT_07",
-        STANDARD_DESCRIPTION, true, true, false, MANUAL_EXECUTION, null, false, IN_TRANSIT_ACCOUNT,
-        DEPOSIT_ACCOUNT, CLEARED_ACCOUNT, true, false, false, MANUAL_EXECUTION, null, false,
-        IN_TRANSIT_ACCOUNT, WITHDRAWN_ACCOUNT, CLEARED_ACCOUNT, true, true);
-
-    FinAccPaymentMethod existAssociation = TestUtility.getOneInstance(FinAccPaymentMethod.class,
-        new Value(FinAccPaymentMethod.PROPERTY_ACCOUNT, testAccount), new Value(
-            FinAccPaymentMethod.PROPERTY_PAYMENTMETHOD, testPaymentMethod));
-
-    if (existAssociation == null)
-      TestUtility.associatePaymentMethod(testAccount, testPaymentMethod);
-    this.financialAccountId = testAccount.getId();
-
-    // UPDATE BPARTNER AND ASSOCIATED NEW FINANCIAL ACCOUNT
-    testBusinessPartner.setAccount(testAccount);
-    OBDal.getInstance().save(testBusinessPartner);
-
-    Warehouse warehouse = OBDal.getInstance().get(Warehouse.class, warehouseId);
-    Order order = TestUtility.createNewOrder(OBContext.getOBContext().getCurrentClient(), OBContext
-        .getOBContext().getCurrentOrganization(), new Date(), new Date(), new Date(),
-        testOrderDocumentType, testBusinessPartner, location, warehouse, "I", testPriceList,
-        testCurrency, testPaymentMethod, testPaymentTerm, testProduct, uom, quantity, netUnitPrice,
-        netListPrice, priceLimit, testTaxRate, lineNetAmount, true);
-
-    TestUtility.processOrder(order);
-    order = OBDal.getInstance().get(Order.class, order.getId());
-
-    // CHECK OUTPUT DATA FOR ORDER
-    OBContext.setAdminMode();
-    try {
-      FIN_PaymentScheduleDetail psd = TestUtility.getOneInstance(FIN_PaymentScheduleDetail.class,
-          new Value(FIN_PaymentScheduleDetail.PROPERTY_ORDERPAYMENTSCHEDULE, order
-              .getFINPaymentScheduleList().get(0)));
-
-      assertTrue("Payment Schedule Outstanding Amount == Order amount", order.getGrandTotalAmount()
-          .compareTo(order.getFINPaymentScheduleList().get(0).getOutstandingAmount()) == 0);
-      assertTrue("Payment Schedule Received Amount == 0",
-          BigDecimal.ZERO.compareTo(order.getFINPaymentScheduleList().get(0).getPaidAmount()) == 0);
-
-      assertTrue("Payment Schedule Deatail Amount == Total Amount", order.getGrandTotalAmount()
-          .compareTo(psd.getAmount()) == 0);
-      assertTrue("Payment Schedule Detail Write-off Amount == 0",
-          BigDecimal.ZERO.compareTo(psd.getWriteoffAmount()) == 0);
-    } finally {
-      OBContext.restorePreviousMode();
-    }
-    FIN_Payment payment = TestUtility.addPaymentFromOrder(order,
-        OBDal.getInstance().get(FIN_FinancialAccount.class, financialAccountId),
-        order.getGrandTotalAmount(), false);
-
-    FIN_PaymentMethod awaitingExecutionPM = TestUtility.insertPaymentMethod(
-        "APRM_PM_PAYMENT_07_AWE", STANDARD_DESCRIPTION, true, false, false, AUTOMATIC_EXECUTION,
-        OBDal.getInstance().get(PaymentExecutionProcess.class, SIMPLE_EXECUTION_PROCESS), true,
-        IN_TRANSIT_ACCOUNT, DEPOSIT_ACCOUNT, CLEARED_ACCOUNT, true, false, false, MANUAL_EXECUTION,
-        null, false, IN_TRANSIT_ACCOUNT, WITHDRAWN_ACCOUNT, CLEARED_ACCOUNT, true, true);
-
-    existAssociation = TestUtility.getOneInstance(FinAccPaymentMethod.class, new Value(
-        FinAccPaymentMethod.PROPERTY_ACCOUNT, testAccount), new Value(
-        FinAccPaymentMethod.PROPERTY_PAYMENTMETHOD, awaitingExecutionPM));
-
-    if (existAssociation == null)
-      TestUtility.associatePaymentMethod(testAccount, awaitingExecutionPM);
-
-    // SET NEW PAYMENT METHOD FOR CREATED PAYMENT: AWAITING EXECUTION
-    // NO PAYMENT INFO SHOULD BE UPDATED AS PAYMENT HAS NOT BEEN EXECUTED YET
-    payment.setPaymentMethod(awaitingExecutionPM);
-    OBDal.getInstance().save(payment);
-    // PROCESS THE PAYMENT
-    TestUtility.processPayment(payment, "P");
-    payment = OBDal.getInstance().get(FIN_Payment.class, payment.getId());
-    order = OBDal.getInstance().get(Order.class, order.getId());
-
-    // CHECK OUTPUT DATA FOR ORDER
-    OBContext.setAdminMode();
-    try {
-      assertTrue("Status != Awaiting Execution", "RPAE".equals(payment.getStatus()));
-      // CHECK OUTPUT DATA FOR ORDER AGAIN NO CHANGE SHOULD HAPPEN AS PAYMENT REMAINS AWE
-      FIN_PaymentScheduleDetail psd = TestUtility.getOneInstance(FIN_PaymentScheduleDetail.class,
-          new Value(FIN_PaymentScheduleDetail.PROPERTY_PAYMENTDETAILS, payment
-              .getFINPaymentDetailList().get(0)));
-
-      assertTrue("Payment Schedule Outstanding Amount != Order amount", order.getGrandTotalAmount()
-          .compareTo(order.getFINPaymentScheduleList().get(0).getOutstandingAmount()) == 0);
-      assertTrue("Payment Schedule Received Amount != 0",
-          BigDecimal.ZERO.compareTo(order.getFINPaymentScheduleList().get(0).getPaidAmount()) == 0);
-
-      assertTrue("Payment Schedule Deatail Amount != Total Amount", order.getGrandTotalAmount()
-          .compareTo(psd.getAmount()) == 0);
-      assertTrue("Payment Schedule Detail Write-off Amount != 0",
-          BigDecimal.ZERO.compareTo(psd.getWriteoffAmount()) == 0);
-
-      assertTrue("Status != Awaiting Execution", "RPAE".equals(payment.getStatus()));
-      assertTrue("Payment Line Write-off Amount != 0",
-          BigDecimal.ZERO.compareTo(psd.getPaymentDetails().getWriteoffAmount()) == 0);
-    } finally {
-      OBContext.restorePreviousMode();
-    }
-    // This created order is invoiced
-
-    Invoice invoice = TestUtility.createNewInvoice(OBContext.getOBContext().getCurrentClient(),
-        OBContext.getOBContext().getCurrentOrganization(), new Date(), new Date(), new Date(),
-        testDocumentType, testBusinessPartner, location, testPriceList, testCurrency,
-        testPaymentMethod, testPaymentTerm, testProduct, uom, invoicedQuantity, netUnitPrice,
-        netListPrice, priceLimit, testTaxRate, invoiceLineNetAmount, true);
-    OBDal.getInstance().refresh(invoice);
-    // Order is associated both to header and lines
-    InvoiceLine invoiceLine = invoice.getInvoiceLineList().get(0);
-    invoiceLine.setSalesOrderLine(order.getOrderLineList().get(0));
-
-    OBDal.getInstance().save(invoiceLine);
-
-    invoice.setSalesOrder(order);
-
-    OBDal.getInstance().save(invoice);
-
-    TestUtility.processInvoice(invoice);
-    invoice = OBDal.getInstance().get(Invoice.class, invoice.getId());
-    return invoice;
-  }
-
-  BigDecimal getPaidAmount(List<FIN_PaymentSchedule> finPaymentScheduleList) {
-    BigDecimal amount = BigDecimal.ZERO;
-    for (FIN_PaymentSchedule ps : finPaymentScheduleList) {
-      boolean isInvoice = ps.getInvoice() != null;
-      for (FIN_PaymentScheduleDetail psd : isInvoice ? ps
-          .getFINPaymentScheduleDetailInvoicePaymentScheduleList() : ps
-          .getFINPaymentScheduleDetailOrderPaymentScheduleList()) {
-        if (psd.getPaymentDetails() != null
-            && psd.getPaymentDetails().getFinPayment().isProcessed()
-            && !"RPAE".equals(psd.getPaymentDetails().getFinPayment().getStatus())) {
-          amount = amount.add(psd.getAmount());
-        }
-      }
-    }
-    return amount;
-  }
-}
--- a/modules/org.openbravo.advpaymentmngt/src-test/org/openbravo/advpaymentmngt/test/draft/PaymentTest_08.java	Thu Sep 29 15:56:24 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,317 +0,0 @@
-/*
- *************************************************************************
- * The contents of this file are subject to the Openbravo  Public  License
- * Version  1.0  (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) 2011-2014 Openbravo SLU
- * All Rights Reserved.
- * Contributor(s):  ______________________________________.
- *************************************************************************
- */
-
-package org.openbravo.advpaymentmngt.test.draft;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-import org.apache.log4j.Logger;
-import org.junit.Before;
-import org.junit.Test;
-import org.openbravo.advpaymentmngt.utility.FIN_Utility;
-import org.openbravo.base.provider.OBProvider;
-import org.openbravo.dal.core.OBContext;
-import org.openbravo.dal.service.OBDal;
-import org.openbravo.model.common.businesspartner.BusinessPartner;
-import org.openbravo.model.common.businesspartner.Location;
-import org.openbravo.model.common.currency.Currency;
-import org.openbravo.model.common.enterprise.DocumentType;
-import org.openbravo.model.common.enterprise.Warehouse;
-import org.openbravo.model.common.invoice.Invoice;
-import org.openbravo.model.common.invoice.InvoiceDiscount;
-import org.openbravo.model.common.invoice.InvoiceLine;
-import org.openbravo.model.common.order.Order;
-import org.openbravo.model.common.plm.Product;
-import org.openbravo.model.common.uom.UOM;
-import org.openbravo.model.financialmgmt.payment.FIN_FinancialAccount;
-import org.openbravo.model.financialmgmt.payment.FIN_Payment;
-import org.openbravo.model.financialmgmt.payment.FIN_PaymentMethod;
-import org.openbravo.model.financialmgmt.payment.FIN_PaymentScheduleDetail;
-import org.openbravo.model.financialmgmt.payment.FinAccPaymentMethod;
-import org.openbravo.model.financialmgmt.payment.PaymentExecutionProcess;
-import org.openbravo.model.financialmgmt.payment.PaymentTerm;
-import org.openbravo.model.financialmgmt.tax.TaxRate;
-import org.openbravo.model.pricing.pricelist.PriceList;
-import org.openbravo.test.base.OBBaseTest;
-
-public class PaymentTest_08 extends OBBaseTest {
-
-  // 1) Create an order
-  // 2) Add a partial payment but do not execute it
-  // 3) Invoice the order partially using an automatic receipt payment method
-  // 4)Review payment info
-
-  private static final Logger log = Logger.getLogger(PaymentTest_08.class);
-
-  private static final String MANUAL_EXECUTION = "M";
-  private static final String AUTOMATIC_EXECUTION = "A";
-  private static final String CLEARED_ACCOUNT = "CLE";
-  private static final String IN_TRANSIT_ACCOUNT = "INT";
-  private static final String WITHDRAWN_ACCOUNT = "WIT";
-  private static final String DEPOSIT_ACCOUNT = "DEP";
-  private static final String CASH = "C";
-  private static final String STANDARD_DESCRIPTION = "JUnit Test Payment_08";
-
-  private String financialAccountId;
-
-  /**
-   * Initial Set up.
-   * 
-   * This before method is named setUpP08() to avoid overwriting the super 
-   * setUp method that is invoke automatically before this one.
-   * 
-   */
-  @Before
-  public void setUpP08() throws Exception {
-    TestUtility.setTestContextSpain();
-  }
-
-  @Test
-  public void testRunPayment_08() {
-    boolean exception = false;
-    try {
-      // DATA SETUP
-      Invoice invoice = dataSetup();
-      Order order = invoice.getSalesOrder();
-      // CHECK OUTPUT DATA
-      OBContext.setAdminMode();
-      try {
-        assertTrue(
-            "Invoice Payment Schedule Outstanding Amount == 0",
-            BigDecimal.ZERO.compareTo(invoice.getFINPaymentScheduleList().get(0)
-                .getOutstandingAmount()) != 0);
-        assertTrue("Invoice Payment Schedule  not Total Pending", invoice.getGrandTotalAmount()
-            .compareTo(invoice.getFINPaymentScheduleList().get(0).getOutstandingAmount()) == 0);
-        assertTrue(
-            "Invoice Payment Schedule Paid Amount != 0",
-            BigDecimal.ZERO.compareTo(invoice.getFINPaymentScheduleList().get(0).getPaidAmount()) == 0);
-        assertTrue(
-            "Order Payment Schedule Outstanding Amount == 0",
-            BigDecimal.ZERO.compareTo(order.getFINPaymentScheduleList().get(0)
-                .getOutstandingAmount()) != 0);
-        assertTrue("Order Payment Schedule not Total Pending", invoice.getGrandTotalAmount()
-            .compareTo(invoice.getFINPaymentScheduleList().get(0).getOutstandingAmount()) == 0);
-        assertTrue(
-            "Order Payment Schedule Paid Amount != 0",
-            BigDecimal.ZERO.compareTo(order.getFINPaymentScheduleList().get(0).getPaidAmount()) == 0);
-
-      } finally {
-        OBContext.restorePreviousMode();
-      }
-
-    } catch (Exception e) {
-      e.printStackTrace();
-      log.error(FIN_Utility.getExceptionMessage(e));
-      exception = true;
-    }
-
-    assertFalse(exception);
-
-  }
-
-  private Invoice dataSetup() throws Exception {
-
-    // DATA SETUP
-    String bpartnerId = "8A64B71A2B0B2946012B0FE1E8B50200"; // Alimentos y Supermercados, S.A.
-    String priceListId = "8A64B71A2B0B2946012B0BD97324018A"; // Precios de Venta
-    String paymentTermId = "3F22D83730EE4FD5AE42542A2839DAC4"; // 30 days
-    String currencyId = "102"; // EUR
-    String productId = "8A64B71A2B0B2946012B0BC438410118"; // Vino Tinto 0,75L
-    String taxId = "F27A37C66749487A876F4DA0EF7467E3"; // Ventas Exentas
-    String docTypeId = "40EE9B1CD3B345FABEFDA62B407B407F"; // AR Invoice
-    String orderDocTypeId = "CB6EEA256BBC41109911215C5A14D39B"; // Standard Order
-    String warehouseId = "71B43F2AAE3641CA849B131960BCEFF4";
-    final String SIMPLE_EXECUTION_PROCESS = "717D521D5F454FAD9199B831001BB4E0"; // Simple Execution
-    // Process
-    BigDecimal quantity = new BigDecimal("10");
-    BigDecimal invoicedQuantity = new BigDecimal("5");
-    BigDecimal netUnitPrice = new BigDecimal("10");
-    BigDecimal netListPrice = new BigDecimal("10");
-    BigDecimal lineNetAmount = new BigDecimal("100");
-    BigDecimal invoiceLineNetAmount = new BigDecimal("50");
-    BigDecimal priceLimit = new BigDecimal("10");
-
-    PriceList testPriceList = OBDal.getInstance().get(PriceList.class, priceListId);
-    BusinessPartner testBusinessPartner = OBDal.getInstance()
-        .get(BusinessPartner.class, bpartnerId);
-    Location location = TestUtility.getOneInstance(Location.class, new Value(
-        Location.PROPERTY_BUSINESSPARTNER, testBusinessPartner));
-    PaymentTerm testPaymentTerm = OBDal.getInstance().get(PaymentTerm.class, paymentTermId);
-    Currency testCurrency = OBDal.getInstance().get(Currency.class, currencyId);
-    Product testProduct = OBDal.getInstance().get(Product.class, productId);
-    UOM uom = TestUtility.getOneInstance(UOM.class, new Value(UOM.PROPERTY_NAME, testProduct
-        .getUOM().getName()));
-    TaxRate testTaxRate = OBDal.getInstance().get(TaxRate.class, taxId);
-    DocumentType testDocumentType = OBDal.getInstance().get(DocumentType.class, docTypeId);
-    DocumentType testOrderDocumentType = OBDal.getInstance()
-        .get(DocumentType.class, orderDocTypeId);
-    FIN_FinancialAccount testAccount = TestUtility.insertFinancialAccount("APRM_FINACC_PAYMENT_08",
-        STANDARD_DESCRIPTION, testCurrency, CASH, false,
-        getOneInstance(org.openbravo.model.common.geog