Fixes issue 15802: Several labels translated as Pago where they should be Cobro.
authorIoritz Cia <ioritz.cia@openbravo.com>
Tue, 08 Mar 2011 18:48:17 +0100
changeset 11121 81998cc632e1
parent 11120 170ecb800acb
child 11124 b409a97821aa
Fixes issue 15802: Several labels translated as Pago where they should be Cobro.
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.xml
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.xml
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.xml
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.html
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.html
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_ELEMENT.xml
src-db/database/sourcedata/AD_FIELD.xml
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml	Tue Mar 08 18:42:40 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml	Tue Mar 08 18:48:17 2011 +0100
@@ -875,8 +875,8 @@
 <!--78A3367822B35459E040007F01012510-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--78A3367822B35459E040007F01012510-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--78A3367822B35459E040007F01012510-->  <NAME><![CDATA[EM_APRM_Addpayment]]></NAME>
-<!--78A3367822B35459E040007F01012510-->  <DESCRIPTION><![CDATA[Add Payment button.]]></DESCRIPTION>
-<!--78A3367822B35459E040007F01012510-->  <HELP><![CDATA[Launches a process to add a payment to the selected invoice.]]></HELP>
+<!--78A3367822B35459E040007F01012510-->  <DESCRIPTION><![CDATA[Add Payment In/Out button.]]></DESCRIPTION>
+<!--78A3367822B35459E040007F01012510-->  <HELP><![CDATA[Launches a process to add a payment in/out to the selected invoice.]]></HELP>
 <!--78A3367822B35459E040007F01012510-->  <COLUMNNAME><![CDATA[EM_APRM_Addpayment]]></COLUMNNAME>
 <!--78A3367822B35459E040007F01012510-->  <AD_TABLE_ID><![CDATA[318]]></AD_TABLE_ID>
 <!--78A3367822B35459E040007F01012510-->  <AD_REFERENCE_ID><![CDATA[28]]></AD_REFERENCE_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml	Tue Mar 08 18:42:40 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml	Tue Mar 08 18:48:17 2011 +0100
@@ -28,10 +28,10 @@
 <!--78A3787B4823C096E040007F0101250E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--78A3787B4823C096E040007F0101250E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--78A3787B4823C096E040007F0101250E-->  <COLUMNNAME><![CDATA[EM_APRM_Addpayment]]></COLUMNNAME>
-<!--78A3787B4823C096E040007F0101250E-->  <NAME><![CDATA[Add Payment]]></NAME>
-<!--78A3787B4823C096E040007F0101250E-->  <PRINTNAME><![CDATA[Add Payment]]></PRINTNAME>
-<!--78A3787B4823C096E040007F0101250E-->  <DESCRIPTION><![CDATA[Add Payment button.]]></DESCRIPTION>
-<!--78A3787B4823C096E040007F0101250E-->  <HELP><![CDATA[Launches a process to add a payment to the selected invoice.]]></HELP>
+<!--78A3787B4823C096E040007F0101250E-->  <NAME><![CDATA[Add Payment In/Out]]></NAME>
+<!--78A3787B4823C096E040007F0101250E-->  <PRINTNAME><![CDATA[Add Payment In/Out]]></PRINTNAME>
+<!--78A3787B4823C096E040007F0101250E-->  <DESCRIPTION><![CDATA[Add Payment In/Out button.]]></DESCRIPTION>
+<!--78A3787B4823C096E040007F0101250E-->  <HELP><![CDATA[Launches a process to add a payment in/out to the selected invoice.]]></HELP>
 <!--78A3787B4823C096E040007F0101250E-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--78A3787B4823C096E040007F0101250E--></AD_ELEMENT>
 
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml	Tue Mar 08 18:42:40 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml	Tue Mar 08 18:48:17 2011 +0100
@@ -103,7 +103,7 @@
 <!--07C4E0B4DF6E4C7AAF5574C5ABA25C65-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--07C4E0B4DF6E4C7AAF5574C5ABA25C65-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--07C4E0B4DF6E4C7AAF5574C5ABA25C65-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--07C4E0B4DF6E4C7AAF5574C5ABA25C65-->  <NAME><![CDATA[Payment Detail]]></NAME>
+<!--07C4E0B4DF6E4C7AAF5574C5ABA25C65-->  <NAME><![CDATA[Payment Out Detail]]></NAME>
 <!--07C4E0B4DF6E4C7AAF5574C5ABA25C65-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--07C4E0B4DF6E4C7AAF5574C5ABA25C65-->  <AD_TAB_ID><![CDATA[F9751D712A804D57B97A36803843F2D7]]></AD_TAB_ID>
 <!--07C4E0B4DF6E4C7AAF5574C5ABA25C65-->  <AD_COLUMN_ID><![CDATA[78D16B5B1787661EE040007F010152F7]]></AD_COLUMN_ID>
@@ -125,8 +125,8 @@
 <!--07D342328D8B4289811B84E1E56D45D0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--07D342328D8B4289811B84E1E56D45D0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--07D342328D8B4289811B84E1E56D45D0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--07D342328D8B4289811B84E1E56D45D0-->  <NAME><![CDATA[Last Payment Date]]></NAME>
-<!--07D342328D8B4289811B84E1E56D45D0-->  <DESCRIPTION><![CDATA[Last Payment Date]]></DESCRIPTION>
+<!--07D342328D8B4289811B84E1E56D45D0-->  <NAME><![CDATA[Last Payment Out Date]]></NAME>
+<!--07D342328D8B4289811B84E1E56D45D0-->  <DESCRIPTION><![CDATA[Last Payment Out Date]]></DESCRIPTION>
 <!--07D342328D8B4289811B84E1E56D45D0-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--07D342328D8B4289811B84E1E56D45D0-->  <AD_TAB_ID><![CDATA[FA57D75B1BBB4583B4A777008A29BF54]]></AD_TAB_ID>
 <!--07D342328D8B4289811B84E1E56D45D0-->  <AD_COLUMN_ID><![CDATA[802DBB308D06C960E040007F01001D1B]]></AD_COLUMN_ID>
@@ -353,9 +353,9 @@
 <!--1B49E0A8CE12471F862FA14E45E98AEE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--1B49E0A8CE12471F862FA14E45E98AEE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--1B49E0A8CE12471F862FA14E45E98AEE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--1B49E0A8CE12471F862FA14E45E98AEE-->  <NAME><![CDATA[Invoice Payment Plan]]></NAME>
-<!--1B49E0A8CE12471F862FA14E45E98AEE-->  <DESCRIPTION><![CDATA[Set of payments planned to be collected/paid for an invoice]]></DESCRIPTION>
-<!--1B49E0A8CE12471F862FA14E45E98AEE-->  <HELP><![CDATA[Set of payments planned to be collected/paid for an invoice]]></HELP>
+<!--1B49E0A8CE12471F862FA14E45E98AEE-->  <NAME><![CDATA[Invoice Payment In Plan]]></NAME>
+<!--1B49E0A8CE12471F862FA14E45E98AEE-->  <DESCRIPTION><![CDATA[Set of payments in planned to be collected/paid for an invoice]]></DESCRIPTION>
+<!--1B49E0A8CE12471F862FA14E45E98AEE-->  <HELP><![CDATA[Set of payments in planned to be collected/paid for an invoice]]></HELP>
 <!--1B49E0A8CE12471F862FA14E45E98AEE-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--1B49E0A8CE12471F862FA14E45E98AEE-->  <AD_TAB_ID><![CDATA[EB0466B2A22343F28773B356D292BC7E]]></AD_TAB_ID>
 <!--1B49E0A8CE12471F862FA14E45E98AEE-->  <AD_COLUMN_ID><![CDATA[78D10D5CC289A0ADE040007F010152E6]]></AD_COLUMN_ID>
@@ -897,7 +897,7 @@
 <!--3E9C6405F0D641308A4377E3198600FE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--3E9C6405F0D641308A4377E3198600FE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--3E9C6405F0D641308A4377E3198600FE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--3E9C6405F0D641308A4377E3198600FE-->  <NAME><![CDATA[Payment Detail]]></NAME>
+<!--3E9C6405F0D641308A4377E3198600FE-->  <NAME><![CDATA[Payment Out Detail]]></NAME>
 <!--3E9C6405F0D641308A4377E3198600FE-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--3E9C6405F0D641308A4377E3198600FE-->  <AD_TAB_ID><![CDATA[6707D7449A8D45DB851F608BA88329C8]]></AD_TAB_ID>
 <!--3E9C6405F0D641308A4377E3198600FE-->  <AD_COLUMN_ID><![CDATA[78D16B5B1787661EE040007F010152F7]]></AD_COLUMN_ID>
@@ -919,9 +919,9 @@
 <!--3FD9A2F24FA84165AB5ACE9F2BF085FC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--3FD9A2F24FA84165AB5ACE9F2BF085FC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--3FD9A2F24FA84165AB5ACE9F2BF085FC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--3FD9A2F24FA84165AB5ACE9F2BF085FC-->  <NAME><![CDATA[Invoice Payment Plan]]></NAME>
-<!--3FD9A2F24FA84165AB5ACE9F2BF085FC-->  <DESCRIPTION><![CDATA[Set of payments planned to be collected/paid for an invoice]]></DESCRIPTION>
-<!--3FD9A2F24FA84165AB5ACE9F2BF085FC-->  <HELP><![CDATA[Set of payments planned to be collected/paid for an invoice]]></HELP>
+<!--3FD9A2F24FA84165AB5ACE9F2BF085FC-->  <NAME><![CDATA[Invoice Payment Out Plan]]></NAME>
+<!--3FD9A2F24FA84165AB5ACE9F2BF085FC-->  <DESCRIPTION><![CDATA[Set of payments out planned to be collected/paid for an invoice]]></DESCRIPTION>
+<!--3FD9A2F24FA84165AB5ACE9F2BF085FC-->  <HELP><![CDATA[Set of payments out planned to be collected/paid for an invoice]]></HELP>
 <!--3FD9A2F24FA84165AB5ACE9F2BF085FC-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--3FD9A2F24FA84165AB5ACE9F2BF085FC-->  <AD_TAB_ID><![CDATA[A94442B27F664A41BF64735DFA76FB4D]]></AD_TAB_ID>
 <!--3FD9A2F24FA84165AB5ACE9F2BF085FC-->  <AD_COLUMN_ID><![CDATA[78D10D5CC289A0ADE040007F010152E6]]></AD_COLUMN_ID>
@@ -1235,7 +1235,7 @@
 <!--5280E667A502462EBD6D493EBD4B129F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--5280E667A502462EBD6D493EBD4B129F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--5280E667A502462EBD6D493EBD4B129F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--5280E667A502462EBD6D493EBD4B129F-->  <NAME><![CDATA[Payment Date]]></NAME>
+<!--5280E667A502462EBD6D493EBD4B129F-->  <NAME><![CDATA[Payment In Date]]></NAME>
 <!--5280E667A502462EBD6D493EBD4B129F-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--5280E667A502462EBD6D493EBD4B129F-->  <AD_TAB_ID><![CDATA[B82C02920AA84E8DB57D553185BD2F06]]></AD_TAB_ID>
 <!--5280E667A502462EBD6D493EBD4B129F-->  <AD_COLUMN_ID><![CDATA[78D16B5B178F661EE040007F010152F7]]></AD_COLUMN_ID>
@@ -1635,7 +1635,7 @@
 <!--6482EC5269CB42CCBC5933A13DF906A5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--6482EC5269CB42CCBC5933A13DF906A5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--6482EC5269CB42CCBC5933A13DF906A5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--6482EC5269CB42CCBC5933A13DF906A5-->  <NAME><![CDATA[Number of Payments]]></NAME>
+<!--6482EC5269CB42CCBC5933A13DF906A5-->  <NAME><![CDATA[Number of Payments Out]]></NAME>
 <!--6482EC5269CB42CCBC5933A13DF906A5-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--6482EC5269CB42CCBC5933A13DF906A5-->  <AD_TAB_ID><![CDATA[FA57D75B1BBB4583B4A777008A29BF54]]></AD_TAB_ID>
 <!--6482EC5269CB42CCBC5933A13DF906A5-->  <AD_COLUMN_ID><![CDATA[802DBB308D07C960E040007F01001D1B]]></AD_COLUMN_ID>
@@ -1982,7 +1982,7 @@
 <!--6D50A189DB3741C0B28C5F52E3AC0136-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--6D50A189DB3741C0B28C5F52E3AC0136-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--6D50A189DB3741C0B28C5F52E3AC0136-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--6D50A189DB3741C0B28C5F52E3AC0136-->  <NAME><![CDATA[Payment Date]]></NAME>
+<!--6D50A189DB3741C0B28C5F52E3AC0136-->  <NAME><![CDATA[Payment Out Date]]></NAME>
 <!--6D50A189DB3741C0B28C5F52E3AC0136-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--6D50A189DB3741C0B28C5F52E3AC0136-->  <AD_TAB_ID><![CDATA[F9751D712A804D57B97A36803843F2D7]]></AD_TAB_ID>
 <!--6D50A189DB3741C0B28C5F52E3AC0136-->  <AD_COLUMN_ID><![CDATA[78D16B5B178F661EE040007F010152F7]]></AD_COLUMN_ID>
@@ -2005,9 +2005,9 @@
 <!--6DEADC667B69465F87F3E5B68B1E5718-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--6DEADC667B69465F87F3E5B68B1E5718-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--6DEADC667B69465F87F3E5B68B1E5718-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--6DEADC667B69465F87F3E5B68B1E5718-->  <NAME><![CDATA[Invoice Payment Plan]]></NAME>
-<!--6DEADC667B69465F87F3E5B68B1E5718-->  <DESCRIPTION><![CDATA[Set of payments planned to be collected/paid for an invoice]]></DESCRIPTION>
-<!--6DEADC667B69465F87F3E5B68B1E5718-->  <HELP><![CDATA[Set of payments planned to be collected/paid for an invoice]]></HELP>
+<!--6DEADC667B69465F87F3E5B68B1E5718-->  <NAME><![CDATA[Invoice Payment Out Plan]]></NAME>
+<!--6DEADC667B69465F87F3E5B68B1E5718-->  <DESCRIPTION><![CDATA[Set of payments out planned to be collected/paid for an invoice]]></DESCRIPTION>
+<!--6DEADC667B69465F87F3E5B68B1E5718-->  <HELP><![CDATA[Set of payments out planned to be collected/paid for an invoice]]></HELP>
 <!--6DEADC667B69465F87F3E5B68B1E5718-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--6DEADC667B69465F87F3E5B68B1E5718-->  <AD_TAB_ID><![CDATA[F9751D712A804D57B97A36803843F2D7]]></AD_TAB_ID>
 <!--6DEADC667B69465F87F3E5B68B1E5718-->  <AD_COLUMN_ID><![CDATA[7FF2234748E7844FE040007F01003861]]></AD_COLUMN_ID>
@@ -2106,9 +2106,9 @@
 <!--741DEAEF26C848BDAC6BEDB333088D7E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--741DEAEF26C848BDAC6BEDB333088D7E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--741DEAEF26C848BDAC6BEDB333088D7E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--741DEAEF26C848BDAC6BEDB333088D7E-->  <NAME><![CDATA[Order Payment Plan]]></NAME>
-<!--741DEAEF26C848BDAC6BEDB333088D7E-->  <DESCRIPTION><![CDATA[Set of payments planned to be collected/paid for an order]]></DESCRIPTION>
-<!--741DEAEF26C848BDAC6BEDB333088D7E-->  <HELP><![CDATA[Set of payments planned to be collected/paid for an order]]></HELP>
+<!--741DEAEF26C848BDAC6BEDB333088D7E-->  <NAME><![CDATA[Order Payment Out Plan]]></NAME>
+<!--741DEAEF26C848BDAC6BEDB333088D7E-->  <DESCRIPTION><![CDATA[Set of payments out planned to be collected/paid for an order]]></DESCRIPTION>
+<!--741DEAEF26C848BDAC6BEDB333088D7E-->  <HELP><![CDATA[Set of payments out planned to be collected/paid for an order]]></HELP>
 <!--741DEAEF26C848BDAC6BEDB333088D7E-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--741DEAEF26C848BDAC6BEDB333088D7E-->  <AD_TAB_ID><![CDATA[FA57D75B1BBB4583B4A777008A29BF54]]></AD_TAB_ID>
 <!--741DEAEF26C848BDAC6BEDB333088D7E-->  <AD_COLUMN_ID><![CDATA[802DBB308CF6C960E040007F01001D1B]]></AD_COLUMN_ID>
@@ -2232,7 +2232,8 @@
 <!--797B22297EFB4124A41FEE6EDD71E14F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--797B22297EFB4124A41FEE6EDD71E14F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--797B22297EFB4124A41FEE6EDD71E14F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--797B22297EFB4124A41FEE6EDD71E14F-->  <NAME><![CDATA[Last Payment Date]]></NAME>
+<!--797B22297EFB4124A41FEE6EDD71E14F-->  <NAME><![CDATA[Last Payment In Date]]></NAME>
+<!--797B22297EFB4124A41FEE6EDD71E14F-->  <DESCRIPTION><![CDATA[Last Payment In Date]]></DESCRIPTION>
 <!--797B22297EFB4124A41FEE6EDD71E14F-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--797B22297EFB4124A41FEE6EDD71E14F-->  <AD_TAB_ID><![CDATA[EB0466B2A22343F28773B356D292BC7E]]></AD_TAB_ID>
 <!--797B22297EFB4124A41FEE6EDD71E14F-->  <AD_COLUMN_ID><![CDATA[78D10D5CC296A0ADE040007F010152E6]]></AD_COLUMN_ID>
@@ -2500,7 +2501,7 @@
 <!--7FCAAFE989BDA375E040007F01007F0A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--7FCAAFE989BDA375E040007F01007F0A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7FCAAFE989BDA375E040007F01007F0A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--7FCAAFE989BDA375E040007F01007F0A-->  <NAME><![CDATA[Add Payment Details]]></NAME>
+<!--7FCAAFE989BDA375E040007F01007F0A-->  <NAME><![CDATA[Add Details]]></NAME>
 <!--7FCAAFE989BDA375E040007F01007F0A-->  <HELP><![CDATA[Select pending payments from Orders or Invoices, or create Payment Details related to GL Items.]]></HELP>
 <!--7FCAAFE989BDA375E040007F01007F0A-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--7FCAAFE989BDA375E040007F01007F0A-->  <AD_TAB_ID><![CDATA[C4B6506838E14A349D6717D6856F1B56]]></AD_TAB_ID>
@@ -2647,9 +2648,9 @@
 <!--7FF44B41FD520341E040007F01006989-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--7FF44B41FD520341E040007F01006989-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7FF44B41FD520341E040007F01006989-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--7FF44B41FD520341E040007F01006989-->  <NAME><![CDATA[Payment]]></NAME>
-<!--7FF44B41FD520341E040007F01006989-->  <DESCRIPTION><![CDATA[Payment event]]></DESCRIPTION>
-<!--7FF44B41FD520341E040007F01006989-->  <HELP><![CDATA[Payment event]]></HELP>
+<!--7FF44B41FD520341E040007F01006989-->  <NAME><![CDATA[Payment In]]></NAME>
+<!--7FF44B41FD520341E040007F01006989-->  <DESCRIPTION><![CDATA[Payment In event]]></DESCRIPTION>
+<!--7FF44B41FD520341E040007F01006989-->  <HELP><![CDATA[Payment In event]]></HELP>
 <!--7FF44B41FD520341E040007F01006989-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--7FF44B41FD520341E040007F01006989-->  <AD_TAB_ID><![CDATA[FD40D9C2F1F14943933DEFEF4A8458E4]]></AD_TAB_ID>
 <!--7FF44B41FD520341E040007F01006989-->  <AD_COLUMN_ID><![CDATA[7FF2234748EC844FE040007F01003861]]></AD_COLUMN_ID>
@@ -2672,9 +2673,9 @@
 <!--7FF44B41FD530341E040007F01006989-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--7FF44B41FD530341E040007F01006989-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7FF44B41FD530341E040007F01006989-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--7FF44B41FD530341E040007F01006989-->  <NAME><![CDATA[Invoice Payment Plan]]></NAME>
-<!--7FF44B41FD530341E040007F01006989-->  <DESCRIPTION><![CDATA[Set of payments planned to be collected/paid for an invoice]]></DESCRIPTION>
-<!--7FF44B41FD530341E040007F01006989-->  <HELP><![CDATA[Set of payments planned to be collected/paid for an invoice]]></HELP>
+<!--7FF44B41FD530341E040007F01006989-->  <NAME><![CDATA[Invoice Payment In Plan]]></NAME>
+<!--7FF44B41FD530341E040007F01006989-->  <DESCRIPTION><![CDATA[Set of payments in planned to be collected/paid for an invoice]]></DESCRIPTION>
+<!--7FF44B41FD530341E040007F01006989-->  <HELP><![CDATA[Set of payments in planned to be collected/paid for an invoice]]></HELP>
 <!--7FF44B41FD530341E040007F01006989-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--7FF44B41FD530341E040007F01006989-->  <AD_TAB_ID><![CDATA[FD40D9C2F1F14943933DEFEF4A8458E4]]></AD_TAB_ID>
 <!--7FF44B41FD530341E040007F01006989-->  <AD_COLUMN_ID><![CDATA[7FF2234748E7844FE040007F01003861]]></AD_COLUMN_ID>
@@ -2789,8 +2790,8 @@
 <!--7FF44B41FD590341E040007F01006989-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--7FF44B41FD590341E040007F01006989-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7FF44B41FD590341E040007F01006989-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--7FF44B41FD590341E040007F01006989-->  <NAME><![CDATA[Payment No.]]></NAME>
-<!--7FF44B41FD590341E040007F01006989-->  <DESCRIPTION><![CDATA[Payment Number]]></DESCRIPTION>
+<!--7FF44B41FD590341E040007F01006989-->  <NAME><![CDATA[Payment In No.]]></NAME>
+<!--7FF44B41FD590341E040007F01006989-->  <DESCRIPTION><![CDATA[Payment  In Number]]></DESCRIPTION>
 <!--7FF44B41FD590341E040007F01006989-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--7FF44B41FD590341E040007F01006989-->  <AD_TAB_ID><![CDATA[FD40D9C2F1F14943933DEFEF4A8458E4]]></AD_TAB_ID>
 <!--7FF44B41FD590341E040007F01006989-->  <AD_COLUMN_ID><![CDATA[7FF2234748EB844FE040007F01003861]]></AD_COLUMN_ID>
@@ -3119,9 +3120,9 @@
 <!--80D2CCB125DAECE6E040007F01000DDE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--80D2CCB125DAECE6E040007F01000DDE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--80D2CCB125DAECE6E040007F01000DDE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--80D2CCB125DAECE6E040007F01000DDE-->  <NAME><![CDATA[Add Payment]]></NAME>
-<!--80D2CCB125DAECE6E040007F01000DDE-->  <DESCRIPTION><![CDATA[Add Payment]]></DESCRIPTION>
-<!--80D2CCB125DAECE6E040007F01000DDE-->  <HELP><![CDATA[Select sales invoices or sales orders that you want to match to this payment]]></HELP>
+<!--80D2CCB125DAECE6E040007F01000DDE-->  <NAME><![CDATA[Add Payment In/Out]]></NAME>
+<!--80D2CCB125DAECE6E040007F01000DDE-->  <DESCRIPTION><![CDATA[Add Payment In/Out]]></DESCRIPTION>
+<!--80D2CCB125DAECE6E040007F01000DDE-->  <HELP><![CDATA[Select sales invoices or sales orders that you want to match to this payment In/Out]]></HELP>
 <!--80D2CCB125DAECE6E040007F01000DDE-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--80D2CCB125DAECE6E040007F01000DDE-->  <AD_TAB_ID><![CDATA[290]]></AD_TAB_ID>
 <!--80D2CCB125DAECE6E040007F01000DDE-->  <AD_COLUMN_ID><![CDATA[78A3367822B35459E040007F01012510]]></AD_COLUMN_ID>
@@ -3145,7 +3146,7 @@
 <!--80D55E34FCEE37C9E040007F01001C25-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--80D55E34FCEE37C9E040007F01001C25-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--80D55E34FCEE37C9E040007F01001C25-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--80D55E34FCEE37C9E040007F01001C25-->  <NAME><![CDATA[Add Payment Details]]></NAME>
+<!--80D55E34FCEE37C9E040007F01001C25-->  <NAME><![CDATA[Add Details]]></NAME>
 <!--80D55E34FCEE37C9E040007F01001C25-->  <HELP><![CDATA[Select pending payments from Orders or Invoices, or create Payment Details related to GL Items.]]></HELP>
 <!--80D55E34FCEE37C9E040007F01001C25-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--80D55E34FCEE37C9E040007F01001C25-->  <AD_TAB_ID><![CDATA[F7A52FDAAA0346EFA07D53C125B40404]]></AD_TAB_ID>
@@ -4175,7 +4176,7 @@
 <!--8352F0300D8B49DB97637EDF62B3119D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--8352F0300D8B49DB97637EDF62B3119D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--8352F0300D8B49DB97637EDF62B3119D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8352F0300D8B49DB97637EDF62B3119D-->  <NAME><![CDATA[Payment Detail]]></NAME>
+<!--8352F0300D8B49DB97637EDF62B3119D-->  <NAME><![CDATA[Payment In Detail]]></NAME>
 <!--8352F0300D8B49DB97637EDF62B3119D-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--8352F0300D8B49DB97637EDF62B3119D-->  <AD_TAB_ID><![CDATA[FD40D9C2F1F14943933DEFEF4A8458E4]]></AD_TAB_ID>
 <!--8352F0300D8B49DB97637EDF62B3119D-->  <AD_COLUMN_ID><![CDATA[78D16B5B1787661EE040007F010152F7]]></AD_COLUMN_ID>
@@ -5214,7 +5215,8 @@
 <!--94CEB84F4308426AA4CDE843C2B3C03C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--94CEB84F4308426AA4CDE843C2B3C03C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--94CEB84F4308426AA4CDE843C2B3C03C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--94CEB84F4308426AA4CDE843C2B3C03C-->  <NAME><![CDATA[Last Payment Date]]></NAME>
+<!--94CEB84F4308426AA4CDE843C2B3C03C-->  <NAME><![CDATA[Last Payment In Date]]></NAME>
+<!--94CEB84F4308426AA4CDE843C2B3C03C-->  <DESCRIPTION><![CDATA[Last Payment In Date]]></DESCRIPTION>
 <!--94CEB84F4308426AA4CDE843C2B3C03C-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--94CEB84F4308426AA4CDE843C2B3C03C-->  <AD_TAB_ID><![CDATA[EB0E0C5A58344F7FA345097E7365CD22]]></AD_TAB_ID>
 <!--94CEB84F4308426AA4CDE843C2B3C03C-->  <AD_COLUMN_ID><![CDATA[802DBB308D06C960E040007F01001D1B]]></AD_COLUMN_ID>
@@ -5364,9 +5366,9 @@
 <!--994F29F5EF074F0E8FDAFE6F47578775-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--994F29F5EF074F0E8FDAFE6F47578775-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--994F29F5EF074F0E8FDAFE6F47578775-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--994F29F5EF074F0E8FDAFE6F47578775-->  <NAME><![CDATA[Order Payment Plan]]></NAME>
-<!--994F29F5EF074F0E8FDAFE6F47578775-->  <DESCRIPTION><![CDATA[Set of payments planned to be collected/paid for an order]]></DESCRIPTION>
-<!--994F29F5EF074F0E8FDAFE6F47578775-->  <HELP><![CDATA[Set of payments planned to be collected/paid for an order]]></HELP>
+<!--994F29F5EF074F0E8FDAFE6F47578775-->  <NAME><![CDATA[Order Payment In Plan]]></NAME>
+<!--994F29F5EF074F0E8FDAFE6F47578775-->  <DESCRIPTION><![CDATA[Set of payments in planned to be collected/paid for an order]]></DESCRIPTION>
+<!--994F29F5EF074F0E8FDAFE6F47578775-->  <HELP><![CDATA[Set of payments in planned to be collected/paid for an order]]></HELP>
 <!--994F29F5EF074F0E8FDAFE6F47578775-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--994F29F5EF074F0E8FDAFE6F47578775-->  <AD_TAB_ID><![CDATA[B82C02920AA84E8DB57D553185BD2F06]]></AD_TAB_ID>
 <!--994F29F5EF074F0E8FDAFE6F47578775-->  <AD_COLUMN_ID><![CDATA[7FF2234748E8844FE040007F01003861]]></AD_COLUMN_ID>
@@ -5707,9 +5709,9 @@
 <!--AD7C15BA367642AFB471EFAFD768FB2D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--AD7C15BA367642AFB471EFAFD768FB2D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--AD7C15BA367642AFB471EFAFD768FB2D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--AD7C15BA367642AFB471EFAFD768FB2D-->  <NAME><![CDATA[Add Payment]]></NAME>
-<!--AD7C15BA367642AFB471EFAFD768FB2D-->  <DESCRIPTION><![CDATA[Add Payment]]></DESCRIPTION>
-<!--AD7C15BA367642AFB471EFAFD768FB2D-->  <HELP><![CDATA[Select sales invoices or sales orders that you want to match to this payment]]></HELP>
+<!--AD7C15BA367642AFB471EFAFD768FB2D-->  <NAME><![CDATA[Add Payment In/Out]]></NAME>
+<!--AD7C15BA367642AFB471EFAFD768FB2D-->  <DESCRIPTION><![CDATA[Add Payment In/Out]]></DESCRIPTION>
+<!--AD7C15BA367642AFB471EFAFD768FB2D-->  <HELP><![CDATA[Select sales invoices or sales orders that you want to match to this payment In/Out]]></HELP>
 <!--AD7C15BA367642AFB471EFAFD768FB2D-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--AD7C15BA367642AFB471EFAFD768FB2D-->  <AD_TAB_ID><![CDATA[263]]></AD_TAB_ID>
 <!--AD7C15BA367642AFB471EFAFD768FB2D-->  <AD_COLUMN_ID><![CDATA[78A3367822B35459E040007F01012510]]></AD_COLUMN_ID>
@@ -5759,9 +5761,9 @@
 <!--AE165A3BE3854E3391784246B72F80AF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--AE165A3BE3854E3391784246B72F80AF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--AE165A3BE3854E3391784246B72F80AF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--AE165A3BE3854E3391784246B72F80AF-->  <NAME><![CDATA[Payment]]></NAME>
-<!--AE165A3BE3854E3391784246B72F80AF-->  <DESCRIPTION><![CDATA[Payment event]]></DESCRIPTION>
-<!--AE165A3BE3854E3391784246B72F80AF-->  <HELP><![CDATA[Payment event]]></HELP>
+<!--AE165A3BE3854E3391784246B72F80AF-->  <NAME><![CDATA[Payment In]]></NAME>
+<!--AE165A3BE3854E3391784246B72F80AF-->  <DESCRIPTION><![CDATA[Payment In event]]></DESCRIPTION>
+<!--AE165A3BE3854E3391784246B72F80AF-->  <HELP><![CDATA[Payment In event]]></HELP>
 <!--AE165A3BE3854E3391784246B72F80AF-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--AE165A3BE3854E3391784246B72F80AF-->  <AD_TAB_ID><![CDATA[B82C02920AA84E8DB57D553185BD2F06]]></AD_TAB_ID>
 <!--AE165A3BE3854E3391784246B72F80AF-->  <AD_COLUMN_ID><![CDATA[7FF2234748EC844FE040007F01003861]]></AD_COLUMN_ID>
@@ -5809,7 +5811,7 @@
 <!--AF40DD148F8D4C6CBDE82035FD82F47B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--AF40DD148F8D4C6CBDE82035FD82F47B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--AF40DD148F8D4C6CBDE82035FD82F47B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--AF40DD148F8D4C6CBDE82035FD82F47B-->  <NAME><![CDATA[Number of Payments]]></NAME>
+<!--AF40DD148F8D4C6CBDE82035FD82F47B-->  <NAME><![CDATA[Number of Payments Out]]></NAME>
 <!--AF40DD148F8D4C6CBDE82035FD82F47B-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--AF40DD148F8D4C6CBDE82035FD82F47B-->  <AD_TAB_ID><![CDATA[A94442B27F664A41BF64735DFA76FB4D]]></AD_TAB_ID>
 <!--AF40DD148F8D4C6CBDE82035FD82F47B-->  <AD_COLUMN_ID><![CDATA[78D10D5CC297A0ADE040007F010152E6]]></AD_COLUMN_ID>
@@ -5833,9 +5835,9 @@
 <!--AFDAED2F41544E10949101E628204D84-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--AFDAED2F41544E10949101E628204D84-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--AFDAED2F41544E10949101E628204D84-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--AFDAED2F41544E10949101E628204D84-->  <NAME><![CDATA[Payment]]></NAME>
-<!--AFDAED2F41544E10949101E628204D84-->  <DESCRIPTION><![CDATA[Payment event]]></DESCRIPTION>
-<!--AFDAED2F41544E10949101E628204D84-->  <HELP><![CDATA[Payment event]]></HELP>
+<!--AFDAED2F41544E10949101E628204D84-->  <NAME><![CDATA[Payment Out]]></NAME>
+<!--AFDAED2F41544E10949101E628204D84-->  <DESCRIPTION><![CDATA[Payment Out event]]></DESCRIPTION>
+<!--AFDAED2F41544E10949101E628204D84-->  <HELP><![CDATA[Payment Out event]]></HELP>
 <!--AFDAED2F41544E10949101E628204D84-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--AFDAED2F41544E10949101E628204D84-->  <AD_TAB_ID><![CDATA[F9751D712A804D57B97A36803843F2D7]]></AD_TAB_ID>
 <!--AFDAED2F41544E10949101E628204D84-->  <AD_COLUMN_ID><![CDATA[7FF2234748EC844FE040007F01003861]]></AD_COLUMN_ID>
@@ -5931,9 +5933,9 @@
 <!--B4BC626AFBAE4F17AA54997C2796B534-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--B4BC626AFBAE4F17AA54997C2796B534-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--B4BC626AFBAE4F17AA54997C2796B534-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--B4BC626AFBAE4F17AA54997C2796B534-->  <NAME><![CDATA[Order Payment Plan]]></NAME>
-<!--B4BC626AFBAE4F17AA54997C2796B534-->  <DESCRIPTION><![CDATA[Set of payments planned to be collected/paid for an order]]></DESCRIPTION>
-<!--B4BC626AFBAE4F17AA54997C2796B534-->  <HELP><![CDATA[Set of payments planned to be collected/paid for an order]]></HELP>
+<!--B4BC626AFBAE4F17AA54997C2796B534-->  <NAME><![CDATA[Order Payment Out Plan]]></NAME>
+<!--B4BC626AFBAE4F17AA54997C2796B534-->  <DESCRIPTION><![CDATA[Set of payments out planned to be collected/paid for an order]]></DESCRIPTION>
+<!--B4BC626AFBAE4F17AA54997C2796B534-->  <HELP><![CDATA[Set of payments out planned to be collected/paid for an order]]></HELP>
 <!--B4BC626AFBAE4F17AA54997C2796B534-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--B4BC626AFBAE4F17AA54997C2796B534-->  <AD_TAB_ID><![CDATA[6707D7449A8D45DB851F608BA88329C8]]></AD_TAB_ID>
 <!--B4BC626AFBAE4F17AA54997C2796B534-->  <AD_COLUMN_ID><![CDATA[7FF2234748E8844FE040007F01003861]]></AD_COLUMN_ID>
@@ -6097,8 +6099,8 @@
 <!--BA2C09836C0D4E9298038CD62CC01982-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--BA2C09836C0D4E9298038CD62CC01982-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--BA2C09836C0D4E9298038CD62CC01982-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--BA2C09836C0D4E9298038CD62CC01982-->  <NAME><![CDATA[Last Payment Date]]></NAME>
-<!--BA2C09836C0D4E9298038CD62CC01982-->  <DESCRIPTION><![CDATA[Last Payment Date]]></DESCRIPTION>
+<!--BA2C09836C0D4E9298038CD62CC01982-->  <NAME><![CDATA[Last Payment Out Date]]></NAME>
+<!--BA2C09836C0D4E9298038CD62CC01982-->  <DESCRIPTION><![CDATA[Last Payment Out Date]]></DESCRIPTION>
 <!--BA2C09836C0D4E9298038CD62CC01982-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--BA2C09836C0D4E9298038CD62CC01982-->  <AD_TAB_ID><![CDATA[A94442B27F664A41BF64735DFA76FB4D]]></AD_TAB_ID>
 <!--BA2C09836C0D4E9298038CD62CC01982-->  <AD_COLUMN_ID><![CDATA[78D10D5CC296A0ADE040007F010152E6]]></AD_COLUMN_ID>
@@ -6317,9 +6319,9 @@
 <!--C92A30F5BB0C47D29066008260A2818B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--C92A30F5BB0C47D29066008260A2818B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--C92A30F5BB0C47D29066008260A2818B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--C92A30F5BB0C47D29066008260A2818B-->  <NAME><![CDATA[Payment]]></NAME>
-<!--C92A30F5BB0C47D29066008260A2818B-->  <DESCRIPTION><![CDATA[Payment event]]></DESCRIPTION>
-<!--C92A30F5BB0C47D29066008260A2818B-->  <HELP><![CDATA[Payment event]]></HELP>
+<!--C92A30F5BB0C47D29066008260A2818B-->  <NAME><![CDATA[Payment Out]]></NAME>
+<!--C92A30F5BB0C47D29066008260A2818B-->  <DESCRIPTION><![CDATA[Payment Out event]]></DESCRIPTION>
+<!--C92A30F5BB0C47D29066008260A2818B-->  <HELP><![CDATA[Payment Out event]]></HELP>
 <!--C92A30F5BB0C47D29066008260A2818B-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--C92A30F5BB0C47D29066008260A2818B-->  <AD_TAB_ID><![CDATA[6707D7449A8D45DB851F608BA88329C8]]></AD_TAB_ID>
 <!--C92A30F5BB0C47D29066008260A2818B-->  <AD_COLUMN_ID><![CDATA[7FF2234748EC844FE040007F01003861]]></AD_COLUMN_ID>
@@ -6391,8 +6393,8 @@
 <!--CCEF625BE5004940A3FC98E1E4EE8CAC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--CCEF625BE5004940A3FC98E1E4EE8CAC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--CCEF625BE5004940A3FC98E1E4EE8CAC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--CCEF625BE5004940A3FC98E1E4EE8CAC-->  <NAME><![CDATA[Payment No.]]></NAME>
-<!--CCEF625BE5004940A3FC98E1E4EE8CAC-->  <DESCRIPTION><![CDATA[Payment Number]]></DESCRIPTION>
+<!--CCEF625BE5004940A3FC98E1E4EE8CAC-->  <NAME><![CDATA[Payment Out No.]]></NAME>
+<!--CCEF625BE5004940A3FC98E1E4EE8CAC-->  <DESCRIPTION><![CDATA[Payment Out Number]]></DESCRIPTION>
 <!--CCEF625BE5004940A3FC98E1E4EE8CAC-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--CCEF625BE5004940A3FC98E1E4EE8CAC-->  <AD_TAB_ID><![CDATA[F9751D712A804D57B97A36803843F2D7]]></AD_TAB_ID>
 <!--CCEF625BE5004940A3FC98E1E4EE8CAC-->  <AD_COLUMN_ID><![CDATA[7FF2234748EB844FE040007F01003861]]></AD_COLUMN_ID>
@@ -6416,8 +6418,8 @@
 <!--D0629CC136214B9CA283EFF68CFE1803-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--D0629CC136214B9CA283EFF68CFE1803-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--D0629CC136214B9CA283EFF68CFE1803-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--D0629CC136214B9CA283EFF68CFE1803-->  <NAME><![CDATA[Payment No.]]></NAME>
-<!--D0629CC136214B9CA283EFF68CFE1803-->  <DESCRIPTION><![CDATA[Payment Number]]></DESCRIPTION>
+<!--D0629CC136214B9CA283EFF68CFE1803-->  <NAME><![CDATA[Payment Out No.]]></NAME>
+<!--D0629CC136214B9CA283EFF68CFE1803-->  <DESCRIPTION><![CDATA[Payment Out Number]]></DESCRIPTION>
 <!--D0629CC136214B9CA283EFF68CFE1803-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--D0629CC136214B9CA283EFF68CFE1803-->  <AD_TAB_ID><![CDATA[6707D7449A8D45DB851F608BA88329C8]]></AD_TAB_ID>
 <!--D0629CC136214B9CA283EFF68CFE1803-->  <AD_COLUMN_ID><![CDATA[7FF2234748EB844FE040007F01003861]]></AD_COLUMN_ID>
@@ -6565,7 +6567,7 @@
 <!--D458466D414A4D339872CB81E70853C8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--D458466D414A4D339872CB81E70853C8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--D458466D414A4D339872CB81E70853C8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--D458466D414A4D339872CB81E70853C8-->  <NAME><![CDATA[Payment Detail]]></NAME>
+<!--D458466D414A4D339872CB81E70853C8-->  <NAME><![CDATA[Payment In Detail]]></NAME>
 <!--D458466D414A4D339872CB81E70853C8-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--D458466D414A4D339872CB81E70853C8-->  <AD_TAB_ID><![CDATA[B82C02920AA84E8DB57D553185BD2F06]]></AD_TAB_ID>
 <!--D458466D414A4D339872CB81E70853C8-->  <AD_COLUMN_ID><![CDATA[78D16B5B1787661EE040007F010152F7]]></AD_COLUMN_ID>
@@ -6855,8 +6857,8 @@
 <!--E6EEA6B9F91F459787518691AFBAF351-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--E6EEA6B9F91F459787518691AFBAF351-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--E6EEA6B9F91F459787518691AFBAF351-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--E6EEA6B9F91F459787518691AFBAF351-->  <NAME><![CDATA[Payment No.]]></NAME>
-<!--E6EEA6B9F91F459787518691AFBAF351-->  <DESCRIPTION><![CDATA[Payment Number]]></DESCRIPTION>
+<!--E6EEA6B9F91F459787518691AFBAF351-->  <NAME><![CDATA[Payment In No.]]></NAME>
+<!--E6EEA6B9F91F459787518691AFBAF351-->  <DESCRIPTION><![CDATA[Payment  In Number]]></DESCRIPTION>
 <!--E6EEA6B9F91F459787518691AFBAF351-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--E6EEA6B9F91F459787518691AFBAF351-->  <AD_TAB_ID><![CDATA[B82C02920AA84E8DB57D553185BD2F06]]></AD_TAB_ID>
 <!--E6EEA6B9F91F459787518691AFBAF351-->  <AD_COLUMN_ID><![CDATA[7FF2234748EB844FE040007F01003861]]></AD_COLUMN_ID>
@@ -7006,7 +7008,7 @@
 <!--EE6921E0FB9D4AB98AD403E011B59A21-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--EE6921E0FB9D4AB98AD403E011B59A21-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--EE6921E0FB9D4AB98AD403E011B59A21-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--EE6921E0FB9D4AB98AD403E011B59A21-->  <NAME><![CDATA[Payment Date]]></NAME>
+<!--EE6921E0FB9D4AB98AD403E011B59A21-->  <NAME><![CDATA[Payment In Date]]></NAME>
 <!--EE6921E0FB9D4AB98AD403E011B59A21-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--EE6921E0FB9D4AB98AD403E011B59A21-->  <AD_TAB_ID><![CDATA[FD40D9C2F1F14943933DEFEF4A8458E4]]></AD_TAB_ID>
 <!--EE6921E0FB9D4AB98AD403E011B59A21-->  <AD_COLUMN_ID><![CDATA[78D16B5B178F661EE040007F010152F7]]></AD_COLUMN_ID>
@@ -7054,7 +7056,7 @@
 <!--F3653CEB40B54EF88F365D55E46CB543-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--F3653CEB40B54EF88F365D55E46CB543-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--F3653CEB40B54EF88F365D55E46CB543-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--F3653CEB40B54EF88F365D55E46CB543-->  <NAME><![CDATA[Number of Payments]]></NAME>
+<!--F3653CEB40B54EF88F365D55E46CB543-->  <NAME><![CDATA[Number of Payments In]]></NAME>
 <!--F3653CEB40B54EF88F365D55E46CB543-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--F3653CEB40B54EF88F365D55E46CB543-->  <AD_TAB_ID><![CDATA[EB0E0C5A58344F7FA345097E7365CD22]]></AD_TAB_ID>
 <!--F3653CEB40B54EF88F365D55E46CB543-->  <AD_COLUMN_ID><![CDATA[802DBB308D07C960E040007F01001D1B]]></AD_COLUMN_ID>
@@ -7103,9 +7105,9 @@
 <!--F6AE914A90D64517A8B8C9C3B41424EB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--F6AE914A90D64517A8B8C9C3B41424EB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--F6AE914A90D64517A8B8C9C3B41424EB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--F6AE914A90D64517A8B8C9C3B41424EB-->  <NAME><![CDATA[Order Payment Plan]]></NAME>
-<!--F6AE914A90D64517A8B8C9C3B41424EB-->  <DESCRIPTION><![CDATA[Set of payments planned to be collected/paid for an order]]></DESCRIPTION>
-<!--F6AE914A90D64517A8B8C9C3B41424EB-->  <HELP><![CDATA[Set of payments planned to be collected/paid for an order]]></HELP>
+<!--F6AE914A90D64517A8B8C9C3B41424EB-->  <NAME><![CDATA[Order Payment In Plan]]></NAME>
+<!--F6AE914A90D64517A8B8C9C3B41424EB-->  <DESCRIPTION><![CDATA[Set of payments in planned to be collected/paid for an order]]></DESCRIPTION>
+<!--F6AE914A90D64517A8B8C9C3B41424EB-->  <HELP><![CDATA[Set of payments in planned to be collected/paid for an order]]></HELP>
 <!--F6AE914A90D64517A8B8C9C3B41424EB-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--F6AE914A90D64517A8B8C9C3B41424EB-->  <AD_TAB_ID><![CDATA[EB0E0C5A58344F7FA345097E7365CD22]]></AD_TAB_ID>
 <!--F6AE914A90D64517A8B8C9C3B41424EB-->  <AD_COLUMN_ID><![CDATA[802DBB308CF6C960E040007F01001D1B]]></AD_COLUMN_ID>
@@ -7198,7 +7200,7 @@
 <!--FD46676E44ED4D129AEE94D54D92814F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--FD46676E44ED4D129AEE94D54D92814F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FD46676E44ED4D129AEE94D54D92814F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FD46676E44ED4D129AEE94D54D92814F-->  <NAME><![CDATA[Payment Date]]></NAME>
+<!--FD46676E44ED4D129AEE94D54D92814F-->  <NAME><![CDATA[Payment Out Date]]></NAME>
 <!--FD46676E44ED4D129AEE94D54D92814F-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--FD46676E44ED4D129AEE94D54D92814F-->  <AD_TAB_ID><![CDATA[6707D7449A8D45DB851F608BA88329C8]]></AD_TAB_ID>
 <!--FD46676E44ED4D129AEE94D54D92814F-->  <AD_COLUMN_ID><![CDATA[78D16B5B178F661EE040007F010152F7]]></AD_COLUMN_ID>
@@ -7221,7 +7223,7 @@
 <!--FEB73B6C75B9445FA61265D24096F41B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--FEB73B6C75B9445FA61265D24096F41B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FEB73B6C75B9445FA61265D24096F41B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FEB73B6C75B9445FA61265D24096F41B-->  <NAME><![CDATA[Number of Payments]]></NAME>
+<!--FEB73B6C75B9445FA61265D24096F41B-->  <NAME><![CDATA[Number of Payments In]]></NAME>
 <!--FEB73B6C75B9445FA61265D24096F41B-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--FEB73B6C75B9445FA61265D24096F41B-->  <AD_TAB_ID><![CDATA[EB0466B2A22343F28773B356D292BC7E]]></AD_TAB_ID>
 <!--FEB73B6C75B9445FA61265D24096F41B-->  <AD_COLUMN_ID><![CDATA[78D10D5CC297A0ADE040007F010152E6]]></AD_COLUMN_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml	Tue Mar 08 18:42:40 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml	Tue Mar 08 18:48:17 2011 +0100
@@ -44,6 +44,17 @@
 <!--19D77522B7A4470FBA505D39A6AA051C-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--19D77522B7A4470FBA505D39A6AA051C--></AD_MESSAGE>
 
+<!--1EB0D3A668784AF8A9133F066EDE6C44--><AD_MESSAGE>
+<!--1EB0D3A668784AF8A9133F066EDE6C44-->  <AD_MESSAGE_ID><![CDATA[1EB0D3A668784AF8A9133F066EDE6C44]]></AD_MESSAGE_ID>
+<!--1EB0D3A668784AF8A9133F066EDE6C44-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1EB0D3A668784AF8A9133F066EDE6C44-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1EB0D3A668784AF8A9133F066EDE6C44-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1EB0D3A668784AF8A9133F066EDE6C44-->  <VALUE><![CDATA[APRM_AddPaymentIn]]></VALUE>
+<!--1EB0D3A668784AF8A9133F066EDE6C44-->  <MSGTEXT><![CDATA[Add Payment In]]></MSGTEXT>
+<!--1EB0D3A668784AF8A9133F066EDE6C44-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--1EB0D3A668784AF8A9133F066EDE6C44-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--1EB0D3A668784AF8A9133F066EDE6C44--></AD_MESSAGE>
+
 <!--1F3D51E013B34F1087BD5416EEB0387F--><AD_MESSAGE>
 <!--1F3D51E013B34F1087BD5416EEB0387F-->  <AD_MESSAGE_ID><![CDATA[1F3D51E013B34F1087BD5416EEB0387F]]></AD_MESSAGE_ID>
 <!--1F3D51E013B34F1087BD5416EEB0387F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -341,6 +352,17 @@
 <!--9350C57F0C194634B4FC83028AC4D31D-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--9350C57F0C194634B4FC83028AC4D31D--></AD_MESSAGE>
 
+<!--939FCFA14C69435EB3A88457933160B6--><AD_MESSAGE>
+<!--939FCFA14C69435EB3A88457933160B6-->  <AD_MESSAGE_ID><![CDATA[939FCFA14C69435EB3A88457933160B6]]></AD_MESSAGE_ID>
+<!--939FCFA14C69435EB3A88457933160B6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--939FCFA14C69435EB3A88457933160B6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--939FCFA14C69435EB3A88457933160B6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--939FCFA14C69435EB3A88457933160B6-->  <VALUE><![CDATA[APRM_AddPaymentOut]]></VALUE>
+<!--939FCFA14C69435EB3A88457933160B6-->  <MSGTEXT><![CDATA[Add Payment Out]]></MSGTEXT>
+<!--939FCFA14C69435EB3A88457933160B6-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--939FCFA14C69435EB3A88457933160B6-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--939FCFA14C69435EB3A88457933160B6--></AD_MESSAGE>
+
 <!--962525CB12714F8EA3C06FAD8A3FAB4A--><AD_MESSAGE>
 <!--962525CB12714F8EA3C06FAD8A3FAB4A-->  <AD_MESSAGE_ID><![CDATA[962525CB12714F8EA3C06FAD8A3FAB4A]]></AD_MESSAGE_ID>
 <!--962525CB12714F8EA3C06FAD8A3FAB4A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS.xml	Tue Mar 08 18:42:40 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS.xml	Tue Mar 08 18:48:17 2011 +0100
@@ -6,7 +6,7 @@
 <!--12016E2EDE0245B5A36B84CBA144DBDF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--12016E2EDE0245B5A36B84CBA144DBDF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--12016E2EDE0245B5A36B84CBA144DBDF-->  <VALUE><![CDATA[FIN_AddOrderOrInvoice]]></VALUE>
-<!--12016E2EDE0245B5A36B84CBA144DBDF-->  <NAME><![CDATA[Add Payment Details]]></NAME>
+<!--12016E2EDE0245B5A36B84CBA144DBDF-->  <NAME><![CDATA[Add Details]]></NAME>
 <!--12016E2EDE0245B5A36B84CBA144DBDF-->  <HELP><![CDATA[Select pending payments from Orders or Invoices, or create Payment Details related to GL Items.]]></HELP>
 <!--12016E2EDE0245B5A36B84CBA144DBDF-->  <ACCESSLEVEL><![CDATA[1]]></ACCESSLEVEL>
 <!--12016E2EDE0245B5A36B84CBA144DBDF-->  <ISUSERSTARTABLE><![CDATA[N]]></ISUSERSTARTABLE>
@@ -25,9 +25,9 @@
 <!--2EED9BC16DB34D2B80BA40A21564BECF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--2EED9BC16DB34D2B80BA40A21564BECF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--2EED9BC16DB34D2B80BA40A21564BECF-->  <VALUE><![CDATA[FIN_AddPaymentFromInvoice]]></VALUE>
-<!--2EED9BC16DB34D2B80BA40A21564BECF-->  <NAME><![CDATA[Add Payment]]></NAME>
-<!--2EED9BC16DB34D2B80BA40A21564BECF-->  <DESCRIPTION><![CDATA[Add Payment]]></DESCRIPTION>
-<!--2EED9BC16DB34D2B80BA40A21564BECF-->  <HELP><![CDATA[Select sales invoices or sales orders that you want to match to this payment]]></HELP>
+<!--2EED9BC16DB34D2B80BA40A21564BECF-->  <NAME><![CDATA[Add Payment In/Out]]></NAME>
+<!--2EED9BC16DB34D2B80BA40A21564BECF-->  <DESCRIPTION><![CDATA[Add Payment In/Out]]></DESCRIPTION>
+<!--2EED9BC16DB34D2B80BA40A21564BECF-->  <HELP><![CDATA[Select sales invoices or sales orders that you want to match to this payment In/Out]]></HELP>
 <!--2EED9BC16DB34D2B80BA40A21564BECF-->  <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
 <!--2EED9BC16DB34D2B80BA40A21564BECF-->  <ISUSERSTARTABLE><![CDATA[N]]></ISUSERSTARTABLE>
 <!--2EED9BC16DB34D2B80BA40A21564BECF-->  <ISREPORT><![CDATA[N]]></ISREPORT>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml	Tue Mar 08 18:42:40 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml	Tue Mar 08 18:48:17 2011 +0100
@@ -54,7 +54,7 @@
 <!--6707D7449A8D45DB851F608BA88329C8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--6707D7449A8D45DB851F608BA88329C8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--6707D7449A8D45DB851F608BA88329C8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--6707D7449A8D45DB851F608BA88329C8-->  <NAME><![CDATA[Payment Details]]></NAME>
+<!--6707D7449A8D45DB851F608BA88329C8-->  <NAME><![CDATA[Payment Out Details]]></NAME>
 <!--6707D7449A8D45DB851F608BA88329C8-->  <AD_TABLE_ID><![CDATA[DC63963AB3F1489BAAB5A9A7EFD1B407]]></AD_TABLE_ID>
 <!--6707D7449A8D45DB851F608BA88329C8-->  <AD_WINDOW_ID><![CDATA[181]]></AD_WINDOW_ID>
 <!--6707D7449A8D45DB851F608BA88329C8-->  <SEQNO><![CDATA[36]]></SEQNO>
@@ -124,9 +124,9 @@
 <!--A94442B27F664A41BF64735DFA76FB4D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--A94442B27F664A41BF64735DFA76FB4D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A94442B27F664A41BF64735DFA76FB4D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--A94442B27F664A41BF64735DFA76FB4D-->  <NAME><![CDATA[Payment Plan]]></NAME>
-<!--A94442B27F664A41BF64735DFA76FB4D-->  <DESCRIPTION><![CDATA[List of scheduled payments expected against a particular invoice and payment plan associated with that invoice.]]></DESCRIPTION>
-<!--A94442B27F664A41BF64735DFA76FB4D-->  <HELP><![CDATA[List of scheduled payments expected against a particular invoice and payment plan associated with that invoice.]]></HELP>
+<!--A94442B27F664A41BF64735DFA76FB4D-->  <NAME><![CDATA[Payment Out Plan]]></NAME>
+<!--A94442B27F664A41BF64735DFA76FB4D-->  <DESCRIPTION><![CDATA[List of scheduled payments in expected against a particular invoice and payment in plan associated with that invoice.]]></DESCRIPTION>
+<!--A94442B27F664A41BF64735DFA76FB4D-->  <HELP><![CDATA[List of scheduled payments in expected against a particular invoice and payment in plan associated with that invoice.]]></HELP>
 <!--A94442B27F664A41BF64735DFA76FB4D-->  <AD_TABLE_ID><![CDATA[77182DC88AA842D499C01FB0BAE39561]]></AD_TABLE_ID>
 <!--A94442B27F664A41BF64735DFA76FB4D-->  <AD_WINDOW_ID><![CDATA[183]]></AD_WINDOW_ID>
 <!--A94442B27F664A41BF64735DFA76FB4D-->  <SEQNO><![CDATA[32]]></SEQNO>
@@ -148,7 +148,7 @@
 <!--B82C02920AA84E8DB57D553185BD2F06-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--B82C02920AA84E8DB57D553185BD2F06-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--B82C02920AA84E8DB57D553185BD2F06-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--B82C02920AA84E8DB57D553185BD2F06-->  <NAME><![CDATA[Payment Details]]></NAME>
+<!--B82C02920AA84E8DB57D553185BD2F06-->  <NAME><![CDATA[Payment In Details]]></NAME>
 <!--B82C02920AA84E8DB57D553185BD2F06-->  <AD_TABLE_ID><![CDATA[DC63963AB3F1489BAAB5A9A7EFD1B407]]></AD_TABLE_ID>
 <!--B82C02920AA84E8DB57D553185BD2F06-->  <AD_WINDOW_ID><![CDATA[143]]></AD_WINDOW_ID>
 <!--B82C02920AA84E8DB57D553185BD2F06-->  <SEQNO><![CDATA[46]]></SEQNO>
@@ -194,9 +194,9 @@
 <!--EB0466B2A22343F28773B356D292BC7E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--EB0466B2A22343F28773B356D292BC7E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--EB0466B2A22343F28773B356D292BC7E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--EB0466B2A22343F28773B356D292BC7E-->  <NAME><![CDATA[Payment Plan]]></NAME>
-<!--EB0466B2A22343F28773B356D292BC7E-->  <DESCRIPTION><![CDATA[List of scheduled payments expected against a particular invoice and payment plan associated with that invoice.]]></DESCRIPTION>
-<!--EB0466B2A22343F28773B356D292BC7E-->  <HELP><![CDATA[List of scheduled payments expected against a particular invoice and payment plan associated with that invoice.]]></HELP>
+<!--EB0466B2A22343F28773B356D292BC7E-->  <NAME><![CDATA[Payment In Plan]]></NAME>
+<!--EB0466B2A22343F28773B356D292BC7E-->  <DESCRIPTION><![CDATA[List of scheduled payments in expected against a particular invoice and payment in plan associated with that invoice.]]></DESCRIPTION>
+<!--EB0466B2A22343F28773B356D292BC7E-->  <HELP><![CDATA[List of scheduled payments in expected against a particular invoice and payment in plan associated with that invoice.]]></HELP>
 <!--EB0466B2A22343F28773B356D292BC7E-->  <AD_TABLE_ID><![CDATA[77182DC88AA842D499C01FB0BAE39561]]></AD_TABLE_ID>
 <!--EB0466B2A22343F28773B356D292BC7E-->  <AD_WINDOW_ID><![CDATA[167]]></AD_WINDOW_ID>
 <!--EB0466B2A22343F28773B356D292BC7E-->  <SEQNO><![CDATA[50]]></SEQNO>
@@ -218,7 +218,7 @@
 <!--EB0E0C5A58344F7FA345097E7365CD22-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--EB0E0C5A58344F7FA345097E7365CD22-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--EB0E0C5A58344F7FA345097E7365CD22-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--EB0E0C5A58344F7FA345097E7365CD22-->  <NAME><![CDATA[Payment Plan]]></NAME>
+<!--EB0E0C5A58344F7FA345097E7365CD22-->  <NAME><![CDATA[Payment In Plan]]></NAME>
 <!--EB0E0C5A58344F7FA345097E7365CD22-->  <AD_TABLE_ID><![CDATA[70E57DEA195843729FF303C9A71EBCA3]]></AD_TABLE_ID>
 <!--EB0E0C5A58344F7FA345097E7365CD22-->  <AD_WINDOW_ID><![CDATA[143]]></AD_WINDOW_ID>
 <!--EB0E0C5A58344F7FA345097E7365CD22-->  <SEQNO><![CDATA[45]]></SEQNO>
@@ -240,9 +240,9 @@
 <!--F9751D712A804D57B97A36803843F2D7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--F9751D712A804D57B97A36803843F2D7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--F9751D712A804D57B97A36803843F2D7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--F9751D712A804D57B97A36803843F2D7-->  <NAME><![CDATA[Payment Details]]></NAME>
-<!--F9751D712A804D57B97A36803843F2D7-->  <DESCRIPTION><![CDATA[List of payment made details against a particular invoice based on the payment plan]]></DESCRIPTION>
-<!--F9751D712A804D57B97A36803843F2D7-->  <HELP><![CDATA[List of payment made details against a particular invoice based on the payment plan]]></HELP>
+<!--F9751D712A804D57B97A36803843F2D7-->  <NAME><![CDATA[Payment Out Details]]></NAME>
+<!--F9751D712A804D57B97A36803843F2D7-->  <DESCRIPTION><![CDATA[List of payment out made details against a particular invoice based on the payment out plan]]></DESCRIPTION>
+<!--F9751D712A804D57B97A36803843F2D7-->  <HELP><![CDATA[List of payment out made details against a particular invoice based on the payment out plan]]></HELP>
 <!--F9751D712A804D57B97A36803843F2D7-->  <AD_TABLE_ID><![CDATA[DC63963AB3F1489BAAB5A9A7EFD1B407]]></AD_TABLE_ID>
 <!--F9751D712A804D57B97A36803843F2D7-->  <AD_WINDOW_ID><![CDATA[183]]></AD_WINDOW_ID>
 <!--F9751D712A804D57B97A36803843F2D7-->  <SEQNO><![CDATA[33]]></SEQNO>
@@ -264,7 +264,7 @@
 <!--FA57D75B1BBB4583B4A777008A29BF54-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--FA57D75B1BBB4583B4A777008A29BF54-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FA57D75B1BBB4583B4A777008A29BF54-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FA57D75B1BBB4583B4A777008A29BF54-->  <NAME><![CDATA[Payment Plan]]></NAME>
+<!--FA57D75B1BBB4583B4A777008A29BF54-->  <NAME><![CDATA[Payment Out Plan]]></NAME>
 <!--FA57D75B1BBB4583B4A777008A29BF54-->  <AD_TABLE_ID><![CDATA[70E57DEA195843729FF303C9A71EBCA3]]></AD_TABLE_ID>
 <!--FA57D75B1BBB4583B4A777008A29BF54-->  <AD_WINDOW_ID><![CDATA[181]]></AD_WINDOW_ID>
 <!--FA57D75B1BBB4583B4A777008A29BF54-->  <SEQNO><![CDATA[35]]></SEQNO>
@@ -286,9 +286,9 @@
 <!--FD40D9C2F1F14943933DEFEF4A8458E4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--FD40D9C2F1F14943933DEFEF4A8458E4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FD40D9C2F1F14943933DEFEF4A8458E4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FD40D9C2F1F14943933DEFEF4A8458E4-->  <NAME><![CDATA[Payment Details]]></NAME>
-<!--FD40D9C2F1F14943933DEFEF4A8458E4-->  <DESCRIPTION><![CDATA[List of payment made details against a particular invoice based on the payment plan..]]></DESCRIPTION>
-<!--FD40D9C2F1F14943933DEFEF4A8458E4-->  <HELP><![CDATA[List of payment made details against a particular invoice based on the payment plan..]]></HELP>
+<!--FD40D9C2F1F14943933DEFEF4A8458E4-->  <NAME><![CDATA[Payment In Details]]></NAME>
+<!--FD40D9C2F1F14943933DEFEF4A8458E4-->  <DESCRIPTION><![CDATA[List of payment in made details against a particular invoice based on the payment in plan..]]></DESCRIPTION>
+<!--FD40D9C2F1F14943933DEFEF4A8458E4-->  <HELP><![CDATA[List of payment in made details against a particular invoice based on the payment in plan..]]></HELP>
 <!--FD40D9C2F1F14943933DEFEF4A8458E4-->  <AD_TABLE_ID><![CDATA[DC63963AB3F1489BAAB5A9A7EFD1B407]]></AD_TABLE_ID>
 <!--FD40D9C2F1F14943933DEFEF4A8458E4-->  <AD_WINDOW_ID><![CDATA[167]]></AD_WINDOW_ID>
 <!--FD40D9C2F1F14943933DEFEF4A8458E4-->  <SEQNO><![CDATA[51]]></SEQNO>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Tue Mar 08 18:42:40 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Tue Mar 08 18:48:17 2011 +0100
@@ -22,6 +22,17 @@
 <!--00C32E24B51F464FBFF3CFE1AFC2D83C-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--00C32E24B51F464FBFF3CFE1AFC2D83C--></AD_TEXTINTERFACES>
 
+<!--04AE1A356C744C4B9ED883267C718F64--><AD_TEXTINTERFACES>
+<!--04AE1A356C744C4B9ED883267C718F64-->  <AD_TEXTINTERFACES_ID><![CDATA[04AE1A356C744C4B9ED883267C718F64]]></AD_TEXTINTERFACES_ID>
+<!--04AE1A356C744C4B9ED883267C718F64-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--04AE1A356C744C4B9ED883267C718F64-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--04AE1A356C744C4B9ED883267C718F64-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--04AE1A356C744C4B9ED883267C718F64-->  <TEXT><![CDATA[Show payments out for alternative payment methods]]></TEXT>
+<!--04AE1A356C744C4B9ED883267C718F64-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html]]></FILENAME>
+<!--04AE1A356C744C4B9ED883267C718F64-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--04AE1A356C744C4B9ED883267C718F64-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--04AE1A356C744C4B9ED883267C718F64--></AD_TEXTINTERFACES>
+
 <!--053D4ECDDD664B65AF752FDF72B459F0--><AD_TEXTINTERFACES>
 <!--053D4ECDDD664B65AF752FDF72B459F0-->  <AD_TEXTINTERFACES_ID><![CDATA[053D4ECDDD664B65AF752FDF72B459F0]]></AD_TEXTINTERFACES_ID>
 <!--053D4ECDDD664B65AF752FDF72B459F0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -33,6 +44,28 @@
 <!--053D4ECDDD664B65AF752FDF72B459F0-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--053D4ECDDD664B65AF752FDF72B459F0--></AD_TEXTINTERFACES>
 
+<!--057707850D86414383D358619912FFF4--><AD_TEXTINTERFACES>
+<!--057707850D86414383D358619912FFF4-->  <AD_TEXTINTERFACES_ID><![CDATA[057707850D86414383D358619912FFF4]]></AD_TEXTINTERFACES_ID>
+<!--057707850D86414383D358619912FFF4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--057707850D86414383D358619912FFF4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--057707850D86414383D358619912FFF4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--057707850D86414383D358619912FFF4-->  <TEXT><![CDATA[Show payments in for alternative payment methods]]></TEXT>
+<!--057707850D86414383D358619912FFF4-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html]]></FILENAME>
+<!--057707850D86414383D358619912FFF4-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--057707850D86414383D358619912FFF4-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--057707850D86414383D358619912FFF4--></AD_TEXTINTERFACES>
+
+<!--06E1D5A1FD904591B1AA9F22F91062D0--><AD_TEXTINTERFACES>
+<!--06E1D5A1FD904591B1AA9F22F91062D0-->  <AD_TEXTINTERFACES_ID><![CDATA[06E1D5A1FD904591B1AA9F22F91062D0]]></AD_TEXTINTERFACES_ID>
+<!--06E1D5A1FD904591B1AA9F22F91062D0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--06E1D5A1FD904591B1AA9F22F91062D0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--06E1D5A1FD904591B1AA9F22F91062D0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--06E1D5A1FD904591B1AA9F22F91062D0-->  <TEXT><![CDATA[Expected Payment Out]]></TEXT>
+<!--06E1D5A1FD904591B1AA9F22F91062D0-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html]]></FILENAME>
+<!--06E1D5A1FD904591B1AA9F22F91062D0-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--06E1D5A1FD904591B1AA9F22F91062D0-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--06E1D5A1FD904591B1AA9F22F91062D0--></AD_TEXTINTERFACES>
+
 <!--0AF70B48638D440491E23FE689DD39F6--><AD_TEXTINTERFACES>
 <!--0AF70B48638D440491E23FE689DD39F6-->  <AD_TEXTINTERFACES_ID><![CDATA[0AF70B48638D440491E23FE689DD39F6]]></AD_TEXTINTERFACES_ID>
 <!--0AF70B48638D440491E23FE689DD39F6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -66,17 +99,6 @@
 <!--0E2A728824A24A2995EC050F8096BAD0-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--0E2A728824A24A2995EC050F8096BAD0--></AD_TEXTINTERFACES>
 
-<!--0EBE60F1E9D64F53A03EA614EE076AD3--><AD_TEXTINTERFACES>
-<!--0EBE60F1E9D64F53A03EA614EE076AD3-->  <AD_TEXTINTERFACES_ID><![CDATA[0EBE60F1E9D64F53A03EA614EE076AD3]]></AD_TEXTINTERFACES_ID>
-<!--0EBE60F1E9D64F53A03EA614EE076AD3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--0EBE60F1E9D64F53A03EA614EE076AD3-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--0EBE60F1E9D64F53A03EA614EE076AD3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--0EBE60F1E9D64F53A03EA614EE076AD3-->  <TEXT><![CDATA[Add Payment]]></TEXT>
-<!--0EBE60F1E9D64F53A03EA614EE076AD3-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html]]></FILENAME>
-<!--0EBE60F1E9D64F53A03EA614EE076AD3-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--0EBE60F1E9D64F53A03EA614EE076AD3-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--0EBE60F1E9D64F53A03EA614EE076AD3--></AD_TEXTINTERFACES>
-
 <!--1053F842DA714DA499EAB367A22D82DD--><AD_TEXTINTERFACES>
 <!--1053F842DA714DA499EAB367A22D82DD-->  <AD_TEXTINTERFACES_ID><![CDATA[1053F842DA714DA499EAB367A22D82DD]]></AD_TEXTINTERFACES_ID>
 <!--1053F842DA714DA499EAB367A22D82DD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -121,6 +143,17 @@
 <!--16527BFEFA3F4A8381DB9554880F479E-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--16527BFEFA3F4A8381DB9554880F479E--></AD_TEXTINTERFACES>
 
+<!--1820A054E7D64146BCCBED763020349E--><AD_TEXTINTERFACES>
+<!--1820A054E7D64146BCCBED763020349E-->  <AD_TEXTINTERFACES_ID><![CDATA[1820A054E7D64146BCCBED763020349E]]></AD_TEXTINTERFACES_ID>
+<!--1820A054E7D64146BCCBED763020349E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1820A054E7D64146BCCBED763020349E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1820A054E7D64146BCCBED763020349E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1820A054E7D64146BCCBED763020349E-->  <TEXT><![CDATA[Payment In]]></TEXT>
+<!--1820A054E7D64146BCCBED763020349E-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME>
+<!--1820A054E7D64146BCCBED763020349E-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--1820A054E7D64146BCCBED763020349E-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--1820A054E7D64146BCCBED763020349E--></AD_TEXTINTERFACES>
+
 <!--1969CE6E77CA43A38A7E72B3E230FD3D--><AD_TEXTINTERFACES>
 <!--1969CE6E77CA43A38A7E72B3E230FD3D-->  <AD_TEXTINTERFACES_ID><![CDATA[1969CE6E77CA43A38A7E72B3E230FD3D]]></AD_TEXTINTERFACES_ID>
 <!--1969CE6E77CA43A38A7E72B3E230FD3D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -154,6 +187,17 @@
 <!--20780A9A54D1483D89458E1C6C6C0D19-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--20780A9A54D1483D89458E1C6C6C0D19--></AD_TEXTINTERFACES>
 
+<!--2166D682A6024E839AD674C2E9624C37--><AD_TEXTINTERFACES>
+<!--2166D682A6024E839AD674C2E9624C37-->  <AD_TEXTINTERFACES_ID><![CDATA[2166D682A6024E839AD674C2E9624C37]]></AD_TEXTINTERFACES_ID>
+<!--2166D682A6024E839AD674C2E9624C37-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2166D682A6024E839AD674C2E9624C37-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2166D682A6024E839AD674C2E9624C37-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2166D682A6024E839AD674C2E9624C37-->  <TEXT><![CDATA[Payment In/Out Ref.]]></TEXT>
+<!--2166D682A6024E839AD674C2E9624C37-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.html]]></FILENAME>
+<!--2166D682A6024E839AD674C2E9624C37-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--2166D682A6024E839AD674C2E9624C37-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--2166D682A6024E839AD674C2E9624C37--></AD_TEXTINTERFACES>
+
 <!--2285489CD37B46EEB218C777400BBCBA--><AD_TEXTINTERFACES>
 <!--2285489CD37B46EEB218C777400BBCBA-->  <AD_TEXTINTERFACES_ID><![CDATA[2285489CD37B46EEB218C777400BBCBA]]></AD_TEXTINTERFACES_ID>
 <!--2285489CD37B46EEB218C777400BBCBA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -187,6 +231,17 @@
 <!--291442B05D53432092711698F88EBED3-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--291442B05D53432092711698F88EBED3--></AD_TEXTINTERFACES>
 
+<!--2C5CE2CC2FD744088B8E9B81F31899B0--><AD_TEXTINTERFACES>
+<!--2C5CE2CC2FD744088B8E9B81F31899B0-->  <AD_TEXTINTERFACES_ID><![CDATA[2C5CE2CC2FD744088B8E9B81F31899B0]]></AD_TEXTINTERFACES_ID>
+<!--2C5CE2CC2FD744088B8E9B81F31899B0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2C5CE2CC2FD744088B8E9B81F31899B0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2C5CE2CC2FD744088B8E9B81F31899B0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2C5CE2CC2FD744088B8E9B81F31899B0-->  <TEXT><![CDATA[Actual Payment In]]></TEXT>
+<!--2C5CE2CC2FD744088B8E9B81F31899B0-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME>
+<!--2C5CE2CC2FD744088B8E9B81F31899B0-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--2C5CE2CC2FD744088B8E9B81F31899B0-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--2C5CE2CC2FD744088B8E9B81F31899B0--></AD_TEXTINTERFACES>
+
 <!--2E40C3D7C5D7472A9B7F1470E91F8FCD--><AD_TEXTINTERFACES>
 <!--2E40C3D7C5D7472A9B7F1470E91F8FCD-->  <AD_TEXTINTERFACES_ID><![CDATA[2E40C3D7C5D7472A9B7F1470E91F8FCD]]></AD_TEXTINTERFACES_ID>
 <!--2E40C3D7C5D7472A9B7F1470E91F8FCD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -220,17 +275,6 @@
 <!--30E50BD12DB1498B817E07734F7A6D9C-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--30E50BD12DB1498B817E07734F7A6D9C--></AD_TEXTINTERFACES>
 
-<!--30FD2C9F2E334091A536882346F08BCC--><AD_TEXTINTERFACES>
-<!--30FD2C9F2E334091A536882346F08BCC-->  <AD_TEXTINTERFACES_ID><![CDATA[30FD2C9F2E334091A536882346F08BCC]]></AD_TEXTINTERFACES_ID>
-<!--30FD2C9F2E334091A536882346F08BCC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--30FD2C9F2E334091A536882346F08BCC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--30FD2C9F2E334091A536882346F08BCC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--30FD2C9F2E334091A536882346F08BCC-->  <TEXT><![CDATA[Payment Ref.]]></TEXT>
-<!--30FD2C9F2E334091A536882346F08BCC-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.html]]></FILENAME>
-<!--30FD2C9F2E334091A536882346F08BCC-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--30FD2C9F2E334091A536882346F08BCC-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--30FD2C9F2E334091A536882346F08BCC--></AD_TEXTINTERFACES>
-
 <!--31A4C0C03B794C6281EC0B396C678D15--><AD_TEXTINTERFACES>
 <!--31A4C0C03B794C6281EC0B396C678D15-->  <AD_TEXTINTERFACES_ID><![CDATA[31A4C0C03B794C6281EC0B396C678D15]]></AD_TEXTINTERFACES_ID>
 <!--31A4C0C03B794C6281EC0B396C678D15-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -253,17 +297,6 @@
 <!--3276B307A1404A97A4F885E3B26A890C-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--3276B307A1404A97A4F885E3B26A890C--></AD_TEXTINTERFACES>
 
-<!--32F8A8E1B6FE449382834CBEDEA6F68C--><AD_TEXTINTERFACES>
-<!--32F8A8E1B6FE449382834CBEDEA6F68C-->  <AD_TEXTINTERFACES_ID><![CDATA[32F8A8E1B6FE449382834CBEDEA6F68C]]></AD_TEXTINTERFACES_ID>
-<!--32F8A8E1B6FE449382834CBEDEA6F68C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--32F8A8E1B6FE449382834CBEDEA6F68C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--32F8A8E1B6FE449382834CBEDEA6F68C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--32F8A8E1B6FE449382834CBEDEA6F68C-->  <TEXT><![CDATA[Add Payment]]></TEXT>
-<!--32F8A8E1B6FE449382834CBEDEA6F68C-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.html]]></FILENAME>
-<!--32F8A8E1B6FE449382834CBEDEA6F68C-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--32F8A8E1B6FE449382834CBEDEA6F68C-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--32F8A8E1B6FE449382834CBEDEA6F68C--></AD_TEXTINTERFACES>
-
 <!--354E5EF7FCD142078572A472031A4F8D--><AD_TEXTINTERFACES>
 <!--354E5EF7FCD142078572A472031A4F8D-->  <AD_TEXTINTERFACES_ID><![CDATA[354E5EF7FCD142078572A472031A4F8D]]></AD_TEXTINTERFACES_ID>
 <!--354E5EF7FCD142078572A472031A4F8D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -275,6 +308,17 @@
 <!--354E5EF7FCD142078572A472031A4F8D-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--354E5EF7FCD142078572A472031A4F8D--></AD_TEXTINTERFACES>
 
+<!--36BA74187E0C438F89A89FD4D30676AC--><AD_TEXTINTERFACES>
+<!--36BA74187E0C438F89A89FD4D30676AC-->  <AD_TEXTINTERFACES_ID><![CDATA[36BA74187E0C438F89A89FD4D30676AC]]></AD_TEXTINTERFACES_ID>
+<!--36BA74187E0C438F89A89FD4D30676AC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--36BA74187E0C438F89A89FD4D30676AC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--36BA74187E0C438F89A89FD4D30676AC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--36BA74187E0C438F89A89FD4D30676AC-->  <TEXT><![CDATA[Payment Out Document No.]]></TEXT>
+<!--36BA74187E0C438F89A89FD4D30676AC-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME>
+<!--36BA74187E0C438F89A89FD4D30676AC-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--36BA74187E0C438F89A89FD4D30676AC-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--36BA74187E0C438F89A89FD4D30676AC--></AD_TEXTINTERFACES>
+
 <!--37495996C56F4D6D96FA89D5F2944CD4--><AD_TEXTINTERFACES>
 <!--37495996C56F4D6D96FA89D5F2944CD4-->  <AD_TEXTINTERFACES_ID><![CDATA[37495996C56F4D6D96FA89D5F2944CD4]]></AD_TEXTINTERFACES_ID>
 <!--37495996C56F4D6D96FA89D5F2944CD4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -330,6 +374,39 @@
 <!--39362908D8D14439B7D7C230905328CF-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--39362908D8D14439B7D7C230905328CF--></AD_TEXTINTERFACES>
 
+<!--3AE410B1911847BDBFA99B086E0F0F9C--><AD_TEXTINTERFACES>
+<!--3AE410B1911847BDBFA99B086E0F0F9C-->  <AD_TEXTINTERFACES_ID><![CDATA[3AE410B1911847BDBFA99B086E0F0F9C]]></AD_TEXTINTERFACES_ID>
+<!--3AE410B1911847BDBFA99B086E0F0F9C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3AE410B1911847BDBFA99B086E0F0F9C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3AE410B1911847BDBFA99B086E0F0F9C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3AE410B1911847BDBFA99B086E0F0F9C-->  <TEXT><![CDATA[Add Payment In]]></TEXT>
+<!--3AE410B1911847BDBFA99B086E0F0F9C-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME>
+<!--3AE410B1911847BDBFA99B086E0F0F9C-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--3AE410B1911847BDBFA99B086E0F0F9C-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--3AE410B1911847BDBFA99B086E0F0F9C--></AD_TEXTINTERFACES>
+
+<!--3D4ED00E31724B3689031C827E396674--><AD_TEXTINTERFACES>
+<!--3D4ED00E31724B3689031C827E396674-->  <AD_TEXTINTERFACES_ID><![CDATA[3D4ED00E31724B3689031C827E396674]]></AD_TEXTINTERFACES_ID>
+<!--3D4ED00E31724B3689031C827E396674-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3D4ED00E31724B3689031C827E396674-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3D4ED00E31724B3689031C827E396674-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3D4ED00E31724B3689031C827E396674-->  <TEXT><![CDATA[Actual Payment Out]]></TEXT>
+<!--3D4ED00E31724B3689031C827E396674-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME>
+<!--3D4ED00E31724B3689031C827E396674-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--3D4ED00E31724B3689031C827E396674-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--3D4ED00E31724B3689031C827E396674--></AD_TEXTINTERFACES>
+
+<!--3E235DF7E8044CBAAA9B24330FEE18BF--><AD_TEXTINTERFACES>
+<!--3E235DF7E8044CBAAA9B24330FEE18BF-->  <AD_TEXTINTERFACES_ID><![CDATA[3E235DF7E8044CBAAA9B24330FEE18BF]]></AD_TEXTINTERFACES_ID>
+<!--3E235DF7E8044CBAAA9B24330FEE18BF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3E235DF7E8044CBAAA9B24330FEE18BF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3E235DF7E8044CBAAA9B24330FEE18BF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3E235DF7E8044CBAAA9B24330FEE18BF-->  <TEXT><![CDATA[Payment In/Out]]></TEXT>
+<!--3E235DF7E8044CBAAA9B24330FEE18BF-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.html]]></FILENAME>
+<!--3E235DF7E8044CBAAA9B24330FEE18BF-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--3E235DF7E8044CBAAA9B24330FEE18BF-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--3E235DF7E8044CBAAA9B24330FEE18BF--></AD_TEXTINTERFACES>
+
 <!--3E2658BC7DB84BA5927989BB52FD1BF0--><AD_TEXTINTERFACES>
 <!--3E2658BC7DB84BA5927989BB52FD1BF0-->  <AD_TEXTINTERFACES_ID><![CDATA[3E2658BC7DB84BA5927989BB52FD1BF0]]></AD_TEXTINTERFACES_ID>
 <!--3E2658BC7DB84BA5927989BB52FD1BF0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -418,6 +495,17 @@
 <!--4921BB79D5B4482286E9EDA4283D6A3F-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--4921BB79D5B4482286E9EDA4283D6A3F--></AD_TEXTINTERFACES>
 
+<!--4A499F6BC9D14A51B12284E7C7FE2B25--><AD_TEXTINTERFACES>
+<!--4A499F6BC9D14A51B12284E7C7FE2B25-->  <AD_TEXTINTERFACES_ID><![CDATA[4A499F6BC9D14A51B12284E7C7FE2B25]]></AD_TEXTINTERFACES_ID>
+<!--4A499F6BC9D14A51B12284E7C7FE2B25-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4A499F6BC9D14A51B12284E7C7FE2B25-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4A499F6BC9D14A51B12284E7C7FE2B25-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4A499F6BC9D14A51B12284E7C7FE2B25-->  <TEXT><![CDATA[Show payments out for alternative payment methods]]></TEXT>
+<!--4A499F6BC9D14A51B12284E7C7FE2B25-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html]]></FILENAME>
+<!--4A499F6BC9D14A51B12284E7C7FE2B25-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--4A499F6BC9D14A51B12284E7C7FE2B25-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--4A499F6BC9D14A51B12284E7C7FE2B25--></AD_TEXTINTERFACES>
+
 <!--4AC782E2EB4D4CBEA7E3FB93626C195A--><AD_TEXTINTERFACES>
 <!--4AC782E2EB4D4CBEA7E3FB93626C195A-->  <AD_TEXTINTERFACES_ID><![CDATA[4AC782E2EB4D4CBEA7E3FB93626C195A]]></AD_TEXTINTERFACES_ID>
 <!--4AC782E2EB4D4CBEA7E3FB93626C195A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -462,17 +550,6 @@
 <!--4F85512699C241C58A3E7AD76FC4B4C6-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--4F85512699C241C58A3E7AD76FC4B4C6--></AD_TEXTINTERFACES>
 
-<!--50C4DD042F5E49A5A209EBB17A02B7FF--><AD_TEXTINTERFACES>
-<!--50C4DD042F5E49A5A209EBB17A02B7FF-->  <AD_TEXTINTERFACES_ID><![CDATA[50C4DD042F5E49A5A209EBB17A02B7FF]]></AD_TEXTINTERFACES_ID>
-<!--50C4DD042F5E49A5A209EBB17A02B7FF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--50C4DD042F5E49A5A209EBB17A02B7FF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--50C4DD042F5E49A5A209EBB17A02B7FF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--50C4DD042F5E49A5A209EBB17A02B7FF-->  <TEXT><![CDATA[Actual Payment]]></TEXT>
-<!--50C4DD042F5E49A5A209EBB17A02B7FF-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html]]></FILENAME>
-<!--50C4DD042F5E49A5A209EBB17A02B7FF-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--50C4DD042F5E49A5A209EBB17A02B7FF-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--50C4DD042F5E49A5A209EBB17A02B7FF--></AD_TEXTINTERFACES>
-
 <!--549D43D3510845D1965ACD2697B007FA--><AD_TEXTINTERFACES>
 <!--549D43D3510845D1965ACD2697B007FA-->  <AD_TEXTINTERFACES_ID><![CDATA[549D43D3510845D1965ACD2697B007FA]]></AD_TEXTINTERFACES_ID>
 <!--549D43D3510845D1965ACD2697B007FA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -539,6 +616,17 @@
 <!--61655846581A4E85A62483FFD1550C0B-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--61655846581A4E85A62483FFD1550C0B--></AD_TEXTINTERFACES>
 
+<!--622249580CC345A0BF56B73956214EB1--><AD_TEXTINTERFACES>
+<!--622249580CC345A0BF56B73956214EB1-->  <AD_TEXTINTERFACES_ID><![CDATA[622249580CC345A0BF56B73956214EB1]]></AD_TEXTINTERFACES_ID>
+<!--622249580CC345A0BF56B73956214EB1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--622249580CC345A0BF56B73956214EB1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--622249580CC345A0BF56B73956214EB1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--622249580CC345A0BF56B73956214EB1-->  <TEXT><![CDATA[Actual Payment Out]]></TEXT>
+<!--622249580CC345A0BF56B73956214EB1-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html]]></FILENAME>
+<!--622249580CC345A0BF56B73956214EB1-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--622249580CC345A0BF56B73956214EB1-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--622249580CC345A0BF56B73956214EB1--></AD_TEXTINTERFACES>
+
 <!--6233C9B1703E402E90E46301737F37D7--><AD_TEXTINTERFACES>
 <!--6233C9B1703E402E90E46301737F37D7-->  <AD_TEXTINTERFACES_ID><![CDATA[6233C9B1703E402E90E46301737F37D7]]></AD_TEXTINTERFACES_ID>
 <!--6233C9B1703E402E90E46301737F37D7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -572,6 +660,28 @@
 <!--6402E58FEDE74C20988E64541D441CE9-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--6402E58FEDE74C20988E64541D441CE9--></AD_TEXTINTERFACES>
 
+<!--641543349D994F628A62AFD96339F701--><AD_TEXTINTERFACES>
+<!--641543349D994F628A62AFD96339F701-->  <AD_TEXTINTERFACES_ID><![CDATA[641543349D994F628A62AFD96339F701]]></AD_TEXTINTERFACES_ID>
+<!--641543349D994F628A62AFD96339F701-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--641543349D994F628A62AFD96339F701-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--641543349D994F628A62AFD96339F701-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--641543349D994F628A62AFD96339F701-->  <TEXT><![CDATA[Add Payment In]]></TEXT>
+<!--641543349D994F628A62AFD96339F701-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html]]></FILENAME>
+<!--641543349D994F628A62AFD96339F701-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--641543349D994F628A62AFD96339F701-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--641543349D994F628A62AFD96339F701--></AD_TEXTINTERFACES>
+
+<!--642A1A00F883467C95A69612A6F73C90--><AD_TEXTINTERFACES>
+<!--642A1A00F883467C95A69612A6F73C90-->  <AD_TEXTINTERFACES_ID><![CDATA[642A1A00F883467C95A69612A6F73C90]]></AD_TEXTINTERFACES_ID>
+<!--642A1A00F883467C95A69612A6F73C90-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--642A1A00F883467C95A69612A6F73C90-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--642A1A00F883467C95A69612A6F73C90-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--642A1A00F883467C95A69612A6F73C90-->  <TEXT><![CDATA[Expected Payment Out]]></TEXT>
+<!--642A1A00F883467C95A69612A6F73C90-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html]]></FILENAME>
+<!--642A1A00F883467C95A69612A6F73C90-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--642A1A00F883467C95A69612A6F73C90-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--642A1A00F883467C95A69612A6F73C90--></AD_TEXTINTERFACES>
+
 <!--667D14BAF0EA47AB8E81C911C4059D02--><AD_TEXTINTERFACES>
 <!--667D14BAF0EA47AB8E81C911C4059D02-->  <AD_TEXTINTERFACES_ID><![CDATA[667D14BAF0EA47AB8E81C911C4059D02]]></AD_TEXTINTERFACES_ID>
 <!--667D14BAF0EA47AB8E81C911C4059D02-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -605,6 +715,17 @@
 <!--68B66E57BCC34CF78BD7F00532438FEC-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--68B66E57BCC34CF78BD7F00532438FEC--></AD_TEXTINTERFACES>
 
+<!--6C15F01D681E41F5A44037DF48EC7926--><AD_TEXTINTERFACES>
+<!--6C15F01D681E41F5A44037DF48EC7926-->  <AD_TEXTINTERFACES_ID><![CDATA[6C15F01D681E41F5A44037DF48EC7926]]></AD_TEXTINTERFACES_ID>
+<!--6C15F01D681E41F5A44037DF48EC7926-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6C15F01D681E41F5A44037DF48EC7926-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6C15F01D681E41F5A44037DF48EC7926-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6C15F01D681E41F5A44037DF48EC7926-->  <TEXT><![CDATA[Payment In]]></TEXT>
+<!--6C15F01D681E41F5A44037DF48EC7926-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html]]></FILENAME>
+<!--6C15F01D681E41F5A44037DF48EC7926-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--6C15F01D681E41F5A44037DF48EC7926-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--6C15F01D681E41F5A44037DF48EC7926--></AD_TEXTINTERFACES>
+
 <!--6C237ED5003847B998E92860AD1AFC18--><AD_TEXTINTERFACES>
 <!--6C237ED5003847B998E92860AD1AFC18-->  <AD_TEXTINTERFACES_ID><![CDATA[6C237ED5003847B998E92860AD1AFC18]]></AD_TEXTINTERFACES_ID>
 <!--6C237ED5003847B998E92860AD1AFC18-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -715,6 +836,17 @@
 <!--763DCC72FEAD49B69ABA8C7EEE35AB4B-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--763DCC72FEAD49B69ABA8C7EEE35AB4B--></AD_TEXTINTERFACES>
 
+<!--791A5A770CBA456E9CB8BC43B2495935--><AD_TEXTINTERFACES>
+<!--791A5A770CBA456E9CB8BC43B2495935-->  <AD_TEXTINTERFACES_ID><![CDATA[791A5A770CBA456E9CB8BC43B2495935]]></AD_TEXTINTERFACES_ID>
+<!--791A5A770CBA456E9CB8BC43B2495935-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--791A5A770CBA456E9CB8BC43B2495935-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--791A5A770CBA456E9CB8BC43B2495935-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--791A5A770CBA456E9CB8BC43B2495935-->  <TEXT><![CDATA[Add Payment Out]]></TEXT>
+<!--791A5A770CBA456E9CB8BC43B2495935-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html]]></FILENAME>
+<!--791A5A770CBA456E9CB8BC43B2495935-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--791A5A770CBA456E9CB8BC43B2495935-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--791A5A770CBA456E9CB8BC43B2495935--></AD_TEXTINTERFACES>
+
 <!--7A2F80682E4D44568B2BDF1F7D41E935--><AD_TEXTINTERFACES>
 <!--7A2F80682E4D44568B2BDF1F7D41E935-->  <AD_TEXTINTERFACES_ID><![CDATA[7A2F80682E4D44568B2BDF1F7D41E935]]></AD_TEXTINTERFACES_ID>
 <!--7A2F80682E4D44568B2BDF1F7D41E935-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -781,39 +913,6 @@
 <!--7ED6FC64149A58B3E040007F01007327-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--7ED6FC64149A58B3E040007F01007327--></AD_TEXTINTERFACES>
 
-<!--7F2DE504A57A62C9E040007F01005F8F--><AD_TEXTINTERFACES>
-<!--7F2DE504A57A62C9E040007F01005F8F-->  <AD_TEXTINTERFACES_ID><![CDATA[7F2DE504A57A62C9E040007F01005F8F]]></AD_TEXTINTERFACES_ID>
-<!--7F2DE504A57A62C9E040007F01005F8F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--7F2DE504A57A62C9E040007F01005F8F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--7F2DE504A57A62C9E040007F01005F8F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--7F2DE504A57A62C9E040007F01005F8F-->  <TEXT><![CDATA[Payment Document No.]]></TEXT>
-<!--7F2DE504A57A62C9E040007F01005F8F-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html]]></FILENAME>
-<!--7F2DE504A57A62C9E040007F01005F8F-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--7F2DE504A57A62C9E040007F01005F8F-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--7F2DE504A57A62C9E040007F01005F8F--></AD_TEXTINTERFACES>
-
-<!--7FCABF4ECC015B45E040007F010006FB--><AD_TEXTINTERFACES>
-<!--7FCABF4ECC015B45E040007F010006FB-->  <AD_TEXTINTERFACES_ID><![CDATA[7FCABF4ECC015B45E040007F010006FB]]></AD_TEXTINTERFACES_ID>
-<!--7FCABF4ECC015B45E040007F010006FB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--7FCABF4ECC015B45E040007F010006FB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--7FCABF4ECC015B45E040007F010006FB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--7FCABF4ECC015B45E040007F010006FB-->  <TEXT><![CDATA[Add Payment]]></TEXT>
-<!--7FCABF4ECC015B45E040007F010006FB-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html]]></FILENAME>
-<!--7FCABF4ECC015B45E040007F010006FB-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--7FCABF4ECC015B45E040007F010006FB-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--7FCABF4ECC015B45E040007F010006FB--></AD_TEXTINTERFACES>
-
-<!--7FCABF4ECC075B45E040007F010006FB--><AD_TEXTINTERFACES>
-<!--7FCABF4ECC075B45E040007F010006FB-->  <AD_TEXTINTERFACES_ID><![CDATA[7FCABF4ECC075B45E040007F010006FB]]></AD_TEXTINTERFACES_ID>
-<!--7FCABF4ECC075B45E040007F010006FB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--7FCABF4ECC075B45E040007F010006FB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--7FCABF4ECC075B45E040007F010006FB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--7FCABF4ECC075B45E040007F010006FB-->  <TEXT><![CDATA[Expected Payment]]></TEXT>
-<!--7FCABF4ECC075B45E040007F010006FB-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html]]></FILENAME>
-<!--7FCABF4ECC075B45E040007F010006FB-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--7FCABF4ECC075B45E040007F010006FB-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--7FCABF4ECC075B45E040007F010006FB--></AD_TEXTINTERFACES>
-
 <!--7FCABF4ECC195B45E040007F010006FB--><AD_TEXTINTERFACES>
 <!--7FCABF4ECC195B45E040007F010006FB-->  <AD_TEXTINTERFACES_ID><![CDATA[7FCABF4ECC195B45E040007F010006FB]]></AD_TEXTINTERFACES_ID>
 <!--7FCABF4ECC195B45E040007F010006FB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -946,17 +1045,6 @@
 <!--7FCB8195C2DD955EE040007F01002DC4-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--7FCB8195C2DD955EE040007F01002DC4--></AD_TEXTINTERFACES>
 
-<!--80D3D5205299DE5AE040007F01001812--><AD_TEXTINTERFACES>
-<!--80D3D5205299DE5AE040007F01001812-->  <AD_TEXTINTERFACES_ID><![CDATA[80D3D5205299DE5AE040007F01001812]]></AD_TEXTINTERFACES_ID>
-<!--80D3D5205299DE5AE040007F01001812-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--80D3D5205299DE5AE040007F01001812-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--80D3D5205299DE5AE040007F01001812-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--80D3D5205299DE5AE040007F01001812-->  <TEXT><![CDATA[Select additional purchase invoices or purchase orders that you want to add to this payment]]></TEXT>
-<!--80D3D5205299DE5AE040007F01001812-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html]]></FILENAME>
-<!--80D3D5205299DE5AE040007F01001812-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--80D3D5205299DE5AE040007F01001812-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--80D3D5205299DE5AE040007F01001812--></AD_TEXTINTERFACES>
-
 <!--80E601570783ADBBE040007F01005FAE--><AD_TEXTINTERFACES>
 <!--80E601570783ADBBE040007F01005FAE-->  <AD_TEXTINTERFACES_ID><![CDATA[80E601570783ADBBE040007F01005FAE]]></AD_TEXTINTERFACES_ID>
 <!--80E601570783ADBBE040007F01005FAE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1122,6 +1210,17 @@
 <!--824388E12E2E4FBEBD3E12CBAD6E97F7-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--824388E12E2E4FBEBD3E12CBAD6E97F7--></AD_TEXTINTERFACES>
 
+<!--82A2A2A618774C3A9E2E54EBE0A6B882--><AD_TEXTINTERFACES>
+<!--82A2A2A618774C3A9E2E54EBE0A6B882-->  <AD_TEXTINTERFACES_ID><![CDATA[82A2A2A618774C3A9E2E54EBE0A6B882]]></AD_TEXTINTERFACES_ID>
+<!--82A2A2A618774C3A9E2E54EBE0A6B882-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--82A2A2A618774C3A9E2E54EBE0A6B882-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--82A2A2A618774C3A9E2E54EBE0A6B882-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--82A2A2A618774C3A9E2E54EBE0A6B882-->  <TEXT><![CDATA[Payment In Document No.]]></TEXT>
+<!--82A2A2A618774C3A9E2E54EBE0A6B882-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME>
+<!--82A2A2A618774C3A9E2E54EBE0A6B882-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--82A2A2A618774C3A9E2E54EBE0A6B882-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--82A2A2A618774C3A9E2E54EBE0A6B882--></AD_TEXTINTERFACES>
+
 <!--830FA1141953448A9C61821616C9421E--><AD_TEXTINTERFACES>
 <!--830FA1141953448A9C61821616C9421E-->  <AD_TEXTINTERFACES_ID><![CDATA[830FA1141953448A9C61821616C9421E]]></AD_TEXTINTERFACES_ID>
 <!--830FA1141953448A9C61821616C9421E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1144,6 +1243,17 @@
 <!--833BFA5F74CC4EFC8642DFEA58B3A22C-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--833BFA5F74CC4EFC8642DFEA58B3A22C--></AD_TEXTINTERFACES>
 
+<!--8378DF86635543E4BA0B172C0AA53A6C--><AD_TEXTINTERFACES>
+<!--8378DF86635543E4BA0B172C0AA53A6C-->  <AD_TEXTINTERFACES_ID><![CDATA[8378DF86635543E4BA0B172C0AA53A6C]]></AD_TEXTINTERFACES_ID>
+<!--8378DF86635543E4BA0B172C0AA53A6C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8378DF86635543E4BA0B172C0AA53A6C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8378DF86635543E4BA0B172C0AA53A6C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8378DF86635543E4BA0B172C0AA53A6C-->  <TEXT><![CDATA[Payment Out]]></TEXT>
+<!--8378DF86635543E4BA0B172C0AA53A6C-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html]]></FILENAME>
+<!--8378DF86635543E4BA0B172C0AA53A6C-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--8378DF86635543E4BA0B172C0AA53A6C-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--8378DF86635543E4BA0B172C0AA53A6C--></AD_TEXTINTERFACES>
+
 <!--8410F4A3878C872EE040007F010014BF--><AD_TEXTINTERFACES>
 <!--8410F4A3878C872EE040007F010014BF-->  <AD_TEXTINTERFACES_ID><![CDATA[8410F4A3878C872EE040007F010014BF]]></AD_TEXTINTERFACES_ID>
 <!--8410F4A3878C872EE040007F010014BF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1309,17 +1419,6 @@
 <!--8549502AAE224052E040007F0101680D-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--8549502AAE224052E040007F0101680D--></AD_TEXTINTERFACES>
 
-<!--85718201D5ADB0ADE040007F01006455--><AD_TEXTINTERFACES>
-<!--85718201D5ADB0ADE040007F01006455-->  <AD_TEXTINTERFACES_ID><![CDATA[85718201D5ADB0ADE040007F01006455]]></AD_TEXTINTERFACES_ID>
-<!--85718201D5ADB0ADE040007F01006455-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--85718201D5ADB0ADE040007F01006455-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--85718201D5ADB0ADE040007F01006455-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--85718201D5ADB0ADE040007F01006455-->  <TEXT><![CDATA[Add Payment]]></TEXT>
-<!--85718201D5ADB0ADE040007F01006455-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME>
-<!--85718201D5ADB0ADE040007F01006455-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--85718201D5ADB0ADE040007F01006455-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--85718201D5ADB0ADE040007F01006455--></AD_TEXTINTERFACES>
-
 <!--85718201D5AFB0ADE040007F01006455--><AD_TEXTINTERFACES>
 <!--85718201D5AFB0ADE040007F01006455-->  <AD_TEXTINTERFACES_ID><![CDATA[85718201D5AFB0ADE040007F01006455]]></AD_TEXTINTERFACES_ID>
 <!--85718201D5AFB0ADE040007F01006455-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1342,17 +1441,6 @@
 <!--85718201D5B1B0ADE040007F01006455-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--85718201D5B1B0ADE040007F01006455--></AD_TEXTINTERFACES>
 
-<!--85718201D5B3B0ADE040007F01006455--><AD_TEXTINTERFACES>
-<!--85718201D5B3B0ADE040007F01006455-->  <AD_TEXTINTERFACES_ID><![CDATA[85718201D5B3B0ADE040007F01006455]]></AD_TEXTINTERFACES_ID>
-<!--85718201D5B3B0ADE040007F01006455-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--85718201D5B3B0ADE040007F01006455-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--85718201D5B3B0ADE040007F01006455-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--85718201D5B3B0ADE040007F01006455-->  <TEXT><![CDATA[Payment Document No.]]></TEXT>
-<!--85718201D5B3B0ADE040007F01006455-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME>
-<!--85718201D5B3B0ADE040007F01006455-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--85718201D5B3B0ADE040007F01006455-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--85718201D5B3B0ADE040007F01006455--></AD_TEXTINTERFACES>
-
 <!--85718201D5BDB0ADE040007F01006455--><AD_TEXTINTERFACES>
 <!--85718201D5BDB0ADE040007F01006455-->  <AD_TEXTINTERFACES_ID><![CDATA[85718201D5BDB0ADE040007F01006455]]></AD_TEXTINTERFACES_ID>
 <!--85718201D5BDB0ADE040007F01006455-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1364,61 +1452,6 @@
 <!--85718201D5BDB0ADE040007F01006455-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--85718201D5BDB0ADE040007F01006455--></AD_TEXTINTERFACES>
 
-<!--85718201D5C3B0ADE040007F01006455--><AD_TEXTINTERFACES>
-<!--85718201D5C3B0ADE040007F01006455-->  <AD_TEXTINTERFACES_ID><![CDATA[85718201D5C3B0ADE040007F01006455]]></AD_TEXTINTERFACES_ID>
-<!--85718201D5C3B0ADE040007F01006455-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--85718201D5C3B0ADE040007F01006455-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--85718201D5C3B0ADE040007F01006455-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--85718201D5C3B0ADE040007F01006455-->  <TEXT><![CDATA[Expected Payment]]></TEXT>
-<!--85718201D5C3B0ADE040007F01006455-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME>
-<!--85718201D5C3B0ADE040007F01006455-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--85718201D5C3B0ADE040007F01006455-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--85718201D5C3B0ADE040007F01006455--></AD_TEXTINTERFACES>
-
-<!--85718201D5C5B0ADE040007F01006455--><AD_TEXTINTERFACES>
-<!--85718201D5C5B0ADE040007F01006455-->  <AD_TEXTINTERFACES_ID><![CDATA[85718201D5C5B0ADE040007F01006455]]></AD_TEXTINTERFACES_ID>
-<!--85718201D5C5B0ADE040007F01006455-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--85718201D5C5B0ADE040007F01006455-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--85718201D5C5B0ADE040007F01006455-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--85718201D5C5B0ADE040007F01006455-->  <TEXT><![CDATA[Actual Payment]]></TEXT>
-<!--85718201D5C5B0ADE040007F01006455-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME>
-<!--85718201D5C5B0ADE040007F01006455-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--85718201D5C5B0ADE040007F01006455-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--85718201D5C5B0ADE040007F01006455--></AD_TEXTINTERFACES>
-
-<!--85718201D5C7B0ADE040007F01006455--><AD_TEXTINTERFACES>
-<!--85718201D5C7B0ADE040007F01006455-->  <AD_TEXTINTERFACES_ID><![CDATA[85718201D5C7B0ADE040007F01006455]]></AD_TEXTINTERFACES_ID>
-<!--85718201D5C7B0ADE040007F01006455-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--85718201D5C7B0ADE040007F01006455-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--85718201D5C7B0ADE040007F01006455-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--85718201D5C7B0ADE040007F01006455-->  <TEXT><![CDATA[Payment Date]]></TEXT>
-<!--85718201D5C7B0ADE040007F01006455-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME>
-<!--85718201D5C7B0ADE040007F01006455-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--85718201D5C7B0ADE040007F01006455-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--85718201D5C7B0ADE040007F01006455--></AD_TEXTINTERFACES>
-
-<!--85718201D5C9B0ADE040007F01006455--><AD_TEXTINTERFACES>
-<!--85718201D5C9B0ADE040007F01006455-->  <AD_TEXTINTERFACES_ID><![CDATA[85718201D5C9B0ADE040007F01006455]]></AD_TEXTINTERFACES_ID>
-<!--85718201D5C9B0ADE040007F01006455-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--85718201D5C9B0ADE040007F01006455-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--85718201D5C9B0ADE040007F01006455-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--85718201D5C9B0ADE040007F01006455-->  <TEXT><![CDATA[Select additional sales invoices or sales orders that you want to add to this payment]]></TEXT>
-<!--85718201D5C9B0ADE040007F01006455-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME>
-<!--85718201D5C9B0ADE040007F01006455-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--85718201D5C9B0ADE040007F01006455-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--85718201D5C9B0ADE040007F01006455--></AD_TEXTINTERFACES>
-
-<!--85718201D5CBB0ADE040007F01006455--><AD_TEXTINTERFACES>
-<!--85718201D5CBB0ADE040007F01006455-->  <AD_TEXTINTERFACES_ID><![CDATA[85718201D5CBB0ADE040007F01006455]]></AD_TEXTINTERFACES_ID>
-<!--85718201D5CBB0ADE040007F01006455-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--85718201D5CBB0ADE040007F01006455-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--85718201D5CBB0ADE040007F01006455-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--85718201D5CBB0ADE040007F01006455-->  <TEXT><![CDATA[Select additional purchase invoices or purchase orders that you want to add to this payment]]></TEXT>
-<!--85718201D5CBB0ADE040007F01006455-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME>
-<!--85718201D5CBB0ADE040007F01006455-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--85718201D5CBB0ADE040007F01006455-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--85718201D5CBB0ADE040007F01006455--></AD_TEXTINTERFACES>
-
 <!--85718201D5D1B0ADE040007F01006455--><AD_TEXTINTERFACES>
 <!--85718201D5D1B0ADE040007F01006455-->  <AD_TEXTINTERFACES_ID><![CDATA[85718201D5D1B0ADE040007F01006455]]></AD_TEXTINTERFACES_ID>
 <!--85718201D5D1B0ADE040007F01006455-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1584,28 +1617,6 @@
 <!--85AE903D1D3372B0E040007F01002083-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--85AE903D1D3372B0E040007F01002083--></AD_TEXTINTERFACES>
 
-<!--85C47520D1FCC9EAE040007F01002002--><AD_TEXTINTERFACES>
-<!--85C47520D1FCC9EAE040007F01002002-->  <AD_TEXTINTERFACES_ID><![CDATA[85C47520D1FCC9EAE040007F01002002]]></AD_TEXTINTERFACES_ID>
-<!--85C47520D1FCC9EAE040007F01002002-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--85C47520D1FCC9EAE040007F01002002-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--85C47520D1FCC9EAE040007F01002002-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--85C47520D1FCC9EAE040007F01002002-->  <TEXT><![CDATA[Select sales orders, invoices or GL Items that you want to match to this payment]]></TEXT>
-<!--85C47520D1FCC9EAE040007F01002002-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html]]></FILENAME>
-<!--85C47520D1FCC9EAE040007F01002002-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--85C47520D1FCC9EAE040007F01002002-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--85C47520D1FCC9EAE040007F01002002--></AD_TEXTINTERFACES>
-
-<!--85C47520D1FEC9EAE040007F01002002--><AD_TEXTINTERFACES>
-<!--85C47520D1FEC9EAE040007F01002002-->  <AD_TEXTINTERFACES_ID><![CDATA[85C47520D1FEC9EAE040007F01002002]]></AD_TEXTINTERFACES_ID>
-<!--85C47520D1FEC9EAE040007F01002002-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--85C47520D1FEC9EAE040007F01002002-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--85C47520D1FEC9EAE040007F01002002-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--85C47520D1FEC9EAE040007F01002002-->  <TEXT><![CDATA[Select purchase orders, invoices or GL Items that you want to match to this payment]]></TEXT>
-<!--85C47520D1FEC9EAE040007F01002002-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html]]></FILENAME>
-<!--85C47520D1FEC9EAE040007F01002002-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--85C47520D1FEC9EAE040007F01002002-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--85C47520D1FEC9EAE040007F01002002--></AD_TEXTINTERFACES>
-
 <!--85C47520D200C9EAE040007F01002002--><AD_TEXTINTERFACES>
 <!--85C47520D200C9EAE040007F01002002-->  <AD_TEXTINTERFACES_ID><![CDATA[85C47520D200C9EAE040007F01002002]]></AD_TEXTINTERFACES_ID>
 <!--85C47520D200C9EAE040007F01002002-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1705,6 +1716,17 @@
 <!--8A63AFFF170841A093E1D677F11A8F06-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--8A63AFFF170841A093E1D677F11A8F06--></AD_TEXTINTERFACES>
 
+<!--90800D9E80B1497EBB3AF0E38C14A98F--><AD_TEXTINTERFACES>
+<!--90800D9E80B1497EBB3AF0E38C14A98F-->  <AD_TEXTINTERFACES_ID><![CDATA[90800D9E80B1497EBB3AF0E38C14A98F]]></AD_TEXTINTERFACES_ID>
+<!--90800D9E80B1497EBB3AF0E38C14A98F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--90800D9E80B1497EBB3AF0E38C14A98F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--90800D9E80B1497EBB3AF0E38C14A98F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--90800D9E80B1497EBB3AF0E38C14A98F-->  <TEXT><![CDATA[Select additional purchase invoices or purchase orders that you want to add to this payment out]]></TEXT>
+<!--90800D9E80B1497EBB3AF0E38C14A98F-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html]]></FILENAME>
+<!--90800D9E80B1497EBB3AF0E38C14A98F-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--90800D9E80B1497EBB3AF0E38C14A98F-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--90800D9E80B1497EBB3AF0E38C14A98F--></AD_TEXTINTERFACES>
+
 <!--91709F28D5A5483782CBF452932312C9--><AD_TEXTINTERFACES>
 <!--91709F28D5A5483782CBF452932312C9-->  <AD_TEXTINTERFACES_ID><![CDATA[91709F28D5A5483782CBF452932312C9]]></AD_TEXTINTERFACES_ID>
 <!--91709F28D5A5483782CBF452932312C9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1793,27 +1815,16 @@
 <!--941752B6DDB7231BE040007F0100437B-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--941752B6DDB7231BE040007F0100437B--></AD_TEXTINTERFACES>
 
-<!--943DE05852BB1276E040007F01007CEB--><AD_TEXTINTERFACES>
-<!--943DE05852BB1276E040007F01007CEB-->  <AD_TEXTINTERFACES_ID><![CDATA[943DE05852BB1276E040007F01007CEB]]></AD_TEXTINTERFACES_ID>
-<!--943DE05852BB1276E040007F01007CEB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--943DE05852BB1276E040007F01007CEB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--943DE05852BB1276E040007F01007CEB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--943DE05852BB1276E040007F01007CEB-->  <TEXT><![CDATA[Show payments for alternative payment methods]]></TEXT>
-<!--943DE05852BB1276E040007F01007CEB-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html]]></FILENAME>
-<!--943DE05852BB1276E040007F01007CEB-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--943DE05852BB1276E040007F01007CEB-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--943DE05852BB1276E040007F01007CEB--></AD_TEXTINTERFACES>
-
-<!--943DE05852BE1276E040007F01007CEB--><AD_TEXTINTERFACES>
-<!--943DE05852BE1276E040007F01007CEB-->  <AD_TEXTINTERFACES_ID><![CDATA[943DE05852BE1276E040007F01007CEB]]></AD_TEXTINTERFACES_ID>
-<!--943DE05852BE1276E040007F01007CEB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--943DE05852BE1276E040007F01007CEB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--943DE05852BE1276E040007F01007CEB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--943DE05852BE1276E040007F01007CEB-->  <TEXT><![CDATA[Show payments for alternative payment methods]]></TEXT>
-<!--943DE05852BE1276E040007F01007CEB-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html]]></FILENAME>
-<!--943DE05852BE1276E040007F01007CEB-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--943DE05852BE1276E040007F01007CEB-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--943DE05852BE1276E040007F01007CEB--></AD_TEXTINTERFACES>
+<!--945579C3A7E747AFB642ABF90F145A73--><AD_TEXTINTERFACES>
+<!--945579C3A7E747AFB642ABF90F145A73-->  <AD_TEXTINTERFACES_ID><![CDATA[945579C3A7E747AFB642ABF90F145A73]]></AD_TEXTINTERFACES_ID>
+<!--945579C3A7E747AFB642ABF90F145A73-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--945579C3A7E747AFB642ABF90F145A73-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--945579C3A7E747AFB642ABF90F145A73-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--945579C3A7E747AFB642ABF90F145A73-->  <TEXT><![CDATA[Payment In Date]]></TEXT>
+<!--945579C3A7E747AFB642ABF90F145A73-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME>
+<!--945579C3A7E747AFB642ABF90F145A73-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--945579C3A7E747AFB642ABF90F145A73-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--945579C3A7E747AFB642ABF90F145A73--></AD_TEXTINTERFACES>
 
 <!--949AA49A4D7C6BEAE040007F0100565C--><AD_TEXTINTERFACES>
 <!--949AA49A4D7C6BEAE040007F0100565C-->  <AD_TEXTINTERFACES_ID><![CDATA[949AA49A4D7C6BEAE040007F0100565C]]></AD_TEXTINTERFACES_ID>
@@ -1947,6 +1958,17 @@
 <!--972DE4AEBFD54C43B8042F289015F5FF-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--972DE4AEBFD54C43B8042F289015F5FF--></AD_TEXTINTERFACES>
 
+<!--97A3D5E93D0146F0A0540BA149BD3A11--><AD_TEXTINTERFACES>
+<!--97A3D5E93D0146F0A0540BA149BD3A11-->  <AD_TEXTINTERFACES_ID><![CDATA[97A3D5E93D0146F0A0540BA149BD3A11]]></AD_TEXTINTERFACES_ID>
+<!--97A3D5E93D0146F0A0540BA149BD3A11-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--97A3D5E93D0146F0A0540BA149BD3A11-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--97A3D5E93D0146F0A0540BA149BD3A11-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--97A3D5E93D0146F0A0540BA149BD3A11-->  <TEXT><![CDATA[Payment In Date]]></TEXT>
+<!--97A3D5E93D0146F0A0540BA149BD3A11-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html]]></FILENAME>
+<!--97A3D5E93D0146F0A0540BA149BD3A11-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--97A3D5E93D0146F0A0540BA149BD3A11-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--97A3D5E93D0146F0A0540BA149BD3A11--></AD_TEXTINTERFACES>
+
 <!--981774F92A97472A8A1FC51CA5B22837--><AD_TEXTINTERFACES>
 <!--981774F92A97472A8A1FC51CA5B22837-->  <AD_TEXTINTERFACES_ID><![CDATA[981774F92A97472A8A1FC51CA5B22837]]></AD_TEXTINTERFACES_ID>
 <!--981774F92A97472A8A1FC51CA5B22837-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2013,6 +2035,28 @@
 <!--9F4572C44CCA4FF2B4270B084382D60E-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--9F4572C44CCA4FF2B4270B084382D60E--></AD_TEXTINTERFACES>
 
+<!--A10EB825614A42CAA40D151B79763680--><AD_TEXTINTERFACES>
+<!--A10EB825614A42CAA40D151B79763680-->  <AD_TEXTINTERFACES_ID><![CDATA[A10EB825614A42CAA40D151B79763680]]></AD_TEXTINTERFACES_ID>
+<!--A10EB825614A42CAA40D151B79763680-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A10EB825614A42CAA40D151B79763680-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A10EB825614A42CAA40D151B79763680-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A10EB825614A42CAA40D151B79763680-->  <TEXT><![CDATA[Payment Out]]></TEXT>
+<!--A10EB825614A42CAA40D151B79763680-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html]]></FILENAME>
+<!--A10EB825614A42CAA40D151B79763680-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--A10EB825614A42CAA40D151B79763680-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--A10EB825614A42CAA40D151B79763680--></AD_TEXTINTERFACES>
+
+<!--A16BAF6A6B0B4A8F9D8BBFA4695E310C--><AD_TEXTINTERFACES>
+<!--A16BAF6A6B0B4A8F9D8BBFA4695E310C-->  <AD_TEXTINTERFACES_ID><![CDATA[A16BAF6A6B0B4A8F9D8BBFA4695E310C]]></AD_TEXTINTERFACES_ID>
+<!--A16BAF6A6B0B4A8F9D8BBFA4695E310C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A16BAF6A6B0B4A8F9D8BBFA4695E310C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A16BAF6A6B0B4A8F9D8BBFA4695E310C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A16BAF6A6B0B4A8F9D8BBFA4695E310C-->  <TEXT><![CDATA[Add Payment In/Out]]></TEXT>
+<!--A16BAF6A6B0B4A8F9D8BBFA4695E310C-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.html]]></FILENAME>
+<!--A16BAF6A6B0B4A8F9D8BBFA4695E310C-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--A16BAF6A6B0B4A8F9D8BBFA4695E310C-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--A16BAF6A6B0B4A8F9D8BBFA4695E310C--></AD_TEXTINTERFACES>
+
 <!--A16D40CBB17E473799C90DD16E9EC7F0--><AD_TEXTINTERFACES>
 <!--A16D40CBB17E473799C90DD16E9EC7F0-->  <AD_TEXTINTERFACES_ID><![CDATA[A16D40CBB17E473799C90DD16E9EC7F0]]></AD_TEXTINTERFACES_ID>
 <!--A16D40CBB17E473799C90DD16E9EC7F0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2024,6 +2068,17 @@
 <!--A16D40CBB17E473799C90DD16E9EC7F0-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--A16D40CBB17E473799C90DD16E9EC7F0--></AD_TEXTINTERFACES>
 
+<!--A2C53159E26643FCBC39501FD7AF2A23--><AD_TEXTINTERFACES>
+<!--A2C53159E26643FCBC39501FD7AF2A23-->  <AD_TEXTINTERFACES_ID><![CDATA[A2C53159E26643FCBC39501FD7AF2A23]]></AD_TEXTINTERFACES_ID>
+<!--A2C53159E26643FCBC39501FD7AF2A23-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A2C53159E26643FCBC39501FD7AF2A23-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A2C53159E26643FCBC39501FD7AF2A23-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A2C53159E26643FCBC39501FD7AF2A23-->  <TEXT><![CDATA[Select additional purchase invoices or purchase orders that you want to add to this payment out]]></TEXT>
+<!--A2C53159E26643FCBC39501FD7AF2A23-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME>
+<!--A2C53159E26643FCBC39501FD7AF2A23-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--A2C53159E26643FCBC39501FD7AF2A23-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--A2C53159E26643FCBC39501FD7AF2A23--></AD_TEXTINTERFACES>
+
 <!--A2E3CEC67D004E7C9BADAB2FD4719E8F--><AD_TEXTINTERFACES>
 <!--A2E3CEC67D004E7C9BADAB2FD4719E8F-->  <AD_TEXTINTERFACES_ID><![CDATA[A2E3CEC67D004E7C9BADAB2FD4719E8F]]></AD_TEXTINTERFACES_ID>
 <!--A2E3CEC67D004E7C9BADAB2FD4719E8F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2068,6 +2123,17 @@
 <!--A4F91D28E3AB4C0EA9ACCA40899141C3-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--A4F91D28E3AB4C0EA9ACCA40899141C3--></AD_TEXTINTERFACES>
 
+<!--A5CF1846079747428154B11860AE2F6E--><AD_TEXTINTERFACES>
+<!--A5CF1846079747428154B11860AE2F6E-->  <AD_TEXTINTERFACES_ID><![CDATA[A5CF1846079747428154B11860AE2F6E]]></AD_TEXTINTERFACES_ID>
+<!--A5CF1846079747428154B11860AE2F6E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A5CF1846079747428154B11860AE2F6E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A5CF1846079747428154B11860AE2F6E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A5CF1846079747428154B11860AE2F6E-->  <TEXT><![CDATA[Payment In]]></TEXT>
+<!--A5CF1846079747428154B11860AE2F6E-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html]]></FILENAME>
+<!--A5CF1846079747428154B11860AE2F6E-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--A5CF1846079747428154B11860AE2F6E-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--A5CF1846079747428154B11860AE2F6E--></AD_TEXTINTERFACES>
+
 <!--A8C9A7A0B28D4C94B22CD692E33136CC--><AD_TEXTINTERFACES>
 <!--A8C9A7A0B28D4C94B22CD692E33136CC-->  <AD_TEXTINTERFACES_ID><![CDATA[A8C9A7A0B28D4C94B22CD692E33136CC]]></AD_TEXTINTERFACES_ID>
 <!--A8C9A7A0B28D4C94B22CD692E33136CC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2090,6 +2156,17 @@
 <!--AAE3622DC9124C86B629E0B30D580767-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--AAE3622DC9124C86B629E0B30D580767--></AD_TEXTINTERFACES>
 
+<!--AB0CA5979B6D4BE5B041B1BA6000A87A--><AD_TEXTINTERFACES>
+<!--AB0CA5979B6D4BE5B041B1BA6000A87A-->  <AD_TEXTINTERFACES_ID><![CDATA[AB0CA5979B6D4BE5B041B1BA6000A87A]]></AD_TEXTINTERFACES_ID>
+<!--AB0CA5979B6D4BE5B041B1BA6000A87A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--AB0CA5979B6D4BE5B041B1BA6000A87A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--AB0CA5979B6D4BE5B041B1BA6000A87A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--AB0CA5979B6D4BE5B041B1BA6000A87A-->  <TEXT><![CDATA[Payment Out Date]]></TEXT>
+<!--AB0CA5979B6D4BE5B041B1BA6000A87A-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html]]></FILENAME>
+<!--AB0CA5979B6D4BE5B041B1BA6000A87A-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--AB0CA5979B6D4BE5B041B1BA6000A87A-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--AB0CA5979B6D4BE5B041B1BA6000A87A--></AD_TEXTINTERFACES>
+
 <!--AC02A8EF9F4F4FF6A8011C70A0F8553C--><AD_TEXTINTERFACES>
 <!--AC02A8EF9F4F4FF6A8011C70A0F8553C-->  <AD_TEXTINTERFACES_ID><![CDATA[AC02A8EF9F4F4FF6A8011C70A0F8553C]]></AD_TEXTINTERFACES_ID>
 <!--AC02A8EF9F4F4FF6A8011C70A0F8553C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2112,6 +2189,28 @@
 <!--AF139B1C12C0477AB902B9DF23D53779-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--AF139B1C12C0477AB902B9DF23D53779--></AD_TEXTINTERFACES>
 
+<!--B279DD8282DA4C27AEAB24CB71C43B33--><AD_TEXTINTERFACES>
+<!--B279DD8282DA4C27AEAB24CB71C43B33-->  <AD_TEXTINTERFACES_ID><![CDATA[B279DD8282DA4C27AEAB24CB71C43B33]]></AD_TEXTINTERFACES_ID>
+<!--B279DD8282DA4C27AEAB24CB71C43B33-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B279DD8282DA4C27AEAB24CB71C43B33-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B279DD8282DA4C27AEAB24CB71C43B33-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B279DD8282DA4C27AEAB24CB71C43B33-->  <TEXT><![CDATA[Payment Out Date]]></TEXT>
+<!--B279DD8282DA4C27AEAB24CB71C43B33-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME>
+<!--B279DD8282DA4C27AEAB24CB71C43B33-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--B279DD8282DA4C27AEAB24CB71C43B33-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--B279DD8282DA4C27AEAB24CB71C43B33--></AD_TEXTINTERFACES>
+
+<!--B3E7E0DFDE1D42B29FD5FF8622E83E67--><AD_TEXTINTERFACES>
+<!--B3E7E0DFDE1D42B29FD5FF8622E83E67-->  <AD_TEXTINTERFACES_ID><![CDATA[B3E7E0DFDE1D42B29FD5FF8622E83E67]]></AD_TEXTINTERFACES_ID>
+<!--B3E7E0DFDE1D42B29FD5FF8622E83E67-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B3E7E0DFDE1D42B29FD5FF8622E83E67-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B3E7E0DFDE1D42B29FD5FF8622E83E67-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B3E7E0DFDE1D42B29FD5FF8622E83E67-->  <TEXT><![CDATA[Select sales orders, invoices or GL Items that you want to match to this payment in]]></TEXT>
+<!--B3E7E0DFDE1D42B29FD5FF8622E83E67-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html]]></FILENAME>
+<!--B3E7E0DFDE1D42B29FD5FF8622E83E67-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--B3E7E0DFDE1D42B29FD5FF8622E83E67-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--B3E7E0DFDE1D42B29FD5FF8622E83E67--></AD_TEXTINTERFACES>
+
 <!--B57AE91319104419920078B0FDAE9C16--><AD_TEXTINTERFACES>
 <!--B57AE91319104419920078B0FDAE9C16-->  <AD_TEXTINTERFACES_ID><![CDATA[B57AE91319104419920078B0FDAE9C16]]></AD_TEXTINTERFACES_ID>
 <!--B57AE91319104419920078B0FDAE9C16-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2145,6 +2244,17 @@
 <!--B8A21C4101304EDEABC1F47BBCC149F8-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--B8A21C4101304EDEABC1F47BBCC149F8--></AD_TEXTINTERFACES>
 
+<!--B8B9F5636D344A39BC32F9269ABF3EC1--><AD_TEXTINTERFACES>
+<!--B8B9F5636D344A39BC32F9269ABF3EC1-->  <AD_TEXTINTERFACES_ID><![CDATA[B8B9F5636D344A39BC32F9269ABF3EC1]]></AD_TEXTINTERFACES_ID>
+<!--B8B9F5636D344A39BC32F9269ABF3EC1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B8B9F5636D344A39BC32F9269ABF3EC1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B8B9F5636D344A39BC32F9269ABF3EC1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B8B9F5636D344A39BC32F9269ABF3EC1-->  <TEXT><![CDATA[Expected Payment In]]></TEXT>
+<!--B8B9F5636D344A39BC32F9269ABF3EC1-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html]]></FILENAME>
+<!--B8B9F5636D344A39BC32F9269ABF3EC1-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--B8B9F5636D344A39BC32F9269ABF3EC1-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--B8B9F5636D344A39BC32F9269ABF3EC1--></AD_TEXTINTERFACES>
+
 <!--BDFCEFEFA4E846F192E4C1EC6A5D5541--><AD_TEXTINTERFACES>
 <!--BDFCEFEFA4E846F192E4C1EC6A5D5541-->  <AD_TEXTINTERFACES_ID><![CDATA[BDFCEFEFA4E846F192E4C1EC6A5D5541]]></AD_TEXTINTERFACES_ID>
 <!--BDFCEFEFA4E846F192E4C1EC6A5D5541-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2233,16 +2343,27 @@
 <!--C581FECAC63D446C8ED58F477CC68E8E-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--C581FECAC63D446C8ED58F477CC68E8E--></AD_TEXTINTERFACES>
 
-<!--C76F0B5FF5E44E3FBF05B5A4C4FD8D75--><AD_TEXTINTERFACES>
-<!--C76F0B5FF5E44E3FBF05B5A4C4FD8D75-->  <AD_TEXTINTERFACES_ID><![CDATA[C76F0B5FF5E44E3FBF05B5A4C4FD8D75]]></AD_TEXTINTERFACES_ID>
-<!--C76F0B5FF5E44E3FBF05B5A4C4FD8D75-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--C76F0B5FF5E44E3FBF05B5A4C4FD8D75-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--C76F0B5FF5E44E3FBF05B5A4C4FD8D75-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--C76F0B5FF5E44E3FBF05B5A4C4FD8D75-->  <TEXT><![CDATA[Expected Payment]]></TEXT>
-<!--C76F0B5FF5E44E3FBF05B5A4C4FD8D75-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html]]></FILENAME>
-<!--C76F0B5FF5E44E3FBF05B5A4C4FD8D75-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--C76F0B5FF5E44E3FBF05B5A4C4FD8D75-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--C76F0B5FF5E44E3FBF05B5A4C4FD8D75--></AD_TEXTINTERFACES>
+<!--C5A2DB9406E744C1868B56B0DF82C3F6--><AD_TEXTINTERFACES>
+<!--C5A2DB9406E744C1868B56B0DF82C3F6-->  <AD_TEXTINTERFACES_ID><![CDATA[C5A2DB9406E744C1868B56B0DF82C3F6]]></AD_TEXTINTERFACES_ID>
+<!--C5A2DB9406E744C1868B56B0DF82C3F6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C5A2DB9406E744C1868B56B0DF82C3F6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C5A2DB9406E744C1868B56B0DF82C3F6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C5A2DB9406E744C1868B56B0DF82C3F6-->  <TEXT><![CDATA[Add Payment In]]></TEXT>
+<!--C5A2DB9406E744C1868B56B0DF82C3F6-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html]]></FILENAME>
+<!--C5A2DB9406E744C1868B56B0DF82C3F6-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--C5A2DB9406E744C1868B56B0DF82C3F6-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--C5A2DB9406E744C1868B56B0DF82C3F6--></AD_TEXTINTERFACES>
+
+<!--C85BFAE3A8FD481699F6C5F7F28540CF--><AD_TEXTINTERFACES>
+<!--C85BFAE3A8FD481699F6C5F7F28540CF-->  <AD_TEXTINTERFACES_ID><![CDATA[C85BFAE3A8FD481699F6C5F7F28540CF]]></AD_TEXTINTERFACES_ID>
+<!--C85BFAE3A8FD481699F6C5F7F28540CF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C85BFAE3A8FD481699F6C5F7F28540CF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C85BFAE3A8FD481699F6C5F7F28540CF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C85BFAE3A8FD481699F6C5F7F28540CF-->  <TEXT><![CDATA[Actual Payment In]]></TEXT>
+<!--C85BFAE3A8FD481699F6C5F7F28540CF-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html]]></FILENAME>
+<!--C85BFAE3A8FD481699F6C5F7F28540CF-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--C85BFAE3A8FD481699F6C5F7F28540CF-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--C85BFAE3A8FD481699F6C5F7F28540CF--></AD_TEXTINTERFACES>
 
 <!--CB1E94F8B2914BEF88FF72433F962F5A--><AD_TEXTINTERFACES>
 <!--CB1E94F8B2914BEF88FF72433F962F5A-->  <AD_TEXTINTERFACES_ID><![CDATA[CB1E94F8B2914BEF88FF72433F962F5A]]></AD_TEXTINTERFACES_ID>
@@ -2255,17 +2376,6 @@
 <!--CB1E94F8B2914BEF88FF72433F962F5A-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--CB1E94F8B2914BEF88FF72433F962F5A--></AD_TEXTINTERFACES>
 
-<!--CB426221520E4BEDBE97837BC8869741--><AD_TEXTINTERFACES>
-<!--CB426221520E4BEDBE97837BC8869741-->  <AD_TEXTINTERFACES_ID><![CDATA[CB426221520E4BEDBE97837BC8869741]]></AD_TEXTINTERFACES_ID>
-<!--CB426221520E4BEDBE97837BC8869741-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--CB426221520E4BEDBE97837BC8869741-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--CB426221520E4BEDBE97837BC8869741-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--CB426221520E4BEDBE97837BC8869741-->  <TEXT><![CDATA[Payment Date]]></TEXT>
-<!--CB426221520E4BEDBE97837BC8869741-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html]]></FILENAME>
-<!--CB426221520E4BEDBE97837BC8869741-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--CB426221520E4BEDBE97837BC8869741-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--CB426221520E4BEDBE97837BC8869741--></AD_TEXTINTERFACES>
-
 <!--CF8D743F746F49759CDF771C6E73A909--><AD_TEXTINTERFACES>
 <!--CF8D743F746F49759CDF771C6E73A909-->  <AD_TEXTINTERFACES_ID><![CDATA[CF8D743F746F49759CDF771C6E73A909]]></AD_TEXTINTERFACES_ID>
 <!--CF8D743F746F49759CDF771C6E73A909-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2288,6 +2398,28 @@
 <!--D03B11F2C6684ADCBC9709CBDC853CEE-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--D03B11F2C6684ADCBC9709CBDC853CEE--></AD_TEXTINTERFACES>
 
+<!--D0BCD60A817244F991C7D75EA93DC0B4--><AD_TEXTINTERFACES>
+<!--D0BCD60A817244F991C7D75EA93DC0B4-->  <AD_TEXTINTERFACES_ID><![CDATA[D0BCD60A817244F991C7D75EA93DC0B4]]></AD_TEXTINTERFACES_ID>
+<!--D0BCD60A817244F991C7D75EA93DC0B4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D0BCD60A817244F991C7D75EA93DC0B4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D0BCD60A817244F991C7D75EA93DC0B4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D0BCD60A817244F991C7D75EA93DC0B4-->  <TEXT><![CDATA[Add Payment Out]]></TEXT>
+<!--D0BCD60A817244F991C7D75EA93DC0B4-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME>
+<!--D0BCD60A817244F991C7D75EA93DC0B4-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--D0BCD60A817244F991C7D75EA93DC0B4-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--D0BCD60A817244F991C7D75EA93DC0B4--></AD_TEXTINTERFACES>
+
+<!--D2238E00427F496CB8D5A0F24935D4DB--><AD_TEXTINTERFACES>
+<!--D2238E00427F496CB8D5A0F24935D4DB-->  <AD_TEXTINTERFACES_ID><![CDATA[D2238E00427F496CB8D5A0F24935D4DB]]></AD_TEXTINTERFACES_ID>
+<!--D2238E00427F496CB8D5A0F24935D4DB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D2238E00427F496CB8D5A0F24935D4DB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D2238E00427F496CB8D5A0F24935D4DB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D2238E00427F496CB8D5A0F24935D4DB-->  <TEXT><![CDATA[Expected Payment In]]></TEXT>
+<!--D2238E00427F496CB8D5A0F24935D4DB-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html]]></FILENAME>
+<!--D2238E00427F496CB8D5A0F24935D4DB-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--D2238E00427F496CB8D5A0F24935D4DB-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--D2238E00427F496CB8D5A0F24935D4DB--></AD_TEXTINTERFACES>
+
 <!--D355AEFFF148477FBBA0711575E575F2--><AD_TEXTINTERFACES>
 <!--D355AEFFF148477FBBA0711575E575F2-->  <AD_TEXTINTERFACES_ID><![CDATA[D355AEFFF148477FBBA0711575E575F2]]></AD_TEXTINTERFACES_ID>
 <!--D355AEFFF148477FBBA0711575E575F2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2332,6 +2464,28 @@
 <!--D6D719F69DB34F29B7AD9D4FB9C0339B-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--D6D719F69DB34F29B7AD9D4FB9C0339B--></AD_TEXTINTERFACES>
 
+<!--D6E2DE50C7AC438E8E9A9FFF1C6EAAA7--><AD_TEXTINTERFACES>
+<!--D6E2DE50C7AC438E8E9A9FFF1C6EAAA7-->  <AD_TEXTINTERFACES_ID><![CDATA[D6E2DE50C7AC438E8E9A9FFF1C6EAAA7]]></AD_TEXTINTERFACES_ID>
+<!--D6E2DE50C7AC438E8E9A9FFF1C6EAAA7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D6E2DE50C7AC438E8E9A9FFF1C6EAAA7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D6E2DE50C7AC438E8E9A9FFF1C6EAAA7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D6E2DE50C7AC438E8E9A9FFF1C6EAAA7-->  <TEXT><![CDATA[Show payments in for alternative payment methods]]></TEXT>
+<!--D6E2DE50C7AC438E8E9A9FFF1C6EAAA7-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html]]></FILENAME>
+<!--D6E2DE50C7AC438E8E9A9FFF1C6EAAA7-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--D6E2DE50C7AC438E8E9A9FFF1C6EAAA7-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--D6E2DE50C7AC438E8E9A9FFF1C6EAAA7--></AD_TEXTINTERFACES>
+
+<!--D6E32F7A21F948C8AF9DFBA82A25FE2A--><AD_TEXTINTERFACES>
+<!--D6E32F7A21F948C8AF9DFBA82A25FE2A-->  <AD_TEXTINTERFACES_ID><![CDATA[D6E32F7A21F948C8AF9DFBA82A25FE2A]]></AD_TEXTINTERFACES_ID>
+<!--D6E32F7A21F948C8AF9DFBA82A25FE2A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D6E32F7A21F948C8AF9DFBA82A25FE2A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D6E32F7A21F948C8AF9DFBA82A25FE2A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D6E32F7A21F948C8AF9DFBA82A25FE2A-->  <TEXT><![CDATA[Select additional sales invoices or sales orders that you want to add to this payment in]]></TEXT>
+<!--D6E32F7A21F948C8AF9DFBA82A25FE2A-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME>
+<!--D6E32F7A21F948C8AF9DFBA82A25FE2A-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--D6E32F7A21F948C8AF9DFBA82A25FE2A-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--D6E32F7A21F948C8AF9DFBA82A25FE2A--></AD_TEXTINTERFACES>
+
 <!--D8B42F3BC554476C8FF5C79AE2445CED--><AD_TEXTINTERFACES>
 <!--D8B42F3BC554476C8FF5C79AE2445CED-->  <AD_TEXTINTERFACES_ID><![CDATA[D8B42F3BC554476C8FF5C79AE2445CED]]></AD_TEXTINTERFACES_ID>
 <!--D8B42F3BC554476C8FF5C79AE2445CED-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2343,6 +2497,28 @@
 <!--D8B42F3BC554476C8FF5C79AE2445CED-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--D8B42F3BC554476C8FF5C79AE2445CED--></AD_TEXTINTERFACES>
 
+<!--DAEBF648F95D4717BEF1678613BC3D82--><AD_TEXTINTERFACES>
+<!--DAEBF648F95D4717BEF1678613BC3D82-->  <AD_TEXTINTERFACES_ID><![CDATA[DAEBF648F95D4717BEF1678613BC3D82]]></AD_TEXTINTERFACES_ID>
+<!--DAEBF648F95D4717BEF1678613BC3D82-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--DAEBF648F95D4717BEF1678613BC3D82-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--DAEBF648F95D4717BEF1678613BC3D82-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--DAEBF648F95D4717BEF1678613BC3D82-->  <TEXT><![CDATA[Payment In Document No.]]></TEXT>
+<!--DAEBF648F95D4717BEF1678613BC3D82-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html]]></FILENAME>
+<!--DAEBF648F95D4717BEF1678613BC3D82-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--DAEBF648F95D4717BEF1678613BC3D82-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--DAEBF648F95D4717BEF1678613BC3D82--></AD_TEXTINTERFACES>
+
+<!--DB2B268442884A5F8673F04A433EBC11--><AD_TEXTINTERFACES>
+<!--DB2B268442884A5F8673F04A433EBC11-->  <AD_TEXTINTERFACES_ID><![CDATA[DB2B268442884A5F8673F04A433EBC11]]></AD_TEXTINTERFACES_ID>
+<!--DB2B268442884A5F8673F04A433EBC11-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--DB2B268442884A5F8673F04A433EBC11-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--DB2B268442884A5F8673F04A433EBC11-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--DB2B268442884A5F8673F04A433EBC11-->  <TEXT><![CDATA[Add Payment Out]]></TEXT>
+<!--DB2B268442884A5F8673F04A433EBC11-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html]]></FILENAME>
+<!--DB2B268442884A5F8673F04A433EBC11-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--DB2B268442884A5F8673F04A433EBC11-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--DB2B268442884A5F8673F04A433EBC11--></AD_TEXTINTERFACES>
+
 <!--DB502BB7F55E41FC8BEAAB244DB25E5F--><AD_TEXTINTERFACES>
 <!--DB502BB7F55E41FC8BEAAB244DB25E5F-->  <AD_TEXTINTERFACES_ID><![CDATA[DB502BB7F55E41FC8BEAAB244DB25E5F]]></AD_TEXTINTERFACES_ID>
 <!--DB502BB7F55E41FC8BEAAB244DB25E5F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2354,16 +2530,16 @@
 <!--DB502BB7F55E41FC8BEAAB244DB25E5F-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--DB502BB7F55E41FC8BEAAB244DB25E5F--></AD_TEXTINTERFACES>
 
-<!--DF86DC9D645C458B86FB5EDAAE60F787--><AD_TEXTINTERFACES>
-<!--DF86DC9D645C458B86FB5EDAAE60F787-->  <AD_TEXTINTERFACES_ID><![CDATA[DF86DC9D645C458B86FB5EDAAE60F787]]></AD_TEXTINTERFACES_ID>
-<!--DF86DC9D645C458B86FB5EDAAE60F787-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--DF86DC9D645C458B86FB5EDAAE60F787-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--DF86DC9D645C458B86FB5EDAAE60F787-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--DF86DC9D645C458B86FB5EDAAE60F787-->  <TEXT><![CDATA[Select additional sales invoices or sales orders that you want to add to this payment]]></TEXT>
-<!--DF86DC9D645C458B86FB5EDAAE60F787-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html]]></FILENAME>
-<!--DF86DC9D645C458B86FB5EDAAE60F787-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--DF86DC9D645C458B86FB5EDAAE60F787-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--DF86DC9D645C458B86FB5EDAAE60F787--></AD_TEXTINTERFACES>
+<!--DC1CA75BBCA445A99CEB81FCFAC16B80--><AD_TEXTINTERFACES>
+<!--DC1CA75BBCA445A99CEB81FCFAC16B80-->  <AD_TEXTINTERFACES_ID><![CDATA[DC1CA75BBCA445A99CEB81FCFAC16B80]]></AD_TEXTINTERFACES_ID>
+<!--DC1CA75BBCA445A99CEB81FCFAC16B80-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--DC1CA75BBCA445A99CEB81FCFAC16B80-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--DC1CA75BBCA445A99CEB81FCFAC16B80-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--DC1CA75BBCA445A99CEB81FCFAC16B80-->  <TEXT><![CDATA[Payment Out]]></TEXT>
+<!--DC1CA75BBCA445A99CEB81FCFAC16B80-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME>
+<!--DC1CA75BBCA445A99CEB81FCFAC16B80-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--DC1CA75BBCA445A99CEB81FCFAC16B80-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--DC1CA75BBCA445A99CEB81FCFAC16B80--></AD_TEXTINTERFACES>
 
 <!--E1FBF4E787254F35B07338C68284B972--><AD_TEXTINTERFACES>
 <!--E1FBF4E787254F35B07338C68284B972-->  <AD_TEXTINTERFACES_ID><![CDATA[E1FBF4E787254F35B07338C68284B972]]></AD_TEXTINTERFACES_ID>
@@ -2376,6 +2552,17 @@
 <!--E1FBF4E787254F35B07338C68284B972-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--E1FBF4E787254F35B07338C68284B972--></AD_TEXTINTERFACES>
 
+<!--E33A5D2A8A2448C2A53E7D573F167056--><AD_TEXTINTERFACES>
+<!--E33A5D2A8A2448C2A53E7D573F167056-->  <AD_TEXTINTERFACES_ID><![CDATA[E33A5D2A8A2448C2A53E7D573F167056]]></AD_TEXTINTERFACES_ID>
+<!--E33A5D2A8A2448C2A53E7D573F167056-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E33A5D2A8A2448C2A53E7D573F167056-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E33A5D2A8A2448C2A53E7D573F167056-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E33A5D2A8A2448C2A53E7D573F167056-->  <TEXT><![CDATA[Expected Payment Out]]></TEXT>
+<!--E33A5D2A8A2448C2A53E7D573F167056-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME>
+<!--E33A5D2A8A2448C2A53E7D573F167056-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--E33A5D2A8A2448C2A53E7D573F167056-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--E33A5D2A8A2448C2A53E7D573F167056--></AD_TEXTINTERFACES>
+
 <!--E33F2FB86A664FED9B3D8A14CF82A56D--><AD_TEXTINTERFACES>
 <!--E33F2FB86A664FED9B3D8A14CF82A56D-->  <AD_TEXTINTERFACES_ID><![CDATA[E33F2FB86A664FED9B3D8A14CF82A56D]]></AD_TEXTINTERFACES_ID>
 <!--E33F2FB86A664FED9B3D8A14CF82A56D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2409,6 +2596,39 @@
 <!--E560EAAEF81847219CD2BE12D33EBBD1-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--E560EAAEF81847219CD2BE12D33EBBD1--></AD_TEXTINTERFACES>
 
+<!--E814AF3733014961A22C16817BEC0BA3--><AD_TEXTINTERFACES>
+<!--E814AF3733014961A22C16817BEC0BA3-->  <AD_TEXTINTERFACES_ID><![CDATA[E814AF3733014961A22C16817BEC0BA3]]></AD_TEXTINTERFACES_ID>
+<!--E814AF3733014961A22C16817BEC0BA3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E814AF3733014961A22C16817BEC0BA3-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E814AF3733014961A22C16817BEC0BA3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E814AF3733014961A22C16817BEC0BA3-->  <TEXT><![CDATA[Payment Out Document No.]]></TEXT>
+<!--E814AF3733014961A22C16817BEC0BA3-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html]]></FILENAME>
+<!--E814AF3733014961A22C16817BEC0BA3-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--E814AF3733014961A22C16817BEC0BA3-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--E814AF3733014961A22C16817BEC0BA3--></AD_TEXTINTERFACES>
+
+<!--E846865E52F44E589F0D59D5DD7EA221--><AD_TEXTINTERFACES>
+<!--E846865E52F44E589F0D59D5DD7EA221-->  <AD_TEXTINTERFACES_ID><![CDATA[E846865E52F44E589F0D59D5DD7EA221]]></AD_TEXTINTERFACES_ID>
+<!--E846865E52F44E589F0D59D5DD7EA221-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E846865E52F44E589F0D59D5DD7EA221-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E846865E52F44E589F0D59D5DD7EA221-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E846865E52F44E589F0D59D5DD7EA221-->  <TEXT><![CDATA[Select additional sales invoices or sales orders that you want to add to this payment in]]></TEXT>
+<!--E846865E52F44E589F0D59D5DD7EA221-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html]]></FILENAME>
+<!--E846865E52F44E589F0D59D5DD7EA221-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--E846865E52F44E589F0D59D5DD7EA221-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--E846865E52F44E589F0D59D5DD7EA221--></AD_TEXTINTERFACES>
+
+<!--E84EA396A8AA4C3AA377D14BFEAD5264--><AD_TEXTINTERFACES>
+<!--E84EA396A8AA4C3AA377D14BFEAD5264-->  <AD_TEXTINTERFACES_ID><![CDATA[E84EA396A8AA4C3AA377D14BFEAD5264]]></AD_TEXTINTERFACES_ID>
+<!--E84EA396A8AA4C3AA377D14BFEAD5264-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E84EA396A8AA4C3AA377D14BFEAD5264-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E84EA396A8AA4C3AA377D14BFEAD5264-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E84EA396A8AA4C3AA377D14BFEAD5264-->  <TEXT><![CDATA[Select purchase orders, invoices or GL Items that you want to match to this payment out]]></TEXT>
+<!--E84EA396A8AA4C3AA377D14BFEAD5264-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html]]></FILENAME>
+<!--E84EA396A8AA4C3AA377D14BFEAD5264-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--E84EA396A8AA4C3AA377D14BFEAD5264-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--E84EA396A8AA4C3AA377D14BFEAD5264--></AD_TEXTINTERFACES>
+
 <!--EA12496A49A3424D9C5EE0CDBEF173C3--><AD_TEXTINTERFACES>
 <!--EA12496A49A3424D9C5EE0CDBEF173C3-->  <AD_TEXTINTERFACES_ID><![CDATA[EA12496A49A3424D9C5EE0CDBEF173C3]]></AD_TEXTINTERFACES_ID>
 <!--EA12496A49A3424D9C5EE0CDBEF173C3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2431,6 +2651,17 @@
 <!--F1ED4310FFD94BFF9BA48E2229F8E2E3-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--F1ED4310FFD94BFF9BA48E2229F8E2E3--></AD_TEXTINTERFACES>
 
+<!--F5E36E22EBE94D568CB6E770A455E056--><AD_TEXTINTERFACES>
+<!--F5E36E22EBE94D568CB6E770A455E056-->  <AD_TEXTINTERFACES_ID><![CDATA[F5E36E22EBE94D568CB6E770A455E056]]></AD_TEXTINTERFACES_ID>
+<!--F5E36E22EBE94D568CB6E770A455E056-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F5E36E22EBE94D568CB6E770A455E056-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F5E36E22EBE94D568CB6E770A455E056-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F5E36E22EBE94D568CB6E770A455E056-->  <TEXT><![CDATA[Expected Payment In]]></TEXT>
+<!--F5E36E22EBE94D568CB6E770A455E056-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME>
+<!--F5E36E22EBE94D568CB6E770A455E056-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--F5E36E22EBE94D568CB6E770A455E056-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--F5E36E22EBE94D568CB6E770A455E056--></AD_TEXTINTERFACES>
+
 <!--FAF4546366E64BEFB9B6E0A8B424F129--><AD_TEXTINTERFACES>
 <!--FAF4546366E64BEFB9B6E0A8B424F129-->  <AD_TEXTINTERFACES_ID><![CDATA[FAF4546366E64BEFB9B6E0A8B424F129]]></AD_TEXTINTERFACES_ID>
 <!--FAF4546366E64BEFB9B6E0A8B424F129-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html	Tue Mar 08 18:42:40 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html	Tue Mar 08 18:48:17 2011 +0100
@@ -20,7 +20,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Add Payment</title>
+<title id="paramTitle">xxTitle</title>
 <link rel="shortcut icon" href="../../../../../web/images/favicon.ico" type="image/x-icon" />
 <link rel="stylesheet" type="text/css" href="../../../../../web/skins/Default/Openbravo_ERP_250.css" id="paramCSS"></link>
 
@@ -456,7 +456,7 @@
             <td class="Popup_NavBar_bg_logo_left"></td>
             <td class="Popup_NavBar_bg_logo" width="1" onclick="openNewBrowser('http://www.openbravo.com', 'Openbravo');return false;"><img src="../../../../../web/images/blank.gif" alt="Openbravo" title="Openbravo" border="0" id="openbravoLogo" class="Popup_NavBar_logo" /></td>
             <td class="Popup_NavBar_bg_logo_right"></td>
-            <td class="Popup_NavBar_Popup_title_cell"><span>Add Payment</span></td>
+            <td class="Popup_NavBar_Popup_title_cell"><span name="lblR" id="lblRPopupTitle">Add Payment In</span><span name="lblP" id="lblPPopupTitle">Add Payment Out</span></td>
             <td class="Popup_NavBar_separator_cell"></td>
           </tr>
         </table>
@@ -695,8 +695,8 @@
             <!-- Text -->
             <tr>
                 <td colspan="6" class="LabelText" style="font-weight: bold;">
-                    <span name="lblR" id="lblRText">Select sales orders, invoices or GL Items that you want to match to this payment</span>
-                    <span name="lblP" id="lblPText">Select purchase orders, invoices or GL Items that you want to match to this payment</span>
+                    <span name="lblR" id="lblRText">Select sales orders, invoices or GL Items that you want to match to this payment in</span>
+                    <span name="lblP" id="lblPText">Select purchase orders, invoices or GL Items that you want to match to this payment out</span>
                 </td>
             </tr>
             
@@ -711,7 +711,7 @@
 
             <!-- Line hidden -->
             <tr style="display:none;">
-              <td class="TitleCell"><span class="LabelText">Expected Payment</span></td>
+              <td class="TitleCell"><span name="lblP" id="lblPExpectedPaym" class="LabelText">Expected Payment Out</span><span name="lblR" id="lblRExpectedPaym" class="LabelText">Expected Payment In</span></td>
               <td class="TextBox_ContentCell"> <input class="readonly dojoValidateValid required TextBox_OneCell_width number" type="text" id="paramExpectedPayment" name="inpExpectedPayment" value="" onchange="updateDifference();"></input>
               </td>
               <td class="TitleCell"></td>
@@ -812,7 +812,7 @@
               </td>
              </tr>
             <tr>
-              <td class="TitleCell" id="inpAlternativeLabel"><span class="TitleCell LabelText"><label for="paramAlternativePaymentMethod">Show payments for alternative payment methods</label></span></td>
+              <td class="TitleCell" id="inpAlternativeLabel"><span class="TitleCell LabelText"><label name="lblP" id="lblPShowPaym" for="paramAlternativePaymentMethod">Show payments out for alternative payment methods</label></span><span class="TitleCell LabelText"><label name="lblR" id="lblRShowPaym" for="paramAlternativePaymentMethod">Show payments in for alternative payment methods</label></span></td>
               <td class="Radio_Check_ContentCell" id="inpAlternativeChkBox">
               <span class="Radio_Check_ContentCell Checkbox_container_NOT_Focused"><input type="checkbox" name="inpAlternativePaymentMethod" value="Y" id="paramAlternativePaymentMethod" onclick="loadGridList()"></input></span>
              </td>
@@ -961,7 +961,7 @@
                         <th class="DataGrid_Header_Cell DataGrid_Header_Cell_Inverse" width="100">Invoiced Amount</th>
                         <th class="DataGrid_Header_Cell DataGrid_Header_Cell_Inverse" width="100">Expected Amount</th>
                         <th class="DataGrid_Header_Cell DataGrid_Header_Cell_Inverse" width="100">Outstanding Amount</th>
-                        <th class="DataGrid_Header_Cell DataGrid_Header_Cell_Inverse" width="110">Payment</th>
+                        <th class="DataGrid_Header_Cell DataGrid_Header_Cell_Inverse" width="110"><span name="lblP" id="lblPPayment">Payment Out</span><span name="lblR" id="lblRPayment">Payment In</span></th>
                       </tr>
                     </thead>
                     <tbody id="sectionGrid">
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java	Tue Mar 08 18:42:40 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java	Tue Mar 08 18:48:17 2011 +0100
@@ -223,6 +223,12 @@
     xmlDocument.setParameter("language", "defaultLang=\"" + vars.getLanguage() + "\";");
     xmlDocument.setParameter("theme", vars.getTheme());
 
+    if (payment.isReceipt())
+      xmlDocument.setParameter("title", Utility.messageBD(this, "APRM_AddPaymentIn", vars
+          .getLanguage()));
+    else
+      xmlDocument.setParameter("title", Utility.messageBD(this, "APRM_AddPaymentOut", vars
+          .getLanguage()));
     xmlDocument.setParameter("dateDisplayFormat", vars.getSessionValue("#AD_SqlDateFormat"));
     xmlDocument.setParameter("businessPartner", payment.getBusinessPartner().getIdentifier());
     xmlDocument.setParameter("businessPartnerId", payment.getBusinessPartner().getId());
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.xml	Tue Mar 08 18:42:40 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.xml	Tue Mar 08 18:48:17 2011 +0100
@@ -27,6 +27,7 @@
     <PARAMETER id="messageBoxIDTitle" name="messageTitle" default=""/>
     <PARAMETER id="messageBoxIDMessage" name="messageMessage" default=""/>
 
+    <PARAMETER id="paramTitle" name="title" replace="xxTitle"/>
     <PARAMETER id="paramCustBalance" name="customerBalance" attribute="value" format="euroEdition"/>
     <PARAMETER id="paramBusinessPartner" name="businessPartner" attribute="value"/>
     <PARAMETER id="paramBusinessPartnerId" name="businessPartnerId" attribute="value"/>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html	Tue Mar 08 18:42:40 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html	Tue Mar 08 18:48:17 2011 +0100
@@ -20,7 +20,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Add Payment</title>
+<title id="paramTitle">xxTitle</title>
 <link rel="shortcut icon" href="../../../../../web/images/favicon.ico" type="image/x-icon" />
 <link rel="stylesheet" type="text/css" href="../../../../../web/skins/Default/Openbravo_ERP_250.css" id="paramCSS"></link>
 
@@ -198,10 +198,10 @@
 function loadFinancialAccountCombo() {
   try {
     var url = "../org.openbravo.advpaymentmngt.ad_actionbutton/AddPaymentFromInvoice.html";
-	var paramXMLReq = null;
-	return submitXmlHttpRequest(callBackFinancialAccount, document.frmMain, "FINANCIALACCOUNT", url, false, null, paramXMLReq);
+    var paramXMLReq = null;
+    return submitXmlHttpRequest(callBackFinancialAccount, document.frmMain, "FINANCIALACCOUNT", url, false, null, paramXMLReq);
   } catch (e) {
-	alert(e);
+    alert(e);
   }
 }
 
@@ -334,7 +334,7 @@
             <td class="Popup_NavBar_bg_logo_left"></td>
             <td class="Popup_NavBar_bg_logo" width="1" onclick="openNewBrowser('http://www.openbravo.com', 'Openbravo');return false;"><img src="../../../../../web/images/blank.gif" alt="Openbravo" title="Openbravo" border="0" id="openbravoLogo" class="Popup_NavBar_logo" /></td>
             <td class="Popup_NavBar_bg_logo_right"></td>
-            <td class="Popup_NavBar_Popup_title_cell"><span>Add Payment</span></td>
+            <td class="Popup_NavBar_Popup_title_cell"><span name="lblR" id="lblRPopupTitle">Add Payment In</span><span name="lblP" id="lblPPopupTitle">Add Payment Out</span></td>
             <td class="Popup_NavBar_separator_cell"></td>
           </tr>
         </table>
@@ -572,7 +572,7 @@
 
             <!-- Line 1 -->
             <tr>
-              <td class="TitleCell"><span class="LabelText">Payment Document No.</span></td>
+              <td class="TitleCell"><span name="lblP" id="lblPDocNo" class="LabelText">Payment Out Document No.</span><span name="lblR" id="lblRDocNo" class="LabelText">Payment In Document No.</span></td>
               <td class="TextBox_ContentCell" colspan="2"><input class="dojoValidateValid required TextBox_TwoCells_width" type="text" name="inpDocNumber" value="" id="paramDocNumber"></input></td>
               <td class="TitleCell"><span class="LabelText" name="lblR" id="lblRCustomerBalance">Customer Balance</span></td>
               <td class="TextBox_ContentCell"><input class="readonly dojoValidateValid TextBox_OneCell_width number" type="text" name="inpCustBalance" value="" id="paramCustBalance"></input></td>
@@ -637,7 +637,7 @@
             
             <!-- Line 6 -->
             <tr>
-              <td class="TitleCell"><span class="LabelText">Expected Payment</span></td>
+              <td class="TitleCell"><span name="lblP" id="lblPExpectedPaym" class="LabelText">Expected Payment Out</span><span name="lblR" id="lblRExpectedPaym" class="LabelText">Expected Payment In</span></td>
               <td class="TextBox_ContentCell"> <input class="readonly dojoValidateValid required TextBox_OneCell_width number" type="text" id="paramExpectedPayment" name="inpExpectedPayment" value="" onchange="updateDifference();" disabled="true"></input>
               </td>
               <td class="TitleCell"></td>
@@ -647,7 +647,7 @@
             
             <!-- Line 7 -->
             <tr>
-              <td class="TitleCell"><span class="LabelText">Actual Payment</span></td>
+              <td class="TitleCell"><span name="lblP" id="lblPActualPaym"class="LabelText">Actual Payment Out</span><span name="lblR" id="lblRActualPaym" class="LabelText">Actual Payment In</span></td>
               <td class="TextBox_btn_ContentCell">
                   <table border="0" cellspacing="0" cellpadding="0" summary=""  style="padding-top: 0px;">
                     <tr>
@@ -699,7 +699,7 @@
             
             <!-- Line 8 -->
             <tr>
-              <td class="TitleCell"><span class="LabelText">Payment Date</span></td>
+              <td class="TitleCell"><span name="lblP" id="lblPPaymDate" class="LabelText">Payment Out Date</span><span name="lblR" id="lblRPaymDate"class="LabelText">Payment In Date</span></td>
               <td class="TextBox_btn_ContentCell">
                 <table border="0" cellspacing="0" cellpadding="0" summary=""  style="padding-top: 0px;">
                   <tr>
@@ -748,8 +748,8 @@
             <!-- Text -->
             <tr>
                 <td colspan="6" class="LabelText" style="font-weight: bold;">
-                    <span name="lblR" id="lblRText">Select additional sales invoices or sales orders that you want to add to this payment</span>
-                    <span name="lblP" id="lblPText">Select additional purchase invoices or purchase orders that you want to add to this payment</span>
+                    <span name="lblP" id="lblPText">Select additional purchase invoices or purchase orders that you want to add to this payment out</span>
+                    <span name="lblR" id="lblRText">Select additional sales invoices or sales orders that you want to add to this payment in</span>
                 </td>
             </tr>
             
@@ -800,7 +800,8 @@
              </tr>
              
              <tr>
-              <td class="TitleCell" ><span class="TitleCell LabelText"><label for="paramAlternativePaymentMethod">Show payments for alternative payment methods</label></span></td>
+              <td class="TitleCell" ><span name="lblP" id="lblPText" class="TitleCell LabelText"><label for="paramAlternativePaymentMethod">Show payments out for alternative payment methods</label></span></td>
+              <span name="lblR" id="lblRText" class="TitleCell LabelText"><label for="paramAlternativePaymentMethod">Show payments in for alternative payment methods</label></span>
               <td class="Radio_Check_ContentCell">
                 <span class="Radio_Check_ContentCell Checkbox_container_NOT_Focused"><input type="checkbox" name="inpAlternativePaymentMethod" value="Y" id="paramAlternativePaymentMethod" onclick="loadGridList()"></input></span>                
               </td>
@@ -867,7 +868,7 @@
                         <th class="DataGrid_Header_Cell DataGrid_Header_Cell_Inverse" width="100">Invoiced Amount</th>
                         <th class="DataGrid_Header_Cell DataGrid_Header_Cell_Inverse" width="100">Expected Amount</th>
                         <th class="DataGrid_Header_Cell DataGrid_Header_Cell_Inverse" width="100">Outstanding Amount</th>
-                        <th class="DataGrid_Header_Cell DataGrid_Header_Cell_Inverse" width="110">Payment</th>
+                        <th class="DataGrid_Header_Cell DataGrid_Header_Cell_Inverse" width="110"><span name="lblP" id="lblPPayment">Payment Out</span><span name="lblR" id="lblRPayment">Payment In</span></th>
                       </tr>
                     </thead>
                     <tbody id="sectionGrid">
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java	Tue Mar 08 18:42:40 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java	Tue Mar 08 18:48:17 2011 +0100
@@ -247,6 +247,12 @@
     xmlDocument.setParameter("language", "defaultLang=\"" + vars.getLanguage() + "\";");
     xmlDocument.setParameter("theme", vars.getTheme());
 
+    if (isReceipt)
+      xmlDocument.setParameter("title", Utility.messageBD(this, "APRM_AddPaymentIn", vars
+          .getLanguage()));
+    else
+      xmlDocument.setParameter("title", Utility.messageBD(this, "APRM_AddPaymentOut", vars
+          .getLanguage()));
     xmlDocument.setParameter("dateDisplayFormat", vars.getSessionValue("#AD_SqlDateFormat"));
     xmlDocument.setParameter("paymentDate", DateTimeData.today(this));
     xmlDocument.setParameter("businessPartner", strBPfromInvoice);
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.xml	Tue Mar 08 18:42:40 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.xml	Tue Mar 08 18:48:17 2011 +0100
@@ -27,6 +27,7 @@
     <PARAMETER id="messageBoxIDTitle" name="messageTitle" default=""/>
     <PARAMETER id="messageBoxIDMessage" name="messageMessage" default=""/>
     
+    <PARAMETER id="paramTitle" name="title" replace="xxTitle"/>
     <PARAMETER id="paramDocNumber" name="documentNumber" attribute="value"/>
     <PARAMETER id="paramCustBalance" name="customerBalance" attribute="value" format="euroEdition"/>
     <PARAMETER id="paramBusinessPartner" name="businessPartner" attribute="value"/>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html	Tue Mar 08 18:42:40 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html	Tue Mar 08 18:48:17 2011 +0100
@@ -20,7 +20,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Add Payment</title>
+<title id="paramTitle">xxTitle</title>
 <link rel="shortcut icon" href="../../../../../web/images/favicon.ico" type="image/x-icon" />
 <link rel="stylesheet" type="text/css" href="../../../../../web/skins/Default/Openbravo_ERP_250.css" id="paramCSS"></link>
 
@@ -332,7 +332,7 @@
             <td class="Popup_NavBar_bg_logo_left"></td>
             <td class="Popup_NavBar_bg_logo" width="1" onclick="openNewBrowser('http://www.openbravo.com', 'Openbravo');return false;"><img src="../../../../../web/images/blank.gif" alt="Openbravo" title="Openbravo" border="0" id="openbravoLogo" class="Popup_NavBar_logo" /></td>
             <td class="Popup_NavBar_bg_logo_right"></td>
-            <td class="Popup_NavBar_Popup_title_cell"><span>Add Payment</span></td>
+            <td class="Popup_NavBar_Popup_title_cell"><span name="lblR" id="lblRPopupTitle">Add Payment In</span><span name="lblP" id="lblPPopupTitle">Add Payment Out</span></td>
             <td class="Popup_NavBar_separator_cell"></td>
           </tr>
         </table>
@@ -570,7 +570,7 @@
 
             <!-- Line 1 -->
             <tr>
-              <td class="TitleCell"><span class="LabelText">Payment Document No.</span></td>
+              <td class="TitleCell"><span name="lblP" id="lblPDocNo" class="LabelText">Payment Out Document No.</span><span name="lblR" id="lblRDocNo" class="LabelText">Payment In Document No.</span></td>
               <td class="TextBox_ContentCell" colspan="2"><input class="dojoValidateValid required TextBox_TwoCells_width" type="text" name="inpDocNumber" value="" id="paramDocNumber"></input></td>
               <td class="TitleCell"><span class="LabelText">Document Type</span></td>
               <td class="TextBox_ContentCell"><input class="readonly dojoValidateValid TextBox_OneCell_width" type="text" name="inpDocType" value="" id="paramDocType"></input></td>
@@ -638,7 +638,7 @@
             
             <!-- Line 6 -->
             <tr>
-              <td class="TitleCell"><span class="LabelText">Expected Payment</span></td>
+              <td class="TitleCell"><span name="lblP" id="lblPExpectedPaym" class="LabelText">Expected Payment Out</span><span name="lblR" id="lblRExpectedPaym" class="LabelText">Expected Payment In</span></td>
               <td class="TextBox_ContentCell"><input class="readonly dojoValidateValid required TextBox_OneCell_width number" type="text" id="paramExpectedPayment" name="inpExpectedPayment" value="" onchange="updateDifference();"></input></td>
               <td class="TitleCell"></td>
               <td class="TitleCell"><span class="LabelText" name="lbl" id="lblCredit">Available Credit</span></td>
@@ -648,7 +648,7 @@
 
             <!-- Line 7 -->
             <tr>
-              <td class="TitleCell"><span class="LabelText">Actual Payment</span></td>
+              <td class="TitleCell"><span name="lblP" id="lblPActualPaym"class="LabelText">Actual Payment Out</span><span name="lblR" id="lblRActualPaym" class="LabelText">Actual Payment In</span></td>
               <td class="TextBox_btn_ContentCell">
                   <table border="0" cellspacing="0" cellpadding="0" summary=""  style="padding-top: 0px;">
                     <tr>
@@ -691,7 +691,7 @@
             
             <!-- Line 8 -->
             <tr>
-              <td class="TitleCell"><span class="LabelText">Payment Date</span></td>
+              <td class="TitleCell"><span name="lblP" id="lblPPaymDate" class="LabelText">Payment Out Date</span><span name="lblR" id="lblRPaymDate"class="LabelText">Payment In Date</span></td>
               <td class="TextBox_btn_ContentCell">
                 <table border="0" cellspacing="0" cellpadding="0" summary=""  style="padding-top: 0px;">
                   <tr>
@@ -719,9 +719,9 @@
             
             <!-- Text -->
             <tr>
-                <td colspan="6" class="LabelText" style="font-weight: bold;">
-                    <span name="lblR" id="lblRText">Select additional sales invoices or sales orders that you want to add to this payment</span>
-                    <span name="lblP" id="lblPText">Select additional purchase invoices or purchase orders that you want to add to this payment</span>
+                <td colspan="6" class="LabelText" style="font-weight: bold;">                    
+                    <span name="lblP" id="lblPText">Select additional purchase invoices or purchase orders that you want to add to this payment out</span>
+                    <span name="lblR" id="lblRText">Select additional sales invoices or sales orders that you want to add to this payment in</span>
                 </td>
             </tr>
             
@@ -832,7 +832,7 @@
                         <th class="DataGrid_Header_Cell DataGrid_Header_Cell_Inverse" width="100">Invoiced Amount</th>
                         <th class="DataGrid_Header_Cell DataGrid_Header_Cell_Inverse" width="100">Expected Amount</th>
                         <th class="DataGrid_Header_Cell DataGrid_Header_Cell_Inverse" width="100">Outstanding Amount</th>
-                        <th class="DataGrid_Header_Cell DataGrid_Header_Cell_Inverse" width="110">Payment</th>
+                        <th class="DataGrid_Header_Cell DataGrid_Header_Cell_Inverse" width="110"><span name="lblP" id="lblPPayment">Payment Out</span><span name="lblR" id="lblRPayment">Payment In</span></th>
                       </tr>
                     </thead>
                     <tbody id="sectionGrid">
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java	Tue Mar 08 18:42:40 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java	Tue Mar 08 18:48:17 2011 +0100
@@ -261,6 +261,12 @@
     } else
       xmlDocument.setParameter("paymentDate", DateTimeData.today(this));
 
+    if (isReceipt)
+      xmlDocument.setParameter("title", Utility.messageBD(this, "APRM_AddPaymentIn", vars
+          .getLanguage()));
+    else
+      xmlDocument.setParameter("title", Utility.messageBD(this, "APRM_AddPaymentOut", vars
+          .getLanguage()));
     xmlDocument.setParameter("directory", "var baseDirectory = \"" + strReplaceWith + "/\";\n");
     xmlDocument.setParameter("language", "defaultLang=\"" + vars.getLanguage() + "\";");
     xmlDocument.setParameter("theme", vars.getTheme());
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.xml	Tue Mar 08 18:42:40 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.xml	Tue Mar 08 18:48:17 2011 +0100
@@ -27,6 +27,7 @@
     <PARAMETER id="messageBoxIDTitle" name="messageTitle" default=""/>
     <PARAMETER id="messageBoxIDMessage" name="messageMessage" default=""/>
     
+    <PARAMETER id="paramTitle" name="title" replace="xxTitle"/>
     <PARAMETER id="paramDocNumber" name="documentNumber" attribute="value"/>
     <PARAMETER id="paramDocType" name="documentType" attribute="value"/>
     <PARAMETER id="paramFinancialAccountId" name="financialAccountId" attribute="value"/>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.html	Tue Mar 08 18:42:40 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.html	Tue Mar 08 18:48:17 2011 +0100
@@ -439,7 +439,7 @@
               </td> -->
               <td class="Combo_ContentCell" colspan="2">
                 <select id="paramTransactionType" name="inpTransactionType" class="ComboKey Combo_TwoCells_width required" onchange="showHideLayers();">
-                  <option value="P" selected="selected">Payment</option>
+                  <option value="P" selected="selected">Payment In/Out</option>
                   <option value="GL">GL Item</option>
                   <option value="F">Fee</option>
                 </select>
@@ -852,7 +852,7 @@
                         <th class="DataGrid_Header_LineNoCell DataGrid_Body_Cell_CheckBox" width="25"> 
                           <input type="checkbox" name="inpAllLines" onclick="markAll(document.frmMain.inpPaymentId, this.checked); return true;"/>
                         </th>
-                        <th class="DataGrid_Header_Cell" width="250">Payment</th>
+                        <th class="DataGrid_Header_Cell" width="250">Payment In/Out</th>
                         <th class="DataGrid_Header_Cell" width="300">Description</th>
                         <th class="DataGrid_Header_Cell" width="70">Date</th>
                         <th class="DataGrid_Header_Cell DataGrid_Header_Cell_Inverse" width="100">Received In</th>
@@ -890,7 +890,7 @@
                   <TABLE class="Button" align="center">
                     <TR>
                       <TD class="Button_left"><IMG class="Button_Icon Button_Icon_process" alt="AddPayment" title="AddPayment" src="../../../../../web/images/blank.gif" border="0"></IMG></TD>
-                      <TD class="Button_text">Add Payment</TD>
+                      <TD class="Button_text">Add Payment In/Out</TD>
                       <TD class="Button_right"></TD>
                     </TR>
                   </TABLE>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.html	Tue Mar 08 18:42:40 2011 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.html	Tue Mar 08 18:48:17 2011 +0100
@@ -693,7 +693,7 @@
                         <th class="DataGrid_Header_LineNoCell" width="25"></th>
                         <th class="DataGrid_Header_Cell" width="70">Date</th>
                         <th class="DataGrid_Header_Cell" width="160">Business Partner</th>
-                        <th class="DataGrid_Header_Cell" width="100">Payment Ref.</th>
+                        <th class="DataGrid_Header_Cell" width="100">Payment In/Out Ref.</th>
                         <th class="DataGrid_Header_Cell" width="220">Description</th>
                         <th class="DataGrid_Header_Cell DataGrid_Header_Cell_Inverse" width="100">Paid out</th>
                         <th class="DataGrid_Header_Cell DataGrid_Header_Cell_Inverse" width="100">Received in</th>
--- a/src-db/database/sourcedata/AD_COLUMN.xml	Tue Mar 08 18:42:40 2011 +0100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Tue Mar 08 18:48:17 2011 +0100
@@ -289717,8 +289717,8 @@
 <!--7891269C83D0655DE040007F010155CE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7891269C83D0655DE040007F010155CE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--7891269C83D0655DE040007F010155CE-->  <NAME><![CDATA[Payment]]></NAME>
-<!--7891269C83D0655DE040007F010155CE-->  <DESCRIPTION><![CDATA[Payment event]]></DESCRIPTION>
-<!--7891269C83D0655DE040007F010155CE-->  <HELP><![CDATA[Payment event]]></HELP>
+<!--7891269C83D0655DE040007F010155CE-->  <DESCRIPTION><![CDATA[Payment In event]]></DESCRIPTION>
+<!--7891269C83D0655DE040007F010155CE-->  <HELP><![CDATA[Payment In event]]></HELP>
 <!--7891269C83D0655DE040007F010155CE-->  <COLUMNNAME><![CDATA[Fin_Payment_ID]]></COLUMNNAME>
 <!--7891269C83D0655DE040007F010155CE-->  <AD_TABLE_ID><![CDATA[D1A97202E832470285C9B1EB026D54E2]]></AD_TABLE_ID>
 <!--7891269C83D0655DE040007F010155CE-->  <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
@@ -289732,7 +289732,7 @@
 <!--7891269C83D0655DE040007F010155CE-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--7891269C83D0655DE040007F010155CE-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--7891269C83D0655DE040007F010155CE-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--7891269C83D0655DE040007F010155CE-->  <AD_ELEMENT_ID><![CDATA[7891269C83EA655DE040007F010155CE]]></AD_ELEMENT_ID>
+<!--7891269C83D0655DE040007F010155CE-->  <AD_ELEMENT_ID><![CDATA[0D1F9C2D797C49A7AA476A3047DC075A]]></AD_ELEMENT_ID>
 <!--7891269C83D0655DE040007F010155CE-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--7891269C83D0655DE040007F010155CE-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--7891269C83D0655DE040007F010155CE-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
@@ -291748,8 +291748,8 @@
 <!--78D10D5CC289A0ADE040007F010152E6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--78D10D5CC289A0ADE040007F010152E6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--78D10D5CC289A0ADE040007F010152E6-->  <NAME><![CDATA[Fin_Payment_Sched_Inv_V_ID]]></NAME>
-<!--78D10D5CC289A0ADE040007F010152E6-->  <DESCRIPTION><![CDATA[Set of payments planned to be collected/paid for an invoice]]></DESCRIPTION>
-<!--78D10D5CC289A0ADE040007F010152E6-->  <HELP><![CDATA[Set of payments planned to be collected/paid for an invoice]]></HELP>
+<!--78D10D5CC289A0ADE040007F010152E6-->  <DESCRIPTION><![CDATA[Set of payments in planned to be collected/paid for an invoice]]></DESCRIPTION>
+<!--78D10D5CC289A0ADE040007F010152E6-->  <HELP><![CDATA[Set of payments in planned to be collected/paid for an invoice]]></HELP>
 <!--78D10D5CC289A0ADE040007F010152E6-->  <COLUMNNAME><![CDATA[Fin_Payment_Sched_Inv_V_ID]]></COLUMNNAME>
 <!--78D10D5CC289A0ADE040007F010152E6-->  <AD_TABLE_ID><![CDATA[77182DC88AA842D499C01FB0BAE39561]]></AD_TABLE_ID>
 <!--78D10D5CC289A0ADE040007F010152E6-->  <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
@@ -292082,6 +292082,7 @@
 <!--78D10D5CC296A0ADE040007F010152E6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--78D10D5CC296A0ADE040007F010152E6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--78D10D5CC296A0ADE040007F010152E6-->  <NAME><![CDATA[Last Payment]]></NAME>
+<!--78D10D5CC296A0ADE040007F010152E6-->  <DESCRIPTION><![CDATA[Last Payment In Date]]></DESCRIPTION>
 <!--78D10D5CC296A0ADE040007F010152E6-->  <COLUMNNAME><![CDATA[Lastpayment]]></COLUMNNAME>
 <!--78D10D5CC296A0ADE040007F010152E6-->  <AD_TABLE_ID><![CDATA[77182DC88AA842D499C01FB0BAE39561]]></AD_TABLE_ID>
 <!--78D10D5CC296A0ADE040007F010152E6-->  <AD_REFERENCE_ID><![CDATA[15]]></AD_REFERENCE_ID>
@@ -295278,8 +295279,8 @@
 <!--7FF2234748E7844FE040007F01003861-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7FF2234748E7844FE040007F01003861-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--7FF2234748E7844FE040007F01003861-->  <NAME><![CDATA[Invoice Payment Plan]]></NAME>
-<!--7FF2234748E7844FE040007F01003861-->  <DESCRIPTION><![CDATA[Set of payments planned to be collected/paid for an invoice]]></DESCRIPTION>
-<!--7FF2234748E7844FE040007F01003861-->  <HELP><![CDATA[Set of payments planned to be collected/paid for an invoice]]></HELP>
+<!--7FF2234748E7844FE040007F01003861-->  <DESCRIPTION><![CDATA[Set of payments in planned to be collected/paid for an invoice]]></DESCRIPTION>
+<!--7FF2234748E7844FE040007F01003861-->  <HELP><![CDATA[Set of payments in planned to be collected/paid for an invoice]]></HELP>
 <!--7FF2234748E7844FE040007F01003861-->  <COLUMNNAME><![CDATA[Fin_Payment_Sched_Inv_V_Id]]></COLUMNNAME>
 <!--7FF2234748E7844FE040007F01003861-->  <AD_TABLE_ID><![CDATA[DC63963AB3F1489BAAB5A9A7EFD1B407]]></AD_TABLE_ID>
 <!--7FF2234748E7844FE040007F01003861-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
@@ -295312,8 +295313,8 @@
 <!--7FF2234748E8844FE040007F01003861-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7FF2234748E8844FE040007F01003861-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--7FF2234748E8844FE040007F01003861-->  <NAME><![CDATA[Order Payment Plan]]></NAME>
-<!--7FF2234748E8844FE040007F01003861-->  <DESCRIPTION><![CDATA[Set of payments planned to be collected/paid for an order]]></DESCRIPTION>
-<!--7FF2234748E8844FE040007F01003861-->  <HELP><![CDATA[Set of payments planned to be collected/paid for an order]]></HELP>
+<!--7FF2234748E8844FE040007F01003861-->  <DESCRIPTION><![CDATA[Set of payments in planned to be collected/paid for an order]]></DESCRIPTION>
+<!--7FF2234748E8844FE040007F01003861-->  <HELP><![CDATA[Set of payments in planned to be collected/paid for an order]]></HELP>
 <!--7FF2234748E8844FE040007F01003861-->  <COLUMNNAME><![CDATA[Fin_Payment_Sched_Ord_V_Id]]></COLUMNNAME>
 <!--7FF2234748E8844FE040007F01003861-->  <AD_TABLE_ID><![CDATA[DC63963AB3F1489BAAB5A9A7EFD1B407]]></AD_TABLE_ID>
 <!--7FF2234748E8844FE040007F01003861-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
@@ -295409,7 +295410,7 @@
 <!--7FF2234748EB844FE040007F01003861-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7FF2234748EB844FE040007F01003861-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--7FF2234748EB844FE040007F01003861-->  <NAME><![CDATA[Paymentno]]></NAME>
-<!--7FF2234748EB844FE040007F01003861-->  <DESCRIPTION><![CDATA[Payment Number]]></DESCRIPTION>
+<!--7FF2234748EB844FE040007F01003861-->  <DESCRIPTION><![CDATA[Payment  In Number]]></DESCRIPTION>
 <!--7FF2234748EB844FE040007F01003861-->  <COLUMNNAME><![CDATA[Paymentno]]></COLUMNNAME>
 <!--7FF2234748EB844FE040007F01003861-->  <AD_TABLE_ID><![CDATA[DC63963AB3F1489BAAB5A9A7EFD1B407]]></AD_TABLE_ID>
 <!--7FF2234748EB844FE040007F01003861-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
@@ -295441,8 +295442,8 @@
 <!--7FF2234748EC844FE040007F01003861-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7FF2234748EC844FE040007F01003861-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--7FF2234748EC844FE040007F01003861-->  <NAME><![CDATA[Payment]]></NAME>
-<!--7FF2234748EC844FE040007F01003861-->  <DESCRIPTION><![CDATA[Payment event]]></DESCRIPTION>
-<!--7FF2234748EC844FE040007F01003861-->  <HELP><![CDATA[Payment event]]></HELP>
+<!--7FF2234748EC844FE040007F01003861-->  <DESCRIPTION><![CDATA[Payment In event]]></DESCRIPTION>
+<!--7FF2234748EC844FE040007F01003861-->  <HELP><![CDATA[Payment In event]]></HELP>
 <!--7FF2234748EC844FE040007F01003861-->  <COLUMNNAME><![CDATA[FIN_Payment_ID]]></COLUMNNAME>
 <!--7FF2234748EC844FE040007F01003861-->  <AD_TABLE_ID><![CDATA[DC63963AB3F1489BAAB5A9A7EFD1B407]]></AD_TABLE_ID>
 <!--7FF2234748EC844FE040007F01003861-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
@@ -295456,7 +295457,7 @@
 <!--7FF2234748EC844FE040007F01003861-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--7FF2234748EC844FE040007F01003861-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--7FF2234748EC844FE040007F01003861-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--7FF2234748EC844FE040007F01003861-->  <AD_ELEMENT_ID><![CDATA[7891269C83EA655DE040007F010155CE]]></AD_ELEMENT_ID>
+<!--7FF2234748EC844FE040007F01003861-->  <AD_ELEMENT_ID><![CDATA[0D1F9C2D797C49A7AA476A3047DC075A]]></AD_ELEMENT_ID>
 <!--7FF2234748EC844FE040007F01003861-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--7FF2234748EC844FE040007F01003861-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--7FF2234748EC844FE040007F01003861-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
@@ -296135,8 +296136,8 @@
 <!--802DBB308CF6C960E040007F01001D1B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--802DBB308CF6C960E040007F01001D1B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--802DBB308CF6C960E040007F01001D1B-->  <NAME><![CDATA[Fin_Payment_Sched_Ord_V_ID]]></NAME>
-<!--802DBB308CF6C960E040007F01001D1B-->  <DESCRIPTION><![CDATA[Set of payments planned to be collected/paid for an order]]></DESCRIPTION>
-<!--802DBB308CF6C960E040007F01001D1B-->  <HELP><![CDATA[Set of payments planned to be collected/paid for an order]]></HELP>
+<!--802DBB308CF6C960E040007F01001D1B-->  <DESCRIPTION><![CDATA[Set of payments in planned to be collected/paid for an order]]></DESCRIPTION>
+<!--802DBB308CF6C960E040007F01001D1B-->  <HELP><![CDATA[Set of payments in planned to be collected/paid for an order]]></HELP>
 <!--802DBB308CF6C960E040007F01001D1B-->  <COLUMNNAME><![CDATA[Fin_Payment_Sched_Ord_V_ID]]></COLUMNNAME>
 <!--802DBB308CF6C960E040007F01001D1B-->  <AD_TABLE_ID><![CDATA[70E57DEA195843729FF303C9A71EBCA3]]></AD_TABLE_ID>
 <!--802DBB308CF6C960E040007F01001D1B-->  <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
@@ -296663,6 +296664,7 @@
 <!--802DBB308D06C960E040007F01001D1B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--802DBB308D06C960E040007F01001D1B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--802DBB308D06C960E040007F01001D1B-->  <NAME><![CDATA[Last Payment]]></NAME>
+<!--802DBB308D06C960E040007F01001D1B-->  <DESCRIPTION><![CDATA[Last Payment In Date]]></DESCRIPTION>
 <!--802DBB308D06C960E040007F01001D1B-->  <COLUMNNAME><![CDATA[Lastpayment]]></COLUMNNAME>
 <!--802DBB308D06C960E040007F01001D1B-->  <AD_TABLE_ID><![CDATA[70E57DEA195843729FF303C9A71EBCA3]]></AD_TABLE_ID>
 <!--802DBB308D06C960E040007F01001D1B-->  <AD_REFERENCE_ID><![CDATA[15]]></AD_REFERENCE_ID>
@@ -297897,7 +297899,7 @@
 <!--80E839B16929298FE040007F01005AAF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--80E839B16929298FE040007F01005AAF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--80E839B16929298FE040007F01005AAF-->  <NAME><![CDATA[Payment No]]></NAME>
-<!--80E839B16929298FE040007F01005AAF-->  <DESCRIPTION><![CDATA[Payment Number]]></DESCRIPTION>
+<!--80E839B16929298FE040007F01005AAF-->  <DESCRIPTION><![CDATA[Payment  In Number]]></DESCRIPTION>
 <!--80E839B16929298FE040007F01005AAF-->  <COLUMNNAME><![CDATA[Paymentno]]></COLUMNNAME>
 <!--80E839B16929298FE040007F01005AAF-->  <AD_TABLE_ID><![CDATA[B5FCAD3055044508B4464B6078A711AD]]></AD_TABLE_ID>
 <!--80E839B16929298FE040007F01005AAF-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
@@ -310769,8 +310771,8 @@
 <!--96137772B128438F9CA61B1837FC7C45-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--96137772B128438F9CA61B1837FC7C45-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--96137772B128438F9CA61B1837FC7C45-->  <NAME><![CDATA[Payment]]></NAME>
-<!--96137772B128438F9CA61B1837FC7C45-->  <DESCRIPTION><![CDATA[Payment event]]></DESCRIPTION>
-<!--96137772B128438F9CA61B1837FC7C45-->  <HELP><![CDATA[Payment event]]></HELP>
+<!--96137772B128438F9CA61B1837FC7C45-->  <DESCRIPTION><![CDATA[Payment In event]]></DESCRIPTION>
+<!--96137772B128438F9CA61B1837FC7C45-->  <HELP><![CDATA[Payment In event]]></HELP>
 <!--96137772B128438F9CA61B1837FC7C45-->  <COLUMNNAME><![CDATA[FIN_Payment_ID]]></COLUMNNAME>
 <!--96137772B128438F9CA61B1837FC7C45-->  <AD_TABLE_ID><![CDATA[A0B24CBC42D34AB4AC0A45BF1480F94F]]></AD_TABLE_ID>
 <!--96137772B128438F9CA61B1837FC7C45-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
@@ -310784,7 +310786,7 @@
 <!--96137772B128438F9CA61B1837FC7C45-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--96137772B128438F9CA61B1837FC7C45-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--96137772B128438F9CA61B1837FC7C45-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--96137772B128438F9CA61B1837FC7C45-->  <AD_ELEMENT_ID><![CDATA[7891269C83EA655DE040007F010155CE]]></AD_ELEMENT_ID>
+<!--96137772B128438F9CA61B1837FC7C45-->  <AD_ELEMENT_ID><![CDATA[0D1F9C2D797C49A7AA476A3047DC075A]]></AD_ELEMENT_ID>
 <!--96137772B128438F9CA61B1837FC7C45-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--96137772B128438F9CA61B1837FC7C45-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--96137772B128438F9CA61B1837FC7C45-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
--- a/src-db/database/sourcedata/AD_ELEMENT.xml	Tue Mar 08 18:42:40 2011 +0100
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml	Tue Mar 08 18:48:17 2011 +0100
@@ -22018,6 +22018,23 @@
 <!--0BD29E7F540B4C12A0F4E02B7A1F4061-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--0BD29E7F540B4C12A0F4E02B7A1F4061--></AD_ELEMENT>
 
+<!--0D1F9C2D797C49A7AA476A3047DC075A--><AD_ELEMENT>
+<!--0D1F9C2D797C49A7AA476A3047DC075A-->  <AD_ELEMENT_ID><![CDATA[0D1F9C2D797C49A7AA476A3047DC075A]]></AD_ELEMENT_ID>
+<!--0D1F9C2D797C49A7AA476A3047DC075A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0D1F9C2D797C49A7AA476A3047DC075A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0D1F9C2D797C49A7AA476A3047DC075A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0D1F9C2D797C49A7AA476A3047DC075A-->  <COLUMNNAME><![CDATA[FIN_Payment_ID]]></COLUMNNAME>
+<!--0D1F9C2D797C49A7AA476A3047DC075A-->  <NAME><![CDATA[Payment In]]></NAME>
+<!--0D1F9C2D797C49A7AA476A3047DC075A-->  <PRINTNAME><![CDATA[Payment In]]></PRINTNAME>
+<!--0D1F9C2D797C49A7AA476A3047DC075A-->  <DESCRIPTION><![CDATA[Payment In event]]></DESCRIPTION>
+<!--0D1F9C2D797C49A7AA476A3047DC075A-->  <HELP><![CDATA[Payment In event]]></HELP>
+<!--0D1F9C2D797C49A7AA476A3047DC075A-->  <PO_NAME><![CDATA[Payment Out]]></PO_NAME>
+<!--0D1F9C2D797C49A7AA476A3047DC075A-->  <PO_PRINTNAME><![CDATA[Payment Out]]></PO_PRINTNAME>
+<!--0D1F9C2D797C49A7AA476A3047DC075A-->  <PO_DESCRIPTION><![CDATA[Payment Out event]]></PO_DESCRIPTION>
+<!--0D1F9C2D797C49A7AA476A3047DC075A-->  <PO_HELP><![CDATA[Payment Out event]]></PO_HELP>
+<!--0D1F9C2D797C49A7AA476A3047DC075A-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--0D1F9C2D797C49A7AA476A3047DC075A--></AD_ELEMENT>
+
 <!--14976679CF0542CDA192111320E142C5--><AD_ELEMENT>
 <!--14976679CF0542CDA192111320E142C5-->  <AD_ELEMENT_ID><![CDATA[14976679CF0542CDA192111320E142C5]]></AD_ELEMENT_ID>
 <!--14976679CF0542CDA192111320E142C5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -22129,8 +22146,10 @@
 <!--3214384084114F38B297AD4448B6D3F6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--3214384084114F38B297AD4448B6D3F6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3214384084114F38B297AD4448B6D3F6-->  <COLUMNNAME><![CDATA[Prun_Status]]></COLUMNNAME>
-<!--3214384084114F38B297AD4448B6D3F6-->  <NAME><![CDATA[Payment Run Status]]></NAME>
-<!--3214384084114F38B297AD4448B6D3F6-->  <PRINTNAME><![CDATA[Payment Run Status]]></PRINTNAME>
+<!--3214384084114F38B297AD4448B6D3F6-->  <NAME><![CDATA[Payment In Run Status]]></NAME>
+<!--3214384084114F38B297AD4448B6D3F6-->  <PRINTNAME><![CDATA[Payment In Run Status]]></PRINTNAME>
+<!--3214384084114F38B297AD4448B6D3F6-->  <PO_NAME><![CDATA[Payment Out Run Status]]></PO_NAME>
+<!--3214384084114F38B297AD4448B6D3F6-->  <PO_PRINTNAME><![CDATA[Payment Out Run Status]]></PO_PRINTNAME>
 <!--3214384084114F38B297AD4448B6D3F6-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--3214384084114F38B297AD4448B6D3F6--></AD_ELEMENT>
 
@@ -23713,8 +23732,10 @@
 <!--5759BA2FA7D64D81926010710E37107B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--5759BA2FA7D64D81926010710E37107B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--5759BA2FA7D64D81926010710E37107B-->  <COLUMNNAME><![CDATA[Paymentexec_Message]]></COLUMNNAME>
-<!--5759BA2FA7D64D81926010710E37107B-->  <NAME><![CDATA[Payment Execution Message]]></NAME>
-<!--5759BA2FA7D64D81926010710E37107B-->  <PRINTNAME><![CDATA[Payment Execution Message]]></PRINTNAME>
+<!--5759BA2FA7D64D81926010710E37107B-->  <NAME><![CDATA[Payment In Execution Message]]></NAME>
+<!--5759BA2FA7D64D81926010710E37107B-->  <PRINTNAME><![CDATA[Payment In Execution Message]]></PRINTNAME>
+<!--5759BA2FA7D64D81926010710E37107B-->  <PO_NAME><![CDATA[Payment Out Execution Message]]></PO_NAME>
+<!--5759BA2FA7D64D81926010710E37107B-->  <PO_PRINTNAME><![CDATA[Payment Out Execution Message]]></PO_PRINTNAME>
 <!--5759BA2FA7D64D81926010710E37107B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--5759BA2FA7D64D81926010710E37107B--></AD_ELEMENT>
 
@@ -25432,8 +25453,10 @@
 <!--7891269C83E6655DE040007F010155CE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7891269C83E6655DE040007F010155CE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--7891269C83E6655DE040007F010155CE-->  <COLUMNNAME><![CDATA[Paymentdate]]></COLUMNNAME>
-<!--7891269C83E6655DE040007F010155CE-->  <NAME><![CDATA[Payment Date]]></NAME>
-<!--7891269C83E6655DE040007F010155CE-->  <PRINTNAME><![CDATA[Paymentdate]]></PRINTNAME>
+<!--7891269C83E6655DE040007F010155CE-->  <NAME><![CDATA[Payment In Date]]></NAME>
+<!--7891269C83E6655DE040007F010155CE-->  <PRINTNAME><![CDATA[Paymentindate]]></PRINTNAME>
+<!--7891269C83E6655DE040007F010155CE-->  <PO_NAME><![CDATA[Payment Out Date]]></PO_NAME>
+<!--7891269C83E6655DE040007F010155CE-->  <PO_PRINTNAME><![CDATA[Paymentoutdate]]></PO_PRINTNAME>
 <!--7891269C83E6655DE040007F010155CE-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--7891269C83E6655DE040007F010155CE--></AD_ELEMENT>
 
@@ -25524,8 +25547,10 @@
 <!--78B98ED0452F560FE040007F0101777C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--78B98ED0452F560FE040007F0101777C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--78B98ED0452F560FE040007F0101777C-->  <COLUMNNAME><![CDATA[Numberofpayments]]></COLUMNNAME>
-<!--78B98ED0452F560FE040007F0101777C-->  <NAME><![CDATA[Number of Payments]]></NAME>
-<!--78B98ED0452F560FE040007F0101777C-->  <PRINTNAME><![CDATA[Numberofpayments]]></PRINTNAME>
+<!--78B98ED0452F560FE040007F0101777C-->  <NAME><![CDATA[Number of Payments In]]></NAME>
+<!--78B98ED0452F560FE040007F0101777C-->  <PRINTNAME><![CDATA[Numberofpaymentsin]]></PRINTNAME>
+<!--78B98ED0452F560FE040007F0101777C-->  <PO_NAME><![CDATA[Number of Payments Out]]></PO_NAME>
+<!--78B98ED0452F560FE040007F0101777C-->  <PO_PRINTNAME><![CDATA[Numberofpaymentsout]]></PO_PRINTNAME>
 <!--78B98ED0452F560FE040007F0101777C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--78B98ED0452F560FE040007F0101777C--></AD_ELEMENT>
 
@@ -25546,10 +25571,14 @@
 <!--78B98ED04531560FE040007F0101777C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--78B98ED04531560FE040007F0101777C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--78B98ED04531560FE040007F0101777C-->  <COLUMNNAME><![CDATA[Fin_Payment_Sched_Inv_V_ID]]></COLUMNNAME>
-<!--78B98ED04531560FE040007F0101777C-->  <NAME><![CDATA[Invoice Payment Plan]]></NAME>
-<!--78B98ED04531560FE040007F0101777C-->  <PRINTNAME><![CDATA[Invoice Payment Plan]]></PRINTNAME>
-<!--78B98ED04531560FE040007F0101777C-->  <DESCRIPTION><![CDATA[Set of payments planned to be collected/paid for an invoice]]></DESCRIPTION>
-<!--78B98ED04531560FE040007F0101777C-->  <HELP><![CDATA[Set of payments planned to be collected/paid for an invoice]]></HELP>
+<!--78B98ED04531560FE040007F0101777C-->  <NAME><![CDATA[Invoice Payment In Plan]]></NAME>
+<!--78B98ED04531560FE040007F0101777C-->  <PRINTNAME><![CDATA[Invoice Payment In Plan]]></PRINTNAME>
+<!--78B98ED04531560FE040007F0101777C-->  <DESCRIPTION><![CDATA[Set of payments in planned to be collected/paid for an invoice]]></DESCRIPTION>
+<!--78B98ED04531560FE040007F0101777C-->  <HELP><![CDATA[Set of payments in planned to be collected/paid for an invoice]]></HELP>
+<!--78B98ED04531560FE040007F0101777C-->  <PO_NAME><![CDATA[Invoice Payment Out Plan]]></PO_NAME>
+<!--78B98ED04531560FE040007F0101777C-->  <PO_PRINTNAME><![CDATA[Invoice Payment Out Plan]]></PO_PRINTNAME>
+<!--78B98ED04531560FE040007F0101777C-->  <PO_DESCRIPTION><![CDATA[Set of payments out planned to be collected/paid for an invoice]]></PO_DESCRIPTION>
+<!--78B98ED04531560FE040007F0101777C-->  <PO_HELP><![CDATA[Set of payments out planned to be collected/paid for an invoice]]></PO_HELP>
 <!--78B98ED04531560FE040007F0101777C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--78B98ED04531560FE040007F0101777C--></AD_ELEMENT>
 
@@ -25559,11 +25588,12 @@
 <!--78B98ED04532560FE040007F0101777C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--78B98ED04532560FE040007F0101777C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--78B98ED04532560FE040007F0101777C-->  <COLUMNNAME><![CDATA[Lastpayment]]></COLUMNNAME>
-<!--78B98ED04532560FE040007F0101777C-->  <NAME><![CDATA[Last Payment Date]]></NAME>
-<!--78B98ED04532560FE040007F0101777C-->  <PRINTNAME><![CDATA[Last Payment Date]]></PRINTNAME>
-<!--78B98ED04532560FE040007F0101777C-->  <PO_NAME><![CDATA[Last Payment Date]]></PO_NAME>
-<!--78B98ED04532560FE040007F0101777C-->  <PO_PRINTNAME><![CDATA[Last Payment Date]]></PO_PRINTNAME>
-<!--78B98ED04532560FE040007F0101777C-->  <PO_DESCRIPTION><![CDATA[Last Payment Date]]></PO_DESCRIPTION>
+<!--78B98ED04532560FE040007F0101777C-->  <NAME><![CDATA[Last Payment In Date]]></NAME>
+<!--78B98ED04532560FE040007F0101777C-->  <PRINTNAME><![CDATA[Last Payment In Date]]></PRINTNAME>
+<!--78B98ED04532560FE040007F0101777C-->  <DESCRIPTION><![CDATA[Last Payment In Date]]></DESCRIPTION>
+<!--78B98ED04532560FE040007F0101777C-->  <PO_NAME><![CDATA[Last Payment Out Date]]></PO_NAME>
+<!--78B98ED04532560FE040007F0101777C-->  <PO_PRINTNAME><![CDATA[Last Payment Out Date]]></PO_PRINTNAME>
+<!--78B98ED04532560FE040007F0101777C-->  <PO_DESCRIPTION><![CDATA[Last Payment Out Date]]></PO_DESCRIPTION>
 <!--78B98ED04532560FE040007F0101777C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--78B98ED04532560FE040007F0101777C--></AD_ELEMENT>
 
@@ -25573,8 +25603,10 @@
 <!--78BBC5006BB24FD5E040007F01017F06-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--78BBC5006BB24FD5E040007F01017F06-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--78BBC5006BB24FD5E040007F01017F06-->  <COLUMNNAME><![CDATA[Fin_Payment_Detail_V_ID]]></COLUMNNAME>
-<!--78BBC5006BB24FD5E040007F01017F06-->  <NAME><![CDATA[Payment Detail]]></NAME>
-<!--78BBC5006BB24FD5E040007F01017F06-->  <PRINTNAME><![CDATA[Payment Detail]]></PRINTNAME>
+<!--78BBC5006BB24FD5E040007F01017F06-->  <NAME><![CDATA[Payment In Detail]]></NAME>
+<!--78BBC5006BB24FD5E040007F01017F06-->  <PRINTNAME><![CDATA[Payment In Detail]]></PRINTNAME>
+<!--78BBC5006BB24FD5E040007F01017F06-->  <PO_NAME><![CDATA[Payment Out Detail]]></PO_NAME>
+<!--78BBC5006BB24FD5E040007F01017F06-->  <PO_PRINTNAME><![CDATA[Payment Out Detail]]></PO_PRINTNAME>
 <!--78BBC5006BB24FD5E040007F01017F06-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--78BBC5006BB24FD5E040007F01017F06--></AD_ELEMENT>
 
@@ -25672,8 +25704,10 @@
 <!--7D4503081DF742E4B43354981406050D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7D4503081DF742E4B43354981406050D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--7D4503081DF742E4B43354981406050D-->  <COLUMNNAME><![CDATA[Paymentexec_Result]]></COLUMNNAME>
-<!--7D4503081DF742E4B43354981406050D-->  <NAME><![CDATA[Payment Execution Result]]></NAME>
-<!--7D4503081DF742E4B43354981406050D-->  <PRINTNAME><![CDATA[Payment Execution Result]]></PRINTNAME>
+<!--7D4503081DF742E4B43354981406050D-->  <NAME><![CDATA[Payment In Execution Result]]></NAME>
+<!--7D4503081DF742E4B43354981406050D-->  <PRINTNAME><![CDATA[Payment In Execution Result]]></PRINTNAME>
+<!--7D4503081DF742E4B43354981406050D-->  <PO_NAME><![CDATA[Payment Out Execution Result]]></PO_NAME>
+<!--7D4503081DF742E4B43354981406050D-->  <PO_PRINTNAME><![CDATA[Payment Out Execution Result]]></PO_PRINTNAME>
 <!--7D4503081DF742E4B43354981406050D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--7D4503081DF742E4B43354981406050D--></AD_ELEMENT>
 
@@ -25875,12 +25909,12 @@
 <!--7FF22347490A844FE040007F01003861-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7FF22347490A844FE040007F01003861-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--7FF22347490A844FE040007F01003861-->  <COLUMNNAME><![CDATA[Paymentno]]></COLUMNNAME>
-<!--7FF22347490A844FE040007F01003861-->  <NAME><![CDATA[Payment No.]]></NAME>
-<!--7FF22347490A844FE040007F01003861-->  <PRINTNAME><![CDATA[Payment No.]]></PRINTNAME>
-<!--7FF22347490A844FE040007F01003861-->  <DESCRIPTION><![CDATA[Payment Number]]></DESCRIPTION>
-<!--7FF22347490A844FE040007F01003861-->  <PO_NAME><![CDATA[Payment No.]]></PO_NAME>
-<!--7FF22347490A844FE040007F01003861-->  <PO_PRINTNAME><![CDATA[Payment No.]]></PO_PRINTNAME>
-<!--7FF22347490A844FE040007F01003861-->  <PO_DESCRIPTION><![CDATA[Payment Number]]></PO_DESCRIPTION>
+<!--7FF22347490A844FE040007F01003861-->  <NAME><![CDATA[Payment In No.]]></NAME>
+<!--7FF22347490A844FE040007F01003861-->  <PRINTNAME><![CDATA[Payment In No.]]></PRINTNAME>
+<!--7FF22347490A844FE040007F01003861-->  <DESCRIPTION><![CDATA[Payment  In Number]]></DESCRIPTION>
+<!--7FF22347490A844FE040007F01003861-->  <PO_NAME><![CDATA[Payment Out No.]]></PO_NAME>
+<!--7FF22347490A844FE040007F01003861-->  <PO_PRINTNAME><![CDATA[Payment Out No.]]></PO_PRINTNAME>
+<!--7FF22347490A844FE040007F01003861-->  <PO_DESCRIPTION><![CDATA[Payment Out Number]]></PO_DESCRIPTION>
 <!--7FF22347490A844FE040007F01003861-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--7FF22347490A844FE040007F01003861--></AD_ELEMENT>
 
@@ -26042,10 +26076,14 @@
 <!--802DBB308D08C960E040007F01001D1B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--802DBB308D08C960E040007F01001D1B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--802DBB308D08C960E040007F01001D1B-->  <COLUMNNAME><![CDATA[Fin_Payment_Sched_Ord_V_ID]]></COLUMNNAME>
-<!--802DBB308D08C960E040007F01001D1B-->  <NAME><![CDATA[Order Payment Plan]]></NAME>
-<!--802DBB308D08C960E040007F01001D1B-->  <PRINTNAME><![CDATA[Order Payment Plan]]></PRINTNAME>
-<!--802DBB308D08C960E040007F01001D1B-->  <DESCRIPTION><![CDATA[Set of payments planned to be collected/paid for an order]]></DESCRIPTION>
-<!--802DBB308D08C960E040007F01001D1B-->  <HELP><![CDATA[Set of payments planned to be collected/paid for an order]]></HELP>
+<!--802DBB308D08C960E040007F01001D1B-->  <NAME><![CDATA[Order Payment In Plan]]></NAME>
+<!--802DBB308D08C960E040007F01001D1B-->  <PRINTNAME><![CDATA[Order Payment In Plan]]></PRINTNAME>
+<!--802DBB308D08C960E040007F01001D1B-->  <DESCRIPTION><![CDATA[Set of payments in planned to be collected/paid for an order]]></DESCRIPTION>
+<!--802DBB308D08C960E040007F01001D1B-->  <HELP><![CDATA[Set of payments in planned to be collected/paid for an order]]></HELP>
+<!--802DBB308D08C960E040007F01001D1B-->  <PO_NAME><![CDATA[Order Payment Out Plan]]></PO_NAME>
+<!--802DBB308D08C960E040007F01001D1B-->  <PO_PRINTNAME><![CDATA[Order Payment Out Plan]]></PO_PRINTNAME>
+<!--802DBB308D08C960E040007F01001D1B-->  <PO_DESCRIPTION><![CDATA[Set of payments out planned to be collected/paid for an order]]></PO_DESCRIPTION>
+<!--802DBB308D08C960E040007F01001D1B-->  <PO_HELP><![CDATA[Set of payments out planned to be collected/paid for an order]]></PO_HELP>
 <!--802DBB308D08C960E040007F01001D1B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--802DBB308D08C960E040007F01001D1B--></AD_ELEMENT>
 
@@ -28015,8 +28053,10 @@
 <!--D6B8F4BF589745C2BFC0E41C36E47FDF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--D6B8F4BF589745C2BFC0E41C36E47FDF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--D6B8F4BF589745C2BFC0E41C36E47FDF-->  <COLUMNNAME><![CDATA[Prun_Message]]></COLUMNNAME>
-<!--D6B8F4BF589745C2BFC0E41C36E47FDF-->  <NAME><![CDATA[Payment Run Message]]></NAME>
-<!--D6B8F4BF589745C2BFC0E41C36E47FDF-->  <PRINTNAME><![CDATA[Payment Run Message]]></PRINTNAME>
+<!--D6B8F4BF589745C2BFC0E41C36E47FDF-->  <NAME><![CDATA[Payment In Run Message]]></NAME>
+<!--D6B8F4BF589745C2BFC0E41C36E47FDF-->  <PRINTNAME><![CDATA[Payment In Run Message]]></PRINTNAME>
+<!--D6B8F4BF589745C2BFC0E41C36E47FDF-->  <PO_NAME><![CDATA[Payment Out Run Message]]></PO_NAME>
+<!--D6B8F4BF589745C2BFC0E41C36E47FDF-->  <PO_PRINTNAME><![CDATA[Payment Out Run Message]]></PO_PRINTNAME>
 <!--D6B8F4BF589745C2BFC0E41C36E47FDF-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--D6B8F4BF589745C2BFC0E41C36E47FDF--></AD_ELEMENT>
 
--- a/src-db/database/sourcedata/AD_FIELD.xml	Tue Mar 08 18:42:40 2011 +0100
+++ b/src-db/database/sourcedata/AD_FIELD.xml	Tue Mar 08 18:48:17 2011 +0100
@@ -171779,7 +171779,7 @@
 <!--803429-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--803429-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--803429-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--803429-->  <NAME><![CDATA[Payment Complete]]></NAME>
+<!--803429-->  <NAME><![CDATA[Payment Out Complete]]></NAME>
 <!--803429-->  <DESCRIPTION><![CDATA[A confirmation stating whether the request has been closed through a monetary transaction.]]></DESCRIPTION>
 <!--803429-->  <HELP><![CDATA[The document is paid for.]]></HELP>
 <!--803429-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
@@ -197195,7 +197195,7 @@
 <!--1A1FB833ADF84AF380832122F9CA5608-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--1A1FB833ADF84AF380832122F9CA5608-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--1A1FB833ADF84AF380832122F9CA5608-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--1A1FB833ADF84AF380832122F9CA5608-->  <NAME><![CDATA[Payment Run Message]]></NAME>
+<!--1A1FB833ADF84AF380832122F9CA5608-->  <NAME><![CDATA[Payment In Run Message]]></NAME>
 <!--1A1FB833ADF84AF380832122F9CA5608-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--1A1FB833ADF84AF380832122F9CA5608-->  <AD_TAB_ID><![CDATA[ABD19F77982D41F7A53F7A61948A137D]]></AD_TAB_ID>
 <!--1A1FB833ADF84AF380832122F9CA5608-->  <AD_COLUMN_ID><![CDATA[34E193A45220401C9DA9E8A4EC6B40F8]]></AD_COLUMN_ID>
@@ -197849,7 +197849,7 @@
 <!--2A992108B0FC463B80C110A795B87673-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--2A992108B0FC463B80C110A795B87673-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--2A992108B0FC463B80C110A795B87673-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--2A992108B0FC463B80C110A795B87673-->  <NAME><![CDATA[Payment Execution Result]]></NAME>
+<!--2A992108B0FC463B80C110A795B87673-->  <NAME><![CDATA[Payment In Execution Result]]></NAME>
 <!--2A992108B0FC463B80C110A795B87673-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--2A992108B0FC463B80C110A795B87673-->  <AD_TAB_ID><![CDATA[ABD19F77982D41F7A53F7A61948A137D]]></AD_TAB_ID>
 <!--2A992108B0FC463B80C110A795B87673-->  <AD_COLUMN_ID><![CDATA[6A13E921C0D04B59B6F2D31DDC1BE2F2]]></AD_COLUMN_ID>
@@ -198404,7 +198404,7 @@
 <!--3A5ADBAF4A124014BD907E769AB0A2F4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--3A5ADBAF4A124014BD907E769AB0A2F4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--3A5ADBAF4A124014BD907E769AB0A2F4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--3A5ADBAF4A124014BD907E769AB0A2F4-->  <NAME><![CDATA[Payment Execution Message]]></NAME>
+<!--3A5ADBAF4A124014BD907E769AB0A2F4-->  <NAME><![CDATA[Payment Out Execution Message]]></NAME>
 <!--3A5ADBAF4A124014BD907E769AB0A2F4-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--3A5ADBAF4A124014BD907E769AB0A2F4-->  <AD_TAB_ID><![CDATA[719D6C8507CA4B27886C0D8A7859B543]]></AD_TAB_ID>
 <!--3A5ADBAF4A124014BD907E769AB0A2F4-->  <AD_COLUMN_ID><![CDATA[DE684B7F563E49E198807C2E8F5DCA3E]]></AD_COLUMN_ID>
@@ -198927,9 +198927,9 @@
 <!--450C02BAFF4349D890F0783E227524ED-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--450C02BAFF4349D890F0783E227524ED-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--450C02BAFF4349D890F0783E227524ED-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--450C02BAFF4349D890F0783E227524ED-->  <NAME><![CDATA[Payment]]></NAME>
-<!--450C02BAFF4349D890F0783E227524ED-->  <DESCRIPTION><![CDATA[Payment event]]></DESCRIPTION>
-<!--450C02BAFF4349D890F0783E227524ED-->  <HELP><![CDATA[Payment event]]></HELP>
+<!--450C02BAFF4349D890F0783E227524ED-->  <NAME><![CDATA[Payment Out]]></NAME>
+<!--450C02BAFF4349D890F0783E227524ED-->  <DESCRIPTION><![CDATA[Payment Out event]]></DESCRIPTION>
+<!--450C02BAFF4349D890F0783E227524ED-->  <HELP><![CDATA[Payment Out event]]></HELP>
 <!--450C02BAFF4349D890F0783E227524ED-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--450C02BAFF4349D890F0783E227524ED-->  <AD_TAB_ID><![CDATA[719D6C8507CA4B27886C0D8A7859B543]]></AD_TAB_ID>
 <!--450C02BAFF4349D890F0783E227524ED-->  <AD_COLUMN_ID><![CDATA[96137772B128438F9CA61B1837FC7C45]]></AD_COLUMN_ID>
@@ -201594,9 +201594,9 @@
 <!--5595D8490E49420E99AF3E23C3EA7D58-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--5595D8490E49420E99AF3E23C3EA7D58-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--5595D8490E49420E99AF3E23C3EA7D58-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--5595D8490E49420E99AF3E23C3EA7D58-->  <NAME><![CDATA[Payment]]></NAME>
-<!--5595D8490E49420E99AF3E23C3EA7D58-->  <DESCRIPTION><![CDATA[Payment event]]></DESCRIPTION>
-<!--5595D8490E49420E99AF3E23C3EA7D58-->  <HELP><![CDATA[Payment event]]></HELP>
+<!--5595D8490E49420E99AF3E23C3EA7D58-->  <NAME><![CDATA[Payment In]]></NAME>
+<!--5595D8490E49420E99AF3E23C3EA7D58-->  <DESCRIPTION><![CDATA[Payment In event]]></DESCRIPTION>
+<!--5595D8490E49420E99AF3E23C3EA7D58-->  <HELP><![CDATA[Payment In event]]></HELP>
 <!--5595D8490E49420E99AF3E23C3EA7D58-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--5595D8490E49420E99AF3E23C3EA7D58-->  <AD_TAB_ID><![CDATA[ABD19F77982D41F7A53F7A61948A137D]]></AD_TAB_ID>
 <!--5595D8490E49420E99AF3E23C3EA7D58-->  <AD_COLUMN_ID><![CDATA[96137772B128438F9CA61B1837FC7C45]]></AD_COLUMN_ID>
@@ -201642,9 +201642,9 @@
 <!--55E6EFE57ABB481582BCDC145E551FBB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--55E6EFE57ABB481582BCDC145E551FBB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--55E6EFE57ABB481582BCDC145E551FBB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--55E6EFE57ABB481582BCDC145E551FBB-->  <NAME><![CDATA[Payment]]></NAME>
-<!--55E6EFE57ABB481582BCDC145E551FBB-->  <DESCRIPTION><![CDATA[Payment event]]></DESCRIPTION>
-<!--55E6EFE57ABB481582BCDC145E551FBB-->  <HELP><![CDATA[Payment event]]></HELP>
+<!--55E6EFE57ABB481582BCDC145E551FBB-->  <NAME><![CDATA[Payment Out]]></NAME>
+<!--55E6EFE57ABB481582BCDC145E551FBB-->  <DESCRIPTION><![CDATA[Payment Out event]]></DESCRIPTION>
+<!--55E6EFE57ABB481582BCDC145E551FBB-->  <HELP><![CDATA[Payment Out event]]></HELP>
 <!--55E6EFE57ABB481582BCDC145E551FBB-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--55E6EFE57ABB481582BCDC145E551FBB-->  <AD_TAB_ID><![CDATA[F7A52FDAAA0346EFA07D53C125B40404]]></AD_TAB_ID>
 <!--55E6EFE57ABB481582BCDC145E551FBB-->  <AD_COLUMN_ID><![CDATA[7891269C83D0655DE040007F010155CE]]></AD_COLUMN_ID>
@@ -208627,7 +208627,7 @@
 <!--60B7D5ABB5FD47608ACB13EC89966A6B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--60B7D5ABB5FD47608ACB13EC89966A6B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--60B7D5ABB5FD47608ACB13EC89966A6B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--60B7D5ABB5FD47608ACB13EC89966A6B-->  <NAME><![CDATA[Payment Date]]></NAME>
+<!--60B7D5ABB5FD47608ACB13EC89966A6B-->  <NAME><![CDATA[Payment Out Date]]></NAME>
 <!--60B7D5ABB5FD47608ACB13EC89966A6B-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--60B7D5ABB5FD47608ACB13EC89966A6B-->  <AD_TAB_ID><![CDATA[07F009753DA647C2AF38697BA9F1B1A0]]></AD_TAB_ID>
 <!--60B7D5ABB5FD47608ACB13EC89966A6B-->  <AD_COLUMN_ID><![CDATA[78D16B5B178F661EE040007F010152F7]]></AD_COLUMN_ID>
@@ -209614,7 +209614,7 @@
 <!--6B9D3023A448408D99D48228B630ABEE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--6B9D3023A448408D99D48228B630ABEE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--6B9D3023A448408D99D48228B630ABEE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--6B9D3023A448408D99D48228B630ABEE-->  <NAME><![CDATA[Payment Execution Result]]></NAME>
+<!--6B9D3023A448408D99D48228B630ABEE-->  <NAME><![CDATA[Payment Out Execution Result]]></NAME>
 <!--6B9D3023A448408D99D48228B630ABEE-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--6B9D3023A448408D99D48228B630ABEE-->  <AD_TAB_ID><![CDATA[719D6C8507CA4B27886C0D8A7859B543]]></AD_TAB_ID>
 <!--6B9D3023A448408D99D48228B630ABEE-->  <AD_COLUMN_ID><![CDATA[6A13E921C0D04B59B6F2D31DDC1BE2F2]]></AD_COLUMN_ID>
@@ -211036,7 +211036,7 @@
 <!--771DEC9F50EE4E5998FD780F99D1A7A5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--771DEC9F50EE4E5998FD780F99D1A7A5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--771DEC9F50EE4E5998FD780F99D1A7A5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--771DEC9F50EE4E5998FD780F99D1A7A5-->  <NAME><![CDATA[Payment Run Message]]></NAME>
+<!--771DEC9F50EE4E5998FD780F99D1A7A5-->  <NAME><![CDATA[Payment Out Run Message]]></NAME>
 <!--771DEC9F50EE4E5998FD780F99D1A7A5-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--771DEC9F50EE4E5998FD780F99D1A7A5-->  <AD_TAB_ID><![CDATA[719D6C8507CA4B27886C0D8A7859B543]]></AD_TAB_ID>
 <!--771DEC9F50EE4E5998FD780F99D1A7A5-->  <AD_COLUMN_ID><![CDATA[34E193A45220401C9DA9E8A4EC6B40F8]]></AD_COLUMN_ID>
@@ -211386,9 +211386,9 @@
 <!--7C541AC0C75BFDD7E040007F01016B4D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--7C541AC0C75BFDD7E040007F01016B4D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7C541AC0C75BFDD7E040007F01016B4D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--7C541AC0C75BFDD7E040007F01016B4D-->  <NAME><![CDATA[Payment]]></NAME>
-<!--7C541AC0C75BFDD7E040007F01016B4D-->  <DESCRIPTION><![CDATA[Payment event]]></DESCRIPTION>
-<!--7C541AC0C75BFDD7E040007F01016B4D-->  <HELP><![CDATA[Payment event]]></HELP>
+<!--7C541AC0C75BFDD7E040007F01016B4D-->  <NAME><![CDATA[Payment In]]></NAME>
+<!--7C541AC0C75BFDD7E040007F01016B4D-->  <DESCRIPTION><![CDATA[Payment In event]]></DESCRIPTION>
+<!--7C541AC0C75BFDD7E040007F01016B4D-->  <HELP><![CDATA[Payment In event]]></HELP>
 <!--7C541AC0C75BFDD7E040007F01016B4D-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--7C541AC0C75BFDD7E040007F01016B4D-->  <AD_TAB_ID><![CDATA[C4B6506838E14A349D6717D6856F1B56]]></AD_TAB_ID>
 <!--7C541AC0C75BFDD7E040007F01016B4D-->  <AD_COLUMN_ID><![CDATA[7891269C83D0655DE040007F010155CE]]></AD_COLUMN_ID>
@@ -211562,7 +211562,7 @@
 <!--7C541AC0C765FDD7E040007F01016B4D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--7C541AC0C765FDD7E040007F01016B4D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7C541AC0C765FDD7E040007F01016B4D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--7C541AC0C765FDD7E040007F01016B4D-->  <NAME><![CDATA[Payment Date]]></NAME>
+<!--7C541AC0C765FDD7E040007F01016B4D-->  <NAME><![CDATA[Payment In Date]]></NAME>
 <!--7C541AC0C765FDD7E040007F01016B4D-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--7C541AC0C765FDD7E040007F01016B4D-->  <AD_TAB_ID><![CDATA[C4B6506838E14A349D6717D6856F1B56]]></AD_TAB_ID>
 <!--7C541AC0C765FDD7E040007F01016B4D-->  <AD_COLUMN_ID><![CDATA[7891269C83DB655DE040007F010155CE]]></AD_COLUMN_ID>
@@ -212109,7 +212109,7 @@
 <!--7DC34559B408B45BE040007F0100784A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--7DC34559B408B45BE040007F0100784A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7DC34559B408B45BE040007F0100784A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--7DC34559B408B45BE040007F0100784A-->  <NAME><![CDATA[Payment Date]]></NAME>
+<!--7DC34559B408B45BE040007F0100784A-->  <NAME><![CDATA[Payment Out Date]]></NAME>
 <!--7DC34559B408B45BE040007F0100784A-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--7DC34559B408B45BE040007F0100784A-->  <AD_TAB_ID><![CDATA[2DD6F1E2CAE0456AA9797A1D627BFF5E]]></AD_TAB_ID>
 <!--7DC34559B408B45BE040007F0100784A-->  <AD_COLUMN_ID><![CDATA[E9A4CCD256404FDDA9EDDC07F9FCAE4B]]></AD_COLUMN_ID>
@@ -213943,9 +213943,9 @@
 <!--7FF2234748FB844FE040007F01003861-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--7FF2234748FB844FE040007F01003861-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7FF2234748FB844FE040007F01003861-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--7FF2234748FB844FE040007F01003861-->  <NAME><![CDATA[Payment]]></NAME>
-<!--7FF2234748FB844FE040007F01003861-->  <DESCRIPTION><![CDATA[Payment event]]></DESCRIPTION>
-<!--7FF2234748FB844FE040007F01003861-->  <HELP><![CDATA[Payment event]]></HELP>
+<!--7FF2234748FB844FE040007F01003861-->  <NAME><![CDATA[Payment In]]></NAME>
+<!--7FF2234748FB844FE040007F01003861-->  <DESCRIPTION><![CDATA[Payment In event]]></DESCRIPTION>
+<!--7FF2234748FB844FE040007F01003861-->  <HELP><![CDATA[Payment In event]]></HELP>
 <!--7FF2234748FB844FE040007F01003861-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--7FF2234748FB844FE040007F01003861-->  <AD_TAB_ID><![CDATA[173B46EC4F91406E9B68DCF6464BB308]]></AD_TAB_ID>
 <!--7FF2234748FB844FE040007F01003861-->  <AD_COLUMN_ID><![CDATA[7FF2234748EC844FE040007F01003861]]></AD_COLUMN_ID>
@@ -213968,9 +213968,9 @@
 <!--7FF2234748FC844FE040007F01003861-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--7FF2234748FC844FE040007F01003861-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7FF2234748FC844FE040007F01003861-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--7FF2234748FC844FE040007F01003861-->  <NAME><![CDATA[Invoice Payment Plan]]></NAME>
-<!--7FF2234748FC844FE040007F01003861-->  <DESCRIPTION><![CDATA[Set of payments planned to be collected/paid for an invoice]]></DESCRIPTION>
-<!--7FF2234748FC844FE040007F01003861-->  <HELP><![CDATA[Set of payments planned to be collected/paid for an invoice]]></HELP>
+<!--7FF2234748FC844FE040007F01003861-->  <NAME><![CDATA[Invoice Payment In Plan]]></NAME>
+<!--7FF2234748FC844FE040007F01003861-->  <DESCRIPTION><![CDATA[Set of payments in planned to be collected/paid for an invoice]]></DESCRIPTION>
+<!--7FF2234748FC844FE040007F01003861-->  <HELP><![CDATA[Set of payments in planned to be collected/paid for an invoice]]></HELP>
 <!--7FF2234748FC844FE040007F01003861-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--7FF2234748FC844FE040007F01003861-->  <AD_TAB_ID><![CDATA[173B46EC4F91406E9B68DCF6464BB308]]></AD_TAB_ID>
 <!--7FF2234748FC844FE040007F01003861-->  <AD_COLUMN_ID><![CDATA[7FF2234748E7844FE040007F01003861]]></AD_COLUMN_ID>
@@ -213993,9 +213993,9 @@
 <!--7FF2234748FD844FE040007F01003861-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--7FF2234748FD844FE040007F01003861-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7FF2234748FD844FE040007F01003861-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--7FF2234748FD844FE040007F01003861-->  <NAME><![CDATA[Order Payment Plan]]></NAME>
-<!--7FF2234748FD844FE040007F01003861-->  <DESCRIPTION><![CDATA[Set of payments planned to be collected/paid for an order]]></DESCRIPTION>
-<!--7FF2234748FD844FE040007F01003861-->  <HELP><![CDATA[Set of payments planned to be collected/paid for an order]]></HELP>
+<!--7FF2234748FD844FE040007F01003861-->  <NAME><![CDATA[Order Payment In Plan]]></NAME>
+<!--7FF2234748FD844FE040007F01003861-->  <DESCRIPTION><![CDATA[Set of payments in planned to be collected/paid for an order]]></DESCRIPTION>
+<!--7FF2234748FD844FE040007F01003861-->  <HELP><![CDATA[Set of payments in planned to be collected/paid for an order]]></HELP>
 <!--7FF2234748FD844FE040007F01003861-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--7FF2234748FD844FE040007F01003861-->  <AD_TAB_ID><![CDATA[173B46EC4F91406E9B68DCF6464BB308]]></AD_TAB_ID>
 <!--7FF2234748FD844FE040007F01003861-->  <AD_COLUMN_ID><![CDATA[7FF2234748E8844FE040007F01003861]]></AD_COLUMN_ID>
@@ -214018,7 +214018,7 @@
 <!--7FF2234748FE844FE040007F01003861-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--7FF2234748FE844FE040007F01003861-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7FF2234748FE844FE040007F01003861-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--7FF2234748FE844FE040007F01003861-->  <NAME><![CDATA[Payment Detail]]></NAME>
+<!--7FF2234748FE844FE040007F01003861-->  <NAME><![CDATA[Payment In Detail]]></NAME>
 <!--7FF2234748FE844FE040007F01003861-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--7FF2234748FE844FE040007F01003861-->  <AD_TAB_ID><![CDATA[173B46EC4F91406E9B68DCF6464BB308]]></AD_TAB_ID>
 <!--7FF2234748FE844FE040007F01003861-->  <AD_COLUMN_ID><![CDATA[78D16B5B1787661EE040007F010152F7]]></AD_COLUMN_ID>
@@ -214185,7 +214185,7 @@
 <!--7FF223474906844FE040007F01003861-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--7FF223474906844FE040007F01003861-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7FF223474906844FE040007F01003861-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--7FF223474906844FE040007F01003861-->  <NAME><![CDATA[Payment Date]]></NAME>
+<!--7FF223474906844FE040007F01003861-->  <NAME><![CDATA[Payment In Date]]></NAME>
 <!--7FF223474906844FE040007F01003861-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--7FF223474906844FE040007F01003861-->  <AD_TAB_ID><![CDATA[173B46EC4F91406E9B68DCF6464BB308]]></AD_TAB_ID>
 <!--7FF223474906844FE040007F01003861-->  <AD_COLUMN_ID><![CDATA[78D16B5B178F661EE040007F010152F7]]></AD_COLUMN_ID>
@@ -214207,8 +214207,8 @@
 <!--7FF223474907844FE040007F01003861-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--7FF223474907844FE040007F01003861-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7FF223474907844FE040007F01003861-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--7FF223474907844FE040007F01003861-->  <NAME><![CDATA[Payment No.]]></NAME>
-<!--7FF223474907844FE040007F01003861-->  <DESCRIPTION><![CDATA[Payment Number]]></DESCRIPTION>
+<!--7FF223474907844FE040007F01003861-->  <NAME><![CDATA[Payment In No.]]></NAME>
+<!--7FF223474907844FE040007F01003861-->  <DESCRIPTION><![CDATA[Payment  In Number]]></DESCRIPTION>
 <!--7FF223474907844FE040007F01003861-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--7FF223474907844FE040007F01003861-->  <AD_TAB_ID><![CDATA[173B46EC4F91406E9B68DCF6464BB308]]></AD_TAB_ID>
 <!--7FF223474907844FE040007F01003861-->  <AD_COLUMN_ID><![CDATA[7FF2234748EB844FE040007F01003861]]></AD_COLUMN_ID>
@@ -214747,8 +214747,8 @@
 <!--80E4CFBA7924A660E040007F01005D04-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--80E4CFBA7924A660E040007F01005D04-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--80E4CFBA7924A660E040007F01005D04-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--80E4CFBA7924A660E040007F01005D04-->  <NAME><![CDATA[Payment No.]]></NAME>
-<!--80E4CFBA7924A660E040007F01005D04-->  <DESCRIPTION><![CDATA[Payment Number]]></DESCRIPTION>
+<!--80E4CFBA7924A660E040007F01005D04-->  <NAME><![CDATA[Payment Out No.]]></NAME>
+<!--80E4CFBA7924A660E040007F01005D04-->  <DESCRIPTION><![CDATA[Payment Out Number]]></DESCRIPTION>
 <!--80E4CFBA7924A660E040007F01005D04-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--80E4CFBA7924A660E040007F01005D04-->  <AD_TAB_ID><![CDATA[E13E29EB8CF349BAA3D4CB71873CC896]]></AD_TAB_ID>
 <!--80E4CFBA7924A660E040007F01005D04-->  <AD_COLUMN_ID><![CDATA[80E839B16929298FE040007F01005AAF]]></AD_COLUMN_ID>
@@ -217971,8 +217971,8 @@
 <!--885CE3F4E4EF4D4C924BBFCE1FA0AB39-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--885CE3F4E4EF4D4C924BBFCE1FA0AB39-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--885CE3F4E4EF4D4C924BBFCE1FA0AB39-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--885CE3F4E4EF4D4C924BBFCE1FA0AB39-->  <NAME><![CDATA[Payment No.]]></NAME>
-<!--885CE3F4E4EF4D4C924BBFCE1FA0AB39-->  <DESCRIPTION><![CDATA[Payment Number]]></DESCRIPTION>
+<!--885CE3F4E4EF4D4C924BBFCE1FA0AB39-->  <NAME><![CDATA[Payment Out No.]]></NAME>
+<!--885CE3F4E4EF4D4C924BBFCE1FA0AB39-->  <DESCRIPTION><![CDATA[Payment Out Number]]></DESCRIPTION>
 <!--885CE3F4E4EF4D4C924BBFCE1FA0AB39-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--885CE3F4E4EF4D4C924BBFCE1FA0AB39-->  <AD_TAB_ID><![CDATA[07F009753DA647C2AF38697BA9F1B1A0]]></AD_TAB_ID>
 <!--885CE3F4E4EF4D4C924BBFCE1FA0AB39-->  <AD_COLUMN_ID><![CDATA[7FF2234748EB844FE040007F01003861]]></AD_COLUMN_ID>
@@ -219132,7 +219132,7 @@
 <!--9020A8DA71DF4538B80FED27E41583A5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--9020A8DA71DF4538B80FED27E41583A5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--9020A8DA71DF4538B80FED27E41583A5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--9020A8DA71DF4538B80FED27E41583A5-->  <NAME><![CDATA[Payment Run Status]]></NAME>
+<!--9020A8DA71DF4538B80FED27E41583A5-->  <NAME><![CDATA[Payment Out Run Status]]></NAME>
 <!--9020A8DA71DF4538B80FED27E41583A5-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--9020A8DA71DF4538B80FED27E41583A5-->  <AD_TAB_ID><![CDATA[719D6C8507CA4B27886C0D8A7859B543]]></AD_TAB_ID>
 <!--9020A8DA71DF4538B80FED27E41583A5-->  <AD_COLUMN_ID><![CDATA[2B8EAE6B89BE4C418795AA11EE377A3E]]></AD_COLUMN_ID>
@@ -220920,7 +220920,7 @@
 <!--9B255A20E9AC41A2AA3028A0D5BCF0B9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--9B255A20E9AC41A2AA3028A0D5BCF0B9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--9B255A20E9AC41A2AA3028A0D5BCF0B9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--9B255A20E9AC41A2AA3028A0D5BCF0B9-->  <NAME><![CDATA[Payment Date]]></NAME>
+<!--9B255A20E9AC41A2AA3028A0D5BCF0B9-->  <NAME><![CDATA[Payment Out Date]]></NAME>
 <!--9B255A20E9AC41A2AA3028A0D5BCF0B9-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--9B255A20E9AC41A2AA3028A0D5BCF0B9-->  <AD_TAB_ID><![CDATA[F7A52FDAAA0346EFA07D53C125B40404]]></AD_TAB_ID>
 <!--9B255A20E9AC41A2AA3028A0D5BCF0B9-->  <AD_COLUMN_ID><![CDATA[7891269C83DB655DE040007F010155CE]]></AD_COLUMN_ID>
@@ -221990,7 +221990,7 @@
 <!--B8CD44FF19E3491DB14C0383FFF23428-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--B8CD44FF19E3491DB14C0383FFF23428-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--B8CD44FF19E3491DB14C0383FFF23428-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--B8CD44FF19E3491DB14C0383FFF23428-->  <NAME><![CDATA[Payment Detail]]></NAME>
+<!--B8CD44FF19E3491DB14C0383FFF23428-->  <NAME><![CDATA[Payment Out Detail]]></NAME>
 <!--B8CD44FF19E3491DB14C0383FFF23428-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--B8CD44FF19E3491DB14C0383FFF23428-->  <AD_TAB_ID><![CDATA[07F009753DA647C2AF38697BA9F1B1A0]]></AD_TAB_ID>
 <!--B8CD44FF19E3491DB14C0383FFF23428-->  <AD_COLUMN_ID><![CDATA[78D16B5B1787661EE040007F010152F7]]></AD_COLUMN_ID>
@@ -222545,9 +222545,9 @@
 <!--C90A5A1B7E964312BA428950997620E7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--C90A5A1B7E964312BA428950997620E7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--C90A5A1B7E964312BA428950997620E7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--C90A5A1B7E964312BA428950997620E7-->  <NAME><![CDATA[Payment]]></NAME>
-<!--C90A5A1B7E964312BA428950997620E7-->  <DESCRIPTION><![CDATA[Payment event]]></DESCRIPTION>
-<!--C90A5A1B7E964312BA428950997620E7-->  <HELP><![CDATA[Payment event]]></HELP>
+<!--C90A5A1B7E964312BA428950997620E7-->  <NAME><![CDATA[Payment Out]]></NAME>
+<!--C90A5A1B7E964312BA428950997620E7-->  <DESCRIPTION><![CDATA[Payment Out event]]></DESCRIPTION>
+<!--C90A5A1B7E964312BA428950997620E7-->  <HELP><![CDATA[Payment Out event]]></HELP>
 <!--C90A5A1B7E964312BA428950997620E7-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--C90A5A1B7E964312BA428950997620E7-->  <AD_TAB_ID><![CDATA[07F009753DA647C2AF38697BA9F1B1A0]]></AD_TAB_ID>
 <!--C90A5A1B7E964312BA428950997620E7-->  <AD_COLUMN_ID><![CDATA[7FF2234748EC844FE040007F01003861]]></AD_COLUMN_ID>
@@ -222747,9 +222747,9 @@
 <!--CD209A4B03CB49888E599377D73FD576-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--CD209A4B03CB49888E599377D73FD576-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--CD209A4B03CB49888E599377D73FD576-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--CD209A4B03CB49888E599377D73FD576-->  <NAME><![CDATA[Invoice Payment Plan]]></NAME>
-<!--CD209A4B03CB49888E599377D73FD576-->  <DESCRIPTION><![CDATA[Set of payments planned to be collected/paid for an invoice]]></DESCRIPTION>
-<!--CD209A4B03CB49888E599377D73FD576-->  <HELP><![CDATA[Set of payments planned to be collected/paid for an invoice]]></HELP>
+<!--CD209A4B03CB49888E599377D73FD576-->  <NAME><![CDATA[Invoice Payment Out Plan]]></NAME>
+<!--CD209A4B03CB49888E599377D73FD576-->  <DESCRIPTION><![CDATA[Set of payments out planned to be collected/paid for an invoice]]></DESCRIPTION>
+<!--CD209A4B03CB49888E599377D73FD576-->  <HELP><![CDATA[Set of payments out planned to be collected/paid for an invoice]]></HELP>
 <!--CD209A4B03CB49888E599377D73FD576-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--CD209A4B03CB49888E599377D73FD576-->  <AD_TAB_ID><![CDATA[07F009753DA647C2AF38697BA9F1B1A0]]></AD_TAB_ID>
 <!--CD209A4B03CB49888E599377D73FD576-->  <AD_COLUMN_ID><![CDATA[7FF2234748E7844FE040007F01003861]]></AD_COLUMN_ID>
@@ -223494,7 +223494,7 @@
 <!--E631ADB38CF6400BA9EC80FA38CABC51-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--E631ADB38CF6400BA9EC80FA38CABC51-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--E631ADB38CF6400BA9EC80FA38CABC51-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--E631ADB38CF6400BA9EC80FA38CABC51-->  <NAME><![CDATA[Payment Run Status]]></NAME>
+<!--E631ADB38CF6400BA9EC80FA38CABC51-->  <NAME><![CDATA[Payment In Run Status]]></NAME>
 <!--E631ADB38CF6400BA9EC80FA38CABC51-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--E631ADB38CF6400BA9EC80FA38CABC51-->  <AD_TAB_ID><![CDATA[ABD19F77982D41F7A53F7A61948A137D]]></AD_TAB_ID>
 <!--E631ADB38CF6400BA9EC80FA38CABC51-->  <AD_COLUMN_ID><![CDATA[2B8EAE6B89BE4C418795AA11EE377A3E]]></AD_COLUMN_ID>
@@ -223642,9 +223642,9 @@
 <!--ED25D01BDDB340AB850689C093A91E38-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--ED25D01BDDB340AB850689C093A91E38-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--ED25D01BDDB340AB850689C093A91E38-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--ED25D01BDDB340AB850689C093A91E38-->  <NAME><![CDATA[Order Payment Plan]]></NAME>
-<!--ED25D01BDDB340AB850689C093A91E38-->  <DESCRIPTION><![CDATA[Set of payments planned to be collected/paid for an order]]></DESCRIPTION>
-<!--ED25D01BDDB340AB850689C093A91E38-->  <HELP><![CDATA[Set of payments planned to be collected/paid for an order]]></HELP>
+<!--ED25D01BDDB340AB850689C093A91E38-->  <NAME><![CDATA[Order Payment Out Plan]]></NAME>
+<!--ED25D01BDDB340AB850689C093A91E38-->  <DESCRIPTION><![CDATA[Set of payments out planned to be collected/paid for an order]]></DESCRIPTION>
+<!--ED25D01BDDB340AB850689C093A91E38-->  <HELP><![CDATA[Set of payments out planned to be collected/paid for an order]]></HELP>
 <!--ED25D01BDDB340AB850689C093A91E38-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--ED25D01BDDB340AB850689C093A91E38-->  <AD_TAB_ID><![CDATA[07F009753DA647C2AF38697BA9F1B1A0]]></AD_TAB_ID>
 <!--ED25D01BDDB340AB850689C093A91E38-->  <AD_COLUMN_ID><![CDATA[7FF2234748E8844FE040007F01003861]]></AD_COLUMN_ID>
@@ -223864,7 +223864,7 @@
 <!--F8A7E19BEA2A4E6792E81EB12A644DDE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--F8A7E19BEA2A4E6792E81EB12A644DDE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--F8A7E19BEA2A4E6792E81EB12A644DDE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--F8A7E19BEA2A4E6792E81EB12A644DDE-->  <NAME><![CDATA[Payment Execution Message]]></NAME>
+<!--F8A7E19BEA2A4E6792E81EB12A644DDE-->  <NAME><![CDATA[Payment In Execution Message]]></NAME>
 <!--F8A7E19BEA2A4E6792E81EB12A644DDE-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--F8A7E19BEA2A4E6792E81EB12A644DDE-->  <AD_TAB_ID><![CDATA[ABD19F77982D41F7A53F7A61948A137D]]></AD_TAB_ID>
 <!--F8A7E19BEA2A4E6792E81EB12A644DDE-->  <AD_COLUMN_ID><![CDATA[DE684B7F563E49E198807C2E8F5DCA3E]]></AD_COLUMN_ID>