fixed bug 20405 Delete all Payment In and Payment Out labels and set Payment
authorNaiara Martinez <naiara.martinez@openbravo.com>
Fri, 18 May 2012 12:46:25 +0200
changeset 16588 67264ae4caee
parent 16587 89b75c8eead8
child 16589 ea677b8b74b5
fixed bug 20405 Delete all Payment In and Payment Out labels and set Payment
this labels are deleted from Sales/Purchase Order and Sales/Purchase invoice
windows.
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_TAB.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_ELEMENT.xml
src-db/database/sourcedata/AD_FIELD.xml
src-db/database/sourcedata/AD_TAB.xml
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml	Wed May 16 10:57:50 2012 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml	Fri May 18 12:46:25 2012 +0200
@@ -449,10 +449,10 @@
 <!--AF073DA2C96EFA0CE040A8C09166378E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--AF073DA2C96EFA0CE040A8C09166378E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--AF073DA2C96EFA0CE040A8C09166378E-->  <COLUMNNAME><![CDATA[EM_Aprm_Modif_Paym_Sched]]></COLUMNNAME>
-<!--AF073DA2C96EFA0CE040A8C09166378E-->  <NAME><![CDATA[Modify Payment In Plan]]></NAME>
-<!--AF073DA2C96EFA0CE040A8C09166378E-->  <PRINTNAME><![CDATA[Modify Payment In Plan]]></PRINTNAME>
-<!--AF073DA2C96EFA0CE040A8C09166378E-->  <PO_NAME><![CDATA[Modify Payment Out Plan]]></PO_NAME>
-<!--AF073DA2C96EFA0CE040A8C09166378E-->  <PO_PRINTNAME><![CDATA[Modify Payment Out Plan]]></PO_PRINTNAME>
+<!--AF073DA2C96EFA0CE040A8C09166378E-->  <NAME><![CDATA[Modify Payment Plan]]></NAME>
+<!--AF073DA2C96EFA0CE040A8C09166378E-->  <PRINTNAME><![CDATA[Modify Payment Plan]]></PRINTNAME>
+<!--AF073DA2C96EFA0CE040A8C09166378E-->  <PO_NAME><![CDATA[Modify Payment Plan]]></PO_NAME>
+<!--AF073DA2C96EFA0CE040A8C09166378E-->  <PO_PRINTNAME><![CDATA[Modify Payment Plan]]></PO_PRINTNAME>
 <!--AF073DA2C96EFA0CE040A8C09166378E-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--AF073DA2C96EFA0CE040A8C09166378E-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--AF073DA2C96EFA0CE040A8C09166378E--></AD_ELEMENT>
@@ -533,10 +533,10 @@
 <!--EDB9CF491555465382F828F48291A0C0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--EDB9CF491555465382F828F48291A0C0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--EDB9CF491555465382F828F48291A0C0-->  <COLUMNNAME><![CDATA[EM_Aprm_Modif_Paym_Sched]]></COLUMNNAME>
-<!--EDB9CF491555465382F828F48291A0C0-->  <NAME><![CDATA[Modify Payment Out Plan]]></NAME>
-<!--EDB9CF491555465382F828F48291A0C0-->  <PRINTNAME><![CDATA[Modify Payment Out Plan]]></PRINTNAME>
-<!--EDB9CF491555465382F828F48291A0C0-->  <PO_NAME><![CDATA[Modify Payment Out Plan]]></PO_NAME>
-<!--EDB9CF491555465382F828F48291A0C0-->  <PO_PRINTNAME><![CDATA[Modify Payment Out Plan]]></PO_PRINTNAME>
+<!--EDB9CF491555465382F828F48291A0C0-->  <NAME><![CDATA[Modify Payment Plan]]></NAME>
+<!--EDB9CF491555465382F828F48291A0C0-->  <PRINTNAME><![CDATA[Modify Payment Plan]]></PRINTNAME>
+<!--EDB9CF491555465382F828F48291A0C0-->  <PO_NAME><![CDATA[Modify Payment Plan]]></PO_NAME>
+<!--EDB9CF491555465382F828F48291A0C0-->  <PO_PRINTNAME><![CDATA[Modify Payment Plan]]></PO_PRINTNAME>
 <!--EDB9CF491555465382F828F48291A0C0-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--EDB9CF491555465382F828F48291A0C0-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--EDB9CF491555465382F828F48291A0C0--></AD_ELEMENT>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml	Wed May 16 10:57:50 2012 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml	Fri May 18 12:46:25 2012 +0200
@@ -165,7 +165,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 Out Detail]]></NAME>
+<!--07C4E0B4DF6E4C7AAF5574C5ABA25C65-->  <NAME><![CDATA[Payment 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>
@@ -189,8 +189,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 Out Date]]></NAME>
-<!--07D342328D8B4289811B84E1E56D45D0-->  <DESCRIPTION><![CDATA[Last Payment Out Date]]></DESCRIPTION>
+<!--07D342328D8B4289811B84E1E56D45D0-->  <NAME><![CDATA[Last Payment Date]]></NAME>
+<!--07D342328D8B4289811B84E1E56D45D0-->  <DESCRIPTION><![CDATA[Last Payment 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>
@@ -436,7 +436,7 @@
 <!--0E791625C809422D901B5B08DE46F11F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--0E791625C809422D901B5B08DE46F11F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0E791625C809422D901B5B08DE46F11F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--0E791625C809422D901B5B08DE46F11F-->  <NAME><![CDATA[Modify Payment In Plan]]></NAME>
+<!--0E791625C809422D901B5B08DE46F11F-->  <NAME><![CDATA[Modify Payment Plan]]></NAME>
 <!--0E791625C809422D901B5B08DE46F11F-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--0E791625C809422D901B5B08DE46F11F-->  <AD_TAB_ID><![CDATA[EB0466B2A22343F28773B356D292BC7E]]></AD_TAB_ID>
 <!--0E791625C809422D901B5B08DE46F11F-->  <AD_COLUMN_ID><![CDATA[385DE6A637CD4D788AB480B3D1369E4F]]></AD_COLUMN_ID>
@@ -1613,7 +1613,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 Out Detail]]></NAME>
+<!--3E9C6405F0D641308A4377E3198600FE-->  <NAME><![CDATA[Payment 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>
@@ -2438,7 +2438,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 In Date]]></NAME>
+<!--5280E667A502462EBD6D493EBD4B129F-->  <NAME><![CDATA[Payment 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>
@@ -3007,7 +3007,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 Out]]></NAME>
+<!--6482EC5269CB42CCBC5933A13DF906A5-->  <NAME><![CDATA[Number of Payments]]></NAME>
 <!--6482EC5269CB42CCBC5933A13DF906A5-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--6482EC5269CB42CCBC5933A13DF906A5-->  <AD_TAB_ID><![CDATA[FA57D75B1BBB4583B4A777008A29BF54]]></AD_TAB_ID>
 <!--6482EC5269CB42CCBC5933A13DF906A5-->  <AD_COLUMN_ID><![CDATA[802DBB308D07C960E040007F01001D1B]]></AD_COLUMN_ID>
@@ -3465,7 +3465,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 Out Date]]></NAME>
+<!--6D50A189DB3741C0B28C5F52E3AC0136-->  <NAME><![CDATA[Payment 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>
@@ -3790,8 +3790,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 In Date]]></NAME>
-<!--797B22297EFB4124A41FEE6EDD71E14F-->  <DESCRIPTION><![CDATA[Last Payment In Date]]></DESCRIPTION>
+<!--797B22297EFB4124A41FEE6EDD71E14F-->  <NAME><![CDATA[Last Payment Date]]></NAME>
+<!--797B22297EFB4124A41FEE6EDD71E14F-->  <DESCRIPTION><![CDATA[Last Payment 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>
@@ -4425,8 +4425,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 In No.]]></NAME>
-<!--7FF44B41FD590341E040007F01006989-->  <DESCRIPTION><![CDATA[Payment  In Number]]></DESCRIPTION>
+<!--7FF44B41FD590341E040007F01006989-->  <NAME><![CDATA[Payment No.]]></NAME>
+<!--7FF44B41FD590341E040007F01006989-->  <DESCRIPTION><![CDATA[Payment 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>
@@ -5825,7 +5825,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 In Detail]]></NAME>
+<!--8352F0300D8B49DB97637EDF62B3119D-->  <NAME><![CDATA[Payment 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>
@@ -7079,8 +7079,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 In Date]]></NAME>
-<!--94CEB84F4308426AA4CDE843C2B3C03C-->  <DESCRIPTION><![CDATA[Last Payment In Date]]></DESCRIPTION>
+<!--94CEB84F4308426AA4CDE843C2B3C03C-->  <NAME><![CDATA[Last Payment Date]]></NAME>
+<!--94CEB84F4308426AA4CDE843C2B3C03C-->  <DESCRIPTION><![CDATA[Last Payment 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>
@@ -8921,7 +8921,7 @@
 <!--AF073DA2C978FA0CE040A8C09166378E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--AF073DA2C978FA0CE040A8C09166378E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--AF073DA2C978FA0CE040A8C09166378E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--AF073DA2C978FA0CE040A8C09166378E-->  <NAME><![CDATA[Modify Payment Out Plan]]></NAME>
+<!--AF073DA2C978FA0CE040A8C09166378E-->  <NAME><![CDATA[Modify Payment Plan]]></NAME>
 <!--AF073DA2C978FA0CE040A8C09166378E-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--AF073DA2C978FA0CE040A8C09166378E-->  <AD_TAB_ID><![CDATA[290]]></AD_TAB_ID>
 <!--AF073DA2C978FA0CE040A8C09166378E-->  <AD_COLUMN_ID><![CDATA[AF073DA2C96CFA0CE040A8C09166378E]]></AD_COLUMN_ID>
@@ -8945,7 +8945,7 @@
 <!--AF2AA90630B83699E040A8C02801184B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--AF2AA90630B83699E040A8C02801184B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--AF2AA90630B83699E040A8C02801184B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--AF2AA90630B83699E040A8C02801184B-->  <NAME><![CDATA[Modify Payment In Plan]]></NAME>
+<!--AF2AA90630B83699E040A8C02801184B-->  <NAME><![CDATA[Modify Payment Plan]]></NAME>
 <!--AF2AA90630B83699E040A8C02801184B-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--AF2AA90630B83699E040A8C02801184B-->  <AD_TAB_ID><![CDATA[263]]></AD_TAB_ID>
 <!--AF2AA90630B83699E040A8C02801184B-->  <AD_COLUMN_ID><![CDATA[AF073DA2C96CFA0CE040A8C09166378E]]></AD_COLUMN_ID>
@@ -8971,7 +8971,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 Out]]></NAME>
+<!--AF40DD148F8D4C6CBDE82035FD82F47B-->  <NAME><![CDATA[Number of Payments]]></NAME>
 <!--AF40DD148F8D4C6CBDE82035FD82F47B-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--AF40DD148F8D4C6CBDE82035FD82F47B-->  <AD_TAB_ID><![CDATA[A94442B27F664A41BF64735DFA76FB4D]]></AD_TAB_ID>
 <!--AF40DD148F8D4C6CBDE82035FD82F47B-->  <AD_COLUMN_ID><![CDATA[78D10D5CC297A0ADE040007F010152E6]]></AD_COLUMN_ID>
@@ -9397,8 +9397,8 @@
 <!--B14B509740EB85BBE040A8C0916624A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--B14B509740EB85BBE040A8C0916624A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--B14B509740EB85BBE040A8C0916624A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--B14B509740EB85BBE040A8C0916624A4-->  <NAME><![CDATA[Last Payment In Date]]></NAME>
-<!--B14B509740EB85BBE040A8C0916624A4-->  <DESCRIPTION><![CDATA[Last Payment In Date]]></DESCRIPTION>
+<!--B14B509740EB85BBE040A8C0916624A4-->  <NAME><![CDATA[Last Payment Date]]></NAME>
+<!--B14B509740EB85BBE040A8C0916624A4-->  <DESCRIPTION><![CDATA[Last Payment Date]]></DESCRIPTION>
 <!--B14B509740EB85BBE040A8C0916624A4-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--B14B509740EB85BBE040A8C0916624A4-->  <AD_TAB_ID><![CDATA[89C009D99323470DB51F100697E2F50C]]></AD_TAB_ID>
 <!--B14B509740EB85BBE040A8C0916624A4-->  <AD_COLUMN_ID><![CDATA[78D10D5CC296A0ADE040007F010152E6]]></AD_COLUMN_ID>
@@ -9422,7 +9422,7 @@
 <!--B14B509740EC85BBE040A8C0916624A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--B14B509740EC85BBE040A8C0916624A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--B14B509740EC85BBE040A8C0916624A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--B14B509740EC85BBE040A8C0916624A4-->  <NAME><![CDATA[Number of Payments In]]></NAME>
+<!--B14B509740EC85BBE040A8C0916624A4-->  <NAME><![CDATA[Number of Payments]]></NAME>
 <!--B14B509740EC85BBE040A8C0916624A4-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--B14B509740EC85BBE040A8C0916624A4-->  <AD_TAB_ID><![CDATA[89C009D99323470DB51F100697E2F50C]]></AD_TAB_ID>
 <!--B14B509740EC85BBE040A8C0916624A4-->  <AD_COLUMN_ID><![CDATA[78D10D5CC297A0ADE040007F010152E6]]></AD_COLUMN_ID>
@@ -9806,7 +9806,7 @@
 <!--B6BC3BB0F6A822EFE040A8C09166661A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--B6BC3BB0F6A822EFE040A8C09166661A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--B6BC3BB0F6A822EFE040A8C09166661A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--B6BC3BB0F6A822EFE040A8C09166661A-->  <NAME><![CDATA[Modify Payment Out Plan]]></NAME>
+<!--B6BC3BB0F6A822EFE040A8C09166661A-->  <NAME><![CDATA[Modify Payment Plan]]></NAME>
 <!--B6BC3BB0F6A822EFE040A8C09166661A-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--B6BC3BB0F6A822EFE040A8C09166661A-->  <AD_TAB_ID><![CDATA[290]]></AD_TAB_ID>
 <!--B6BC3BB0F6A822EFE040A8C09166661A-->  <AD_COLUMN_ID><![CDATA[B6BAAEE47510A3A0E040A8C091663D0C]]></AD_COLUMN_ID>
@@ -9833,7 +9833,7 @@
 <!--B6BC3BB0F6AA22EFE040A8C09166661A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--B6BC3BB0F6AA22EFE040A8C09166661A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--B6BC3BB0F6AA22EFE040A8C09166661A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--B6BC3BB0F6AA22EFE040A8C09166661A-->  <NAME><![CDATA[Modify Payment Out Plan]]></NAME>
+<!--B6BC3BB0F6AA22EFE040A8C09166661A-->  <NAME><![CDATA[Modify Payment Plan]]></NAME>
 <!--B6BC3BB0F6AA22EFE040A8C09166661A-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--B6BC3BB0F6AA22EFE040A8C09166661A-->  <AD_TAB_ID><![CDATA[263]]></AD_TAB_ID>
 <!--B6BC3BB0F6AA22EFE040A8C09166661A-->  <AD_COLUMN_ID><![CDATA[B6BAAEE47510A3A0E040A8C091663D0C]]></AD_COLUMN_ID>
@@ -10070,8 +10070,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 Out Date]]></NAME>
-<!--BA2C09836C0D4E9298038CD62CC01982-->  <DESCRIPTION><![CDATA[Last Payment Out Date]]></DESCRIPTION>
+<!--BA2C09836C0D4E9298038CD62CC01982-->  <NAME><![CDATA[Last Payment Date]]></NAME>
+<!--BA2C09836C0D4E9298038CD62CC01982-->  <DESCRIPTION><![CDATA[Last Payment 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>
@@ -10526,8 +10526,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 Out No.]]></NAME>
-<!--CCEF625BE5004940A3FC98E1E4EE8CAC-->  <DESCRIPTION><![CDATA[Payment Out Number]]></DESCRIPTION>
+<!--CCEF625BE5004940A3FC98E1E4EE8CAC-->  <NAME><![CDATA[Payment No.]]></NAME>
+<!--CCEF625BE5004940A3FC98E1E4EE8CAC-->  <DESCRIPTION><![CDATA[Payment 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>
@@ -10554,7 +10554,7 @@
 <!--CF64469FAF20489CA2224A7EA9BE56E6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--CF64469FAF20489CA2224A7EA9BE56E6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--CF64469FAF20489CA2224A7EA9BE56E6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--CF64469FAF20489CA2224A7EA9BE56E6-->  <NAME><![CDATA[Modify Payment Out Plan]]></NAME>
+<!--CF64469FAF20489CA2224A7EA9BE56E6-->  <NAME><![CDATA[Modify Payment Plan]]></NAME>
 <!--CF64469FAF20489CA2224A7EA9BE56E6-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--CF64469FAF20489CA2224A7EA9BE56E6-->  <AD_TAB_ID><![CDATA[A94442B27F664A41BF64735DFA76FB4D]]></AD_TAB_ID>
 <!--CF64469FAF20489CA2224A7EA9BE56E6-->  <AD_COLUMN_ID><![CDATA[FA6349D74151420A86921C36A7977DF7]]></AD_COLUMN_ID>
@@ -10581,8 +10581,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 Out No.]]></NAME>
-<!--D0629CC136214B9CA283EFF68CFE1803-->  <DESCRIPTION><![CDATA[Payment Out Number]]></DESCRIPTION>
+<!--D0629CC136214B9CA283EFF68CFE1803-->  <NAME><![CDATA[Payment No.]]></NAME>
+<!--D0629CC136214B9CA283EFF68CFE1803-->  <DESCRIPTION><![CDATA[Payment 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>
@@ -10797,7 +10797,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 In Detail]]></NAME>
+<!--D458466D414A4D339872CB81E70853C8-->  <NAME><![CDATA[Payment 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>
@@ -11218,8 +11218,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 In No.]]></NAME>
-<!--E6EEA6B9F91F459787518691AFBAF351-->  <DESCRIPTION><![CDATA[Payment  In Number]]></DESCRIPTION>
+<!--E6EEA6B9F91F459787518691AFBAF351-->  <NAME><![CDATA[Payment No.]]></NAME>
+<!--E6EEA6B9F91F459787518691AFBAF351-->  <DESCRIPTION><![CDATA[Payment 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>
@@ -11438,7 +11438,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 In Date]]></NAME>
+<!--EE6921E0FB9D4AB98AD403E011B59A21-->  <NAME><![CDATA[Payment 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>
@@ -11490,7 +11490,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 In]]></NAME>
+<!--F3653CEB40B54EF88F365D55E46CB543-->  <NAME><![CDATA[Number of Payments]]></NAME>
 <!--F3653CEB40B54EF88F365D55E46CB543-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--F3653CEB40B54EF88F365D55E46CB543-->  <AD_TAB_ID><![CDATA[EB0E0C5A58344F7FA345097E7365CD22]]></AD_TAB_ID>
 <!--F3653CEB40B54EF88F365D55E46CB543-->  <AD_COLUMN_ID><![CDATA[802DBB308D07C960E040007F01001D1B]]></AD_COLUMN_ID>
@@ -11757,7 +11757,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 Out Date]]></NAME>
+<!--FD46676E44ED4D129AEE94D54D92814F-->  <NAME><![CDATA[Payment 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>
@@ -11783,7 +11783,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 In]]></NAME>
+<!--FEB73B6C75B9445FA61265D24096F41B-->  <NAME><![CDATA[Number of Payments]]></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	Wed May 16 10:57:50 2012 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml	Fri May 18 12:46:25 2012 +0200
@@ -83,7 +83,7 @@
 <!--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-->  <MSGTEXT><![CDATA[Add Payment]]></MSGTEXT>
 <!--1EB0D3A668784AF8A9133F066EDE6C44-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
 <!--1EB0D3A668784AF8A9133F066EDE6C44-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--1EB0D3A668784AF8A9133F066EDE6C44--></AD_MESSAGE>
@@ -513,7 +513,7 @@
 <!--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-->  <MSGTEXT><![CDATA[Add Payment]]></MSGTEXT>
 <!--939FCFA14C69435EB3A88457933160B6-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
 <!--939FCFA14C69435EB3A88457933160B6-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--939FCFA14C69435EB3A88457933160B6--></AD_MESSAGE>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml	Wed May 16 10:57:50 2012 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml	Fri May 18 12:46:25 2012 +0200
@@ -62,7 +62,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 Out Details]]></NAME>
+<!--6707D7449A8D45DB851F608BA88329C8-->  <NAME><![CDATA[Payment Details]]></NAME>
 <!--6707D7449A8D45DB851F608BA88329C8-->  <HELP><![CDATA[Displays the details of the payments (pre-payments or regular payments) made for the order or for the invoice/s of the order.]]></HELP>
 <!--6707D7449A8D45DB851F608BA88329C8-->  <AD_TABLE_ID><![CDATA[DC63963AB3F1489BAAB5A9A7EFD1B407]]></AD_TABLE_ID>
 <!--6707D7449A8D45DB851F608BA88329C8-->  <AD_WINDOW_ID><![CDATA[181]]></AD_WINDOW_ID>
@@ -175,8 +175,8 @@
 <!--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 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-->  <NAME><![CDATA[Payment Plan]]></NAME>
+<!--A94442B27F664A41BF64735DFA76FB4D-->  <DESCRIPTION><![CDATA[List of scheduled payments in expected against a particular invoice and payment plan associated with that invoice.]]></DESCRIPTION>
 <!--A94442B27F664A41BF64735DFA76FB4D-->  <HELP><![CDATA[List of the scheduled payments expected against the invoice.]]></HELP>
 <!--A94442B27F664A41BF64735DFA76FB4D-->  <AD_TABLE_ID><![CDATA[77182DC88AA842D499C01FB0BAE39561]]></AD_TABLE_ID>
 <!--A94442B27F664A41BF64735DFA76FB4D-->  <AD_WINDOW_ID><![CDATA[183]]></AD_WINDOW_ID>
@@ -203,7 +203,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 In Details]]></NAME>
+<!--B82C02920AA84E8DB57D553185BD2F06-->  <NAME><![CDATA[Payment Details]]></NAME>
 <!--B82C02920AA84E8DB57D553185BD2F06-->  <HELP><![CDATA[Displays the details of the payments (pre-payments or regular payments) received for the order or for the invoice/s of the order.]]></HELP>
 <!--B82C02920AA84E8DB57D553185BD2F06-->  <AD_TABLE_ID><![CDATA[DC63963AB3F1489BAAB5A9A7EFD1B407]]></AD_TABLE_ID>
 <!--B82C02920AA84E8DB57D553185BD2F06-->  <AD_WINDOW_ID><![CDATA[143]]></AD_WINDOW_ID>
@@ -288,8 +288,8 @@
 <!--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 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-->  <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 the scheduled payments expected against the invoice.]]></HELP>
 <!--EB0466B2A22343F28773B356D292BC7E-->  <AD_TABLE_ID><![CDATA[77182DC88AA842D499C01FB0BAE39561]]></AD_TABLE_ID>
 <!--EB0466B2A22343F28773B356D292BC7E-->  <AD_WINDOW_ID><![CDATA[167]]></AD_WINDOW_ID>
@@ -316,7 +316,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 In Plan]]></NAME>
+<!--EB0E0C5A58344F7FA345097E7365CD22-->  <NAME><![CDATA[Payment Plan]]></NAME>
 <!--EB0E0C5A58344F7FA345097E7365CD22-->  <HELP><![CDATA[Shows the total amount expected to be collected upon order booking as well as the amount/s pre-paid or paid against the invoice/s for the order.]]></HELP>
 <!--EB0E0C5A58344F7FA345097E7365CD22-->  <AD_TABLE_ID><![CDATA[70E57DEA195843729FF303C9A71EBCA3]]></AD_TABLE_ID>
 <!--EB0E0C5A58344F7FA345097E7365CD22-->  <AD_WINDOW_ID><![CDATA[143]]></AD_WINDOW_ID>
@@ -343,8 +343,8 @@
 <!--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 Out Details]]></NAME>
-<!--F9751D712A804D57B97A36803843F2D7-->  <DESCRIPTION><![CDATA[List of payment out made details against a particular invoice based on the payment out plan]]></DESCRIPTION>
+<!--F9751D712A804D57B97A36803843F2D7-->  <NAME><![CDATA[Payment Details]]></NAME>
+<!--F9751D712A804D57B97A36803843F2D7-->  <DESCRIPTION><![CDATA[List of payments made details against a particular invoice based on the payment plan]]></DESCRIPTION>
 <!--F9751D712A804D57B97A36803843F2D7-->  <HELP><![CDATA[Display the details of the payments made against the invoice.]]></HELP>
 <!--F9751D712A804D57B97A36803843F2D7-->  <AD_TABLE_ID><![CDATA[DC63963AB3F1489BAAB5A9A7EFD1B407]]></AD_TABLE_ID>
 <!--F9751D712A804D57B97A36803843F2D7-->  <AD_WINDOW_ID><![CDATA[183]]></AD_WINDOW_ID>
@@ -371,7 +371,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 Out Plan]]></NAME>
+<!--FA57D75B1BBB4583B4A777008A29BF54-->  <NAME><![CDATA[Payment Plan]]></NAME>
 <!--FA57D75B1BBB4583B4A777008A29BF54-->  <HELP><![CDATA[Shows the total amount expected to be paid upon order booking as well as the amount/s pre-paid or paid against the invoice/s for the order.]]></HELP>
 <!--FA57D75B1BBB4583B4A777008A29BF54-->  <AD_TABLE_ID><![CDATA[70E57DEA195843729FF303C9A71EBCA3]]></AD_TABLE_ID>
 <!--FA57D75B1BBB4583B4A777008A29BF54-->  <AD_WINDOW_ID><![CDATA[181]]></AD_WINDOW_ID>
@@ -398,8 +398,8 @@
 <!--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 In Details]]></NAME>
-<!--FD40D9C2F1F14943933DEFEF4A8458E4-->  <DESCRIPTION><![CDATA[List of payment in made details against a particular invoice based on the payment in plan..]]></DESCRIPTION>
+<!--FD40D9C2F1F14943933DEFEF4A8458E4-->  <NAME><![CDATA[Payment Details]]></NAME>
+<!--FD40D9C2F1F14943933DEFEF4A8458E4-->  <DESCRIPTION><![CDATA[List of payment made details against a particular invoice based on the payment in plan..]]></DESCRIPTION>
 <!--FD40D9C2F1F14943933DEFEF4A8458E4-->  <HELP><![CDATA[Display the details of the payments received against the invoice.]]></HELP>
 <!--FD40D9C2F1F14943933DEFEF4A8458E4-->  <AD_TABLE_ID><![CDATA[DC63963AB3F1489BAAB5A9A7EFD1B407]]></AD_TABLE_ID>
 <!--FD40D9C2F1F14943933DEFEF4A8458E4-->  <AD_WINDOW_ID><![CDATA[167]]></AD_WINDOW_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Wed May 16 10:57:50 2012 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Fri May 18 12:46:25 2012 +0200
@@ -44,28 +44,6 @@
 <!--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>
@@ -154,17 +132,6 @@
 <!--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>
@@ -220,6 +187,17 @@
 <!--2166D682A6024E839AD674C2E9624C37-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--2166D682A6024E839AD674C2E9624C37--></AD_TEXTINTERFACES>
 
+<!--21790613236647CC80CC771B889EE538--><AD_TEXTINTERFACES>
+<!--21790613236647CC80CC771B889EE538-->  <AD_TEXTINTERFACES_ID><![CDATA[21790613236647CC80CC771B889EE538]]></AD_TEXTINTERFACES_ID>
+<!--21790613236647CC80CC771B889EE538-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--21790613236647CC80CC771B889EE538-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--21790613236647CC80CC771B889EE538-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--21790613236647CC80CC771B889EE538-->  <TEXT><![CDATA[Select additional purchase invoices or purchase orders that you want to add to this payment]]></TEXT>
+<!--21790613236647CC80CC771B889EE538-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html]]></FILENAME>
+<!--21790613236647CC80CC771B889EE538-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--21790613236647CC80CC771B889EE538-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--21790613236647CC80CC771B889EE538--></AD_TEXTINTERFACES>
+
 <!--2285489CD37B46EEB218C777400BBCBA--><AD_TEXTINTERFACES>
 <!--2285489CD37B46EEB218C777400BBCBA-->  <AD_TEXTINTERFACES_ID><![CDATA[2285489CD37B46EEB218C777400BBCBA]]></AD_TEXTINTERFACES_ID>
 <!--2285489CD37B46EEB218C777400BBCBA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -253,17 +231,6 @@
 <!--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>
@@ -330,17 +297,6 @@
 <!--361C7BAF7DFE4D90B8A2B671B4548B34-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--361C7BAF7DFE4D90B8A2B671B4548B34--></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>
@@ -407,17 +363,6 @@
 <!--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>
@@ -561,17 +506,6 @@
 <!--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>
@@ -638,6 +572,17 @@
 <!--55C25FEEFC8E443F908854E36E9F74DB-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--55C25FEEFC8E443F908854E36E9F74DB--></AD_TEXTINTERFACES>
 
+<!--57288859DEFC454F9F499AF45F42B7AB--><AD_TEXTINTERFACES>
+<!--57288859DEFC454F9F499AF45F42B7AB-->  <AD_TEXTINTERFACES_ID><![CDATA[57288859DEFC454F9F499AF45F42B7AB]]></AD_TEXTINTERFACES_ID>
+<!--57288859DEFC454F9F499AF45F42B7AB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--57288859DEFC454F9F499AF45F42B7AB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--57288859DEFC454F9F499AF45F42B7AB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--57288859DEFC454F9F499AF45F42B7AB-->  <TEXT><![CDATA[Payment Date]]></TEXT>
+<!--57288859DEFC454F9F499AF45F42B7AB-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME>
+<!--57288859DEFC454F9F499AF45F42B7AB-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--57288859DEFC454F9F499AF45F42B7AB-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--57288859DEFC454F9F499AF45F42B7AB--></AD_TEXTINTERFACES>
+
 <!--573CBDB3274146178B5432861CDDC159--><AD_TEXTINTERFACES>
 <!--573CBDB3274146178B5432861CDDC159-->  <AD_TEXTINTERFACES_ID><![CDATA[573CBDB3274146178B5432861CDDC159]]></AD_TEXTINTERFACES_ID>
 <!--573CBDB3274146178B5432861CDDC159-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -682,17 +627,6 @@
 <!--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>
@@ -825,6 +759,17 @@
 <!--6C2460B2EAB9490CB68FB828F9290EC6-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--6C2460B2EAB9490CB68FB828F9290EC6--></AD_TEXTINTERFACES>
 
+<!--6C947133458C40569B6C5F4FCB0AC46A--><AD_TEXTINTERFACES>
+<!--6C947133458C40569B6C5F4FCB0AC46A-->  <AD_TEXTINTERFACES_ID><![CDATA[6C947133458C40569B6C5F4FCB0AC46A]]></AD_TEXTINTERFACES_ID>
+<!--6C947133458C40569B6C5F4FCB0AC46A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6C947133458C40569B6C5F4FCB0AC46A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6C947133458C40569B6C5F4FCB0AC46A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6C947133458C40569B6C5F4FCB0AC46A-->  <TEXT><![CDATA[Payment Document No.]]></TEXT>
+<!--6C947133458C40569B6C5F4FCB0AC46A-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME>
+<!--6C947133458C40569B6C5F4FCB0AC46A-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--6C947133458C40569B6C5F4FCB0AC46A-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--6C947133458C40569B6C5F4FCB0AC46A--></AD_TEXTINTERFACES>
+
 <!--6DD60FD81F5B4D17A5101D7BFED7E910--><AD_TEXTINTERFACES>
 <!--6DD60FD81F5B4D17A5101D7BFED7E910-->  <AD_TEXTINTERFACES_ID><![CDATA[6DD60FD81F5B4D17A5101D7BFED7E910]]></AD_TEXTINTERFACES_ID>
 <!--6DD60FD81F5B4D17A5101D7BFED7E910-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1309,17 +1254,6 @@
 <!--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>
@@ -1804,6 +1738,17 @@
 <!--8A63AFFF170841A093E1D677F11A8F06-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--8A63AFFF170841A093E1D677F11A8F06--></AD_TEXTINTERFACES>
 
+<!--8D99A51A37534657B4315658A504DD1A--><AD_TEXTINTERFACES>
+<!--8D99A51A37534657B4315658A504DD1A-->  <AD_TEXTINTERFACES_ID><![CDATA[8D99A51A37534657B4315658A504DD1A]]></AD_TEXTINTERFACES_ID>
+<!--8D99A51A37534657B4315658A504DD1A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8D99A51A37534657B4315658A504DD1A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8D99A51A37534657B4315658A504DD1A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8D99A51A37534657B4315658A504DD1A-->  <TEXT><![CDATA[Actual Payment]]></TEXT>
+<!--8D99A51A37534657B4315658A504DD1A-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME>
+<!--8D99A51A37534657B4315658A504DD1A-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--8D99A51A37534657B4315658A504DD1A-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--8D99A51A37534657B4315658A504DD1A--></AD_TEXTINTERFACES>
+
 <!--8F869C21DCF14031BC01CCD9D158190E--><AD_TEXTINTERFACES>
 <!--8F869C21DCF14031BC01CCD9D158190E-->  <AD_TEXTINTERFACES_ID><![CDATA[8F869C21DCF14031BC01CCD9D158190E]]></AD_TEXTINTERFACES_ID>
 <!--8F869C21DCF14031BC01CCD9D158190E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1815,17 +1760,6 @@
 <!--8F869C21DCF14031BC01CCD9D158190E-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--8F869C21DCF14031BC01CCD9D158190E--></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>
@@ -1870,6 +1804,17 @@
 <!--9307B5C71D7A9CACE040007F01000F27-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--9307B5C71D7A9CACE040007F01000F27--></AD_TEXTINTERFACES>
 
+<!--93391616B4324B12B2E99B919FEADA6E--><AD_TEXTINTERFACES>
+<!--93391616B4324B12B2E99B919FEADA6E-->  <AD_TEXTINTERFACES_ID><![CDATA[93391616B4324B12B2E99B919FEADA6E]]></AD_TEXTINTERFACES_ID>
+<!--93391616B4324B12B2E99B919FEADA6E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--93391616B4324B12B2E99B919FEADA6E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--93391616B4324B12B2E99B919FEADA6E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--93391616B4324B12B2E99B919FEADA6E-->  <TEXT><![CDATA[Expected Payment]]></TEXT>
+<!--93391616B4324B12B2E99B919FEADA6E-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html]]></FILENAME>
+<!--93391616B4324B12B2E99B919FEADA6E-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--93391616B4324B12B2E99B919FEADA6E-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--93391616B4324B12B2E99B919FEADA6E--></AD_TEXTINTERFACES>
+
 <!--9370255AD32E4EED889DEFDCBBD48646--><AD_TEXTINTERFACES>
 <!--9370255AD32E4EED889DEFDCBBD48646-->  <AD_TEXTINTERFACES_ID><![CDATA[9370255AD32E4EED889DEFDCBBD48646]]></AD_TEXTINTERFACES_ID>
 <!--9370255AD32E4EED889DEFDCBBD48646-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1914,17 +1859,6 @@
 <!--941752B6DDB7231BE040007F0100437B-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--941752B6DDB7231BE040007F0100437B--></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>
 <!--949AA49A4D7C6BEAE040007F0100565C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2035,17 +1969,6 @@
 <!--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>
@@ -2068,6 +1991,17 @@
 <!--98463D76F0A641C18DA68B25C1C6277E-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--98463D76F0A641C18DA68B25C1C6277E--></AD_TEXTINTERFACES>
 
+<!--9945CD4943104B7A925652DEA7BD7C10--><AD_TEXTINTERFACES>
+<!--9945CD4943104B7A925652DEA7BD7C10-->  <AD_TEXTINTERFACES_ID><![CDATA[9945CD4943104B7A925652DEA7BD7C10]]></AD_TEXTINTERFACES_ID>
+<!--9945CD4943104B7A925652DEA7BD7C10-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9945CD4943104B7A925652DEA7BD7C10-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9945CD4943104B7A925652DEA7BD7C10-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9945CD4943104B7A925652DEA7BD7C10-->  <TEXT><![CDATA[Show payments for alternative payment methods]]></TEXT>
+<!--9945CD4943104B7A925652DEA7BD7C10-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html]]></FILENAME>
+<!--9945CD4943104B7A925652DEA7BD7C10-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--9945CD4943104B7A925652DEA7BD7C10-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--9945CD4943104B7A925652DEA7BD7C10--></AD_TEXTINTERFACES>
+
 <!--9B8EE95FED0F4B8EAD0E501CB33BA29B--><AD_TEXTINTERFACES>
 <!--9B8EE95FED0F4B8EAD0E501CB33BA29B-->  <AD_TEXTINTERFACES_ID><![CDATA[9B8EE95FED0F4B8EAD0E501CB33BA29B]]></AD_TEXTINTERFACES_ID>
 <!--9B8EE95FED0F4B8EAD0E501CB33BA29B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2123,17 +2057,6 @@
 <!--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>
@@ -2167,6 +2090,17 @@
 <!--A2E3CEC67D004E7C9BADAB2FD4719E8F-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--A2E3CEC67D004E7C9BADAB2FD4719E8F--></AD_TEXTINTERFACES>
 
+<!--A3F4C1BAFC824039B78C5FC3006AB93C--><AD_TEXTINTERFACES>
+<!--A3F4C1BAFC824039B78C5FC3006AB93C-->  <AD_TEXTINTERFACES_ID><![CDATA[A3F4C1BAFC824039B78C5FC3006AB93C]]></AD_TEXTINTERFACES_ID>
+<!--A3F4C1BAFC824039B78C5FC3006AB93C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A3F4C1BAFC824039B78C5FC3006AB93C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A3F4C1BAFC824039B78C5FC3006AB93C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A3F4C1BAFC824039B78C5FC3006AB93C-->  <TEXT><![CDATA[Payment Document No.]]></TEXT>
+<!--A3F4C1BAFC824039B78C5FC3006AB93C-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html]]></FILENAME>
+<!--A3F4C1BAFC824039B78C5FC3006AB93C-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--A3F4C1BAFC824039B78C5FC3006AB93C-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--A3F4C1BAFC824039B78C5FC3006AB93C--></AD_TEXTINTERFACES>
+
 <!--A437061218404865BF781A13704403AB--><AD_TEXTINTERFACES>
 <!--A437061218404865BF781A13704403AB-->  <AD_TEXTINTERFACES_ID><![CDATA[A437061218404865BF781A13704403AB]]></AD_TEXTINTERFACES_ID>
 <!--A437061218404865BF781A13704403AB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2189,6 +2123,17 @@
 <!--A4663E5CA5AF44FB9F2DF3F1586E9432-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--A4663E5CA5AF44FB9F2DF3F1586E9432--></AD_TEXTINTERFACES>
 
+<!--A4ACF6F90F7C42F9AA0B58DECDAB61B9--><AD_TEXTINTERFACES>
+<!--A4ACF6F90F7C42F9AA0B58DECDAB61B9-->  <AD_TEXTINTERFACES_ID><![CDATA[A4ACF6F90F7C42F9AA0B58DECDAB61B9]]></AD_TEXTINTERFACES_ID>
+<!--A4ACF6F90F7C42F9AA0B58DECDAB61B9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A4ACF6F90F7C42F9AA0B58DECDAB61B9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A4ACF6F90F7C42F9AA0B58DECDAB61B9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A4ACF6F90F7C42F9AA0B58DECDAB61B9-->  <TEXT><![CDATA[Select additional purchase invoices, purchase orders or gl items that you want to add to this payment]]></TEXT>
+<!--A4ACF6F90F7C42F9AA0B58DECDAB61B9-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME>
+<!--A4ACF6F90F7C42F9AA0B58DECDAB61B9-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--A4ACF6F90F7C42F9AA0B58DECDAB61B9-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--A4ACF6F90F7C42F9AA0B58DECDAB61B9--></AD_TEXTINTERFACES>
+
 <!--A4F91D28E3AB4C0EA9ACCA40899141C3--><AD_TEXTINTERFACES>
 <!--A4F91D28E3AB4C0EA9ACCA40899141C3-->  <AD_TEXTINTERFACES_ID><![CDATA[A4F91D28E3AB4C0EA9ACCA40899141C3]]></AD_TEXTINTERFACES_ID>
 <!--A4F91D28E3AB4C0EA9ACCA40899141C3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2200,17 +2145,6 @@
 <!--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>
@@ -2222,28 +2156,6 @@
 <!--A8C9A7A0B28D4C94B22CD692E33136CC-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--A8C9A7A0B28D4C94B22CD692E33136CC--></AD_TEXTINTERFACES>
 
-<!--A8F5EE29EF31BBCAE040007F01002D53--><AD_TEXTINTERFACES>
-<!--A8F5EE29EF31BBCAE040007F01002D53-->  <AD_TEXTINTERFACES_ID><![CDATA[A8F5EE29EF31BBCAE040007F01002D53]]></AD_TEXTINTERFACES_ID>
-<!--A8F5EE29EF31BBCAE040007F01002D53-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--A8F5EE29EF31BBCAE040007F01002D53-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--A8F5EE29EF31BBCAE040007F01002D53-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--A8F5EE29EF31BBCAE040007F01002D53-->  <TEXT><![CDATA[Select additional purchase invoices, purchase orders or gl items that you want to add to this payment out]]></TEXT>
-<!--A8F5EE29EF31BBCAE040007F01002D53-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME>
-<!--A8F5EE29EF31BBCAE040007F01002D53-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--A8F5EE29EF31BBCAE040007F01002D53-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--A8F5EE29EF31BBCAE040007F01002D53--></AD_TEXTINTERFACES>
-
-<!--A8F5EE29EF34BBCAE040007F01002D53--><AD_TEXTINTERFACES>
-<!--A8F5EE29EF34BBCAE040007F01002D53-->  <AD_TEXTINTERFACES_ID><![CDATA[A8F5EE29EF34BBCAE040007F01002D53]]></AD_TEXTINTERFACES_ID>
-<!--A8F5EE29EF34BBCAE040007F01002D53-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--A8F5EE29EF34BBCAE040007F01002D53-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--A8F5EE29EF34BBCAE040007F01002D53-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--A8F5EE29EF34BBCAE040007F01002D53-->  <TEXT><![CDATA[Select additional sales invoices, sales orders or gl items that you want to add to this payment in]]></TEXT>
-<!--A8F5EE29EF34BBCAE040007F01002D53-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME>
-<!--A8F5EE29EF34BBCAE040007F01002D53-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--A8F5EE29EF34BBCAE040007F01002D53-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--A8F5EE29EF34BBCAE040007F01002D53--></AD_TEXTINTERFACES>
-
 <!--A8F5EE29EF37BBCAE040007F01002D53--><AD_TEXTINTERFACES>
 <!--A8F5EE29EF37BBCAE040007F01002D53-->  <AD_TEXTINTERFACES_ID><![CDATA[A8F5EE29EF37BBCAE040007F01002D53]]></AD_TEXTINTERFACES_ID>
 <!--A8F5EE29EF37BBCAE040007F01002D53-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2343,17 +2255,6 @@
 <!--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>
@@ -2398,17 +2299,6 @@
 <!--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>
@@ -2453,16 +2343,16 @@
 <!--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>
+<!--BB74934772394B239FAF47DD103D224B--><AD_TEXTINTERFACES>
+<!--BB74934772394B239FAF47DD103D224B-->  <AD_TEXTINTERFACES_ID><![CDATA[BB74934772394B239FAF47DD103D224B]]></AD_TEXTINTERFACES_ID>
+<!--BB74934772394B239FAF47DD103D224B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BB74934772394B239FAF47DD103D224B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BB74934772394B239FAF47DD103D224B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BB74934772394B239FAF47DD103D224B-->  <TEXT><![CDATA[Payment Date]]></TEXT>
+<!--BB74934772394B239FAF47DD103D224B-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html]]></FILENAME>
+<!--BB74934772394B239FAF47DD103D224B-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--BB74934772394B239FAF47DD103D224B-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--BB74934772394B239FAF47DD103D224B--></AD_TEXTINTERFACES>
 
 <!--BDFCEFEFA4E846F192E4C1EC6A5D5541--><AD_TEXTINTERFACES>
 <!--BDFCEFEFA4E846F192E4C1EC6A5D5541-->  <AD_TEXTINTERFACES_ID><![CDATA[BDFCEFEFA4E846F192E4C1EC6A5D5541]]></AD_TEXTINTERFACES_ID>
@@ -2486,6 +2376,17 @@
 <!--BE73A5F0775447398C2ECD4C30CE7155-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--BE73A5F0775447398C2ECD4C30CE7155--></AD_TEXTINTERFACES>
 
+<!--BE77AFEC6C9942F6B9467E8E4F4A95FD--><AD_TEXTINTERFACES>
+<!--BE77AFEC6C9942F6B9467E8E4F4A95FD-->  <AD_TEXTINTERFACES_ID><![CDATA[BE77AFEC6C9942F6B9467E8E4F4A95FD]]></AD_TEXTINTERFACES_ID>
+<!--BE77AFEC6C9942F6B9467E8E4F4A95FD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BE77AFEC6C9942F6B9467E8E4F4A95FD-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BE77AFEC6C9942F6B9467E8E4F4A95FD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BE77AFEC6C9942F6B9467E8E4F4A95FD-->  <TEXT><![CDATA[Actual Payment]]></TEXT>
+<!--BE77AFEC6C9942F6B9467E8E4F4A95FD-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html]]></FILENAME>
+<!--BE77AFEC6C9942F6B9467E8E4F4A95FD-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--BE77AFEC6C9942F6B9467E8E4F4A95FD-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--BE77AFEC6C9942F6B9467E8E4F4A95FD--></AD_TEXTINTERFACES>
+
 <!--BE924775AF967C78E040007F010017BF--><AD_TEXTINTERFACES>
 <!--BE924775AF967C78E040007F010017BF-->  <AD_TEXTINTERFACES_ID><![CDATA[BE924775AF967C78E040007F010017BF]]></AD_TEXTINTERFACES_ID>
 <!--BE924775AF967C78E040007F010017BF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2618,16 +2519,16 @@
 <!--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>
+<!--C80B5C1D721F49C0983C231729C550F8--><AD_TEXTINTERFACES>
+<!--C80B5C1D721F49C0983C231729C550F8-->  <AD_TEXTINTERFACES_ID><![CDATA[C80B5C1D721F49C0983C231729C550F8]]></AD_TEXTINTERFACES_ID>
+<!--C80B5C1D721F49C0983C231729C550F8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C80B5C1D721F49C0983C231729C550F8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C80B5C1D721F49C0983C231729C550F8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C80B5C1D721F49C0983C231729C550F8-->  <TEXT><![CDATA[Expected Payment]]></TEXT>
+<!--C80B5C1D721F49C0983C231729C550F8-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME>
+<!--C80B5C1D721F49C0983C231729C550F8-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--C80B5C1D721F49C0983C231729C550F8-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--C80B5C1D721F49C0983C231729C550F8--></AD_TEXTINTERFACES>
 
 <!--CA4B60EB983146229DBD2AFC9135E6D1--><AD_TEXTINTERFACES>
 <!--CA4B60EB983146229DBD2AFC9135E6D1-->  <AD_TEXTINTERFACES_ID><![CDATA[CA4B60EB983146229DBD2AFC9135E6D1]]></AD_TEXTINTERFACES_ID>
@@ -2783,17 +2684,6 @@
 <!--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>
@@ -2816,17 +2706,6 @@
 <!--DB98F20D5C2B4F3F9D5A01B27F9E4946-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--DB98F20D5C2B4F3F9D5A01B27F9E4946--></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>
-
 <!--DC8B2BB3C55B4BF7B5782F006EB37106--><AD_TEXTINTERFACES>
 <!--DC8B2BB3C55B4BF7B5782F006EB37106-->  <AD_TEXTINTERFACES_ID><![CDATA[DC8B2BB3C55B4BF7B5782F006EB37106]]></AD_TEXTINTERFACES_ID>
 <!--DC8B2BB3C55B4BF7B5782F006EB37106-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2849,17 +2728,6 @@
 <!--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>
@@ -2904,28 +2772,6 @@
 <!--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>
@@ -2959,17 +2805,6 @@
 <!--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-db/database/sourcedata/OBUIAPP_PARAMETER.xml	Wed May 16 10:57:50 2012 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml	Fri May 18 12:46:25 2012 +0200
@@ -6,7 +6,7 @@
 <!--0586B9F7ED4147758536007BF402F1DF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0586B9F7ED4147758536007BF402F1DF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0586B9F7ED4147758536007BF402F1DF-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--0586B9F7ED4147758536007BF402F1DF-->  <NAME><![CDATA[Modify Payment In Plan]]></NAME>
+<!--0586B9F7ED4147758536007BF402F1DF-->  <NAME><![CDATA[Modify Payment Plan]]></NAME>
 <!--0586B9F7ED4147758536007BF402F1DF-->  <SEQNO><![CDATA[10]]></SEQNO>
 <!--0586B9F7ED4147758536007BF402F1DF-->  <AD_REFERENCE_ID><![CDATA[FF80818132D8F0F30132D9BC395D0038]]></AD_REFERENCE_ID>
 <!--0586B9F7ED4147758536007BF402F1DF-->  <AD_REFERENCE_VALUE_ID><![CDATA[6932F568D27E47DB861809AD66C15A01]]></AD_REFERENCE_VALUE_ID>
@@ -106,7 +106,7 @@
 <!--878E7842FC524139BBEE0CAE0C1F3E17-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--878E7842FC524139BBEE0CAE0C1F3E17-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--878E7842FC524139BBEE0CAE0C1F3E17-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--878E7842FC524139BBEE0CAE0C1F3E17-->  <NAME><![CDATA[Modify Payment Out Plan]]></NAME>
+<!--878E7842FC524139BBEE0CAE0C1F3E17-->  <NAME><![CDATA[Modify Payment Plan]]></NAME>
 <!--878E7842FC524139BBEE0CAE0C1F3E17-->  <SEQNO><![CDATA[10]]></SEQNO>
 <!--878E7842FC524139BBEE0CAE0C1F3E17-->  <AD_REFERENCE_ID><![CDATA[FF80818132D8F0F30132D9BC395D0038]]></AD_REFERENCE_ID>
 <!--878E7842FC524139BBEE0CAE0C1F3E17-->  <AD_REFERENCE_VALUE_ID><![CDATA[B8C833E4F0A44A2DA5FC7606F3CD9439]]></AD_REFERENCE_VALUE_ID>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html	Wed May 16 10:57:50 2012 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html	Fri May 18 12:46:25 2012 +0200
@@ -694,7 +694,7 @@
 
             <!-- Line 1 -->
             <tr>
-              <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="TitleCell"><span id="lblPDocNo" class="LabelText">Payment 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>
@@ -778,7 +778,7 @@
             
             <!-- Line 6 -->
             <tr>
-              <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="TitleCell"><span id="lblPExpectedPaym" class="LabelText">Expected Payment</span></td>
               <td class="TextBox_ContentCell"> <input class="readonly dojoValidateValid required TextBox_OneCell_width number" type="text" id="paramExpectedPayment" name="inpExpectedPayment" value="" onchange="updateDifference();updateConvertedAmounts();" disabled="true"></input>
               </td>
               <td class="TitleCell"></td>
@@ -790,7 +790,7 @@
             
             <!-- Line 7 -->
             <tr>
-              <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="TitleCell"><span id="lblPActualPaym"class="LabelText">Actual Payment</span></td>
               <td class="TextBox_btn_ContentCell">
                   <table border="0" cellspacing="0" cellpadding="0" summary=""  style="padding-top: 0px;">
                     <tr>
@@ -876,7 +876,7 @@
             
             <!-- Line 8 -->
             <tr>
-              <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="TitleCell"><span id="lblPPaymDate" class="LabelText">Payment Date</span></td>
               <td class="TextBox_btn_ContentCell">
                 <table border="0" cellspacing="0" cellpadding="0" summary=""  style="padding-top: 0px;">
                   <tr>
@@ -925,8 +925,8 @@
             <!-- Text -->
             <tr>
                 <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>
+                    <span name="lblP" id="lblPText">Select additional purchase invoices or purchase orders that you want to add to this payment</span>
+                    <span name="lblR" id="lblRText">Select additional sales invoices or sales orders that you want to add to this payment</span>
                 </td>
             </tr>
             
@@ -977,8 +977,7 @@
              </tr>
              
              <tr>
-              <td class="TitleCell" ><span name="lblP" id="lblPShowAlternative" class="TitleCell LabelText"><label for="paramAlternativePaymentMethod">Show payments out for alternative payment methods</label></span>
-                                     <span name="lblR" id="lblRShowAlternative" class="TitleCell LabelText"><label for="paramAlternativePaymentMethod">Show payments in for alternative payment methods</label></span></td>
+              <td class="TitleCell" ><span id="lblPShowAlternative" class="TitleCell LabelText"><label for="paramAlternativePaymentMethod">Show payments for alternative payment methods</label></span></td>
               <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>
@@ -1045,7 +1044,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"><span name="lblP" id="lblPPayment">Payment Out</span><span name="lblR" id="lblRPayment">Payment In</span></th>
+                        <th class="DataGrid_Header_Cell DataGrid_Header_Cell_Inverse" width="110"><span id="lblPPayment">Payment</span></th>
                       </tr>
                     </thead>
                     <tbody id="sectionGrid">
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html	Wed May 16 10:57:50 2012 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html	Fri May 18 12:46:25 2012 +0200
@@ -1035,7 +1035,7 @@
 
             <!-- Line 1 -->
             <tr>
-              <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="TitleCell"><span id="lblPDocNo" class="LabelText">Payment 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>
@@ -1111,7 +1111,7 @@
             
             <!-- Line 6 -->
             <tr>
-              <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="TitleCell"><span id="lblPExpectedPaym" class="LabelText">Expected Payment</span></td>
               <td class="TextBox_ContentCell"><input class="readonly dojoValidateValid required TextBox_OneCell_width number" readonly type="text" id="paramExpectedPayment" name="inpExpectedPayment" value="" onchange="updateDifference();"></input></td>
               <td class="TitleCell"></td>
               <td class="TitleCell"><span class="LabelText" id="lblExpectedConverted">Expected Converted</span></td>
@@ -1122,7 +1122,7 @@
 
             <!-- Line 7 -->
             <tr>
-              <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="TitleCell"><span id="lblPActualPaym"class="LabelText">Actual Payment</span></td>
               <td class="TextBox_btn_ContentCell">
                   <table border="0" cellspacing="0" cellpadding="0" summary=""  style="padding-top: 0px;">
                     <tr>
@@ -1199,7 +1199,7 @@
             
             <!-- Line 8 -->
             <tr>
-              <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="TitleCell"><span id="lblPPaymDate" class="LabelText">Payment Date</span></td>
               <td class="TextBox_btn_ContentCell">
                 <table border="0" cellspacing="0" cellpadding="0" summary=""  style="padding-top: 0px;">
                   <tr>
@@ -1254,8 +1254,8 @@
             <!-- Text -->
             <tr>
                 <td colspan="6" class="LabelText" style="font-weight: bold;">
-                    <span name="lblP" id="lblPText">Select additional purchase invoices, purchase orders or gl items that you want to add to this payment out</span>
-                    <span name="lblR" id="lblRText">Select additional sales invoices, sales orders or gl items that you want to add to this payment in</span>
+                    <span name="lblP" id="lblPText">Select additional purchase invoices, purchase orders or gl items that you want to add to this payment</span>
+                    <span name="lblR" id="lblRText">Select additional sales invoices, sales orders or gl items that you want to add to this payment</span>
                 </td>
             </tr>
             
@@ -1742,7 +1742,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"><span name="lblP" id="lblPPayment">Payment Out</span><span name="lblR" id="lblRPayment">Payment In</span></th>
+                        <th class="DataGrid_Header_Cell DataGrid_Header_Cell_Inverse" width="110"><span id="lblPPayment">Payment</span></th>
                       </tr>
                     </thead>
                     <tbody id="sectionGrid">
--- a/src-db/database/sourcedata/AD_COLUMN.xml	Wed May 16 10:57:50 2012 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Fri May 18 12:46:25 2012 +0200
@@ -254499,7 +254499,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-->  <DESCRIPTION><![CDATA[Last Payment 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>
@@ -258169,7 +258169,7 @@
 <!--7FF2234748EB844FE040007F01003861-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7FF2234748EB844FE040007F01003861-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--7FF2234748EB844FE040007F01003861-->  <NAME><![CDATA[Paymentno]]></NAME>
-<!--7FF2234748EB844FE040007F01003861-->  <DESCRIPTION><![CDATA[Payment  In Number]]></DESCRIPTION>
+<!--7FF2234748EB844FE040007F01003861-->  <DESCRIPTION><![CDATA[Payment 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>
@@ -259499,7 +259499,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-->  <DESCRIPTION><![CDATA[Last Payment 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>
@@ -260808,7 +260808,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  In Number]]></DESCRIPTION>
+<!--80E839B16929298FE040007F01005AAF-->  <DESCRIPTION><![CDATA[Payment 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>
@@ -282457,7 +282457,7 @@
 <!--B0D661BBD3FF0A3AE040A8C0916624CC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--B0D661BBD3FF0A3AE040A8C0916624CC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--B0D661BBD3FF0A3AE040A8C0916624CC-->  <NAME><![CDATA[Last Payment In Date]]></NAME>
-<!--B0D661BBD3FF0A3AE040A8C0916624CC-->  <DESCRIPTION><![CDATA[Last Payment In Date]]></DESCRIPTION>
+<!--B0D661BBD3FF0A3AE040A8C0916624CC-->  <DESCRIPTION><![CDATA[Last Payment Date]]></DESCRIPTION>
 <!--B0D661BBD3FF0A3AE040A8C0916624CC-->  <COLUMNNAME><![CDATA[Lastpayment]]></COLUMNNAME>
 <!--B0D661BBD3FF0A3AE040A8C0916624CC-->  <AD_TABLE_ID><![CDATA[8C391E83D9A74F738D4D67E09329B745]]></AD_TABLE_ID>
 <!--B0D661BBD3FF0A3AE040A8C0916624CC-->  <AD_REFERENCE_ID><![CDATA[15]]></AD_REFERENCE_ID>
@@ -283179,7 +283179,7 @@
 <!--B0D6CA178757AB98E040A8C091662FB5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--B0D6CA178757AB98E040A8C091662FB5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--B0D6CA178757AB98E040A8C091662FB5-->  <NAME><![CDATA[Payment In No.]]></NAME>
-<!--B0D6CA178757AB98E040A8C091662FB5-->  <DESCRIPTION><![CDATA[Payment  In Number]]></DESCRIPTION>
+<!--B0D6CA178757AB98E040A8C091662FB5-->  <DESCRIPTION><![CDATA[Payment Number]]></DESCRIPTION>
 <!--B0D6CA178757AB98E040A8C091662FB5-->  <COLUMNNAME><![CDATA[Paymentno]]></COLUMNNAME>
 <!--B0D6CA178757AB98E040A8C091662FB5-->  <AD_TABLE_ID><![CDATA[542D9D78E5D8452CA4977210B7BE7FA1]]></AD_TABLE_ID>
 <!--B0D6CA178757AB98E040A8C091662FB5-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
--- a/src-db/database/sourcedata/AD_ELEMENT.xml	Wed May 16 10:57:50 2012 +0200
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml	Fri May 18 12:46:25 2012 +0200
@@ -24854,10 +24854,10 @@
 <!--7891269C83E6655DE040007F010155CE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7891269C83E6655DE040007F010155CE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--7891269C83E6655DE040007F010155CE-->  <COLUMNNAME><![CDATA[Paymentdate]]></COLUMNNAME>
-<!--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-->  <NAME><![CDATA[Payment Date]]></NAME>
+<!--7891269C83E6655DE040007F010155CE-->  <PRINTNAME><![CDATA[Paymentdate]]></PRINTNAME>
+<!--7891269C83E6655DE040007F010155CE-->  <PO_NAME><![CDATA[Payment Date]]></PO_NAME>
+<!--7891269C83E6655DE040007F010155CE-->  <PO_PRINTNAME><![CDATA[Paymentdate]]></PO_PRINTNAME>
 <!--7891269C83E6655DE040007F010155CE-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--7891269C83E6655DE040007F010155CE-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--7891269C83E6655DE040007F010155CE--></AD_ELEMENT>
@@ -24957,10 +24957,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 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-->  <NAME><![CDATA[Number of Payments]]></NAME>
+<!--78B98ED0452F560FE040007F0101777C-->  <PRINTNAME><![CDATA[Numberofpayments]]></PRINTNAME>
+<!--78B98ED0452F560FE040007F0101777C-->  <PO_NAME><![CDATA[Number of Payments]]></PO_NAME>
+<!--78B98ED0452F560FE040007F0101777C-->  <PO_PRINTNAME><![CDATA[Numberofpayments]]></PO_PRINTNAME>
 <!--78B98ED0452F560FE040007F0101777C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--78B98ED0452F560FE040007F0101777C-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--78B98ED0452F560FE040007F0101777C--></AD_ELEMENT>
@@ -25001,12 +25001,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 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-->  <NAME><![CDATA[Last Payment Date]]></NAME>
+<!--78B98ED04532560FE040007F0101777C-->  <PRINTNAME><![CDATA[Last Payment Date]]></PRINTNAME>
+<!--78B98ED04532560FE040007F0101777C-->  <DESCRIPTION><![CDATA[Last Payment Date]]></DESCRIPTION>
+<!--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-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--78B98ED04532560FE040007F0101777C-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--78B98ED04532560FE040007F0101777C--></AD_ELEMENT>
@@ -25017,10 +25017,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 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-->  <NAME><![CDATA[Payment Detail]]></NAME>
+<!--78BBC5006BB24FD5E040007F01017F06-->  <PRINTNAME><![CDATA[Payment Detail]]></PRINTNAME>
+<!--78BBC5006BB24FD5E040007F01017F06-->  <PO_NAME><![CDATA[Payment Detail]]></PO_NAME>
+<!--78BBC5006BB24FD5E040007F01017F06-->  <PO_PRINTNAME><![CDATA[Payment Detail]]></PO_PRINTNAME>
 <!--78BBC5006BB24FD5E040007F01017F06-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--78BBC5006BB24FD5E040007F01017F06-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--78BBC5006BB24FD5E040007F01017F06--></AD_ELEMENT>
@@ -25371,12 +25371,12 @@
 <!--7FF22347490A844FE040007F01003861-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7FF22347490A844FE040007F01003861-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--7FF22347490A844FE040007F01003861-->  <COLUMNNAME><![CDATA[Paymentno]]></COLUMNNAME>
-<!--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-->  <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-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--7FF22347490A844FE040007F01003861-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--7FF22347490A844FE040007F01003861--></AD_ELEMENT>
--- a/src-db/database/sourcedata/AD_FIELD.xml	Wed May 16 10:57:50 2012 +0200
+++ b/src-db/database/sourcedata/AD_FIELD.xml	Fri May 18 12:46:25 2012 +0200
@@ -170764,7 +170764,7 @@
 <!--148A616B2B3C443C9038572011B135C7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--148A616B2B3C443C9038572011B135C7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--148A616B2B3C443C9038572011B135C7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--148A616B2B3C443C9038572011B135C7-->  <NAME><![CDATA[Payment Out Date]]></NAME>
+<!--148A616B2B3C443C9038572011B135C7-->  <NAME><![CDATA[Payment Date]]></NAME>
 <!--148A616B2B3C443C9038572011B135C7-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--148A616B2B3C443C9038572011B135C7-->  <AD_TAB_ID><![CDATA[FA619778CCD24476BD89873D139824BB]]></AD_TAB_ID>
 <!--148A616B2B3C443C9038572011B135C7-->  <AD_COLUMN_ID><![CDATA[78D16B5B178F661EE040007F010152F7]]></AD_COLUMN_ID>
@@ -171496,7 +171496,7 @@
 <!--1A3E8EC8DCBA4F2380FA40146B8AE759-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--1A3E8EC8DCBA4F2380FA40146B8AE759-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--1A3E8EC8DCBA4F2380FA40146B8AE759-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--1A3E8EC8DCBA4F2380FA40146B8AE759-->  <NAME><![CDATA[Payment Out Detail]]></NAME>
+<!--1A3E8EC8DCBA4F2380FA40146B8AE759-->  <NAME><![CDATA[Payment Detail]]></NAME>
 <!--1A3E8EC8DCBA4F2380FA40146B8AE759-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--1A3E8EC8DCBA4F2380FA40146B8AE759-->  <AD_TAB_ID><![CDATA[FA619778CCD24476BD89873D139824BB]]></AD_TAB_ID>
 <!--1A3E8EC8DCBA4F2380FA40146B8AE759-->  <AD_COLUMN_ID><![CDATA[78D16B5B1787661EE040007F010152F7]]></AD_COLUMN_ID>
@@ -173899,7 +173899,7 @@
 <!--2F5E2A25F44B42E4AE4AF128E8B0589B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--2F5E2A25F44B42E4AE4AF128E8B0589B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--2F5E2A25F44B42E4AE4AF128E8B0589B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--2F5E2A25F44B42E4AE4AF128E8B0589B-->  <NAME><![CDATA[Number of Payments Out]]></NAME>
+<!--2F5E2A25F44B42E4AE4AF128E8B0589B-->  <NAME><![CDATA[Number of Payments]]></NAME>
 <!--2F5E2A25F44B42E4AE4AF128E8B0589B-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--2F5E2A25F44B42E4AE4AF128E8B0589B-->  <AD_TAB_ID><![CDATA[3D342267CAAE4CA5B191082E20F87660]]></AD_TAB_ID>
 <!--2F5E2A25F44B42E4AE4AF128E8B0589B-->  <AD_COLUMN_ID><![CDATA[802DBB308D07C960E040007F01001D1B]]></AD_COLUMN_ID>
@@ -187857,7 +187857,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 Out Date]]></NAME>
+<!--60B7D5ABB5FD47608ACB13EC89966A6B-->  <NAME><![CDATA[Payment 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>
@@ -189570,8 +189570,8 @@
 <!--69E8A75F4F5D4B4FBF826F8FA3B48ECC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--69E8A75F4F5D4B4FBF826F8FA3B48ECC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--69E8A75F4F5D4B4FBF826F8FA3B48ECC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--69E8A75F4F5D4B4FBF826F8FA3B48ECC-->  <NAME><![CDATA[Last Payment Out Date]]></NAME>
-<!--69E8A75F4F5D4B4FBF826F8FA3B48ECC-->  <DESCRIPTION><![CDATA[Last Payment Out Date]]></DESCRIPTION>
+<!--69E8A75F4F5D4B4FBF826F8FA3B48ECC-->  <NAME><![CDATA[Last Payment Date]]></NAME>
+<!--69E8A75F4F5D4B4FBF826F8FA3B48ECC-->  <DESCRIPTION><![CDATA[Last Payment Date]]></DESCRIPTION>
 <!--69E8A75F4F5D4B4FBF826F8FA3B48ECC-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--69E8A75F4F5D4B4FBF826F8FA3B48ECC-->  <AD_TAB_ID><![CDATA[3D342267CAAE4CA5B191082E20F87660]]></AD_TAB_ID>
 <!--69E8A75F4F5D4B4FBF826F8FA3B48ECC-->  <AD_COLUMN_ID><![CDATA[802DBB308D06C960E040007F01001D1B]]></AD_COLUMN_ID>
@@ -191711,8 +191711,8 @@
 <!--7416B815AC324CA39FD5516C1A4BD7ED-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--7416B815AC324CA39FD5516C1A4BD7ED-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7416B815AC324CA39FD5516C1A4BD7ED-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--7416B815AC324CA39FD5516C1A4BD7ED-->  <NAME><![CDATA[Payment Out No.]]></NAME>
-<!--7416B815AC324CA39FD5516C1A4BD7ED-->  <DESCRIPTION><![CDATA[Payment Out Number]]></DESCRIPTION>
+<!--7416B815AC324CA39FD5516C1A4BD7ED-->  <NAME><![CDATA[Payment No.]]></NAME>
+<!--7416B815AC324CA39FD5516C1A4BD7ED-->  <DESCRIPTION><![CDATA[Payment Number]]></DESCRIPTION>
 <!--7416B815AC324CA39FD5516C1A4BD7ED-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--7416B815AC324CA39FD5516C1A4BD7ED-->  <AD_TAB_ID><![CDATA[FA619778CCD24476BD89873D139824BB]]></AD_TAB_ID>
 <!--7416B815AC324CA39FD5516C1A4BD7ED-->  <AD_COLUMN_ID><![CDATA[7FF2234748EB844FE040007F01003861]]></AD_COLUMN_ID>
@@ -193164,7 +193164,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 In Date]]></NAME>
+<!--7C541AC0C765FDD7E040007F01016B4D-->  <NAME><![CDATA[Payment 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>
@@ -193838,7 +193838,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 Out Date]]></NAME>
+<!--7DC34559B408B45BE040007F0100784A-->  <NAME><![CDATA[Payment 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>
@@ -195997,7 +195997,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 In Detail]]></NAME>
+<!--7FF2234748FE844FE040007F01003861-->  <NAME><![CDATA[Payment 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>
@@ -196181,7 +196181,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 In Date]]></NAME>
+<!--7FF223474906844FE040007F01003861-->  <NAME><![CDATA[Payment 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>
@@ -196205,8 +196205,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 In No.]]></NAME>
-<!--7FF223474907844FE040007F01003861-->  <DESCRIPTION><![CDATA[Payment  In Number]]></DESCRIPTION>
+<!--7FF223474907844FE040007F01003861-->  <NAME><![CDATA[Payment No.]]></NAME>
+<!--7FF223474907844FE040007F01003861-->  <DESCRIPTION><![CDATA[Payment 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>
@@ -196800,8 +196800,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 Out No.]]></NAME>
-<!--80E4CFBA7924A660E040007F01005D04-->  <DESCRIPTION><![CDATA[Payment Out Number]]></DESCRIPTION>
+<!--80E4CFBA7924A660E040007F01005D04-->  <NAME><![CDATA[Payment No.]]></NAME>
+<!--80E4CFBA7924A660E040007F01005D04-->  <DESCRIPTION><![CDATA[Payment 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>
@@ -200880,8 +200880,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 Out No.]]></NAME>
-<!--885CE3F4E4EF4D4C924BBFCE1FA0AB39-->  <DESCRIPTION><![CDATA[Payment Out Number]]></DESCRIPTION>
+<!--885CE3F4E4EF4D4C924BBFCE1FA0AB39-->  <NAME><![CDATA[Payment No.]]></NAME>
+<!--885CE3F4E4EF4D4C924BBFCE1FA0AB39-->  <DESCRIPTION><![CDATA[Payment 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>
@@ -205368,7 +205368,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 Out Date]]></NAME>
+<!--9B255A20E9AC41A2AA3028A0D5BCF0B9-->  <NAME><![CDATA[Payment 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>
@@ -212920,7 +212920,7 @@
 <!--AF4090093DC11431E040007F010048A5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--AF4090093DC11431E040007F010048A5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--AF4090093DC11431E040007F010048A5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--AF4090093DC11431E040007F010048A5-->  <NAME><![CDATA[Payment In Date]]></NAME>
+<!--AF4090093DC11431E040007F010048A5-->  <NAME><![CDATA[Payment Date]]></NAME>
 <!--AF4090093DC11431E040007F010048A5-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--AF4090093DC11431E040007F010048A5-->  <AD_TAB_ID><![CDATA[AF4090093DB91431E040007F010048A5]]></AD_TAB_ID>
 <!--AF4090093DC11431E040007F010048A5-->  <AD_COLUMN_ID><![CDATA[78D16B5B178F661EE040007F010152F7]]></AD_COLUMN_ID>
@@ -213052,7 +213052,7 @@
 <!--AF4090093DC61431E040007F010048A5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--AF4090093DC61431E040007F010048A5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--AF4090093DC61431E040007F010048A5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--AF4090093DC61431E040007F010048A5-->  <NAME><![CDATA[Payment In Detail]]></NAME>
+<!--AF4090093DC61431E040007F010048A5-->  <NAME><![CDATA[Payment Detail]]></NAME>
 <!--AF4090093DC61431E040007F010048A5-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--AF4090093DC61431E040007F010048A5-->  <AD_TAB_ID><![CDATA[AF4090093DB91431E040007F010048A5]]></AD_TAB_ID>
 <!--AF4090093DC61431E040007F010048A5-->  <AD_COLUMN_ID><![CDATA[78D16B5B1787661EE040007F010152F7]]></AD_COLUMN_ID>
@@ -213127,8 +213127,8 @@
 <!--AF4090093DC91431E040007F010048A5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--AF4090093DC91431E040007F010048A5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--AF4090093DC91431E040007F010048A5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--AF4090093DC91431E040007F010048A5-->  <NAME><![CDATA[Payment In No.]]></NAME>
-<!--AF4090093DC91431E040007F010048A5-->  <DESCRIPTION><![CDATA[Payment  In Number]]></DESCRIPTION>
+<!--AF4090093DC91431E040007F010048A5-->  <NAME><![CDATA[Payment No.]]></NAME>
+<!--AF4090093DC91431E040007F010048A5-->  <DESCRIPTION><![CDATA[Payment Number]]></DESCRIPTION>
 <!--AF4090093DC91431E040007F010048A5-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--AF4090093DC91431E040007F010048A5-->  <AD_TAB_ID><![CDATA[AF4090093DB91431E040007F010048A5]]></AD_TAB_ID>
 <!--AF4090093DC91431E040007F010048A5-->  <AD_COLUMN_ID><![CDATA[7FF2234748EB844FE040007F01003861]]></AD_COLUMN_ID>
@@ -213530,7 +213530,7 @@
 <!--AF4090093DD91431E040007F010048A5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--AF4090093DD91431E040007F010048A5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--AF4090093DD91431E040007F010048A5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--AF4090093DD91431E040007F010048A5-->  <NAME><![CDATA[Number of Payments In]]></NAME>
+<!--AF4090093DD91431E040007F010048A5-->  <NAME><![CDATA[Number of Payments]]></NAME>
 <!--AF4090093DD91431E040007F010048A5-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--AF4090093DD91431E040007F010048A5-->  <AD_TAB_ID><![CDATA[AF4090093DD21431E040007F010048A5]]></AD_TAB_ID>
 <!--AF4090093DD91431E040007F010048A5-->  <AD_COLUMN_ID><![CDATA[802DBB308D07C960E040007F01001D1B]]></AD_COLUMN_ID>
@@ -213662,8 +213662,8 @@
 <!--AF4090093DDE1431E040007F010048A5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--AF4090093DDE1431E040007F010048A5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--AF4090093DDE1431E040007F010048A5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--AF4090093DDE1431E040007F010048A5-->  <NAME><![CDATA[Last Payment In Date]]></NAME>
-<!--AF4090093DDE1431E040007F010048A5-->  <DESCRIPTION><![CDATA[Last Payment In Date]]></DESCRIPTION>
+<!--AF4090093DDE1431E040007F010048A5-->  <NAME><![CDATA[Last Payment Date]]></NAME>
+<!--AF4090093DDE1431E040007F010048A5-->  <DESCRIPTION><![CDATA[Last Payment Date]]></DESCRIPTION>
 <!--AF4090093DDE1431E040007F010048A5-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--AF4090093DDE1431E040007F010048A5-->  <AD_TAB_ID><![CDATA[AF4090093DD21431E040007F010048A5]]></AD_TAB_ID>
 <!--AF4090093DDE1431E040007F010048A5-->  <AD_COLUMN_ID><![CDATA[802DBB308D06C960E040007F01001D1B]]></AD_COLUMN_ID>
@@ -215232,8 +215232,8 @@
 <!--B0D66195A8036F0AE040A8C0916624B5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--B0D66195A8036F0AE040A8C0916624B5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--B0D66195A8036F0AE040A8C0916624B5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--B0D66195A8036F0AE040A8C0916624B5-->  <NAME><![CDATA[Last Payment Out Date]]></NAME>
-<!--B0D66195A8036F0AE040A8C0916624B5-->  <DESCRIPTION><![CDATA[Last Payment Out Date]]></DESCRIPTION>
+<!--B0D66195A8036F0AE040A8C0916624B5-->  <NAME><![CDATA[Last Payment Date]]></NAME>
+<!--B0D66195A8036F0AE040A8C0916624B5-->  <DESCRIPTION><![CDATA[Last Payment Date]]></DESCRIPTION>
 <!--B0D66195A8036F0AE040A8C0916624B5-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--B0D66195A8036F0AE040A8C0916624B5-->  <AD_TAB_ID><![CDATA[4028E61132F1F5830132F25470980063]]></AD_TAB_ID>
 <!--B0D66195A8036F0AE040A8C0916624B5-->  <AD_COLUMN_ID><![CDATA[B0D661BBD3FF0A3AE040A8C0916624CC]]></AD_COLUMN_ID>
@@ -215258,7 +215258,7 @@
 <!--B0D66195A8046F0AE040A8C0916624B5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--B0D66195A8046F0AE040A8C0916624B5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--B0D66195A8046F0AE040A8C0916624B5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--B0D66195A8046F0AE040A8C0916624B5-->  <NAME><![CDATA[Number of Payments Out]]></NAME>
+<!--B0D66195A8046F0AE040A8C0916624B5-->  <NAME><![CDATA[Number of Payments]]></NAME>
 <!--B0D66195A8046F0AE040A8C0916624B5-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--B0D66195A8046F0AE040A8C0916624B5-->  <AD_TAB_ID><![CDATA[4028E61132F1F5830132F25470980063]]></AD_TAB_ID>
 <!--B0D66195A8046F0AE040A8C0916624B5-->  <AD_COLUMN_ID><![CDATA[B0D661BBD4000A3AE040A8C0916624CC]]></AD_COLUMN_ID>
@@ -215648,8 +215648,8 @@
 <!--B0D661BBD4160A3AE040A8C0916624CC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--B0D661BBD4160A3AE040A8C0916624CC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--B0D661BBD4160A3AE040A8C0916624CC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--B0D661BBD4160A3AE040A8C0916624CC-->  <NAME><![CDATA[Last Payment In Date]]></NAME>
-<!--B0D661BBD4160A3AE040A8C0916624CC-->  <DESCRIPTION><![CDATA[Last Payment In Date]]></DESCRIPTION>
+<!--B0D661BBD4160A3AE040A8C0916624CC-->  <NAME><![CDATA[Last Payment Date]]></NAME>
+<!--B0D661BBD4160A3AE040A8C0916624CC-->  <DESCRIPTION><![CDATA[Last Payment Date]]></DESCRIPTION>
 <!--B0D661BBD4160A3AE040A8C0916624CC-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--B0D661BBD4160A3AE040A8C0916624CC-->  <AD_TAB_ID><![CDATA[402881A832FC85E30132FC8BF00A000D]]></AD_TAB_ID>
 <!--B0D661BBD4160A3AE040A8C0916624CC-->  <AD_COLUMN_ID><![CDATA[B0D661BBD3FF0A3AE040A8C0916624CC]]></AD_COLUMN_ID>
@@ -215674,7 +215674,7 @@
 <!--B0D661BBD4170A3AE040A8C0916624CC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--B0D661BBD4170A3AE040A8C0916624CC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--B0D661BBD4170A3AE040A8C0916624CC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--B0D661BBD4170A3AE040A8C0916624CC-->  <NAME><![CDATA[Number of Payments In]]></NAME>
+<!--B0D661BBD4170A3AE040A8C0916624CC-->  <NAME><![CDATA[Number of Payments]]></NAME>
 <!--B0D661BBD4170A3AE040A8C0916624CC-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--B0D661BBD4170A3AE040A8C0916624CC-->  <AD_TAB_ID><![CDATA[402881A832FC85E30132FC8BF00A000D]]></AD_TAB_ID>
 <!--B0D661BBD4170A3AE040A8C0916624CC-->  <AD_COLUMN_ID><![CDATA[B0D661BBD4000A3AE040A8C0916624CC]]></AD_COLUMN_ID>
@@ -215981,7 +215981,7 @@
 <!--B0D6CA17876AAB98E040A8C091662FB5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--B0D6CA17876AAB98E040A8C091662FB5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--B0D6CA17876AAB98E040A8C091662FB5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--B0D6CA17876AAB98E040A8C091662FB5-->  <NAME><![CDATA[Payment Out Detail]]></NAME>
+<!--B0D6CA17876AAB98E040A8C091662FB5-->  <NAME><![CDATA[Payment Detail]]></NAME>
 <!--B0D6CA17876AAB98E040A8C091662FB5-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--B0D6CA17876AAB98E040A8C091662FB5-->  <AD_TAB_ID><![CDATA[402881A832FC397A0132FC55A71F001E]]></AD_TAB_ID>
 <!--B0D6CA17876AAB98E040A8C091662FB5-->  <AD_COLUMN_ID><![CDATA[B0D6CA178753AB98E040A8C091662FB5]]></AD_COLUMN_ID>
@@ -216030,7 +216030,7 @@
 <!--B0D6CA17876CAB98E040A8C091662FB5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--B0D6CA17876CAB98E040A8C091662FB5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--B0D6CA17876CAB98E040A8C091662FB5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--B0D6CA17876CAB98E040A8C091662FB5-->  <NAME><![CDATA[Payment Out Date]]></NAME>
+<!--B0D6CA17876CAB98E040A8C091662FB5-->  <NAME><![CDATA[Payment Date]]></NAME>
 <!--B0D6CA17876CAB98E040A8C091662FB5-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--B0D6CA17876CAB98E040A8C091662FB5-->  <AD_TAB_ID><![CDATA[402881A832FC397A0132FC55A71F001E]]></AD_TAB_ID>
 <!--B0D6CA17876CAB98E040A8C091662FB5-->  <AD_COLUMN_ID><![CDATA[B0D6CA178755AB98E040A8C091662FB5]]></AD_COLUMN_ID>
@@ -216082,8 +216082,8 @@
 <!--B0D6CA17876EAB98E040A8C091662FB5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--B0D6CA17876EAB98E040A8C091662FB5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--B0D6CA17876EAB98E040A8C091662FB5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--B0D6CA17876EAB98E040A8C091662FB5-->  <NAME><![CDATA[Payment Out No.]]></NAME>
-<!--B0D6CA17876EAB98E040A8C091662FB5-->  <DESCRIPTION><![CDATA[Payment Out Number]]></DESCRIPTION>
+<!--B0D6CA17876EAB98E040A8C091662FB5-->  <NAME><![CDATA[Payment No.]]></NAME>
+<!--B0D6CA17876EAB98E040A8C091662FB5-->  <DESCRIPTION><![CDATA[Payment Number]]></DESCRIPTION>
 <!--B0D6CA17876EAB98E040A8C091662FB5-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--B0D6CA17876EAB98E040A8C091662FB5-->  <AD_TAB_ID><![CDATA[402881A832FC397A0132FC55A71F001E]]></AD_TAB_ID>
 <!--B0D6CA17876EAB98E040A8C091662FB5-->  <AD_COLUMN_ID><![CDATA[B0D6CA178757AB98E040A8C091662FB5]]></AD_COLUMN_ID>
@@ -216415,7 +216415,7 @@
 <!--B0D6F08A188F0E63E040A8C0916632D4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--B0D6F08A188F0E63E040A8C0916632D4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--B0D6F08A188F0E63E040A8C0916632D4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--B0D6F08A188F0E63E040A8C0916632D4-->  <NAME><![CDATA[Payment In Detail]]></NAME>
+<!--B0D6F08A188F0E63E040A8C0916632D4-->  <NAME><![CDATA[Payment Detail]]></NAME>
 <!--B0D6F08A188F0E63E040A8C0916632D4-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--B0D6F08A188F0E63E040A8C0916632D4-->  <AD_TAB_ID><![CDATA[402881A832FC85E30132FC8FA8E60025]]></AD_TAB_ID>
 <!--B0D6F08A188F0E63E040A8C0916632D4-->  <AD_COLUMN_ID><![CDATA[B0D6CA178753AB98E040A8C091662FB5]]></AD_COLUMN_ID>
@@ -216464,7 +216464,7 @@
 <!--B0D6F08A18910E63E040A8C0916632D4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--B0D6F08A18910E63E040A8C0916632D4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--B0D6F08A18910E63E040A8C0916632D4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--B0D6F08A18910E63E040A8C0916632D4-->  <NAME><![CDATA[Payment In Date]]></NAME>
+<!--B0D6F08A18910E63E040A8C0916632D4-->  <NAME><![CDATA[Payment Date]]></NAME>
 <!--B0D6F08A18910E63E040A8C0916632D4-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--B0D6F08A18910E63E040A8C0916632D4-->  <AD_TAB_ID><![CDATA[402881A832FC85E30132FC8FA8E60025]]></AD_TAB_ID>
 <!--B0D6F08A18910E63E040A8C0916632D4-->  <AD_COLUMN_ID><![CDATA[B0D6CA178755AB98E040A8C091662FB5]]></AD_COLUMN_ID>
@@ -216516,8 +216516,8 @@
 <!--B0D6F08A18930E63E040A8C0916632D4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--B0D6F08A18930E63E040A8C0916632D4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--B0D6F08A18930E63E040A8C0916632D4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--B0D6F08A18930E63E040A8C0916632D4-->  <NAME><![CDATA[Payment In No.]]></NAME>
-<!--B0D6F08A18930E63E040A8C0916632D4-->  <DESCRIPTION><![CDATA[Payment  In Number]]></DESCRIPTION>
+<!--B0D6F08A18930E63E040A8C0916632D4-->  <NAME><![CDATA[Payment No.]]></NAME>
+<!--B0D6F08A18930E63E040A8C0916632D4-->  <DESCRIPTION><![CDATA[Payment Number]]></DESCRIPTION>
 <!--B0D6F08A18930E63E040A8C0916632D4-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--B0D6F08A18930E63E040A8C0916632D4-->  <AD_TAB_ID><![CDATA[402881A832FC85E30132FC8FA8E60025]]></AD_TAB_ID>
 <!--B0D6F08A18930E63E040A8C0916632D4-->  <AD_COLUMN_ID><![CDATA[B0D6CA178757AB98E040A8C091662FB5]]></AD_COLUMN_ID>
@@ -218362,8 +218362,8 @@
 <!--B6BB67AE51F91BEBE040A8C091666000-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--B6BB67AE51F91BEBE040A8C091666000-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--B6BB67AE51F91BEBE040A8C091666000-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--B6BB67AE51F91BEBE040A8C091666000-->  <NAME><![CDATA[Last Payment Out Date]]></NAME>
-<!--B6BB67AE51F91BEBE040A8C091666000-->  <DESCRIPTION><![CDATA[Last Payment Out Date]]></DESCRIPTION>
+<!--B6BB67AE51F91BEBE040A8C091666000-->  <NAME><![CDATA[Last Payment Date]]></NAME>
+<!--B6BB67AE51F91BEBE040A8C091666000-->  <DESCRIPTION><![CDATA[Last Payment Date]]></DESCRIPTION>
 <!--B6BB67AE51F91BEBE040A8C091666000-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--B6BB67AE51F91BEBE040A8C091666000-->  <AD_TAB_ID><![CDATA[D4D450A66C754D65940DBC36B11779C8]]></AD_TAB_ID>
 <!--B6BB67AE51F91BEBE040A8C091666000-->  <AD_COLUMN_ID><![CDATA[78D10D5CC296A0ADE040007F010152E6]]></AD_COLUMN_ID>
@@ -218387,7 +218387,7 @@
 <!--B6BB67AE51FA1BEBE040A8C091666000-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--B6BB67AE51FA1BEBE040A8C091666000-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--B6BB67AE51FA1BEBE040A8C091666000-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--B6BB67AE51FA1BEBE040A8C091666000-->  <NAME><![CDATA[Number of Payments Out]]></NAME>
+<!--B6BB67AE51FA1BEBE040A8C091666000-->  <NAME><![CDATA[Number of Payments]]></NAME>
 <!--B6BB67AE51FA1BEBE040A8C091666000-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--B6BB67AE51FA1BEBE040A8C091666000-->  <AD_TAB_ID><![CDATA[D4D450A66C754D65940DBC36B11779C8]]></AD_TAB_ID>
 <!--B6BB67AE51FA1BEBE040A8C091666000-->  <AD_COLUMN_ID><![CDATA[78D10D5CC297A0ADE040007F010152E6]]></AD_COLUMN_ID>
@@ -218724,7 +218724,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 Out Detail]]></NAME>
+<!--B8CD44FF19E3491DB14C0383FFF23428-->  <NAME><![CDATA[Payment 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>
--- a/src-db/database/sourcedata/AD_TAB.xml	Wed May 16 10:57:50 2012 +0200
+++ b/src-db/database/sourcedata/AD_TAB.xml	Fri May 18 12:46:25 2012 +0200
@@ -12528,9 +12528,9 @@
 <!--402881A832FC397A0132FC55A71F001E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--402881A832FC397A0132FC55A71F001E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--402881A832FC397A0132FC55A71F001E-->  <ISACTIVE><![CDATA[N]]></ISACTIVE>
-<!--402881A832FC397A0132FC55A71F001E-->  <NAME><![CDATA[Archived Payment Out Plan Details]]></NAME>
-<!--402881A832FC397A0132FC55A71F001E-->  <DESCRIPTION><![CDATA[List of payment out made details against a particular invoice based on the payment out plan]]></DESCRIPTION>
-<!--402881A832FC397A0132FC55A71F001E-->  <HELP><![CDATA[List of payment out made details against a particular invoice based on the payment out plan]]></HELP>
+<!--402881A832FC397A0132FC55A71F001E-->  <NAME><![CDATA[Archived Payment Plan Details]]></NAME>
+<!--402881A832FC397A0132FC55A71F001E-->  <DESCRIPTION><![CDATA[List of payment made details against a particular invoice based on the payment plan]]></DESCRIPTION>
+<!--402881A832FC397A0132FC55A71F001E-->  <HELP><![CDATA[List of payment made details against a particular invoice based on the payment plan]]></HELP>
 <!--402881A832FC397A0132FC55A71F001E-->  <AD_TABLE_ID><![CDATA[542D9D78E5D8452CA4977210B7BE7FA1]]></AD_TABLE_ID>
 <!--402881A832FC397A0132FC55A71F001E-->  <AD_WINDOW_ID><![CDATA[183]]></AD_WINDOW_ID>
 <!--402881A832FC397A0132FC55A71F001E-->  <SEQNO><![CDATA[39]]></SEQNO>
@@ -12556,9 +12556,9 @@
 <!--402881A832FC85E30132FC8BF00A000D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--402881A832FC85E30132FC8BF00A000D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--402881A832FC85E30132FC8BF00A000D-->  <ISACTIVE><![CDATA[N]]></ISACTIVE>
-<!--402881A832FC85E30132FC8BF00A000D-->  <NAME><![CDATA[Archived Payment In Plan]]></NAME>
-<!--402881A832FC85E30132FC8BF00A000D-->  <DESCRIPTION><![CDATA[List of scheduled payments in expected against a particular invoice and archived payment in plan associated with that invoice.]]></DESCRIPTION>
-<!--402881A832FC85E30132FC8BF00A000D-->  <HELP><![CDATA[List of scheduled payments in expected against a particular invoice and archived payment in plan associated with that invoice.]]></HELP>
+<!--402881A832FC85E30132FC8BF00A000D-->  <NAME><![CDATA[Archived Payment Plan]]></NAME>
+<!--402881A832FC85E30132FC8BF00A000D-->  <DESCRIPTION><![CDATA[List of scheduled payments expected against a particular invoice and archived payment plan associated with that invoice.]]></DESCRIPTION>
+<!--402881A832FC85E30132FC8BF00A000D-->  <HELP><![CDATA[List of scheduled payments expected against a particular invoice and archived payment plan associated with that invoice.]]></HELP>
 <!--402881A832FC85E30132FC8BF00A000D-->  <AD_TABLE_ID><![CDATA[8C391E83D9A74F738D4D67E09329B745]]></AD_TABLE_ID>
 <!--402881A832FC85E30132FC8BF00A000D-->  <AD_WINDOW_ID><![CDATA[167]]></AD_WINDOW_ID>
 <!--402881A832FC85E30132FC8BF00A000D-->  <SEQNO><![CDATA[55]]></SEQNO>
@@ -12584,9 +12584,9 @@
 <!--402881A832FC85E30132FC8FA8E60025-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--402881A832FC85E30132FC8FA8E60025-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--402881A832FC85E30132FC8FA8E60025-->  <ISACTIVE><![CDATA[N]]></ISACTIVE>
-<!--402881A832FC85E30132FC8FA8E60025-->  <NAME><![CDATA[Archived Payment In Plan Details]]></NAME>
-<!--402881A832FC85E30132FC8FA8E60025-->  <DESCRIPTION><![CDATA[List of payment in made details against a particular invoice based on the archived payment in plan..]]></DESCRIPTION>
-<!--402881A832FC85E30132FC8FA8E60025-->  <HELP><![CDATA[List of payment in made details against a particular invoice based on the archived payment in plan..]]></HELP>
+<!--402881A832FC85E30132FC8FA8E60025-->  <NAME><![CDATA[Archived Payment Plan Details]]></NAME>
+<!--402881A832FC85E30132FC8FA8E60025-->  <DESCRIPTION><![CDATA[List of payment made details against a particular invoice based on the archived payment plan.]]></DESCRIPTION>
+<!--402881A832FC85E30132FC8FA8E60025-->  <HELP><![CDATA[List of payment made details against a particular invoice based on the archived payment plan.]]></HELP>
 <!--402881A832FC85E30132FC8FA8E60025-->  <AD_TABLE_ID><![CDATA[542D9D78E5D8452CA4977210B7BE7FA1]]></AD_TABLE_ID>
 <!--402881A832FC85E30132FC8FA8E60025-->  <AD_WINDOW_ID><![CDATA[167]]></AD_WINDOW_ID>
 <!--402881A832FC85E30132FC8FA8E60025-->  <SEQNO><![CDATA[56]]></SEQNO>
@@ -12612,9 +12612,9 @@
 <!--4028E61132F1F5830132F25470980063-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--4028E61132F1F5830132F25470980063-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--4028E61132F1F5830132F25470980063-->  <ISACTIVE><![CDATA[N]]></ISACTIVE>
-<!--4028E61132F1F5830132F25470980063-->  <NAME><![CDATA[Archived Payment Out Plan]]></NAME>
-<!--4028E61132F1F5830132F25470980063-->  <DESCRIPTION><![CDATA[Original list of scheduled payments in expected against a particular invoice and payment in plan associated with that invoice.]]></DESCRIPTION>
-<!--4028E61132F1F5830132F25470980063-->  <HELP><![CDATA[List of originally scheduled payments in expected against a particular invoice and payment in plan associated with that invoice.]]></HELP>
+<!--4028E61132F1F5830132F25470980063-->  <NAME><![CDATA[Archived Payment Plan]]></NAME>
+<!--4028E61132F1F5830132F25470980063-->  <DESCRIPTION><![CDATA[Original list of scheduled payments expected against a particular invoice and payment plan associated with that invoice.]]></DESCRIPTION>
+<!--4028E61132F1F5830132F25470980063-->  <HELP><![CDATA[List of originally scheduled payments expected against a particular invoice and payment plan associated with that invoice.]]></HELP>
 <!--4028E61132F1F5830132F25470980063-->  <AD_TABLE_ID><![CDATA[8C391E83D9A74F738D4D67E09329B745]]></AD_TABLE_ID>
 <!--4028E61132F1F5830132F25470980063-->  <AD_WINDOW_ID><![CDATA[183]]></AD_WINDOW_ID>
 <!--4028E61132F1F5830132F25470980063-->  <SEQNO><![CDATA[38]]></SEQNO>