Fixes issue 22006
authorEduardo Argal Guibert <eduardo.argal@openbravo.com>
Tue, 30 Oct 2012 12:16:46 +0100
changeset 18402 6ce264ad0561
parent 18130 1cd80d4b32bb
child 18403 f9ebfb6a229b
Fixes issue 22006
modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml
modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml
modules/org.openbravo.advpaymentmngt/src-db/database/model/views/APRM_PAYMENT_PROP_PICK_EDIT.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/ModifyPaymentPlanActionHandler.java
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.xml
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.xml
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.xml
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransactionGrid.srpt
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransactionGrid.xml
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentGrid.srpt
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentGrid.xml
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentProposalGrid.srpt
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentProposalGrid.xml
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/SelectExpectedPayments.html
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/SelectExpectedPayments.java
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentMonitorProcess.java
src-db/database/model/tables/FIN_PAYMENT_SCHEDULE.xml
src-db/database/model/views/FIN_PAYMENT_DETAIL_V.xml
src-db/database/model/views/FIN_PAYMENT_PROP_DETAIL_V.xml
src-db/database/model/views/FIN_PAYMENT_SCHED_INV_V.xml
src-db/database/model/views/FIN_PAYMENT_SCHED_ORD_V.xml
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_ELEMENT.xml
src-db/database/sourcedata/AD_FIELD.xml
src-db/database/sourcedata/AD_PROCESS_PARA.xml
src-db/database/sourcedata/AD_REFERENCE.xml
src-db/database/sourcedata/OBUISEL_SELECTOR.xml
src-util/modulescript/build/classes/org/openbravo/modulescript/UpdateDueDate.class
src-util/modulescript/build/classes/org/openbravo/modulescript/UpdateDueDateData.class
src-util/modulescript/build/javasqlc/src/org/openbravo/modulescript/UpdateDueDateData.java
src-util/modulescript/src/org/openbravo/modulescript/UpdateDueDate.java
src-util/modulescript/src/org/openbravo/modulescript/UpdateDueDate_data.xsql
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml	Fri Oct 05 10:33:28 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml	Tue Oct 30 12:16:46 2012 +0100
@@ -317,7 +317,7 @@
             fin_payment_schedule_id, ad_client_id, ad_org_id, isactive,
             created, createdby, updated, updatedby,
             c_invoice_id, c_currency_id, c_order_id,
-            fin_paymentmethod_id, amount, duedate, origduedate,
+            fin_paymentmethod_id, amount, duedate, expecteddate,
             outstandingamt, fin_payment_priority_id
            ) VALUES (
             v_payment_schedule_invoice, v_client_id, v_org_id, 'Y',
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml	Fri Oct 05 10:33:28 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml	Tue Oct 30 12:16:46 2012 +0100
@@ -119,7 +119,7 @@
         fin_payment_schedule_id, ad_client_id, ad_org_id, isactive,
         created, createdby, updated, updatedby,
         c_invoice_id, c_currency_id, c_order_id,
-        fin_paymentmethod_id, amount, duedate, origduedate,
+        fin_paymentmethod_id, amount, duedate, expecteddate,
         outstandingamt, fin_payment_priority_id
        )
       VALUES
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/views/APRM_PAYMENT_PROP_PICK_EDIT.xml	Fri Oct 05 10:33:28 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/views/APRM_PAYMENT_PROP_PICK_EDIT.xml	Tue Oct 30 12:16:46 2012 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
   <database name="VIEW APRM_PAYMENT_PROP_PICK_EDIT">
-    <view name="APRM_PAYMENT_PROP_PICK_EDIT"><![CDATA[SELECT psd.fin_payment_scheduledetail_id AS aprm_payment_prop_pick_edit_id, psd.ad_client_id, psd.ad_org_id, psd.isactive, psd.created, psd.updated, psd.createdby, psd.updatedby, psd.fin_payment_scheduledetail_id, ppd.fin_payment_proposal_id, o.documentno AS order_documentno, i.documentno AS invoice_documentno, COALESCE(i.fin_paymentmethod_id, o.fin_paymentmethod_id) AS fin_paymentmethod_id, COALESCE(i.c_bpartner_id, o.c_bpartner_id) AS c_bpartner_id, COALESCE(psi.duedate, pso.duedate) AS duedate, i.grandtotal AS invoiced, COALESCE(psi.amount, pso.amount) AS expected, psd.amount AS outstanding, COALESCE(ppd.amount, 0) AS payment, COALESCE(psd.amount - ppd.amount, psd.amount) AS difference, 
+    <view name="APRM_PAYMENT_PROP_PICK_EDIT"><![CDATA[SELECT psd.fin_payment_scheduledetail_id AS aprm_payment_prop_pick_edit_id, psd.ad_client_id, psd.ad_org_id, psd.isactive, psd.created, psd.updated, psd.createdby, psd.updatedby, psd.fin_payment_scheduledetail_id, ppd.fin_payment_proposal_id, o.documentno AS order_documentno, i.documentno AS invoice_documentno, COALESCE(i.fin_paymentmethod_id, o.fin_paymentmethod_id) AS fin_paymentmethod_id, COALESCE(i.c_bpartner_id, o.c_bpartner_id) AS c_bpartner_id, COALESCE(psi.duedate, pso.duedate) AS duedate, COALESCE(psi.expecteddate, pso.expecteddate) AS expecteddate, i.grandtotal AS invoiced, COALESCE(psi.amount, pso.amount) AS expected, psd.amount AS outstanding, COALESCE(ppd.amount, 0) AS payment, COALESCE(psd.amount - ppd.amount, psd.amount) AS difference, 
 CASE
 WHEN ppd.writeoffamt <> 0 THEN 'Y'
 ELSE 'N'
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml	Fri Oct 05 10:33:28 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml	Tue Oct 30 12:16:46 2012 +0100
@@ -132,7 +132,7 @@
 <!--0790053440214B14AF3610EE2739140E-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--0790053440214B14AF3610EE2739140E-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--0790053440214B14AF3610EE2739140E-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--0790053440214B14AF3610EE2739140E-->  <POSITION><![CDATA[24]]></POSITION>
+<!--0790053440214B14AF3610EE2739140E-->  <POSITION><![CDATA[25]]></POSITION>
 <!--0790053440214B14AF3610EE2739140E-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--0790053440214B14AF3610EE2739140E-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--0790053440214B14AF3610EE2739140E-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -664,7 +664,7 @@
 <!--2198B37AF80C4020ACAADFA677917352-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--2198B37AF80C4020ACAADFA677917352-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--2198B37AF80C4020ACAADFA677917352-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--2198B37AF80C4020ACAADFA677917352-->  <POSITION><![CDATA[22]]></POSITION>
+<!--2198B37AF80C4020ACAADFA677917352-->  <POSITION><![CDATA[23]]></POSITION>
 <!--2198B37AF80C4020ACAADFA677917352-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--2198B37AF80C4020ACAADFA677917352-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--2198B37AF80C4020ACAADFA677917352-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -1081,7 +1081,7 @@
 <!--31820F9EAD6B48489FC3875553CB6ED7-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--31820F9EAD6B48489FC3875553CB6ED7-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--31820F9EAD6B48489FC3875553CB6ED7-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--31820F9EAD6B48489FC3875553CB6ED7-->  <POSITION><![CDATA[25]]></POSITION>
+<!--31820F9EAD6B48489FC3875553CB6ED7-->  <POSITION><![CDATA[26]]></POSITION>
 <!--31820F9EAD6B48489FC3875553CB6ED7-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--31820F9EAD6B48489FC3875553CB6ED7-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--31820F9EAD6B48489FC3875553CB6ED7-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -1115,7 +1115,7 @@
 <!--385DE6A637CD4D788AB480B3D1369E4F-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--385DE6A637CD4D788AB480B3D1369E4F-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--385DE6A637CD4D788AB480B3D1369E4F-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--385DE6A637CD4D788AB480B3D1369E4F-->  <POSITION><![CDATA[24]]></POSITION>
+<!--385DE6A637CD4D788AB480B3D1369E4F-->  <POSITION><![CDATA[25]]></POSITION>
 <!--385DE6A637CD4D788AB480B3D1369E4F-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--385DE6A637CD4D788AB480B3D1369E4F-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--385DE6A637CD4D788AB480B3D1369E4F-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -1644,7 +1644,7 @@
 <!--46BDDEB8C59C4ADA9C4C9D837A10CD45-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--46BDDEB8C59C4ADA9C4C9D837A10CD45-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--46BDDEB8C59C4ADA9C4C9D837A10CD45-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--46BDDEB8C59C4ADA9C4C9D837A10CD45-->  <POSITION><![CDATA[23]]></POSITION>
+<!--46BDDEB8C59C4ADA9C4C9D837A10CD45-->  <POSITION><![CDATA[24]]></POSITION>
 <!--46BDDEB8C59C4ADA9C4C9D837A10CD45-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--46BDDEB8C59C4ADA9C4C9D837A10CD45-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--46BDDEB8C59C4ADA9C4C9D837A10CD45-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -2538,6 +2538,41 @@
 <!--74C8BD1CFDD44F86840A223FE75F63D7-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--74C8BD1CFDD44F86840A223FE75F63D7--></AD_COLUMN>
 
+<!--7535FAF92D1D480D895710811C18A552--><AD_COLUMN>
+<!--7535FAF92D1D480D895710811C18A552-->  <AD_COLUMN_ID><![CDATA[7535FAF92D1D480D895710811C18A552]]></AD_COLUMN_ID>
+<!--7535FAF92D1D480D895710811C18A552-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7535FAF92D1D480D895710811C18A552-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7535FAF92D1D480D895710811C18A552-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7535FAF92D1D480D895710811C18A552-->  <NAME><![CDATA[Expected Date]]></NAME>
+<!--7535FAF92D1D480D895710811C18A552-->  <DESCRIPTION><![CDATA[The date when a specified request must be carried out by.]]></DESCRIPTION>
+<!--7535FAF92D1D480D895710811C18A552-->  <HELP><![CDATA[Date when the payment is due without deductions or discount]]></HELP>
+<!--7535FAF92D1D480D895710811C18A552-->  <COLUMNNAME><![CDATA[ExpectedDate]]></COLUMNNAME>
+<!--7535FAF92D1D480D895710811C18A552-->  <AD_TABLE_ID><![CDATA[DC814AB3BC84486CA5411131724BC95A]]></AD_TABLE_ID>
+<!--7535FAF92D1D480D895710811C18A552-->  <AD_REFERENCE_ID><![CDATA[15]]></AD_REFERENCE_ID>
+<!--7535FAF92D1D480D895710811C18A552-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--7535FAF92D1D480D895710811C18A552-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7535FAF92D1D480D895710811C18A552-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7535FAF92D1D480D895710811C18A552-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--7535FAF92D1D480D895710811C18A552-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--7535FAF92D1D480D895710811C18A552-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7535FAF92D1D480D895710811C18A552-->  <SEQNO><![CDATA[260]]></SEQNO>
+<!--7535FAF92D1D480D895710811C18A552-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7535FAF92D1D480D895710811C18A552-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7535FAF92D1D480D895710811C18A552-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7535FAF92D1D480D895710811C18A552-->  <AD_ELEMENT_ID><![CDATA[C00EC2D7121949B18BE9D52FE3EB2468]]></AD_ELEMENT_ID>
+<!--7535FAF92D1D480D895710811C18A552-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7535FAF92D1D480D895710811C18A552-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7535FAF92D1D480D895710811C18A552-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7535FAF92D1D480D895710811C18A552-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7535FAF92D1D480D895710811C18A552-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--7535FAF92D1D480D895710811C18A552-->  <POSITION><![CDATA[16]]></POSITION>
+<!--7535FAF92D1D480D895710811C18A552-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7535FAF92D1D480D895710811C18A552-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--7535FAF92D1D480D895710811C18A552-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--7535FAF92D1D480D895710811C18A552-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--7535FAF92D1D480D895710811C18A552-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--7535FAF92D1D480D895710811C18A552--></AD_COLUMN>
+
 <!--76A20548884B489E88D731480658E2D1--><AD_COLUMN>
 <!--76A20548884B489E88D731480658E2D1-->  <AD_COLUMN_ID><![CDATA[76A20548884B489E88D731480658E2D1]]></AD_COLUMN_ID>
 <!--76A20548884B489E88D731480658E2D1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -4101,7 +4136,7 @@
 <!--85CFAF08A714472C82A6CC014B4F5B66-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--85CFAF08A714472C82A6CC014B4F5B66-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--85CFAF08A714472C82A6CC014B4F5B66-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--85CFAF08A714472C82A6CC014B4F5B66-->  <POSITION><![CDATA[19]]></POSITION>
+<!--85CFAF08A714472C82A6CC014B4F5B66-->  <POSITION><![CDATA[20]]></POSITION>
 <!--85CFAF08A714472C82A6CC014B4F5B66-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--85CFAF08A714472C82A6CC014B4F5B66-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--85CFAF08A714472C82A6CC014B4F5B66-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -4806,7 +4841,7 @@
 <!--8CC5F550529A4F95AAC174A230361A08-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--8CC5F550529A4F95AAC174A230361A08-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--8CC5F550529A4F95AAC174A230361A08-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--8CC5F550529A4F95AAC174A230361A08-->  <POSITION><![CDATA[17]]></POSITION>
+<!--8CC5F550529A4F95AAC174A230361A08-->  <POSITION><![CDATA[18]]></POSITION>
 <!--8CC5F550529A4F95AAC174A230361A08-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--8CC5F550529A4F95AAC174A230361A08-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--8CC5F550529A4F95AAC174A230361A08-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -4890,7 +4925,7 @@
 <!--93E0298CEA7A446B863D7D3456A1157E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--93E0298CEA7A446B863D7D3456A1157E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--93E0298CEA7A446B863D7D3456A1157E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--93E0298CEA7A446B863D7D3456A1157E-->  <NAME><![CDATA[Expected Date]]></NAME>
+<!--93E0298CEA7A446B863D7D3456A1157E-->  <NAME><![CDATA[Due Date]]></NAME>
 <!--93E0298CEA7A446B863D7D3456A1157E-->  <DESCRIPTION><![CDATA[The date when a specified request must be carried out by.]]></DESCRIPTION>
 <!--93E0298CEA7A446B863D7D3456A1157E-->  <HELP><![CDATA[Date when the payment is due without deductions or discount]]></HELP>
 <!--93E0298CEA7A446B863D7D3456A1157E-->  <COLUMNNAME><![CDATA[Duedate]]></COLUMNNAME>
@@ -5119,7 +5154,7 @@
 <!--9C4FD145923A42C5BE399865AA3A2602-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--9C4FD145923A42C5BE399865AA3A2602-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--9C4FD145923A42C5BE399865AA3A2602-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--9C4FD145923A42C5BE399865AA3A2602-->  <POSITION><![CDATA[21]]></POSITION>
+<!--9C4FD145923A42C5BE399865AA3A2602-->  <POSITION><![CDATA[22]]></POSITION>
 <!--9C4FD145923A42C5BE399865AA3A2602-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--9C4FD145923A42C5BE399865AA3A2602-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--9C4FD145923A42C5BE399865AA3A2602-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -7319,7 +7354,7 @@
 <!--B664B25117244ED99118A33E5273C96B-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--B664B25117244ED99118A33E5273C96B-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--B664B25117244ED99118A33E5273C96B-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--B664B25117244ED99118A33E5273C96B-->  <POSITION><![CDATA[16]]></POSITION>
+<!--B664B25117244ED99118A33E5273C96B-->  <POSITION><![CDATA[17]]></POSITION>
 <!--B664B25117244ED99118A33E5273C96B-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--B664B25117244ED99118A33E5273C96B-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--B664B25117244ED99118A33E5273C96B-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -7671,7 +7706,7 @@
 <!--BCAAFCD921B345508B2793C73FC9E79C-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--BCAAFCD921B345508B2793C73FC9E79C-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--BCAAFCD921B345508B2793C73FC9E79C-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--BCAAFCD921B345508B2793C73FC9E79C-->  <POSITION><![CDATA[18]]></POSITION>
+<!--BCAAFCD921B345508B2793C73FC9E79C-->  <POSITION><![CDATA[19]]></POSITION>
 <!--BCAAFCD921B345508B2793C73FC9E79C-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--BCAAFCD921B345508B2793C73FC9E79C-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--BCAAFCD921B345508B2793C73FC9E79C-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -7918,7 +7953,7 @@
 <!--C4248185C139416FA0B6E1F11E4B3B29-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--C4248185C139416FA0B6E1F11E4B3B29-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--C4248185C139416FA0B6E1F11E4B3B29-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--C4248185C139416FA0B6E1F11E4B3B29-->  <POSITION><![CDATA[20]]></POSITION>
+<!--C4248185C139416FA0B6E1F11E4B3B29-->  <POSITION><![CDATA[21]]></POSITION>
 <!--C4248185C139416FA0B6E1F11E4B3B29-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--C4248185C139416FA0B6E1F11E4B3B29-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--C4248185C139416FA0B6E1F11E4B3B29-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -8581,7 +8616,7 @@
 <!--FA6349D74151420A86921C36A7977DF7-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--FA6349D74151420A86921C36A7977DF7-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--FA6349D74151420A86921C36A7977DF7-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--FA6349D74151420A86921C36A7977DF7-->  <POSITION><![CDATA[25]]></POSITION>
+<!--FA6349D74151420A86921C36A7977DF7-->  <POSITION><![CDATA[26]]></POSITION>
 <!--FA6349D74151420A86921C36A7977DF7-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--FA6349D74151420A86921C36A7977DF7-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--FA6349D74151420A86921C36A7977DF7-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml	Fri Oct 05 10:33:28 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml	Tue Oct 30 12:16:46 2012 +0100
@@ -247,6 +247,35 @@
 <!--05319D4150334838A56B43FC8FD319D9-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--05319D4150334838A56B43FC8FD319D9--></AD_FIELD>
 
+<!--0797D781255A4405A2E0C0CDE8ED23BE--><AD_FIELD>
+<!--0797D781255A4405A2E0C0CDE8ED23BE-->  <AD_FIELD_ID><![CDATA[0797D781255A4405A2E0C0CDE8ED23BE]]></AD_FIELD_ID>
+<!--0797D781255A4405A2E0C0CDE8ED23BE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0797D781255A4405A2E0C0CDE8ED23BE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0797D781255A4405A2E0C0CDE8ED23BE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0797D781255A4405A2E0C0CDE8ED23BE-->  <NAME><![CDATA[Expected Date]]></NAME>
+<!--0797D781255A4405A2E0C0CDE8ED23BE-->  <DESCRIPTION><![CDATA[The date when a specified request must be carried out by.]]></DESCRIPTION>
+<!--0797D781255A4405A2E0C0CDE8ED23BE-->  <HELP><![CDATA[Date when the payment is due without deductions or discount]]></HELP>
+<!--0797D781255A4405A2E0C0CDE8ED23BE-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--0797D781255A4405A2E0C0CDE8ED23BE-->  <AD_TAB_ID><![CDATA[2ECAED4620B840BA8DD738140F58A629]]></AD_TAB_ID>
+<!--0797D781255A4405A2E0C0CDE8ED23BE-->  <AD_COLUMN_ID><![CDATA[48D8B48A76CA4AF4B3F660AFC0A50279]]></AD_COLUMN_ID>
+<!--0797D781255A4405A2E0C0CDE8ED23BE-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--0797D781255A4405A2E0C0CDE8ED23BE-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--0797D781255A4405A2E0C0CDE8ED23BE-->  <DISPLAYLENGTH><![CDATA[19]]></DISPLAYLENGTH>
+<!--0797D781255A4405A2E0C0CDE8ED23BE-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--0797D781255A4405A2E0C0CDE8ED23BE-->  <SEQNO><![CDATA[110]]></SEQNO>
+<!--0797D781255A4405A2E0C0CDE8ED23BE-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--0797D781255A4405A2E0C0CDE8ED23BE-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--0797D781255A4405A2E0C0CDE8ED23BE-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--0797D781255A4405A2E0C0CDE8ED23BE-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--0797D781255A4405A2E0C0CDE8ED23BE-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--0797D781255A4405A2E0C0CDE8ED23BE-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--0797D781255A4405A2E0C0CDE8ED23BE-->  <GRID_SEQNO><![CDATA[9]]></GRID_SEQNO>
+<!--0797D781255A4405A2E0C0CDE8ED23BE-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--0797D781255A4405A2E0C0CDE8ED23BE-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--0797D781255A4405A2E0C0CDE8ED23BE-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--0797D781255A4405A2E0C0CDE8ED23BE-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--0797D781255A4405A2E0C0CDE8ED23BE--></AD_FIELD>
+
 <!--07C4E0B4DF6E4C7AAF5574C5ABA25C65--><AD_FIELD>
 <!--07C4E0B4DF6E4C7AAF5574C5ABA25C65-->  <AD_FIELD_ID><![CDATA[07C4E0B4DF6E4C7AAF5574C5ABA25C65]]></AD_FIELD_ID>
 <!--07C4E0B4DF6E4C7AAF5574C5ABA25C65-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -652,7 +681,7 @@
 <!--0E791625C809422D901B5B08DE46F11F-->  <AD_TAB_ID><![CDATA[EB0466B2A22343F28773B356D292BC7E]]></AD_TAB_ID>
 <!--0E791625C809422D901B5B08DE46F11F-->  <AD_COLUMN_ID><![CDATA[385DE6A637CD4D788AB480B3D1369E4F]]></AD_COLUMN_ID>
 <!--0E791625C809422D901B5B08DE46F11F-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--0E791625C809422D901B5B08DE46F11F-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--0E791625C809422D901B5B08DE46F11F-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
 <!--0E791625C809422D901B5B08DE46F11F-->  <DISPLAYLOGIC><![CDATA[@DocStatus@='CO'&@IsPaid@='N']]></DISPLAYLOGIC>
 <!--0E791625C809422D901B5B08DE46F11F-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
 <!--0E791625C809422D901B5B08DE46F11F-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
@@ -836,6 +865,35 @@
 <!--11F8370880F0417BA23C7CC0100FBD57-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--11F8370880F0417BA23C7CC0100FBD57--></AD_FIELD>
 
+<!--1211E0FB0E974E9EBFC4D2EB31F5AC0E--><AD_FIELD>
+<!--1211E0FB0E974E9EBFC4D2EB31F5AC0E-->  <AD_FIELD_ID><![CDATA[1211E0FB0E974E9EBFC4D2EB31F5AC0E]]></AD_FIELD_ID>
+<!--1211E0FB0E974E9EBFC4D2EB31F5AC0E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1211E0FB0E974E9EBFC4D2EB31F5AC0E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1211E0FB0E974E9EBFC4D2EB31F5AC0E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1211E0FB0E974E9EBFC4D2EB31F5AC0E-->  <NAME><![CDATA[Expected Date]]></NAME>
+<!--1211E0FB0E974E9EBFC4D2EB31F5AC0E-->  <DESCRIPTION><![CDATA[The date when a specified request must be carried out by.]]></DESCRIPTION>
+<!--1211E0FB0E974E9EBFC4D2EB31F5AC0E-->  <HELP><![CDATA[Date when the payment is due without deductions or discount]]></HELP>
+<!--1211E0FB0E974E9EBFC4D2EB31F5AC0E-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--1211E0FB0E974E9EBFC4D2EB31F5AC0E-->  <AD_TAB_ID><![CDATA[89C009D99323470DB51F100697E2F50C]]></AD_TAB_ID>
+<!--1211E0FB0E974E9EBFC4D2EB31F5AC0E-->  <AD_COLUMN_ID><![CDATA[F55387BA03C14531AA6A20E0AF799E1B]]></AD_COLUMN_ID>
+<!--1211E0FB0E974E9EBFC4D2EB31F5AC0E-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--1211E0FB0E974E9EBFC4D2EB31F5AC0E-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--1211E0FB0E974E9EBFC4D2EB31F5AC0E-->  <DISPLAYLENGTH><![CDATA[19]]></DISPLAYLENGTH>
+<!--1211E0FB0E974E9EBFC4D2EB31F5AC0E-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--1211E0FB0E974E9EBFC4D2EB31F5AC0E-->  <SEQNO><![CDATA[15]]></SEQNO>
+<!--1211E0FB0E974E9EBFC4D2EB31F5AC0E-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--1211E0FB0E974E9EBFC4D2EB31F5AC0E-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--1211E0FB0E974E9EBFC4D2EB31F5AC0E-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--1211E0FB0E974E9EBFC4D2EB31F5AC0E-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1211E0FB0E974E9EBFC4D2EB31F5AC0E-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--1211E0FB0E974E9EBFC4D2EB31F5AC0E-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--1211E0FB0E974E9EBFC4D2EB31F5AC0E-->  <GRID_SEQNO><![CDATA[15]]></GRID_SEQNO>
+<!--1211E0FB0E974E9EBFC4D2EB31F5AC0E-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--1211E0FB0E974E9EBFC4D2EB31F5AC0E-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--1211E0FB0E974E9EBFC4D2EB31F5AC0E-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--1211E0FB0E974E9EBFC4D2EB31F5AC0E-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--1211E0FB0E974E9EBFC4D2EB31F5AC0E--></AD_FIELD>
+
 <!--129E8EA0D0C74557AE07727C31F63B77--><AD_FIELD>
 <!--129E8EA0D0C74557AE07727C31F63B77-->  <AD_FIELD_ID><![CDATA[129E8EA0D0C74557AE07727C31F63B77]]></AD_FIELD_ID>
 <!--129E8EA0D0C74557AE07727C31F63B77-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1037,6 +1095,35 @@
 <!--19FBF0F2D58C4680ABC4A5EBE144F5C0-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--19FBF0F2D58C4680ABC4A5EBE144F5C0--></AD_FIELD>
 
+<!--1B1F654EF7D8454986E0BD790AE25486--><AD_FIELD>
+<!--1B1F654EF7D8454986E0BD790AE25486-->  <AD_FIELD_ID><![CDATA[1B1F654EF7D8454986E0BD790AE25486]]></AD_FIELD_ID>
+<!--1B1F654EF7D8454986E0BD790AE25486-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1B1F654EF7D8454986E0BD790AE25486-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1B1F654EF7D8454986E0BD790AE25486-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1B1F654EF7D8454986E0BD790AE25486-->  <NAME><![CDATA[Expected Date]]></NAME>
+<!--1B1F654EF7D8454986E0BD790AE25486-->  <DESCRIPTION><![CDATA[The date when a specified request must be carried out by.]]></DESCRIPTION>
+<!--1B1F654EF7D8454986E0BD790AE25486-->  <HELP><![CDATA[Date when the payment is due without deductions or discount]]></HELP>
+<!--1B1F654EF7D8454986E0BD790AE25486-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--1B1F654EF7D8454986E0BD790AE25486-->  <AD_TAB_ID><![CDATA[15ECCF8974044A81982F57F9F1E1A67B]]></AD_TAB_ID>
+<!--1B1F654EF7D8454986E0BD790AE25486-->  <AD_COLUMN_ID><![CDATA[48D8B48A76CA4AF4B3F660AFC0A50279]]></AD_COLUMN_ID>
+<!--1B1F654EF7D8454986E0BD790AE25486-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--1B1F654EF7D8454986E0BD790AE25486-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--1B1F654EF7D8454986E0BD790AE25486-->  <DISPLAYLENGTH><![CDATA[19]]></DISPLAYLENGTH>
+<!--1B1F654EF7D8454986E0BD790AE25486-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--1B1F654EF7D8454986E0BD790AE25486-->  <SEQNO><![CDATA[110]]></SEQNO>
+<!--1B1F654EF7D8454986E0BD790AE25486-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--1B1F654EF7D8454986E0BD790AE25486-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--1B1F654EF7D8454986E0BD790AE25486-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--1B1F654EF7D8454986E0BD790AE25486-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1B1F654EF7D8454986E0BD790AE25486-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--1B1F654EF7D8454986E0BD790AE25486-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--1B1F654EF7D8454986E0BD790AE25486-->  <GRID_SEQNO><![CDATA[9]]></GRID_SEQNO>
+<!--1B1F654EF7D8454986E0BD790AE25486-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--1B1F654EF7D8454986E0BD790AE25486-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--1B1F654EF7D8454986E0BD790AE25486-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--1B1F654EF7D8454986E0BD790AE25486-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--1B1F654EF7D8454986E0BD790AE25486--></AD_FIELD>
+
 <!--1B49E0A8CE12471F862FA14E45E98AEE--><AD_FIELD>
 <!--1B49E0A8CE12471F862FA14E45E98AEE-->  <AD_FIELD_ID><![CDATA[1B49E0A8CE12471F862FA14E45E98AEE]]></AD_FIELD_ID>
 <!--1B49E0A8CE12471F862FA14E45E98AEE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1383,14 +1470,14 @@
 <!--2224A72A74ED41E8AB02F64BB8C3637E-->  <AD_TAB_ID><![CDATA[7A8D43541F8C49F1BD8A431A0041BF89]]></AD_TAB_ID>
 <!--2224A72A74ED41E8AB02F64BB8C3637E-->  <AD_COLUMN_ID><![CDATA[ACE4EFA3342246E6920D9895478CFACB]]></AD_COLUMN_ID>
 <!--2224A72A74ED41E8AB02F64BB8C3637E-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--2224A72A74ED41E8AB02F64BB8C3637E-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--2224A72A74ED41E8AB02F64BB8C3637E-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
 <!--2224A72A74ED41E8AB02F64BB8C3637E-->  <DISPLAYLENGTH><![CDATA[19]]></DISPLAYLENGTH>
 <!--2224A72A74ED41E8AB02F64BB8C3637E-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
 <!--2224A72A74ED41E8AB02F64BB8C3637E-->  <SEQNO><![CDATA[30]]></SEQNO>
 <!--2224A72A74ED41E8AB02F64BB8C3637E-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--2224A72A74ED41E8AB02F64BB8C3637E-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--2224A72A74ED41E8AB02F64BB8C3637E-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--2224A72A74ED41E8AB02F64BB8C3637E-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--2224A72A74ED41E8AB02F64BB8C3637E-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--2224A72A74ED41E8AB02F64BB8C3637E-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--2224A72A74ED41E8AB02F64BB8C3637E-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--2224A72A74ED41E8AB02F64BB8C3637E-->  <GRID_SEQNO><![CDATA[0]]></GRID_SEQNO>
@@ -3288,7 +3375,7 @@
 <!--4990B075D91F4BAB91FCB1C11CC8E9CC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--4990B075D91F4BAB91FCB1C11CC8E9CC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--4990B075D91F4BAB91FCB1C11CC8E9CC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--4990B075D91F4BAB91FCB1C11CC8E9CC-->  <NAME><![CDATA[Expected Date]]></NAME>
+<!--4990B075D91F4BAB91FCB1C11CC8E9CC-->  <NAME><![CDATA[Due Date]]></NAME>
 <!--4990B075D91F4BAB91FCB1C11CC8E9CC-->  <DESCRIPTION><![CDATA[The date when a specified request must be carried out by.]]></DESCRIPTION>
 <!--4990B075D91F4BAB91FCB1C11CC8E9CC-->  <HELP><![CDATA[Date when the payment is due without deductions or discount]]></HELP>
 <!--4990B075D91F4BAB91FCB1C11CC8E9CC-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
@@ -3297,15 +3384,15 @@
 <!--4990B075D91F4BAB91FCB1C11CC8E9CC-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--4990B075D91F4BAB91FCB1C11CC8E9CC-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--4990B075D91F4BAB91FCB1C11CC8E9CC-->  <DISPLAYLENGTH><![CDATA[19]]></DISPLAYLENGTH>
-<!--4990B075D91F4BAB91FCB1C11CC8E9CC-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--4990B075D91F4BAB91FCB1C11CC8E9CC-->  <SEQNO><![CDATA[110]]></SEQNO>
+<!--4990B075D91F4BAB91FCB1C11CC8E9CC-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--4990B075D91F4BAB91FCB1C11CC8E9CC-->  <SEQNO><![CDATA[100]]></SEQNO>
 <!--4990B075D91F4BAB91FCB1C11CC8E9CC-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--4990B075D91F4BAB91FCB1C11CC8E9CC-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--4990B075D91F4BAB91FCB1C11CC8E9CC-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--4990B075D91F4BAB91FCB1C11CC8E9CC-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--4990B075D91F4BAB91FCB1C11CC8E9CC-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--4990B075D91F4BAB91FCB1C11CC8E9CC-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--4990B075D91F4BAB91FCB1C11CC8E9CC-->  <GRID_SEQNO><![CDATA[9]]></GRID_SEQNO>
+<!--4990B075D91F4BAB91FCB1C11CC8E9CC-->  <GRID_SEQNO><![CDATA[8]]></GRID_SEQNO>
 <!--4990B075D91F4BAB91FCB1C11CC8E9CC-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--4990B075D91F4BAB91FCB1C11CC8E9CC-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--4990B075D91F4BAB91FCB1C11CC8E9CC-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -3368,6 +3455,36 @@
 <!--4BBE86A40070422CB644510F93C92F81-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--4BBE86A40070422CB644510F93C92F81--></AD_FIELD>
 
+<!--4C3D2B4E7CD14390BF20A8FB5474EE32--><AD_FIELD>
+<!--4C3D2B4E7CD14390BF20A8FB5474EE32-->  <AD_FIELD_ID><![CDATA[4C3D2B4E7CD14390BF20A8FB5474EE32]]></AD_FIELD_ID>
+<!--4C3D2B4E7CD14390BF20A8FB5474EE32-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4C3D2B4E7CD14390BF20A8FB5474EE32-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4C3D2B4E7CD14390BF20A8FB5474EE32-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4C3D2B4E7CD14390BF20A8FB5474EE32-->  <NAME><![CDATA[Payment]]></NAME>
+<!--4C3D2B4E7CD14390BF20A8FB5474EE32-->  <DESCRIPTION><![CDATA[Payment event]]></DESCRIPTION>
+<!--4C3D2B4E7CD14390BF20A8FB5474EE32-->  <HELP><![CDATA[Payment event]]></HELP>
+<!--4C3D2B4E7CD14390BF20A8FB5474EE32-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--4C3D2B4E7CD14390BF20A8FB5474EE32-->  <AD_TAB_ID><![CDATA[9817E22E2536417F8C9AEC8D5FA33E18]]></AD_TAB_ID>
+<!--4C3D2B4E7CD14390BF20A8FB5474EE32-->  <AD_COLUMN_ID><![CDATA[7891269C83F9655DE040007F010155CE]]></AD_COLUMN_ID>
+<!--4C3D2B4E7CD14390BF20A8FB5474EE32-->  <PROPERTY><![CDATA[paymentDetails.finPayment]]></PROPERTY>
+<!--4C3D2B4E7CD14390BF20A8FB5474EE32-->  <IGNOREINWAD><![CDATA[Y]]></IGNOREINWAD>
+<!--4C3D2B4E7CD14390BF20A8FB5474EE32-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--4C3D2B4E7CD14390BF20A8FB5474EE32-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--4C3D2B4E7CD14390BF20A8FB5474EE32-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--4C3D2B4E7CD14390BF20A8FB5474EE32-->  <SEQNO><![CDATA[230]]></SEQNO>
+<!--4C3D2B4E7CD14390BF20A8FB5474EE32-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--4C3D2B4E7CD14390BF20A8FB5474EE32-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--4C3D2B4E7CD14390BF20A8FB5474EE32-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--4C3D2B4E7CD14390BF20A8FB5474EE32-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--4C3D2B4E7CD14390BF20A8FB5474EE32-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--4C3D2B4E7CD14390BF20A8FB5474EE32-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--4C3D2B4E7CD14390BF20A8FB5474EE32-->  <GRID_SEQNO><![CDATA[21]]></GRID_SEQNO>
+<!--4C3D2B4E7CD14390BF20A8FB5474EE32-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--4C3D2B4E7CD14390BF20A8FB5474EE32-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--4C3D2B4E7CD14390BF20A8FB5474EE32-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--4C3D2B4E7CD14390BF20A8FB5474EE32-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--4C3D2B4E7CD14390BF20A8FB5474EE32--></AD_FIELD>
+
 <!--4C85D478837741C4A3AD74CFF852A470--><AD_FIELD>
 <!--4C85D478837741C4A3AD74CFF852A470-->  <AD_FIELD_ID><![CDATA[4C85D478837741C4A3AD74CFF852A470]]></AD_FIELD_ID>
 <!--4C85D478837741C4A3AD74CFF852A470-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -3715,14 +3832,14 @@
 <!--5338F8634A4B4E349CD467557E6BA236-->  <AD_TAB_ID><![CDATA[2ECAED4620B840BA8DD738140F58A629]]></AD_TAB_ID>
 <!--5338F8634A4B4E349CD467557E6BA236-->  <AD_COLUMN_ID><![CDATA[ACE4EFA3342246E6920D9895478CFACB]]></AD_COLUMN_ID>
 <!--5338F8634A4B4E349CD467557E6BA236-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--5338F8634A4B4E349CD467557E6BA236-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--5338F8634A4B4E349CD467557E6BA236-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
 <!--5338F8634A4B4E349CD467557E6BA236-->  <DISPLAYLENGTH><![CDATA[19]]></DISPLAYLENGTH>
 <!--5338F8634A4B4E349CD467557E6BA236-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
 <!--5338F8634A4B4E349CD467557E6BA236-->  <SEQNO><![CDATA[100]]></SEQNO>
 <!--5338F8634A4B4E349CD467557E6BA236-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--5338F8634A4B4E349CD467557E6BA236-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--5338F8634A4B4E349CD467557E6BA236-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--5338F8634A4B4E349CD467557E6BA236-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--5338F8634A4B4E349CD467557E6BA236-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--5338F8634A4B4E349CD467557E6BA236-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--5338F8634A4B4E349CD467557E6BA236-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--5338F8634A4B4E349CD467557E6BA236-->  <GRID_SEQNO><![CDATA[8]]></GRID_SEQNO>
@@ -3785,6 +3902,34 @@
 <!--54486FF4083A441CA9AA109054C94AAC-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--54486FF4083A441CA9AA109054C94AAC--></AD_FIELD>
 
+<!--558CA99C5B914C0F802C954EA2E508A3--><AD_FIELD>
+<!--558CA99C5B914C0F802C954EA2E508A3-->  <AD_FIELD_ID><![CDATA[558CA99C5B914C0F802C954EA2E508A3]]></AD_FIELD_ID>
+<!--558CA99C5B914C0F802C954EA2E508A3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--558CA99C5B914C0F802C954EA2E508A3-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--558CA99C5B914C0F802C954EA2E508A3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--558CA99C5B914C0F802C954EA2E508A3-->  <NAME><![CDATA[Expected Date]]></NAME>
+<!--558CA99C5B914C0F802C954EA2E508A3-->  <DESCRIPTION><![CDATA[The date when a specified request must be carried out by.]]></DESCRIPTION>
+<!--558CA99C5B914C0F802C954EA2E508A3-->  <HELP><![CDATA[Date when the payment is due without deductions or discount]]></HELP>
+<!--558CA99C5B914C0F802C954EA2E508A3-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--558CA99C5B914C0F802C954EA2E508A3-->  <AD_TAB_ID><![CDATA[81644A22CC4D4B879AA71C33C30E00A4]]></AD_TAB_ID>
+<!--558CA99C5B914C0F802C954EA2E508A3-->  <AD_COLUMN_ID><![CDATA[7535FAF92D1D480D895710811C18A552]]></AD_COLUMN_ID>
+<!--558CA99C5B914C0F802C954EA2E508A3-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--558CA99C5B914C0F802C954EA2E508A3-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--558CA99C5B914C0F802C954EA2E508A3-->  <DISPLAYLENGTH><![CDATA[19]]></DISPLAYLENGTH>
+<!--558CA99C5B914C0F802C954EA2E508A3-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--558CA99C5B914C0F802C954EA2E508A3-->  <SEQNO><![CDATA[55]]></SEQNO>
+<!--558CA99C5B914C0F802C954EA2E508A3-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--558CA99C5B914C0F802C954EA2E508A3-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--558CA99C5B914C0F802C954EA2E508A3-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--558CA99C5B914C0F802C954EA2E508A3-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--558CA99C5B914C0F802C954EA2E508A3-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--558CA99C5B914C0F802C954EA2E508A3-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--558CA99C5B914C0F802C954EA2E508A3-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--558CA99C5B914C0F802C954EA2E508A3-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--558CA99C5B914C0F802C954EA2E508A3-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--558CA99C5B914C0F802C954EA2E508A3-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--558CA99C5B914C0F802C954EA2E508A3--></AD_FIELD>
+
 <!--55E47437B52847D4AC6193187048D1D1--><AD_FIELD>
 <!--55E47437B52847D4AC6193187048D1D1-->  <AD_FIELD_ID><![CDATA[55E47437B52847D4AC6193187048D1D1]]></AD_FIELD_ID>
 <!--55E47437B52847D4AC6193187048D1D1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -4538,6 +4683,36 @@
 <!--64A645D93D704FA080658916E4AA11BA-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--64A645D93D704FA080658916E4AA11BA--></AD_FIELD>
 
+<!--6532A4E2F4584171B04D97CCC0E78F3A--><AD_FIELD>
+<!--6532A4E2F4584171B04D97CCC0E78F3A-->  <AD_FIELD_ID><![CDATA[6532A4E2F4584171B04D97CCC0E78F3A]]></AD_FIELD_ID>
+<!--6532A4E2F4584171B04D97CCC0E78F3A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6532A4E2F4584171B04D97CCC0E78F3A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6532A4E2F4584171B04D97CCC0E78F3A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6532A4E2F4584171B04D97CCC0E78F3A-->  <NAME><![CDATA[Payment]]></NAME>
+<!--6532A4E2F4584171B04D97CCC0E78F3A-->  <DESCRIPTION><![CDATA[Payment event]]></DESCRIPTION>
+<!--6532A4E2F4584171B04D97CCC0E78F3A-->  <HELP><![CDATA[Payment event]]></HELP>
+<!--6532A4E2F4584171B04D97CCC0E78F3A-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--6532A4E2F4584171B04D97CCC0E78F3A-->  <AD_TAB_ID><![CDATA[F6C2283A21314407BBBB23FF14B85ED4]]></AD_TAB_ID>
+<!--6532A4E2F4584171B04D97CCC0E78F3A-->  <AD_COLUMN_ID><![CDATA[7891269C83F9655DE040007F010155CE]]></AD_COLUMN_ID>
+<!--6532A4E2F4584171B04D97CCC0E78F3A-->  <PROPERTY><![CDATA[paymentDetails.finPayment]]></PROPERTY>
+<!--6532A4E2F4584171B04D97CCC0E78F3A-->  <IGNOREINWAD><![CDATA[Y]]></IGNOREINWAD>
+<!--6532A4E2F4584171B04D97CCC0E78F3A-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--6532A4E2F4584171B04D97CCC0E78F3A-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--6532A4E2F4584171B04D97CCC0E78F3A-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--6532A4E2F4584171B04D97CCC0E78F3A-->  <SEQNO><![CDATA[230]]></SEQNO>
+<!--6532A4E2F4584171B04D97CCC0E78F3A-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--6532A4E2F4584171B04D97CCC0E78F3A-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--6532A4E2F4584171B04D97CCC0E78F3A-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--6532A4E2F4584171B04D97CCC0E78F3A-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--6532A4E2F4584171B04D97CCC0E78F3A-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--6532A4E2F4584171B04D97CCC0E78F3A-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--6532A4E2F4584171B04D97CCC0E78F3A-->  <GRID_SEQNO><![CDATA[21]]></GRID_SEQNO>
+<!--6532A4E2F4584171B04D97CCC0E78F3A-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--6532A4E2F4584171B04D97CCC0E78F3A-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--6532A4E2F4584171B04D97CCC0E78F3A-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--6532A4E2F4584171B04D97CCC0E78F3A-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--6532A4E2F4584171B04D97CCC0E78F3A--></AD_FIELD>
+
 <!--65BCA534FAC848298C8F156505618CDF--><AD_FIELD>
 <!--65BCA534FAC848298C8F156505618CDF-->  <AD_FIELD_ID><![CDATA[65BCA534FAC848298C8F156505618CDF]]></AD_FIELD_ID>
 <!--65BCA534FAC848298C8F156505618CDF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -5962,7 +6137,7 @@
 <!--7FF44B41FD4F0341E040007F01006989-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--7FF44B41FD4F0341E040007F01006989-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7FF44B41FD4F0341E040007F01006989-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--7FF44B41FD4F0341E040007F01006989-->  <NAME><![CDATA[Expected Date]]></NAME>
+<!--7FF44B41FD4F0341E040007F01006989-->  <NAME><![CDATA[Due Date]]></NAME>
 <!--7FF44B41FD4F0341E040007F01006989-->  <DESCRIPTION><![CDATA[The date when a specified request must be carried out by.]]></DESCRIPTION>
 <!--7FF44B41FD4F0341E040007F01006989-->  <HELP><![CDATA[Date when the payment is due without deductions or discount]]></HELP>
 <!--7FF44B41FD4F0341E040007F01006989-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
@@ -6721,7 +6896,7 @@
 <!--81FBC24097FC4B0894884DD7ACFD08C1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--81FBC24097FC4B0894884DD7ACFD08C1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--81FBC24097FC4B0894884DD7ACFD08C1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--81FBC24097FC4B0894884DD7ACFD08C1-->  <NAME><![CDATA[Expected Date]]></NAME>
+<!--81FBC24097FC4B0894884DD7ACFD08C1-->  <NAME><![CDATA[Due Date]]></NAME>
 <!--81FBC24097FC4B0894884DD7ACFD08C1-->  <DESCRIPTION><![CDATA[The date when a specified request must be carried out by.]]></DESCRIPTION>
 <!--81FBC24097FC4B0894884DD7ACFD08C1-->  <HELP><![CDATA[Date when the payment is due without deductions or discount]]></HELP>
 <!--81FBC24097FC4B0894884DD7ACFD08C1-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
@@ -8622,6 +8797,35 @@
 <!--87648124688D47868755BD65CBE1D76B-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--87648124688D47868755BD65CBE1D76B--></AD_FIELD>
 
+<!--879364DC86FE43209C7A6D742B0C2638--><AD_FIELD>
+<!--879364DC86FE43209C7A6D742B0C2638-->  <AD_FIELD_ID><![CDATA[879364DC86FE43209C7A6D742B0C2638]]></AD_FIELD_ID>
+<!--879364DC86FE43209C7A6D742B0C2638-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--879364DC86FE43209C7A6D742B0C2638-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--879364DC86FE43209C7A6D742B0C2638-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--879364DC86FE43209C7A6D742B0C2638-->  <NAME><![CDATA[Expected Date]]></NAME>
+<!--879364DC86FE43209C7A6D742B0C2638-->  <DESCRIPTION><![CDATA[The date when a specified request must be carried out by.]]></DESCRIPTION>
+<!--879364DC86FE43209C7A6D742B0C2638-->  <HELP><![CDATA[Date when the payment is due without deductions or discount]]></HELP>
+<!--879364DC86FE43209C7A6D742B0C2638-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--879364DC86FE43209C7A6D742B0C2638-->  <AD_TAB_ID><![CDATA[7A8D43541F8C49F1BD8A431A0041BF89]]></AD_TAB_ID>
+<!--879364DC86FE43209C7A6D742B0C2638-->  <AD_COLUMN_ID><![CDATA[48D8B48A76CA4AF4B3F660AFC0A50279]]></AD_COLUMN_ID>
+<!--879364DC86FE43209C7A6D742B0C2638-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--879364DC86FE43209C7A6D742B0C2638-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--879364DC86FE43209C7A6D742B0C2638-->  <DISPLAYLENGTH><![CDATA[19]]></DISPLAYLENGTH>
+<!--879364DC86FE43209C7A6D742B0C2638-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--879364DC86FE43209C7A6D742B0C2638-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--879364DC86FE43209C7A6D742B0C2638-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--879364DC86FE43209C7A6D742B0C2638-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--879364DC86FE43209C7A6D742B0C2638-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--879364DC86FE43209C7A6D742B0C2638-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--879364DC86FE43209C7A6D742B0C2638-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--879364DC86FE43209C7A6D742B0C2638-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--879364DC86FE43209C7A6D742B0C2638-->  <GRID_SEQNO><![CDATA[1]]></GRID_SEQNO>
+<!--879364DC86FE43209C7A6D742B0C2638-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--879364DC86FE43209C7A6D742B0C2638-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--879364DC86FE43209C7A6D742B0C2638-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--879364DC86FE43209C7A6D742B0C2638-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--879364DC86FE43209C7A6D742B0C2638--></AD_FIELD>
+
 <!--87AA1068F11242CAE040007F010011D5--><AD_FIELD>
 <!--87AA1068F11242CAE040007F010011D5-->  <AD_FIELD_ID><![CDATA[87AA1068F11242CAE040007F010011D5]]></AD_FIELD_ID>
 <!--87AA1068F11242CAE040007F010011D5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -8708,7 +8912,7 @@
 <!--897F23D8C4A94CDBA1E18A1950A6D8F7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--897F23D8C4A94CDBA1E18A1950A6D8F7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--897F23D8C4A94CDBA1E18A1950A6D8F7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--897F23D8C4A94CDBA1E18A1950A6D8F7-->  <NAME><![CDATA[Expected Date]]></NAME>
+<!--897F23D8C4A94CDBA1E18A1950A6D8F7-->  <NAME><![CDATA[Due Date]]></NAME>
 <!--897F23D8C4A94CDBA1E18A1950A6D8F7-->  <DESCRIPTION><![CDATA[The date when a specified request must be carried out by.]]></DESCRIPTION>
 <!--897F23D8C4A94CDBA1E18A1950A6D8F7-->  <HELP><![CDATA[Date when the payment is due without deductions or discount]]></HELP>
 <!--897F23D8C4A94CDBA1E18A1950A6D8F7-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
@@ -9457,27 +9661,27 @@
 <!--995689CC18304C3C8709D826F459F780-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--995689CC18304C3C8709D826F459F780-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--995689CC18304C3C8709D826F459F780-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--995689CC18304C3C8709D826F459F780-->  <NAME><![CDATA[Expected Due Date]]></NAME>
+<!--995689CC18304C3C8709D826F459F780-->  <NAME><![CDATA[Due Date]]></NAME>
 <!--995689CC18304C3C8709D826F459F780-->  <DESCRIPTION><![CDATA[The date when a specified request must be carried out by.]]></DESCRIPTION>
 <!--995689CC18304C3C8709D826F459F780-->  <HELP><![CDATA[Date when the payment is due without deductions or discount]]></HELP>
-<!--995689CC18304C3C8709D826F459F780-->  <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED>
+<!--995689CC18304C3C8709D826F459F780-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--995689CC18304C3C8709D826F459F780-->  <AD_TAB_ID><![CDATA[7A8D43541F8C49F1BD8A431A0041BF89]]></AD_TAB_ID>
 <!--995689CC18304C3C8709D826F459F780-->  <AD_COLUMN_ID><![CDATA[7890366979612CEFE040007F01013334]]></AD_COLUMN_ID>
 <!--995689CC18304C3C8709D826F459F780-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--995689CC18304C3C8709D826F459F780-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--995689CC18304C3C8709D826F459F780-->  <DISPLAYLENGTH><![CDATA[19]]></DISPLAYLENGTH>
-<!--995689CC18304C3C8709D826F459F780-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--995689CC18304C3C8709D826F459F780-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--995689CC18304C3C8709D826F459F780-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--995689CC18304C3C8709D826F459F780-->  <SEQNO><![CDATA[30]]></SEQNO>
 <!--995689CC18304C3C8709D826F459F780-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--995689CC18304C3C8709D826F459F780-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--995689CC18304C3C8709D826F459F780-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--995689CC18304C3C8709D826F459F780-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--995689CC18304C3C8709D826F459F780-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--995689CC18304C3C8709D826F459F780-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--995689CC18304C3C8709D826F459F780-->  <GRID_SEQNO><![CDATA[1]]></GRID_SEQNO>
+<!--995689CC18304C3C8709D826F459F780-->  <GRID_SEQNO><![CDATA[0]]></GRID_SEQNO>
 <!--995689CC18304C3C8709D826F459F780-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--995689CC18304C3C8709D826F459F780-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--995689CC18304C3C8709D826F459F780-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--995689CC18304C3C8709D826F459F780-->  <ISSHOWNINSTATUSBAR><![CDATA[Y]]></ISSHOWNINSTATUSBAR>
 <!--995689CC18304C3C8709D826F459F780-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--995689CC18304C3C8709D826F459F780--></AD_FIELD>
 
@@ -9817,6 +10021,35 @@
 <!--A0417A0E9257CA28E040007F01003C18-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--A0417A0E9257CA28E040007F01003C18--></AD_FIELD>
 
+<!--A0BCE39FA7F9460A818F98BFE2846576--><AD_FIELD>
+<!--A0BCE39FA7F9460A818F98BFE2846576-->  <AD_FIELD_ID><![CDATA[A0BCE39FA7F9460A818F98BFE2846576]]></AD_FIELD_ID>
+<!--A0BCE39FA7F9460A818F98BFE2846576-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A0BCE39FA7F9460A818F98BFE2846576-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A0BCE39FA7F9460A818F98BFE2846576-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A0BCE39FA7F9460A818F98BFE2846576-->  <NAME><![CDATA[Expected Date]]></NAME>
+<!--A0BCE39FA7F9460A818F98BFE2846576-->  <DESCRIPTION><![CDATA[The date when a specified request must be carried out by.]]></DESCRIPTION>
+<!--A0BCE39FA7F9460A818F98BFE2846576-->  <HELP><![CDATA[Date when the payment is due without deductions or discount]]></HELP>
+<!--A0BCE39FA7F9460A818F98BFE2846576-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--A0BCE39FA7F9460A818F98BFE2846576-->  <AD_TAB_ID><![CDATA[60825C9E68644DBC9C530DDCABE05A6E]]></AD_TAB_ID>
+<!--A0BCE39FA7F9460A818F98BFE2846576-->  <AD_COLUMN_ID><![CDATA[48D8B48A76CA4AF4B3F660AFC0A50279]]></AD_COLUMN_ID>
+<!--A0BCE39FA7F9460A818F98BFE2846576-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--A0BCE39FA7F9460A818F98BFE2846576-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--A0BCE39FA7F9460A818F98BFE2846576-->  <DISPLAYLENGTH><![CDATA[19]]></DISPLAYLENGTH>
+<!--A0BCE39FA7F9460A818F98BFE2846576-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--A0BCE39FA7F9460A818F98BFE2846576-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--A0BCE39FA7F9460A818F98BFE2846576-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--A0BCE39FA7F9460A818F98BFE2846576-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--A0BCE39FA7F9460A818F98BFE2846576-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--A0BCE39FA7F9460A818F98BFE2846576-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--A0BCE39FA7F9460A818F98BFE2846576-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--A0BCE39FA7F9460A818F98BFE2846576-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--A0BCE39FA7F9460A818F98BFE2846576-->  <GRID_SEQNO><![CDATA[1]]></GRID_SEQNO>
+<!--A0BCE39FA7F9460A818F98BFE2846576-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--A0BCE39FA7F9460A818F98BFE2846576-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--A0BCE39FA7F9460A818F98BFE2846576-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--A0BCE39FA7F9460A818F98BFE2846576-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--A0BCE39FA7F9460A818F98BFE2846576--></AD_FIELD>
+
 <!--A135CD50436C4E97808E6F7ABAC1E1E8--><AD_FIELD>
 <!--A135CD50436C4E97808E6F7ABAC1E1E8-->  <AD_FIELD_ID><![CDATA[A135CD50436C4E97808E6F7ABAC1E1E8]]></AD_FIELD_ID>
 <!--A135CD50436C4E97808E6F7ABAC1E1E8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -9885,14 +10118,14 @@
 <!--A19EFBCD4CEE48ADA318EB734806CFC5-->  <AD_TAB_ID><![CDATA[60825C9E68644DBC9C530DDCABE05A6E]]></AD_TAB_ID>
 <!--A19EFBCD4CEE48ADA318EB734806CFC5-->  <AD_COLUMN_ID><![CDATA[ACE4EFA3342246E6920D9895478CFACB]]></AD_COLUMN_ID>
 <!--A19EFBCD4CEE48ADA318EB734806CFC5-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--A19EFBCD4CEE48ADA318EB734806CFC5-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--A19EFBCD4CEE48ADA318EB734806CFC5-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
 <!--A19EFBCD4CEE48ADA318EB734806CFC5-->  <DISPLAYLENGTH><![CDATA[19]]></DISPLAYLENGTH>
 <!--A19EFBCD4CEE48ADA318EB734806CFC5-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
 <!--A19EFBCD4CEE48ADA318EB734806CFC5-->  <SEQNO><![CDATA[30]]></SEQNO>
 <!--A19EFBCD4CEE48ADA318EB734806CFC5-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--A19EFBCD4CEE48ADA318EB734806CFC5-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--A19EFBCD4CEE48ADA318EB734806CFC5-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--A19EFBCD4CEE48ADA318EB734806CFC5-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--A19EFBCD4CEE48ADA318EB734806CFC5-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--A19EFBCD4CEE48ADA318EB734806CFC5-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--A19EFBCD4CEE48ADA318EB734806CFC5-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--A19EFBCD4CEE48ADA318EB734806CFC5-->  <GRID_SEQNO><![CDATA[0]]></GRID_SEQNO>
@@ -11040,7 +11273,7 @@
 <!--A6F29BF47A6E4834A4C60073517DA5A9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--A6F29BF47A6E4834A4C60073517DA5A9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A6F29BF47A6E4834A4C60073517DA5A9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--A6F29BF47A6E4834A4C60073517DA5A9-->  <NAME><![CDATA[Expected Date]]></NAME>
+<!--A6F29BF47A6E4834A4C60073517DA5A9-->  <NAME><![CDATA[Due Date]]></NAME>
 <!--A6F29BF47A6E4834A4C60073517DA5A9-->  <DESCRIPTION><![CDATA[The date when a specified request must be carried out by.]]></DESCRIPTION>
 <!--A6F29BF47A6E4834A4C60073517DA5A9-->  <HELP><![CDATA[Date when the payment is due without deductions or discount]]></HELP>
 <!--A6F29BF47A6E4834A4C60073517DA5A9-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
@@ -11049,18 +11282,18 @@
 <!--A6F29BF47A6E4834A4C60073517DA5A9-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--A6F29BF47A6E4834A4C60073517DA5A9-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--A6F29BF47A6E4834A4C60073517DA5A9-->  <DISPLAYLENGTH><![CDATA[19]]></DISPLAYLENGTH>
-<!--A6F29BF47A6E4834A4C60073517DA5A9-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--A6F29BF47A6E4834A4C60073517DA5A9-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--A6F29BF47A6E4834A4C60073517DA5A9-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--A6F29BF47A6E4834A4C60073517DA5A9-->  <SEQNO><![CDATA[30]]></SEQNO>
 <!--A6F29BF47A6E4834A4C60073517DA5A9-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--A6F29BF47A6E4834A4C60073517DA5A9-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--A6F29BF47A6E4834A4C60073517DA5A9-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--A6F29BF47A6E4834A4C60073517DA5A9-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--A6F29BF47A6E4834A4C60073517DA5A9-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--A6F29BF47A6E4834A4C60073517DA5A9-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--A6F29BF47A6E4834A4C60073517DA5A9-->  <GRID_SEQNO><![CDATA[1]]></GRID_SEQNO>
+<!--A6F29BF47A6E4834A4C60073517DA5A9-->  <GRID_SEQNO><![CDATA[0]]></GRID_SEQNO>
 <!--A6F29BF47A6E4834A4C60073517DA5A9-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--A6F29BF47A6E4834A4C60073517DA5A9-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--A6F29BF47A6E4834A4C60073517DA5A9-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--A6F29BF47A6E4834A4C60073517DA5A9-->  <ISSHOWNINSTATUSBAR><![CDATA[Y]]></ISSHOWNINSTATUSBAR>
 <!--A6F29BF47A6E4834A4C60073517DA5A9-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--A6F29BF47A6E4834A4C60073517DA5A9--></AD_FIELD>
 
@@ -11206,7 +11439,7 @@
 <!--AA33525387124B91BA305A6C3F314574-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--AA33525387124B91BA305A6C3F314574-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--AA33525387124B91BA305A6C3F314574-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--AA33525387124B91BA305A6C3F314574-->  <NAME><![CDATA[Expected Date]]></NAME>
+<!--AA33525387124B91BA305A6C3F314574-->  <NAME><![CDATA[Due Date]]></NAME>
 <!--AA33525387124B91BA305A6C3F314574-->  <DESCRIPTION><![CDATA[The date when a specified request must be carried out by.]]></DESCRIPTION>
 <!--AA33525387124B91BA305A6C3F314574-->  <HELP><![CDATA[Date when the payment is due without deductions or discount]]></HELP>
 <!--AA33525387124B91BA305A6C3F314574-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
@@ -12581,14 +12814,14 @@
 <!--B5896DD669EA4B1F9FD845EA8C1E9AA8-->  <AD_TAB_ID><![CDATA[15ECCF8974044A81982F57F9F1E1A67B]]></AD_TAB_ID>
 <!--B5896DD669EA4B1F9FD845EA8C1E9AA8-->  <AD_COLUMN_ID><![CDATA[ACE4EFA3342246E6920D9895478CFACB]]></AD_COLUMN_ID>
 <!--B5896DD669EA4B1F9FD845EA8C1E9AA8-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--B5896DD669EA4B1F9FD845EA8C1E9AA8-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--B5896DD669EA4B1F9FD845EA8C1E9AA8-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
 <!--B5896DD669EA4B1F9FD845EA8C1E9AA8-->  <DISPLAYLENGTH><![CDATA[19]]></DISPLAYLENGTH>
 <!--B5896DD669EA4B1F9FD845EA8C1E9AA8-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
 <!--B5896DD669EA4B1F9FD845EA8C1E9AA8-->  <SEQNO><![CDATA[100]]></SEQNO>
 <!--B5896DD669EA4B1F9FD845EA8C1E9AA8-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--B5896DD669EA4B1F9FD845EA8C1E9AA8-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--B5896DD669EA4B1F9FD845EA8C1E9AA8-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--B5896DD669EA4B1F9FD845EA8C1E9AA8-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--B5896DD669EA4B1F9FD845EA8C1E9AA8-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--B5896DD669EA4B1F9FD845EA8C1E9AA8-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--B5896DD669EA4B1F9FD845EA8C1E9AA8-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--B5896DD669EA4B1F9FD845EA8C1E9AA8-->  <GRID_SEQNO><![CDATA[8]]></GRID_SEQNO>
@@ -13677,7 +13910,7 @@
 <!--C69E4E9B902543EA84E7CAFE2AE53BCE-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--C69E4E9B902543EA84E7CAFE2AE53BCE-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--C69E4E9B902543EA84E7CAFE2AE53BCE-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
-<!--C69E4E9B902543EA84E7CAFE2AE53BCE-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--C69E4E9B902543EA84E7CAFE2AE53BCE-->  <SEQNO><![CDATA[160]]></SEQNO>
 <!--C69E4E9B902543EA84E7CAFE2AE53BCE-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--C69E4E9B902543EA84E7CAFE2AE53BCE-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--C69E4E9B902543EA84E7CAFE2AE53BCE-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -14917,7 +15150,7 @@
 <!--E812C39245A44AD39CFAEDDB21120E29-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--E812C39245A44AD39CFAEDDB21120E29-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--E812C39245A44AD39CFAEDDB21120E29-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--E812C39245A44AD39CFAEDDB21120E29-->  <NAME><![CDATA[Expected Date]]></NAME>
+<!--E812C39245A44AD39CFAEDDB21120E29-->  <NAME><![CDATA[Due Date]]></NAME>
 <!--E812C39245A44AD39CFAEDDB21120E29-->  <DESCRIPTION><![CDATA[The date when a specified request must be carried out by.]]></DESCRIPTION>
 <!--E812C39245A44AD39CFAEDDB21120E29-->  <HELP><![CDATA[Date when the payment is due without deductions or discount]]></HELP>
 <!--E812C39245A44AD39CFAEDDB21120E29-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
@@ -14926,15 +15159,15 @@
 <!--E812C39245A44AD39CFAEDDB21120E29-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--E812C39245A44AD39CFAEDDB21120E29-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--E812C39245A44AD39CFAEDDB21120E29-->  <DISPLAYLENGTH><![CDATA[19]]></DISPLAYLENGTH>
-<!--E812C39245A44AD39CFAEDDB21120E29-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--E812C39245A44AD39CFAEDDB21120E29-->  <SEQNO><![CDATA[110]]></SEQNO>
+<!--E812C39245A44AD39CFAEDDB21120E29-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--E812C39245A44AD39CFAEDDB21120E29-->  <SEQNO><![CDATA[100]]></SEQNO>
 <!--E812C39245A44AD39CFAEDDB21120E29-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--E812C39245A44AD39CFAEDDB21120E29-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--E812C39245A44AD39CFAEDDB21120E29-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--E812C39245A44AD39CFAEDDB21120E29-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--E812C39245A44AD39CFAEDDB21120E29-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--E812C39245A44AD39CFAEDDB21120E29-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--E812C39245A44AD39CFAEDDB21120E29-->  <GRID_SEQNO><![CDATA[9]]></GRID_SEQNO>
+<!--E812C39245A44AD39CFAEDDB21120E29-->  <GRID_SEQNO><![CDATA[8]]></GRID_SEQNO>
 <!--E812C39245A44AD39CFAEDDB21120E29-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--E812C39245A44AD39CFAEDDB21120E29-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--E812C39245A44AD39CFAEDDB21120E29-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml	Fri Oct 05 10:33:28 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml	Tue Oct 30 12:16:46 2012 +0100
@@ -251,7 +251,7 @@
 <!--81644A22CC4D4B879AA71C33C30E00A4-->  <ISSORTTAB><![CDATA[N]]></ISSORTTAB>
 <!--81644A22CC4D4B879AA71C33C30E00A4-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--81644A22CC4D4B879AA71C33C30E00A4-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
-<!--81644A22CC4D4B879AA71C33C30E00A4-->  <HQLWHERECLAUSE><![CDATA[((e.obSelected = true and e.paymentProposal.id = @FIN_Payment_Proposal.id@) or e.obSelected = false) and e.salesTransaction = false  and e.currency.id= @FIN_Payment_Proposal.currency@ and (@FIN_Payment_Proposal.businessPartner@ is null OR @FIN_Payment_Proposal.businessPartner@ = '' OR @FIN_Payment_Proposal.businessPartner@ = e.businessPartner.id) and (@FIN_Payment_Proposal.duedate@ = '' OR @FIN_Payment_Proposal.duedate@ is null OR @FIN_Payment_Proposal.duedate@ = 'null' OR e.expectedDate <= to_date(@FIN_Payment_Proposal.duedate@,'YYYY-MM-DD'))]]></HQLWHERECLAUSE>
+<!--81644A22CC4D4B879AA71C33C30E00A4-->  <HQLWHERECLAUSE><![CDATA[(e.obSelected = true and e.paymentProposal.id = @FIN_Payment_Proposal.id@) or (e.obSelected = false and e.salesTransaction = false  and e.currency.id= @FIN_Payment_Proposal.currency@ and (@FIN_Payment_Proposal.businessPartner@ is null OR @FIN_Payment_Proposal.businessPartner@ = '' OR @FIN_Payment_Proposal.businessPartner@ = e.businessPartner.id) and (@FIN_Payment_Proposal.duedate@ = '' OR @FIN_Payment_Proposal.duedate@ is null OR @FIN_Payment_Proposal.duedate@ = 'null' OR e.expectedDate <= to_date(@FIN_Payment_Proposal.duedate@,'YYYY-MM-DD')))]]></HQLWHERECLAUSE>
 <!--81644A22CC4D4B879AA71C33C30E00A4-->  <HQLORDERBYCLAUSE><![CDATA[obSelected desc, paymentPriority, expectedDate, coalesce(orderDocumentno, invoiceorderDocumentno)]]></HQLORDERBYCLAUSE>
 <!--81644A22CC4D4B879AA71C33C30E00A4-->  <HQLFILTERCLAUSE><![CDATA[(e.obSelected = true) OR (e.paymentMethod.id = @FIN_Payment_Proposal.paymentMethod@)]]></HQLFILTERCLAUSE>
 <!--81644A22CC4D4B879AA71C33C30E00A4-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Fri Oct 05 10:33:28 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Tue Oct 30 12:16:46 2012 +0100
@@ -209,6 +209,17 @@
 <!--2285489CD37B46EEB218C777400BBCBA-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--2285489CD37B46EEB218C777400BBCBA--></AD_TEXTINTERFACES>
 
+<!--271D3D8520934D1E90A34CBDD2BF4C9C--><AD_TEXTINTERFACES>
+<!--271D3D8520934D1E90A34CBDD2BF4C9C-->  <AD_TEXTINTERFACES_ID><![CDATA[271D3D8520934D1E90A34CBDD2BF4C9C]]></AD_TEXTINTERFACES_ID>
+<!--271D3D8520934D1E90A34CBDD2BF4C9C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--271D3D8520934D1E90A34CBDD2BF4C9C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--271D3D8520934D1E90A34CBDD2BF4C9C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--271D3D8520934D1E90A34CBDD2BF4C9C-->  <TEXT><![CDATA[Expected Date From]]></TEXT>
+<!--271D3D8520934D1E90A34CBDD2BF4C9C-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME>
+<!--271D3D8520934D1E90A34CBDD2BF4C9C-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--271D3D8520934D1E90A34CBDD2BF4C9C-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--271D3D8520934D1E90A34CBDD2BF4C9C--></AD_TEXTINTERFACES>
+
 <!--2758F01B4C674307B43AAEC51D7B1503--><AD_TEXTINTERFACES>
 <!--2758F01B4C674307B43AAEC51D7B1503-->  <AD_TEXTINTERFACES_ID><![CDATA[2758F01B4C674307B43AAEC51D7B1503]]></AD_TEXTINTERFACES_ID>
 <!--2758F01B4C674307B43AAEC51D7B1503-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -836,6 +847,17 @@
 <!--6E9827D58923455D95EFD3D3A7288BC9-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--6E9827D58923455D95EFD3D3A7288BC9--></AD_TEXTINTERFACES>
 
+<!--6F2ADD8B5E31420E8E0424DED914BF81--><AD_TEXTINTERFACES>
+<!--6F2ADD8B5E31420E8E0424DED914BF81-->  <AD_TEXTINTERFACES_ID><![CDATA[6F2ADD8B5E31420E8E0424DED914BF81]]></AD_TEXTINTERFACES_ID>
+<!--6F2ADD8B5E31420E8E0424DED914BF81-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6F2ADD8B5E31420E8E0424DED914BF81-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6F2ADD8B5E31420E8E0424DED914BF81-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6F2ADD8B5E31420E8E0424DED914BF81-->  <TEXT><![CDATA[Expected Date]]></TEXT>
+<!--6F2ADD8B5E31420E8E0424DED914BF81-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/SelectExpectedPayments.html]]></FILENAME>
+<!--6F2ADD8B5E31420E8E0424DED914BF81-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--6F2ADD8B5E31420E8E0424DED914BF81-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--6F2ADD8B5E31420E8E0424DED914BF81--></AD_TEXTINTERFACES>
+
 <!--6F49E71B58104D7DBC666A2C6D27ED55--><AD_TEXTINTERFACES>
 <!--6F49E71B58104D7DBC666A2C6D27ED55-->  <AD_TEXTINTERFACES_ID><![CDATA[6F49E71B58104D7DBC666A2C6D27ED55]]></AD_TEXTINTERFACES_ID>
 <!--6F49E71B58104D7DBC666A2C6D27ED55-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1804,6 +1826,17 @@
 <!--8D99A51A37534657B4315658A504DD1A-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--8D99A51A37534657B4315658A504DD1A--></AD_TEXTINTERFACES>
 
+<!--8DBA8F9BC68D445ABD1E80E8BDE20A30--><AD_TEXTINTERFACES>
+<!--8DBA8F9BC68D445ABD1E80E8BDE20A30-->  <AD_TEXTINTERFACES_ID><![CDATA[8DBA8F9BC68D445ABD1E80E8BDE20A30]]></AD_TEXTINTERFACES_ID>
+<!--8DBA8F9BC68D445ABD1E80E8BDE20A30-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8DBA8F9BC68D445ABD1E80E8BDE20A30-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8DBA8F9BC68D445ABD1E80E8BDE20A30-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8DBA8F9BC68D445ABD1E80E8BDE20A30-->  <TEXT><![CDATA[Expected Date From]]></TEXT>
+<!--8DBA8F9BC68D445ABD1E80E8BDE20A30-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html]]></FILENAME>
+<!--8DBA8F9BC68D445ABD1E80E8BDE20A30-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--8DBA8F9BC68D445ABD1E80E8BDE20A30-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--8DBA8F9BC68D445ABD1E80E8BDE20A30--></AD_TEXTINTERFACES>
+
 <!--8F869C21DCF14031BC01CCD9D158190E--><AD_TEXTINTERFACES>
 <!--8F869C21DCF14031BC01CCD9D158190E-->  <AD_TEXTINTERFACES_ID><![CDATA[8F869C21DCF14031BC01CCD9D158190E]]></AD_TEXTINTERFACES_ID>
 <!--8F869C21DCF14031BC01CCD9D158190E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2343,6 +2376,17 @@
 <!--AD4B47A653588779E040007F010055A7-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--AD4B47A653588779E040007F010055A7--></AD_TEXTINTERFACES>
 
+<!--ADD85DC6B32E4CB5B0D548409B0FD1C8--><AD_TEXTINTERFACES>
+<!--ADD85DC6B32E4CB5B0D548409B0FD1C8-->  <AD_TEXTINTERFACES_ID><![CDATA[ADD85DC6B32E4CB5B0D548409B0FD1C8]]></AD_TEXTINTERFACES_ID>
+<!--ADD85DC6B32E4CB5B0D548409B0FD1C8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--ADD85DC6B32E4CB5B0D548409B0FD1C8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--ADD85DC6B32E4CB5B0D548409B0FD1C8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--ADD85DC6B32E4CB5B0D548409B0FD1C8-->  <TEXT><![CDATA[Expected Date From]]></TEXT>
+<!--ADD85DC6B32E4CB5B0D548409B0FD1C8-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html]]></FILENAME>
+<!--ADD85DC6B32E4CB5B0D548409B0FD1C8-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--ADD85DC6B32E4CB5B0D548409B0FD1C8-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--ADD85DC6B32E4CB5B0D548409B0FD1C8--></AD_TEXTINTERFACES>
+
 <!--AF139B1C12C0477AB902B9DF23D53779--><AD_TEXTINTERFACES>
 <!--AF139B1C12C0477AB902B9DF23D53779-->  <AD_TEXTINTERFACES_ID><![CDATA[AF139B1C12C0477AB902B9DF23D53779]]></AD_TEXTINTERFACES_ID>
 <!--AF139B1C12C0477AB902B9DF23D53779-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2376,6 +2420,17 @@
 <!--B57AE91319104419920078B0FDAE9C16-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--B57AE91319104419920078B0FDAE9C16--></AD_TEXTINTERFACES>
 
+<!--B5F98BCEA84247B0A26185B72012C28F--><AD_TEXTINTERFACES>
+<!--B5F98BCEA84247B0A26185B72012C28F-->  <AD_TEXTINTERFACES_ID><![CDATA[B5F98BCEA84247B0A26185B72012C28F]]></AD_TEXTINTERFACES_ID>
+<!--B5F98BCEA84247B0A26185B72012C28F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B5F98BCEA84247B0A26185B72012C28F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B5F98BCEA84247B0A26185B72012C28F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B5F98BCEA84247B0A26185B72012C28F-->  <TEXT><![CDATA[Expected Date To]]></TEXT>
+<!--B5F98BCEA84247B0A26185B72012C28F-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME>
+<!--B5F98BCEA84247B0A26185B72012C28F-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--B5F98BCEA84247B0A26185B72012C28F-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--B5F98BCEA84247B0A26185B72012C28F--></AD_TEXTINTERFACES>
+
 <!--B86C9C60E1D64BF98E5A2FE0851F3693--><AD_TEXTINTERFACES>
 <!--B86C9C60E1D64BF98E5A2FE0851F3693-->  <AD_TEXTINTERFACES_ID><![CDATA[B86C9C60E1D64BF98E5A2FE0851F3693]]></AD_TEXTINTERFACES_ID>
 <!--B86C9C60E1D64BF98E5A2FE0851F3693-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2585,6 +2640,17 @@
 <!--C80B5C1D721F49C0983C231729C550F8-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--C80B5C1D721F49C0983C231729C550F8--></AD_TEXTINTERFACES>
 
+<!--C9066DBDF11048B99E4FC46E4D890D30--><AD_TEXTINTERFACES>
+<!--C9066DBDF11048B99E4FC46E4D890D30-->  <AD_TEXTINTERFACES_ID><![CDATA[C9066DBDF11048B99E4FC46E4D890D30]]></AD_TEXTINTERFACES_ID>
+<!--C9066DBDF11048B99E4FC46E4D890D30-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C9066DBDF11048B99E4FC46E4D890D30-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C9066DBDF11048B99E4FC46E4D890D30-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C9066DBDF11048B99E4FC46E4D890D30-->  <TEXT><![CDATA[Expected Date]]></TEXT>
+<!--C9066DBDF11048B99E4FC46E4D890D30-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME>
+<!--C9066DBDF11048B99E4FC46E4D890D30-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--C9066DBDF11048B99E4FC46E4D890D30-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--C9066DBDF11048B99E4FC46E4D890D30--></AD_TEXTINTERFACES>
+
 <!--CA4B60EB983146229DBD2AFC9135E6D1--><AD_TEXTINTERFACES>
 <!--CA4B60EB983146229DBD2AFC9135E6D1-->  <AD_TEXTINTERFACES_ID><![CDATA[CA4B60EB983146229DBD2AFC9135E6D1]]></AD_TEXTINTERFACES_ID>
 <!--CA4B60EB983146229DBD2AFC9135E6D1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2728,6 +2794,17 @@
 <!--D6E2DE50C7AC438E8E9A9FFF1C6EAAA7-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--D6E2DE50C7AC438E8E9A9FFF1C6EAAA7--></AD_TEXTINTERFACES>
 
+<!--D8162326FAE4410C879DA6D1908AC844--><AD_TEXTINTERFACES>
+<!--D8162326FAE4410C879DA6D1908AC844-->  <AD_TEXTINTERFACES_ID><![CDATA[D8162326FAE4410C879DA6D1908AC844]]></AD_TEXTINTERFACES_ID>
+<!--D8162326FAE4410C879DA6D1908AC844-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D8162326FAE4410C879DA6D1908AC844-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D8162326FAE4410C879DA6D1908AC844-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D8162326FAE4410C879DA6D1908AC844-->  <TEXT><![CDATA[Expected Date To]]></TEXT>
+<!--D8162326FAE4410C879DA6D1908AC844-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html]]></FILENAME>
+<!--D8162326FAE4410C879DA6D1908AC844-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--D8162326FAE4410C879DA6D1908AC844-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--D8162326FAE4410C879DA6D1908AC844--></AD_TEXTINTERFACES>
+
 <!--D8B42F3BC554476C8FF5C79AE2445CED--><AD_TEXTINTERFACES>
 <!--D8B42F3BC554476C8FF5C79AE2445CED-->  <AD_TEXTINTERFACES_ID><![CDATA[D8B42F3BC554476C8FF5C79AE2445CED]]></AD_TEXTINTERFACES_ID>
 <!--D8B42F3BC554476C8FF5C79AE2445CED-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2794,6 +2871,17 @@
 <!--E33F2FB86A664FED9B3D8A14CF82A56D-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--E33F2FB86A664FED9B3D8A14CF82A56D--></AD_TEXTINTERFACES>
 
+<!--E35AB8E889F8495696C2B5D2A17D0262--><AD_TEXTINTERFACES>
+<!--E35AB8E889F8495696C2B5D2A17D0262-->  <AD_TEXTINTERFACES_ID><![CDATA[E35AB8E889F8495696C2B5D2A17D0262]]></AD_TEXTINTERFACES_ID>
+<!--E35AB8E889F8495696C2B5D2A17D0262-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E35AB8E889F8495696C2B5D2A17D0262-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E35AB8E889F8495696C2B5D2A17D0262-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E35AB8E889F8495696C2B5D2A17D0262-->  <TEXT><![CDATA[Expected Date]]></TEXT>
+<!--E35AB8E889F8495696C2B5D2A17D0262-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html]]></FILENAME>
+<!--E35AB8E889F8495696C2B5D2A17D0262-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--E35AB8E889F8495696C2B5D2A17D0262-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--E35AB8E889F8495696C2B5D2A17D0262--></AD_TEXTINTERFACES>
+
 <!--E3AE130FA2E4446CA8528541965DCAE0--><AD_TEXTINTERFACES>
 <!--E3AE130FA2E4446CA8528541965DCAE0-->  <AD_TEXTINTERFACES_ID><![CDATA[E3AE130FA2E4446CA8528541965DCAE0]]></AD_TEXTINTERFACES_ID>
 <!--E3AE130FA2E4446CA8528541965DCAE0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2849,6 +2937,17 @@
 <!--EA12496A49A3424D9C5EE0CDBEF173C3-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--EA12496A49A3424D9C5EE0CDBEF173C3--></AD_TEXTINTERFACES>
 
+<!--EE51A4BA4CA74D8BB746938BCE15EE4D--><AD_TEXTINTERFACES>
+<!--EE51A4BA4CA74D8BB746938BCE15EE4D-->  <AD_TEXTINTERFACES_ID><![CDATA[EE51A4BA4CA74D8BB746938BCE15EE4D]]></AD_TEXTINTERFACES_ID>
+<!--EE51A4BA4CA74D8BB746938BCE15EE4D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--EE51A4BA4CA74D8BB746938BCE15EE4D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--EE51A4BA4CA74D8BB746938BCE15EE4D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--EE51A4BA4CA74D8BB746938BCE15EE4D-->  <TEXT><![CDATA[Expected Date]]></TEXT>
+<!--EE51A4BA4CA74D8BB746938BCE15EE4D-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html]]></FILENAME>
+<!--EE51A4BA4CA74D8BB746938BCE15EE4D-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--EE51A4BA4CA74D8BB746938BCE15EE4D-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--EE51A4BA4CA74D8BB746938BCE15EE4D--></AD_TEXTINTERFACES>
+
 <!--F1ED4310FFD94BFF9BA48E2229F8E2E3--><AD_TEXTINTERFACES>
 <!--F1ED4310FFD94BFF9BA48E2229F8E2E3-->  <AD_TEXTINTERFACES_ID><![CDATA[F1ED4310FFD94BFF9BA48E2229F8E2E3]]></AD_TEXTINTERFACES_ID>
 <!--F1ED4310FFD94BFF9BA48E2229F8E2E3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2860,6 +2959,17 @@
 <!--F1ED4310FFD94BFF9BA48E2229F8E2E3-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--F1ED4310FFD94BFF9BA48E2229F8E2E3--></AD_TEXTINTERFACES>
 
+<!--F5A1427C39234E78B7CD365FE8B129D2--><AD_TEXTINTERFACES>
+<!--F5A1427C39234E78B7CD365FE8B129D2-->  <AD_TEXTINTERFACES_ID><![CDATA[F5A1427C39234E78B7CD365FE8B129D2]]></AD_TEXTINTERFACES_ID>
+<!--F5A1427C39234E78B7CD365FE8B129D2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F5A1427C39234E78B7CD365FE8B129D2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F5A1427C39234E78B7CD365FE8B129D2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F5A1427C39234E78B7CD365FE8B129D2-->  <TEXT><![CDATA[Expected Date To]]></TEXT>
+<!--F5A1427C39234E78B7CD365FE8B129D2-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html]]></FILENAME>
+<!--F5A1427C39234E78B7CD365FE8B129D2-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--F5A1427C39234E78B7CD365FE8B129D2-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--F5A1427C39234E78B7CD365FE8B129D2--></AD_TEXTINTERFACES>
+
 <!--FAF4546366E64BEFB9B6E0A8B424F129--><AD_TEXTINTERFACES>
 <!--FAF4546366E64BEFB9B6E0A8B424F129-->  <AD_TEXTINTERFACES_ID><![CDATA[FAF4546366E64BEFB9B6E0A8B424F129]]></AD_TEXTINTERFACES_ID>
 <!--FAF4546366E64BEFB9B6E0A8B424F129-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/ModifyPaymentPlanActionHandler.java	Fri Oct 05 10:33:28 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/ModifyPaymentPlanActionHandler.java	Tue Oct 30 12:16:46 2012 +0100
@@ -336,12 +336,13 @@
       // 3) New row is created
       BigDecimal outstanding = new BigDecimal(modifiedGridRow.getString("outstanding"));
       Date dueDate = getJSDate(modifiedGridRow.getString("dueDate"));
+      Date expectedDate = getJSDate(modifiedGridRow.getString("expectedDate"));
       FIN_PaymentMethod pm = OBDal.getInstance().get(FIN_PaymentMethod.class,
           modifiedGridRow.getString("paymentMethod"));
       invoicePS.setOutstandingAmount(outstanding);
       invoicePS.setAmount(invoicePS.getPaidAmount().add(outstanding));
       invoicePS.setDueDate(dueDate);
-      invoicePS.setOrigDueDate(dueDate);
+      invoicePS.setExpectedDate(expectedDate);
       invoicePS.setFinPaymentmethod(pm);
       OBDal.getInstance().save(invoicePS);
       lPSsToReturn.add(invoicePS);
@@ -396,9 +397,11 @@
       FIN_PaymentMethod paymentMethod = OBDal.getInstance().get(FIN_PaymentMethod.class,
           jo.getString("paymentMethod"));
       String dueDate = jo.getString("dueDate");
+      String expectedDate = jo.getString("expectedDate");
       FIN_PaymentSchedule invoicePS = dao.getNewPaymentSchedule(invoice.getClient(),
           invoice.getOrganization(), invoice, null, invoice.getCurrency(), getJSDate(dueDate),
           paymentMethod, outstanding);
+      invoicePS.setExpectedDate(getJSDate(expectedDate));
       lToReturn.add(invoicePS);
     }
     OBDal.getInstance().flush();
@@ -576,6 +579,9 @@
     if (!getJSDate(jsonObject.getString("dueDate")).equals(ps.getDueDate())) {
       return true;
     }
+    if (!getJSDate(jsonObject.getString("expectedDate")).equals(ps.getExpectedDate())) {
+      return true;
+    }
     return false;
   }
 
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html	Fri Oct 05 10:33:28 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html	Tue Oct 30 12:16:46 2012 +0100
@@ -178,15 +178,15 @@
       OB.APRM.AOOI_bp !== document.getElementById('C_BPartner_ID').value ||
       OB.APRM.AOOI_dt !== document.getElementById('paramDocumentType').value ||
       OB.APRM.AOOI_pm !== document.getElementById('paramAlternativePaymentMethod').checked ||
-      OB.APRM.AOOI_ddf !== document.getElementById('paramDueDateFrom').value ||
-      OB.APRM.AOOI_ddt !== document.getElementById('paramDueDateTo').value ||
+      OB.APRM.AOOI_ddf !== document.getElementById('paramExpectedDateFrom').value ||
+      OB.APRM.AOOI_ddt !== document.getElementById('paramExpectedDateTo').value ||
       OB.APRM.AOOI_cu !== document.getElementById('paramCurrencyId').value)
   {
     OB.APRM.AOOI_bp = document.getElementById('C_BPartner_ID').value;
     OB.APRM.AOOI_dt = document.getElementById('paramDocumentType').value;
     OB.APRM.AOOI_pm = document.getElementById('paramAlternativePaymentMethod').checked;
-    OB.APRM.AOOI_ddf = document.getElementById('paramDueDateFrom').value;
-    OB.APRM.AOOI_ddt = document.getElementById('paramDueDateTo').value;
+    OB.APRM.AOOI_ddf = document.getElementById('paramExpectedDateFrom').value;
+    OB.APRM.AOOI_ddt = document.getElementById('paramExpectedDateTo').value;
     OB.APRM.AOOI_cu = document.getElementById('paramCurrencyId').value;
 
     try {
@@ -561,10 +561,10 @@
   displayLogicElement('GLItemSelectorLbl', toGLItem);
   displayLogicElement('GLItemSelector', toGLItem);
   
-  displayLogicElement('DueDateFromLbl', !toGLItem);
-  displayLogicElement('DueDateFrom', !toGLItem);
-  displayLogicElement('DueDateToLbl', !toGLItem);
-  displayLogicElement('DueDateTo', !toGLItem);
+  displayLogicElement('ExpectedDateFromLbl', !toGLItem);
+  displayLogicElement('ExpectedDateFrom', !toGLItem);
+  displayLogicElement('ExpectedDateToLbl', !toGLItem);
+  displayLogicElement('ExpectedDateTo', !toGLItem);
   displayLogicElement('gridPayment', !toGLItem);
   displayLogicElement('totalGLItems', !toGLItem);
   displayLogicElement('inpAlternativeLabel', !toGLItem);
@@ -1135,25 +1135,40 @@
                   <option value="G">GL Items</option>
                 </select>
               </td>
-              <td class="TitleCell" id="DueDateFromLbl" colspan="2"><span class="LabelText">Due Date From</span></td>
-              <td class="TextBox_btn_ContentCell" id="DueDateFrom">
+              <td class="TitleCell" id="ExpectedDateFromLbl" colspan="2"><span class="LabelText">Expected Date From</span></td>
+              <td class="TextBox_btn_ContentCell" id="ExpectedDateFrom">
                 <table border="0" cellspacing="0" cellpadding="0" summary=""  style="padding-top: 0px;">
                   <tr>
                     <td class="TextBox_ContentCell">
                       <table style="border: 0px none; border-collapse: collapse;">
                         <tr><td style="padding-top: 0px;">
-                          <input type="text" id="paramDueDateFrom" class="dojoValidateValid TextBox_btn_OneCell_width" value="" maxlength="10" name="inpDueDateFrom" onkeyup="autoCompleteDate(this);" onkeydown="changeToEditingMode('onkeydown');" onkeypress="changeToEditingMode('onkeypress');" oncut="changeToEditingMode('oncut');" onpaste="changeToEditingMode('onpaste');" oncontextmenu="changeToEditingMode('oncontextmenu');" onblur="expandDateYear(this.id);" onchange="validateDateTextBox(this.id); validateDate(this); return true;" displayFormat="xx" saveFormat="xx"></input>
+                          <input type="text" 
+                          id="paramExpectedDateFrom" 
+                          class="dojoValidateValid TextBox_btn_OneCell_width" 
+                          value="" 
+                          maxlength="10" 
+                          name="inpExpectedDateFrom" 
+                          onkeyup="autoCompleteDate(this);" 
+                          onkeydown="changeToEditingMode('onkeydown');" 
+                          onkeypress="changeToEditingMode('onkeypress');" 
+                          oncut="changeToEditingMode('oncut');" 
+                          onpaste="changeToEditingMode('onpaste');" 
+                          oncontextmenu="changeToEditingMode('oncontextmenu');" 
+                          onblur="expandDateYear(this.id);" 
+                          onchange="validateDateTextBox(this.id); validateDate(this); return true;" 
+                          displayFormat="xx" 
+                          saveFormat="xx"></input>
                         </td></tr>
                       </table>
-                      <span id="paramDueDateFrominvalidSpan" style="display: none;" class="TextBox_MsgContainer_span">
+                      <span id="paramExpectedDateFrominvalidSpan" style="display: none;" class="TextBox_MsgContainer_span">
                         <table class="TextBox_MsgContainer_table">
                           <tbody><tr class="TextBox_MsgContainer_tr"><td class="TextBox_MsgContainer_td"><div class="TextBox_MsgContainer_div"></div></td><td></td></tr>
-                          <tr><td class="invalid" colspan="2"><div name="invalidText" id="paramDueDateFrominvalidSpanText" class="TextBox_MsgContainer_div2">* The value entered is not valid.</div></td></tr>
+                          <tr><td class="invalid" colspan="2"><div name="invalidText" id="paramExpectedDateFrominvalidSpanText" class="TextBox_MsgContainer_div2">* The value entered is not valid.</div></td></tr>
                         </tbody></table>
                       </span>
                     </td>
                     <td class="FieldButton_ContentCell">
-                      <a class="FieldButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Calendar'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='FieldButtonLink_active'; return true;" onkeyup="this.className='FieldButtonLink_focus'; return true;" onclick="showCalendar('frmMain.inpDueDateFrom', document.frmMain.inpDueDateFrom.value, false);return false;">
+                      <a class="FieldButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Calendar'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='FieldButtonLink_active'; return true;" onkeyup="this.className='FieldButtonLink_focus'; return true;" onclick="showCalendar('frmMain.inpExpectedDateFrom', document.frmMain.inpExepctedDateFrom.value, false);return false;">
                         <table class="FieldButton" onmouseout="this.className='FieldButton';window.status='';return true;" onmouseover="this.className='FieldButton_hover';window.status='Show calendar';return true;" onmousedown="this.className='FieldButton_active';return true;" onmouseup="this.className='FieldButton';return true;">
                           <tr>
                             <td class="FieldButton_bg">
@@ -1185,25 +1200,25 @@
               <span class="Radio_Check_ContentCell Checkbox_container_NOT_Focused"><input type="checkbox" name="inpAlternativePaymentMethod" value="Y" id="paramAlternativePaymentMethod" onclick="loadGridList()"></input></span>
               </td>
               <td class="TitleCell"></td>
-              <td class="TitleCell" id="DueDateToLbl"><span class="LabelText">Due Date To</span></td>
-              <td class="TextBox_btn_ContentCell" id="DueDateTo">
+              <td class="TitleCell" id="ExpectedDateToLbl"><span class="LabelText">Expected Date To</span></td>
+              <td class="TextBox_btn_ContentCell" id="ExpectedDateTo">
                 <table border="0" cellspacing="0" cellpadding="0" summary=""  style="padding-top: 0px;">
                   <tr>
                     <td class="TextBox_ContentCell">
                       <table style="border: 0px none; border-collapse: collapse;">
                         <tr><td style="padding-top: 0px;">
-                          <input type="text" id="paramDueDateTo" class="dojoValidateValid TextBox_btn_OneCell_width" value="" maxlength="10" name="inpDueDateTo" onkeyup="autoCompleteDate(this);" onkeydown="changeToEditingMode('onkeydown');" onkeypress="changeToEditingMode('onkeypress');" oncut="changeToEditingMode('oncut');" onpaste="changeToEditingMode('onpaste');" oncontextmenu="changeToEditingMode('oncontextmenu');" onblur="expandDateYear(this.id);" onchange="validateDateTextBox(this.id); validateDate(this);return true;" displayFormat="xx" saveFormat="xx"></input>
+                          <input type="text" id="paramExpectedDateTo" class="dojoValidateValid TextBox_btn_OneCell_width" value="" maxlength="10" name="inpExpectedDateTo" onkeyup="autoCompleteDate(this);" onkeydown="changeToEditingMode('onkeydown');" onkeypress="changeToEditingMode('onkeypress');" oncut="changeToEditingMode('oncut');" onpaste="changeToEditingMode('onpaste');" oncontextmenu="changeToEditingMode('oncontextmenu');" onblur="expandDateYear(this.id);" onchange="validateDateTextBox(this.id); validateDate(this);return true;" displayFormat="xx" saveFormat="xx"></input>
                           </td></tr>
                       </table>
-                      <span id="paramDueDateToinvalidSpan" style="display: none;" class="TextBox_MsgContainer_span">
+                      <span id="paramExpectedDateToinvalidSpan" style="display: none;" class="TextBox_MsgContainer_span">
                         <table class="TextBox_MsgContainer_table">
                           <tbody><tr class="TextBox_MsgContainer_tr"><td class="TextBox_MsgContainer_td"><div class="TextBox_MsgContainer_div"></div></td><td></td></tr>
-                          <tr><td class="invalid" colspan="2"><div name="invalidText" id="paramDueDateToinvalidSpanText" class="TextBox_MsgContainer_div2">* The value entered is not valid.</div></td></tr>
+                          <tr><td class="invalid" colspan="2"><div name="invalidText" id="paramExpectedDateToinvalidSpanText" class="TextBox_MsgContainer_div2">* The value entered is not valid.</div></td></tr>
                         </tbody></table>
                       </span>
                     </td>
                     <td class="FieldButton_ContentCell">
-                      <a class="FieldButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Calendar'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='FieldButtonLink_active'; return true;" onkeyup="this.className='FieldButtonLink_focus'; return true;" onclick="showCalendar('frmMain.inpDueDateTo', document.frmMain.inpDueDateTo.value, false);return false;">
+                      <a class="FieldButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Calendar'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='FieldButtonLink_active'; return true;" onkeyup="this.className='FieldButtonLink_focus'; return true;" onclick="showCalendar('frmMain.inpExpectedDateTo', document.frmMain.inpExpectedDateTo.value, false);return false;">
                         <table class="FieldButton" onmouseout="this.className='FieldButton';window.status='';return true;" onmouseover="this.className='FieldButton_hover';window.status='Show calendar';return true;" onmousedown="this.className='FieldButton_active';return true;" onmouseup="this.className='FieldButton';return true;">
                           <tr>
                             <td class="FieldButton_bg">
@@ -1471,7 +1486,7 @@
                         <th class="DataGrid_Header_Cell" width="120"><span name="lblP" id="lblPPIN">Purchase Invoice No.</span><span name="lblR" id="lblRSIN">Sales Invoice No.</span></th>
                         <th class="DataGrid_Header_Cell" width="100" id="bpGridColumn">Business Partner</th>
                         <th class="DataGrid_Header_Cell" width="100">Payment Method</th>
-                        <th class="DataGrid_Header_Cell" width="70">Due Date</th>
+                        <th class="DataGrid_Header_Cell" width="70">Expected Date</th>
                         <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>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java	Fri Oct 05 10:33:28 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java	Tue Oct 30 12:16:46 2012 +0100
@@ -96,8 +96,8 @@
       }
       String strOrgId = vars.getRequestGlobalVariable("inpadOrgId", "");
       String strPaymentId = vars.getRequestGlobalVariable("inpfinPaymentId", "");
-      String strDueDateFrom = vars.getStringParameter("inpDueDateFrom", "");
-      String strDueDateTo = vars.getStringParameter("inpDueDateTo", "");
+      String strExpectedDateFrom = vars.getStringParameter("inpExpectedDateFrom", "");
+      String strExpectedDateTo = vars.getStringParameter("inpExpectedDateTo", "");
       String strDocumentType = vars.getStringParameter("inpDocumentType", "");
       String strSelectedPaymentDetails = vars.getInStringParameter("inpScheduledPaymentDetailId",
           "", null);
@@ -105,8 +105,9 @@
       Boolean showAlternativePM = "Y".equals(vars.getStringParameter("inpAlternativePaymentMethod",
           filterYesNo));
 
-      printGrid(response, vars, strBusinessPartnerId, strPaymentId, strOrgId, strDueDateFrom,
-          strDueDateTo, strDocumentType, strSelectedPaymentDetails, isReceipt, showAlternativePM);
+      printGrid(response, vars, strBusinessPartnerId, strPaymentId, strOrgId, strExpectedDateFrom,
+          strExpectedDateTo, strDocumentType, strSelectedPaymentDetails, isReceipt,
+          showAlternativePM);
     } else if (vars.commandIn("SAVE") || vars.commandIn("SAVEANDPROCESS")) {
       boolean isReceipt = vars.getRequiredStringParameter("isReceipt").equals("Y");
       String strAction = null;
@@ -549,9 +550,10 @@
   }
 
   private void printGrid(HttpServletResponse response, VariablesSecureApp vars,
-      String strBusinessPartnerId, String strPaymentId, String strOrgId, String strDueDateFrom,
-      String strDueDateTo, String strDocumentType, String strSelectedPaymentDetails,
-      boolean isReceipt, boolean showAlternativePM) throws IOException, ServletException {
+      String strBusinessPartnerId, String strPaymentId, String strOrgId,
+      String strExpectedDateFrom, String strExpectedDateTo, String strDocumentType,
+      String strSelectedPaymentDetails, boolean isReceipt, boolean showAlternativePM)
+      throws IOException, ServletException {
 
     log4j.debug("Output: Grid with pending payments");
     dao = new AdvPaymentMngtDao();
@@ -593,10 +595,10 @@
     final List<FIN_PaymentScheduleDetail> filteredScheduledPaymentDetails = dao
         .getFilteredScheduledPaymentDetails(dao.getObject(Organization.class, strOrgId),
             dao.getObject(BusinessPartner.class, strBusinessPartnerId), payment.getCurrency(),
-            FIN_Utility.getDate(strDueDateFrom),
-            FIN_Utility.getDate(DateTimeData.nDaysAfter(this, strDueDateTo, "1")), strDocumentType,
-            showAlternativePM ? null : payment.getPaymentMethod(), selectedScheduledPaymentDetails,
-            isReceipt);
+            null, null, FIN_Utility.getDate(strExpectedDateFrom),
+            FIN_Utility.getDate(DateTimeData.nDaysAfter(this, strExpectedDateTo, "1")), null, null,
+            strDocumentType, "", showAlternativePM ? null : payment.getPaymentMethod(),
+            selectedScheduledPaymentDetails, isReceipt);
     // Remove related outstanding schedule details related to those ones being edited as amount will
     // be later added to storedScheduledPaymentDetails
     for (FIN_PaymentScheduleDetail psd : storedScheduledPaymentDetails) {
@@ -648,7 +650,7 @@
     empty.put("finScheduledPaymentId", "");
     empty.put("salesOrderNr", "");
     empty.put("salesInvoiceNr", "");
-    empty.put("dueDate", "");
+    empty.put("expectedDate", "");
     empty.put("invoicedAmount", "");
     empty.put("expectedAmount", "");
     empty.put("paymentAmount", "");
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.xml	Fri Oct 05 10:33:28 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.xml	Tue Oct 30 12:16:46 2012 +0100
@@ -12,7 +12,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010-2011 Openbravo SLU
+ * All portions are Copyright (C) 2010-2012 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  *************************************************************************
@@ -50,10 +50,10 @@
     <PARAMETER id="fieldIsSoTrx" name="isSoTrx" attribute="value"/>
     <PARAMETER id="paramHeaderAmount" name="headerAmount" attribute="value" format="euroEdition"/>
 
-    <PARAMETER id="paramDueDateFrom" name="dateDisplayFormat" attribute="displayformat" replace="xx"/>
-    <PARAMETER id="paramDueDateFrom" name="dateDisplayFormat" attribute="saveformat" replace="yy"/>
-    <PARAMETER id="paramDueDateTo" name="dateDisplayFormat" attribute="displayformat" replace="xx"/>
-    <PARAMETER id="paramDueDateTo" name="dateDisplayFormat" attribute="saveformat" replace="yy"/>
+    <PARAMETER id="paramExpectedDateFrom" name="dateDisplayFormat" attribute="displayformat" replace="xx"/>
+    <PARAMETER id="paramExpectedDateFrom" name="dateDisplayFormat" attribute="saveformat" replace="yy"/>
+    <PARAMETER id="paramExpectedDateTo" name="dateDisplayFormat" attribute="displayformat" replace="xx"/>
+    <PARAMETER id="paramExpectedDateTo" name="dateDisplayFormat" attribute="saveformat" replace="yy"/>
 
     <PARAMETER id="paramActionDocument" name="ActionDocument" attribute="value"/>
     <SUBREPORT id="reportActionDocument" name="reportActionDocument" report="org/openbravo/erpCommon/reference/List">
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html	Fri Oct 05 10:33:28 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html	Tue Oct 30 12:16:46 2012 +0100
@@ -1012,25 +1012,25 @@
                </select>
              </td>
              <td></td>
-             <td class="TitleCell"><span class="LabelText">Due Date From</span></td>
+             <td class="TitleCell"><span class="LabelText">Expected Date From</span></td>
              <td class="TextBox_btn_ContentCell">
                 <table border="0" cellspacing="0" cellpadding="0" summary=""  style="padding-top: 0px;">
                   <tr>
                     <td class="TextBox_ContentCell">
                     <table style="border: 0px none; border-collapse: collapse;">
                         <tr><td style="padding-top: 0px;">
-                          <input type="text" id="paramDueDateFrom" class="dojoValidateValid TextBox_btn_OneCell_width" value="" maxlength="10" name="inpDueDateFrom" onkeyup="autoCompleteDate(this);" onkeydown="changeToEditingMode('onkeydown');" onkeypress="changeToEditingMode('onkeypress');" oncut="changeToEditingMode('oncut');" onpaste="changeToEditingMode('onpaste');" oncontextmenu="changeToEditingMode('oncontextmenu');" onblur="expandDateYear(this.id);" onchange="validateDateTextBox(this.id); validateDate(this);return true;" displayFormat="xx" saveFormat="yy"></input>
+                          <input type="text" id="paramExpectedDateFrom" class="dojoValidateValid TextBox_btn_OneCell_width" value="" maxlength="10" name="inpExpectedDateFrom" onkeyup="autoCompleteDate(this);" onkeydown="changeToEditingMode('onkeydown');" onkeypress="changeToEditingMode('onkeypress');" oncut="changeToEditingMode('oncut');" onpaste="changeToEditingMode('onpaste');" oncontextmenu="changeToEditingMode('oncontextmenu');" onblur="expandDateYear(this.id);" onchange="validateDateTextBox(this.id); validateDate(this);return true;" displayFormat="xx" saveFormat="yy"></input>
                         </td></tr>
                       </table>
-                      <span id="paramDueDateFrominvalidSpan" style="display: none;" class="TextBox_MsgContainer_span">
+                      <span id="paramExpectedDateFrominvalidSpan" style="display: none;" class="TextBox_MsgContainer_span">
                         <table class="TextBox_MsgContainer_table">
                           <tbody><tr class="TextBox_MsgContainer_tr"><td class="TextBox_MsgContainer_td"><div class="TextBox_MsgContainer_div"></div></td><td></td></tr>
-                          <tr><td class="invalid" colspan="2"><div name="invalidText" id="paramDueDateFrominvalidSpanText" class="TextBox_MsgContainer_div2">* The value entered is not valid.</div></td></tr>
+                          <tr><td class="invalid" colspan="2"><div name="invalidText" id="paramExpectedDateFrominvalidSpanText" class="TextBox_MsgContainer_div2">* The value entered is not valid.</div></td></tr>
                         </tbody></table>
                       </span>
                     </td>
                     <td class="FieldButton_ContentCell">
-                      <a class="FieldButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Calendar'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='FieldButtonLink_active'; return true;" onkeyup="this.className='FieldButtonLink_focus'; return true;" onclick="showCalendar('frmMain.inpDueDateFrom', document.frmMain.inpDueDateFrom.value, false);return false;">
+                      <a class="FieldButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Calendar'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='FieldButtonLink_active'; return true;" onkeyup="this.className='FieldButtonLink_focus'; return true;" onclick="showCalendar('frmMain.inpExpectedDateFrom', document.frmMain.inpExpectedDateFrom.value, false);return false;">
                         <table class="FieldButton" onmouseout="this.className='FieldButton';window.status='';return true;" onmouseover="this.className='FieldButton_hover';window.status='Show calendar';return true;" onmousedown="this.className='FieldButton_active';return true;" onmouseup="this.className='FieldButton';return true;">
                           <tr>
                             <td class="FieldButton_bg">
@@ -1051,25 +1051,25 @@
                 <span class="Radio_Check_ContentCell Checkbox_container_NOT_Focused"><input type="checkbox" name="inpAlternativePaymentMethod" value="Y" id="paramAlternativePaymentMethod" onclick="loadGridList()"></input></span>                
               </td>
               <td></td>
-              <td class="TitleCell"><span class="LabelText">Due Date To</span></td>
+              <td class="TitleCell"><span class="LabelText">Expected Date To</span></td>
               <td class="TextBox_btn_ContentCell">
                 <table border="0" cellspacing="0" cellpadding="0" summary=""  style="padding-top: 0px;">
                   <tr>
                     <td class="TextBox_ContentCell">
                      <table style="border: 0px none; border-collapse: collapse;">
                          <tr><td style="padding-top: 0px;">
-                           <input type="text" id="paramDueDateTo" class="dojoValidateValid TextBox_btn_OneCell_width" value="" maxlength="10" name="inpDueDateTo" onkeyup="autoCompleteDate(this);" onkeydown="changeToEditingMode('onkeydown');" onkeypress="changeToEditingMode('onkeypress');" oncut="changeToEditingMode('oncut');" onpaste="changeToEditingMode('onpaste');" oncontextmenu="changeToEditingMode('oncontextmenu');" onblur="expandDateYear(this.id);" onchange="validateDateTextBox(this.id); validateDate(this);return true;" displayFormat="xx" saveFormat="yy"></input>
+                           <input type="text" id="paramExpectedDateTo" class="dojoValidateValid TextBox_btn_OneCell_width" value="" maxlength="10" name="inpExpectedDateTo" onkeyup="autoCompleteDate(this);" onkeydown="changeToEditingMode('onkeydown');" onkeypress="changeToEditingMode('onkeypress');" oncut="changeToEditingMode('oncut');" onpaste="changeToEditingMode('onpaste');" oncontextmenu="changeToEditingMode('oncontextmenu');" onblur="expandDateYear(this.id);" onchange="validateDateTextBox(this.id); validateDate(this);return true;" displayFormat="xx" saveFormat="yy"></input>
                          </td></tr>
                        </table>
-                       <span id="paramDueDateToinvalidSpan" style="display: none;" class="TextBox_MsgContainer_span">
+                       <span id="paramExpectedDateToinvalidSpan" style="display: none;" class="TextBox_MsgContainer_span">
                          <table class="TextBox_MsgContainer_table">
                            <tbody><tr class="TextBox_MsgContainer_tr"><td class="TextBox_MsgContainer_td"><div class="TextBox_MsgContainer_div"></div></td><td></td></tr>
-                           <tr><td class="invalid" colspan="2"><div name="invalidText" id="paramDueDateToinvalidSpanText" class="TextBox_MsgContainer_div2">* The value entered is not valid.</div></td></tr>
+                           <tr><td class="invalid" colspan="2"><div name="invalidText" id="paramExpectedDateToinvalidSpanText" class="TextBox_MsgContainer_div2">* The value entered is not valid.</div></td></tr>
                          </tbody></table>
                        </span>
                     </td>
                     <td class="FieldButton_ContentCell">
-                       <a class="FieldButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Calendar'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='FieldButtonLink_active'; return true;" onkeyup="this.className='FieldButtonLink_focus'; return true;" onclick="showCalendar('frmMain.inpDueDateTo', document.frmMain.inpDueDateTo.value, false);return false;">
+                       <a class="FieldButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Calendar'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='FieldButtonLink_active'; return true;" onkeyup="this.className='FieldButtonLink_focus'; return true;" onclick="showCalendar('frmMain.inpExpectedDateTo', document.frmMain.inpExpectedDateTo.value, false);return false;">
                          <table class="FieldButton" onmouseout="this.className='FieldButton';window.status='';return true;" onmouseover="this.className='FieldButton_hover';window.status='Show calendar';return true;" onmousedown="this.className='FieldButton_active';return true;" onmouseup="this.className='FieldButton';return true;">
                            <tr>
                              <td class="FieldButton_bg">
@@ -1109,7 +1109,7 @@
                         <th class="DataGrid_Header_Cell" width="120"><span name="lblP" id="lblPPON">Purchase Order No.</span><span name="lblR" id="lblRSON">Sales Order No.</span></th>
                         <th class="DataGrid_Header_Cell" width="120"><span name="lblP" id="lblPPIN">Purchase Invoice No.</span><span name="lblR" id="lblRSIN">Sales Invoice No.</span></th>
                         <th class="DataGrid_Header_Cell" width="100">Payment Method</th>
-                        <th class="DataGrid_Header_Cell" width="70">Due Date</th>
+                        <th class="DataGrid_Header_Cell" width="70">Expected Date</th>
                         <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>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java	Fri Oct 05 10:33:28 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java	Tue Oct 30 12:16:46 2012 +0100
@@ -95,8 +95,8 @@
       String strOrgId = vars.getRequestGlobalVariable("inpadOrgId", "");
       String strCurrencyId = vars.getRequestGlobalVariable("inpCurrencyId", "");
       String strInvoiceId = vars.getRequestGlobalVariable("inpcInvoiceId", "");
-      String strDueDateFrom = vars.getStringParameter("inpDueDateFrom", "");
-      String strDueDateTo = vars.getStringParameter("inpDueDateTo", "");
+      String strExpectedDateFrom = vars.getStringParameter("inpExpectedDateFrom", "");
+      String strExpectedDateTo = vars.getStringParameter("inpExpectedDateTo", "");
       String strDocumentType = vars.getStringParameter("inpDocumentType", "");
       String strSelectedPaymentDetails = vars.getInStringParameter("inpScheduledPaymentDetailId",
           IsIDFilter.instance);
@@ -105,8 +105,8 @@
       boolean isReceipt = vars.getRequiredStringParameter("isReceipt").equals("Y");
 
       printGrid(response, vars, strBPfromInvoiceId, strCurrencyId, strInvoiceId, strOrgId,
-          strDueDateFrom, strDueDateTo, strDocumentType, strSelectedPaymentDetails, isReceipt,
-          showAlternativePM);
+          strExpectedDateFrom, strExpectedDateTo, strDocumentType, strSelectedPaymentDetails,
+          isReceipt, showAlternativePM);
 
     } else if (vars.commandIn("PAYMENTMETHOD")) {
       String strFinancialAccountId = vars.getRequestGlobalVariable("inpFinancialAccount", "");
@@ -456,7 +456,7 @@
 
   private void printGrid(HttpServletResponse response, VariablesSecureApp vars,
       String strBusinessPartnerId, String strCurrencyId, String strInvoiceId, String strOrgId,
-      String strDueDateFrom, String strDueDateTo, String strDocumentType,
+      String strExpectedDateFrom, String strExpectedDateTo, String strDocumentType,
       String strSelectedPaymentDetails, boolean isReceipt, boolean showAlternativePM)
       throws IOException, ServletException {
 
@@ -480,10 +480,11 @@
     final List<FIN_PaymentScheduleDetail> filteredScheduledPaymentDetails = dao
         .getFilteredScheduledPaymentDetails(dao.getObject(Organization.class, strOrgId),
             dao.getObject(BusinessPartner.class, strBusinessPartnerId),
-            dao.getObject(Currency.class, strCurrencyId), FIN_Utility.getDate(strDueDateFrom),
-            FIN_Utility.getDate(DateTimeData.nDaysAfter(this, strDueDateTo, "1")), strDocumentType,
-            showAlternativePM ? null : inv.getPaymentMethod(), selectedScheduledPaymentDetails,
-            isReceipt);
+            dao.getObject(Currency.class, strCurrencyId), null, null,
+            FIN_Utility.getDate(strExpectedDateFrom),
+            FIN_Utility.getDate(DateTimeData.nDaysAfter(this, strExpectedDateTo, "1")), null, null,
+            strDocumentType, "", showAlternativePM ? null : inv.getPaymentMethod(),
+            selectedScheduledPaymentDetails, isReceipt);
 
     final FieldProvider[] data = FIN_AddPayment.getShownScheduledPaymentDetails(vars,
         selectedScheduledPaymentDetails, filteredScheduledPaymentDetails, false, null);
@@ -609,7 +610,7 @@
     empty.put("finScheduledPaymentId", "");
     empty.put("salesOrderNr", "");
     empty.put("salesInvoiceNr", "");
-    empty.put("dueDate", "");
+    empty.put("expectedDate", "");
     empty.put("invoicedAmount", "");
     empty.put("expectedAmount", "");
     empty.put("paymentAmount", "");
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.xml	Fri Oct 05 10:33:28 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.xml	Tue Oct 30 12:16:46 2012 +0100
@@ -12,7 +12,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010-2011 Openbravo SLU
+ * All portions are Copyright (C) 2010-2012 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s): Enterprise Intelligence Systems (http://www.eintel.com.au).
  *************************************************************************
@@ -53,11 +53,11 @@
     <PARAMETER id="paramPaymentDate" name="dateDisplayFormat" attribute="displayformat" replace="xx"/>
     <PARAMETER id="paramPaymentDate" name="dateDisplayFormat" attribute="saveformat" replace="yy"/>
     
-    <PARAMETER id="paramDueDateFrom" name="dateDisplayFormat" attribute="displayformat" replace="xx"/>
-    <PARAMETER id="paramDueDateFrom" name="dateDisplayFormat" attribute="saveformat" replace="yy"/>
+    <PARAMETER id="paramExpectedDateFrom" name="dateDisplayFormat" attribute="displayformat" replace="xx"/>
+    <PARAMETER id="paramExpectedDateFrom" name="dateDisplayFormat" attribute="saveformat" replace="yy"/>
     
-    <PARAMETER id="paramDueDateTo" name="dateDisplayFormat" attribute="displayformat" replace="xx"/>
-    <PARAMETER id="paramDueDateTo" name="dateDisplayFormat" attribute="saveformat" replace="yy"/>
+    <PARAMETER id="paramExpectedDateTo" name="dateDisplayFormat" attribute="displayformat" replace="xx"/>
+    <PARAMETER id="paramExpectedDateTo" name="dateDisplayFormat" attribute="saveformat" replace="yy"/>
     <PARAMETER id="paramCurrencyId" name="CurrencyId" attribute="onchange" replace="xx"/>
     
     <PARAMETER id="sectionDetailPaymentMethod" name="sectionDetailPaymentMethod"/>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html	Fri Oct 05 10:33:28 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html	Tue Oct 30 12:16:46 2012 +0100
@@ -99,8 +99,8 @@
   if (OB.APRM.APFT_bp === null ||
       OB.APRM.APFT_bp !== frmMain['inpcBpartnerId'].value ||
       OB.APRM.APFT_fa !== frmMain['inpFinancialAccountId'].value ||
-      OB.APRM.APFT_ddf !== frmMain['inpDueDateFrom'].value ||
-      OB.APRM.APFT_ddt !== frmMain['inpDueDateTo'].value ||
+      OB.APRM.APFT_ddf !== frmMain['inpExpectedDateFrom'].value ||
+      OB.APRM.APFT_ddt !== frmMain['inpExpectedDateTo'].value ||
       OB.APRM.APFT_tdf !== frmMain['inpTransDateFrom'].value ||
       OB.APRM.APFT_tdt !== frmMain['inpTransDateTo'].value ||
       OB.APRM.APFT_dt !== frmMain['inpDocumentType'].value ||
@@ -112,8 +112,8 @@
 
     OB.APRM.APFT_bp = frmMain['inpcBpartnerId'].value;
     OB.APRM.APFT_fa = frmMain['inpFinancialAccountId'].value;
-    OB.APRM.APFT_ddf = frmMain['inpDueDateFrom'].value;
-    OB.APRM.APFT_ddt = frmMain['inpDueDateTo'].value;
+    OB.APRM.APFT_ddf = frmMain['inpExpectedDateFrom'].value;
+    OB.APRM.APFT_ddt = frmMain['inpExpectedDateTo'].value;
     OB.APRM.APFT_tdf = frmMain['inpTransDateFrom'].value;
     OB.APRM.APFT_tdt = frmMain['inpTransDateTo'].value;
     OB.APRM.APFT_dt = frmMain['inpDocumentType'].value;
@@ -483,10 +483,10 @@
   displayLogicElement('GLItemSelectorLbl', toGLItem);
   displayLogicElement('GLItemSelector', toGLItem);
   
-  displayLogicElement('DueDateFromLbl', !toGLItem);
-  displayLogicElement('DueDateFrom', !toGLItem);
-  displayLogicElement('DueDateToLbl', !toGLItem);
-  displayLogicElement('DueDateTo', !toGLItem);
+  displayLogicElement('ExpectedDateFromLbl', !toGLItem);
+  displayLogicElement('ExpectedDateFrom', !toGLItem);
+  displayLogicElement('ExpectedDateToLbl', !toGLItem);
+  displayLogicElement('ExpectedDateTo', !toGLItem);
   displayLogicElement('DocumentNoLbl', !toGLItem);
   displayLogicElement('DocumentNo', !toGLItem);
   displayLogicElement('TrxDateFromLbl', !toGLItem);
@@ -1324,25 +1324,25 @@
                 </select>
               </td>
               <!-- Cells shown when not in GL Item mode -->
-              <td class="TitleCell" id="DueDateFromLbl"><span class="LabelText">Due Date From</span></td>
-              <td class="TextBox_btn_ContentCell" id="DueDateFrom">
+              <td class="TitleCell" id="ExpectedDateFromLbl"><span class="LabelText">Expected Date From</span></td>
+              <td class="TextBox_btn_ContentCell" id="ExpectedDateFrom">
                 <table border="0" cellspacing="0" cellpadding="0" summary=""  style="padding-top: 0px;">
                   <tr>
                     <td class="TextBox_ContentCell">
                       <table style="border: 0px none; border-collapse: collapse;">
                         <tr><td style="padding-top: 0px;">
-                          <input type="text" id="paramDueDateFrom" class="dojoValidateValid TextBox_btn_OneCell_width" value="" maxlength="10" name="inpDueDateFrom" onkeyup="autoCompleteDate(this);" onkeydown="changeToEditingMode('onkeydown');" onkeypress="changeToEditingMode('onkeypress');" oncut="changeToEditingMode('oncut');" onpaste="changeToEditingMode('onpaste');" oncontextmenu="changeToEditingMode('oncontextmenu');" onblur="expandDateYear(this.id);" onchange="validateDateTextBox(this.id);  validateDate(this);return true;" displayFormat="xx" saveFormat="xx"></input>
+                          <input type="text" id="paramExpectedDateFrom" class="dojoValidateValid TextBox_btn_OneCell_width" value="" maxlength="10" name="inpExpectedDateFrom" onkeyup="autoCompleteDate(this);" onkeydown="changeToEditingMode('onkeydown');" onkeypress="changeToEditingMode('onkeypress');" oncut="changeToEditingMode('oncut');" onpaste="changeToEditingMode('onpaste');" oncontextmenu="changeToEditingMode('oncontextmenu');" onblur="expandDateYear(this.id);" onchange="validateDateTextBox(this.id);  validateDate(this);return true;" displayFormat="xx" saveFormat="xx"></input>
                         </td></tr>
                       </table>
-                      <span id="paramDueDateFrominvalidSpan" style="display: none;" class="TextBox_MsgContainer_span">
+                      <span id="paramExpectedDateFrominvalidSpan" style="display: none;" class="TextBox_MsgContainer_span">
                         <table class="TextBox_MsgContainer_table">
                           <tbody><tr class="TextBox_MsgContainer_tr"><td class="TextBox_MsgContainer_td"><div class="TextBox_MsgContainer_div"></div></td><td></td></tr>
-                          <tr><td class="invalid" colspan="2"><div name="invalidText" id="paramDueDateFrominvalidSpanText" class="TextBox_MsgContainer_div2">* The value entered is not valid.</div></td></tr>
+                          <tr><td class="invalid" colspan="2"><div name="invalidText" id="paramExpectedDateFrominvalidSpanText" class="TextBox_MsgContainer_div2">* The value entered is not valid.</div></td></tr>
                         </tbody></table>
                       </span>
                     </td>
                     <td class="FieldButton_ContentCell">
-                      <a class="FieldButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Calendar'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='FieldButtonLink_active'; return true;" onkeyup="this.className='FieldButtonLink_focus'; return true;" onclick="showCalendar('frmMain.inpDueDateFrom', document.frmMain.inpDueDateFrom.value, false);return false;">
+                      <a class="FieldButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Calendar'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='FieldButtonLink_active'; return true;" onkeyup="this.className='FieldButtonLink_focus'; return true;" onclick="showCalendar('frmMain.inpExpectedDateFrom', document.frmMain.inpExpectedDateFrom.value, false);return false;">
                         <table class="FieldButton" onmouseout="this.className='FieldButton';window.status='';return true;" onmouseover="this.className='FieldButton_hover';window.status='Show calendar';return true;" onmousedown="this.className='FieldButton_active';return true;" onmouseup="this.className='FieldButton';return true;">
                           <tr>
                             <td class="FieldButton_bg">
@@ -1355,25 +1355,25 @@
                   </tr>
                 </table>
               </td>
-              <td class="TitleCell" id="DueDateToLbl"><span class="LabelText">Due Date To</span></td>
-              <td class="TextBox_btn_ContentCell" id="DueDateTo">
+              <td class="TitleCell" id="ExpectedDateToLbl"><span class="LabelText">Expected Date To</span></td>
+              <td class="TextBox_btn_ContentCell" id="ExpectedDateTo">
                 <table border="0" cellspacing="0" cellpadding="0" summary=""  style="padding-top: 0px;">
                   <tr>
                     <td class="TextBox_ContentCell">
                       <table style="border: 0px none; border-collapse: collapse;">
                         <tr><td style="padding-top: 0px;">
-                          <input type="text" id="paramDueDateTo" class="dojoValidateValid TextBox_btn_OneCell_width" value="" maxlength="10" name="inpDueDateTo" onkeyup="autoCompleteDate(this);" onkeydown="changeToEditingMode('onkeydown');" onkeypress="changeToEditingMode('onkeypress');" oncut="changeToEditingMode('oncut');" onpaste="changeToEditingMode('onpaste');" oncontextmenu="changeToEditingMode('oncontextmenu');" onblur="expandDateYear(this.id);" onchange="validateDateTextBox(this.id); validateDate(this);return true;" displayFormat="xx" saveFormat="xx"></input>
+                          <input type="text" id="paramExpectedDateTo" class="dojoValidateValid TextBox_btn_OneCell_width" value="" maxlength="10" name="inpExpectedDateTo" onkeyup="autoCompleteDate(this);" onkeydown="changeToEditingMode('onkeydown');" onkeypress="changeToEditingMode('onkeypress');" oncut="changeToEditingMode('oncut');" onpaste="changeToEditingMode('onpaste');" oncontextmenu="changeToEditingMode('oncontextmenu');" onblur="expandDateYear(this.id);" onchange="validateDateTextBox(this.id); validateDate(this);return true;" displayFormat="xx" saveFormat="xx"></input>
                         </td></tr>
                       </table>
-                      <span id="paramDueDateToinvalidSpan" style="display: none;" class="TextBox_MsgContainer_span">
+                      <span id="paramExpectedDateToinvalidSpan" style="display: none;" class="TextBox_MsgContainer_span">
                         <table class="TextBox_MsgContainer_table">
                           <tbody><tr class="TextBox_MsgContainer_tr"><td class="TextBox_MsgContainer_td"><div class="TextBox_MsgContainer_div"></div></td><td></td></tr>
-                          <tr><td class="invalid" colspan="2"><div name="invalidText" id="paramDueDateToinvalidSpanText" class="TextBox_MsgContainer_div2">* The value entered is not valid.</div></td></tr>
+                          <tr><td class="invalid" colspan="2"><div name="invalidText" id="paramExpectedDateToinvalidSpanText" class="TextBox_MsgContainer_div2">* The value entered is not valid.</div></td></tr>
                         </tbody></table>
                       </span>
                     </td>
                     <td class="FieldButton_ContentCell">
-                      <a class="FieldButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Calendar'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='FieldButtonLink_active'; return true;" onkeyup="this.className='FieldButtonLink_focus'; return true;" onclick="showCalendar('frmMain.inpDueDateTo', document.frmMain.inpDueDateTo.value, false);return false;">
+                      <a class="FieldButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Calendar'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='FieldButtonLink_active'; return true;" onkeyup="this.className='FieldButtonLink_focus'; return true;" onclick="showCalendar('frmMain.inpExpectedDateTo', document.frmMain.inpExpectedDateTo.value, false);return false;">
                         <table class="FieldButton" onmouseout="this.className='FieldButton';window.status='';return true;" onmouseover="this.className='FieldButton_hover';window.status='Show calendar';return true;" onmousedown="this.className='FieldButton_active';return true;" onmouseup="this.className='FieldButton';return true;">
                           <tr>
                             <td class="FieldButton_bg">
@@ -1789,7 +1789,7 @@
                         <th class="DataGrid_Header_Cell" width="100">Payment Method</th>
                         <th class="DataGrid_Header_Cell" width="100">Bussines Partner</th>
                         <th class="DataGrid_Header_Cell" width="70">Transaction Date</th>
-                        <th class="DataGrid_Header_Cell" width="70">Due Date</th>
+                        <th class="DataGrid_Header_Cell" width="70">Expected Date</th>
                         <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>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java	Fri Oct 05 10:33:28 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java	Tue Oct 30 12:16:46 2012 +0100
@@ -104,8 +104,8 @@
       final String strBusinessPartnerId = vars.getRequestGlobalVariable("inpcBpartnerId", "");
       final String strFinancialAccountId = vars.getRequiredStringParameter("inpFinancialAccountId",
           IsIDFilter.instance);
-      final String strDueDateFrom = vars.getStringParameter("inpDueDateFrom", "");
-      final String strDueDateTo = vars.getStringParameter("inpDueDateTo", "");
+      final String strExpectedDateFrom = vars.getStringParameter("inpExpectedDateFrom", "");
+      final String strExpectedDateTo = vars.getStringParameter("inpExpectedDateTo", "");
       final String strTransDateFrom = vars.getStringParameter("inpTransDateFrom", "");
       final String strTransDateTo = vars.getStringParameter("inpTransDateTo", "");
       final String strDocumentType = vars.getStringParameter("inpDocumentType", "");
@@ -117,8 +117,8 @@
       final String strAmountFrom = vars.getNumericParameter("inpAmountFrom", "");
       final String strAmountTo = vars.getNumericParameter("inpAmountTo", "");
 
-      printGrid(response, vars, strFinancialAccountId, strBusinessPartnerId, strDueDateFrom,
-          strDueDateTo, strTransDateFrom, strTransDateTo, strDocumentType, strDocumentNo,
+      printGrid(response, vars, strFinancialAccountId, strBusinessPartnerId, strExpectedDateFrom,
+          strExpectedDateTo, strTransDateFrom, strTransDateTo, strDocumentType, strDocumentNo,
           strSelectedPaymentDetails, isReceipt, strCurrencyId, strAmountFrom, strAmountTo);
 
     } else if (vars.commandIn("PAYMENTMETHODCOMBO")) {
@@ -555,11 +555,11 @@
   }
 
   private void printGrid(HttpServletResponse response, VariablesSecureApp vars,
-      String strFinancialAccountId, String strBusinessPartnerId, String strDueDateFrom,
-      String strDueDateTo, String strTransDateFrom, String strTransDateTo, String strDocumentType,
-      String strDocumentNo, String strSelectedPaymentDetails, boolean isReceipt,
-      String strCurrencyId, String strAmountFrom, String strAmountTo) throws IOException,
-      ServletException {
+      String strFinancialAccountId, String strBusinessPartnerId, String strExpectedDateFrom,
+      String strExpectedDateTo, String strTransDateFrom, String strTransDateTo,
+      String strDocumentType, String strDocumentNo, String strSelectedPaymentDetails,
+      boolean isReceipt, String strCurrencyId, String strAmountFrom, String strAmountTo)
+      throws IOException, ServletException {
 
     log4j.debug("Output: Grid with pending payments");
 
@@ -582,7 +582,7 @@
     // If business partner and document number are empty search for all filtered scheduled payments
     // list
     if (!"".equals(strBusinessPartnerId) || !"".equals(strDocumentNo)
-        || isValidJSDate(strDueDateFrom) || isValidJSDate(strDueDateTo)
+        || isValidJSDate(strExpectedDateFrom) || isValidJSDate(strExpectedDateTo)
         || isValidJSDate(strTransDateFrom) || isValidJSDate(strTransDateTo)
         || !"".equals(strAmountFrom) || !"".equals(strAmountTo)) {
       Currency paymentCurrency;
@@ -594,9 +594,9 @@
 
       filteredScheduledPaymentDetails = dao.getFilteredScheduledPaymentDetails(
           financialAccount.getOrganization(),
-          dao.getObject(BusinessPartner.class, strBusinessPartnerId), paymentCurrency,
-          FIN_Utility.getDate(strDueDateFrom),
-          FIN_Utility.getDate(DateTimeData.nDaysAfter(this, strDueDateTo, "1")),
+          dao.getObject(BusinessPartner.class, strBusinessPartnerId), paymentCurrency, null, null,
+          FIN_Utility.getDate(strExpectedDateFrom),
+          FIN_Utility.getDate(DateTimeData.nDaysAfter(this, strExpectedDateTo, "1")),
           FIN_Utility.getDate(strTransDateFrom),
           FIN_Utility.getDate(DateTimeData.nDaysAfter(this, strTransDateTo, "1")), strDocumentType,
           strDocumentNo, null, selectedScheduledPaymentDetails, isReceipt, strAmountFrom,
@@ -741,7 +741,7 @@
     empty.put("finScheduledPaymentId", "");
     empty.put("salesOrderNr", "");
     empty.put("salesInvoiceNr", "");
-    empty.put("dueDate", "");
+    empty.put("expectedDate", "");
     empty.put("invoicedAmount", "");
     empty.put("expectedAmount", "");
     empty.put("paymentAmount", "");
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.xml	Fri Oct 05 10:33:28 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.xml	Tue Oct 30 12:16:46 2012 +0100
@@ -56,11 +56,11 @@
     <PARAMETER id="paramPaymentDate" name="dateDisplayFormat" attribute="displayformat" replace="xx"/>
     <PARAMETER id="paramPaymentDate" name="dateDisplayFormat" attribute="saveformat" replace="yy"/>
     
-    <PARAMETER id="paramDueDateFrom" name="dateDisplayFormat" attribute="displayformat" replace="xx"/>
-    <PARAMETER id="paramDueDateFrom" name="dateDisplayFormat" attribute="saveformat" replace="yy"/>
+    <PARAMETER id="paramExpectedDateFrom" name="dateDisplayFormat" attribute="displayformat" replace="xx"/>
+    <PARAMETER id="paramExpectedDateFrom" name="dateDisplayFormat" attribute="saveformat" replace="yy"/>
     
-    <PARAMETER id="paramDueDateTo" name="dateDisplayFormat" attribute="displayformat" replace="xx"/>
-    <PARAMETER id="paramDueDateTo" name="dateDisplayFormat" attribute="saveformat" replace="yy"/>
+    <PARAMETER id="paramExpectedDateTo" name="dateDisplayFormat" attribute="displayformat" replace="xx"/>
+    <PARAMETER id="paramExpectedDateTo" name="dateDisplayFormat" attribute="saveformat" replace="yy"/>
     
     <PARAMETER id="paramTransDateFrom" name="dateDisplayFormat" attribute="displayformat" replace="xx"/>
     <PARAMETER id="paramTransDateFrom" name="dateDisplayFormat" attribute="saveformat" replace="yy"/>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransactionGrid.srpt	Fri Oct 05 10:33:28 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransactionGrid.srpt	Tue Oct 30 12:16:46 2012 +0100
@@ -12,7 +12,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010-2011 Openbravo SLU
+ * All portions are Copyright (C) 2010-2012 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  *************************************************************************
@@ -28,7 +28,7 @@
     <td class="DataGrid_Body_Cell" id="fieldPaymentMethod" title="">xxCash</td>
     <td class="DataGrid_Body_Cell" id="fieldBusinessPartner" title="">xxMcGiver</td>
     <td class="DataGrid_Body_Cell" id="fieldTransactionDate">xx12/12/2009</td>
-    <td class="DataGrid_Body_Cell" id="fieldDueDate">xx12/12/2009</td>
+    <td class="DataGrid_Body_Cell" id="fieldExpectedDate">xx12/12/2009</td>
     <td class="DataGrid_Body_Cell_Amount" id="fieldInvoicedAmount">xx150.00</td>
     <td class="DataGrid_Body_Cell_Amount" id="fieldExpectedAmount">xx60.00</td>
     <td class="DataGrid_Body_Cell_Amount" id="fieldOutstandingAmount">xx60.00</td>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransactionGrid.xml	Fri Oct 05 10:33:28 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransactionGrid.xml	Tue Oct 30 12:16:46 2012 +0100
@@ -12,7 +12,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010-2011 Openbravo SLU
+ * All portions are Copyright (C) 2010-2012 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  *************************************************************************
@@ -37,7 +37,7 @@
     <FIELD id="fieldBusinessPartner">businessPartnerNameTrunc</FIELD>
     <FIELD id="fieldBusinessPartner" attribute="title">businessPartnerName</FIELD>
     <FIELD id="fieldTransactionDate">transactionDate</FIELD>
-    <FIELD id="fieldDueDate">dueDate</FIELD>
+    <FIELD id="fieldExpectedDate">expectedDate</FIELD>
     <FIELD id="fieldInvoicedAmount" format="euroEdition">invoicedAmount</FIELD>
     <FIELD id="fieldExpectedAmount" format="euroEdition">expectedAmount</FIELD>
     <FIELD id="fieldOutstandingAmount" format="euroEdition">outstandingAmount</FIELD>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentGrid.srpt	Fri Oct 05 10:33:28 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentGrid.srpt	Tue Oct 30 12:16:46 2012 +0100
@@ -12,7 +12,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010-2011 Openbravo SLU
+ * All portions are Copyright (C) 2010-2012 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  *************************************************************************
@@ -26,7 +26,7 @@
     <td class="DataGrid_Body_Cell" title="zz" id="fieldInvoiceNr">xxINV30004 (2/3)</td>
     <td class="DataGrid_Body_Cell" id="businessPartnerName" title="">xxBPartner</td>
     <td class="DataGrid_Body_Cell" title="zz" id="fieldPaymentMethod">xxCash</td>
-    <td class="DataGrid_Body_Cell" id="fieldDueDate">xx12/12/2009</td>
+    <td class="DataGrid_Body_Cell" id="fieldExpectedDate">xx12/12/2009</td>
     <td class="DataGrid_Body_Cell_Amount" id="fieldInvoicedAmount">xx150.00</td>
     <td class="DataGrid_Body_Cell_Amount" id="fieldExpectedAmount">xx60.00</td>
     <td class="DataGrid_Body_Cell_Amount" id="fieldOutstandingAmount">xx60.00</td>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentGrid.xml	Fri Oct 05 10:33:28 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentGrid.xml	Tue Oct 30 12:16:46 2012 +0100
@@ -12,7 +12,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010-2011 Openbravo SLU
+ * All portions are Copyright (C) 2010-2012 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  *************************************************************************
@@ -36,7 +36,7 @@
     <FIELD id="businessPartnerName">businessPartnerNameTrunc</FIELD>
     <FIELD id="fieldPaymentMethod">paymentMethodNameTrunc</FIELD>
     <FIELD id="fieldPaymentMethod" attribute="title" replace="zz">paymentMethodName</FIELD>
-    <FIELD id="fieldDueDate">dueDate</FIELD>
+    <FIELD id="fieldExpectedDate">expectedDate</FIELD>
     <FIELD id="fieldInvoicedAmount" format="euroEdition">invoicedAmount</FIELD>
     <FIELD id="fieldExpectedAmount" format="euroEdition">expectedAmount</FIELD>
     <FIELD id="fieldOutstandingAmount" format="euroEdition">outstandingAmount</FIELD>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentProposalGrid.srpt	Fri Oct 05 10:33:28 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentProposalGrid.srpt	Tue Oct 30 12:16:46 2012 +0100
@@ -12,7 +12,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010-2011 Openbravo SLU
+ * All portions are Copyright (C) 2010-2012 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  *************************************************************************
@@ -26,7 +26,7 @@
     <td class="DataGrid_Body_Cell" id="fieldInvoiceNr">xxINV30004 (2/3)</td>
     <td class="DataGrid_Body_Cell" title="zz" id="fieldPaymentMethod">xx</td>
     <td class="DataGrid_Body_Cell" title="zz" id="fieldBusinessPartner">xx</td>
-    <td class="DataGrid_Body_Cell" id="fieldDueDate">xx12/12/2009</td>
+    <td class="DataGrid_Body_Cell" id="fieldExpectedDate">xx12/12/2009</td>
     <td class="DataGrid_Body_Cell_Amount" id="fieldInvoicedAmount">xx150.00</td>
     <td class="DataGrid_Body_Cell_Amount" id="fieldExpectedAmount">xx60.00</td>
     <td class="DataGrid_Body_Cell_Amount" id="fieldOutstandingAmount">xx60.00</td>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentProposalGrid.xml	Fri Oct 05 10:33:28 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentProposalGrid.xml	Tue Oct 30 12:16:46 2012 +0100
@@ -12,7 +12,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010-2011 Openbravo SLU
+ * All portions are Copyright (C) 2010-2012 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  *************************************************************************
@@ -34,7 +34,7 @@
     <FIELD id="fieldBusinessPartner" attribute="title" replace="zz">businessPartnerName</FIELD>
     <FIELD id="fieldOrderNr">orderNr</FIELD>
     <FIELD id="fieldInvoiceNr">invoiceNr</FIELD>
-    <FIELD id="fieldDueDate">dueDate</FIELD>
+    <FIELD id="fieldExpectedDate">expectedDate</FIELD>
     <FIELD id="fieldInvoicedAmount" format="euroEdition">invoicedAmount</FIELD>
     <FIELD id="fieldExpectedAmount" format="euroEdition">expectedAmount</FIELD>
     <FIELD id="fieldOutstandingAmount" format="euroEdition">outstandingAmount</FIELD>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/SelectExpectedPayments.html	Fri Oct 05 10:33:28 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/SelectExpectedPayments.html	Tue Oct 30 12:16:46 2012 +0100
@@ -477,7 +477,7 @@
                         <th class="DataGrid_Header_Cell" width="80">Invoice No.</th>
                         <th class="DataGrid_Header_Cell" width="110">Payment Method</th>
                         <th class="DataGrid_Header_Cell" width="110">Business Partner</th>
-                        <th class="DataGrid_Header_Cell" width="70">Due Date</th>
+                        <th class="DataGrid_Header_Cell" width="70">Expected Date</th>
                         <th class="DataGrid_Header_Cell DataGrid_Header_Cell_Inverse" width="80">Invoiced Amt</th>
                         <th class="DataGrid_Header_Cell DataGrid_Header_Cell_Inverse" width="80">Expected Amt</th>
                         <th class="DataGrid_Header_Cell DataGrid_Header_Cell_Inverse" width="80">Outs. Amt</th>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/SelectExpectedPayments.java	Fri Oct 05 10:33:28 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/SelectExpectedPayments.java	Tue Oct 30 12:16:46 2012 +0100
@@ -182,8 +182,9 @@
     // filtered scheduled payments list
     final List<FIN_PaymentScheduleDetail> filteredScheduledPaymentDetails = dao
         .getFilteredScheduledPaymentDetails(paymentProposal.getOrganization(),
-            paymentProposal.getBusinessPartner(), paymentProposal.getCurrency(), null, dueDate,
-            "B", showAlternativePM ? null : paymentProposal.getPaymentMethod(),
+            paymentProposal.getBusinessPartner(), paymentProposal.getCurrency(), null, null, null,
+            dueDate, null, null, "B", "",
+            showAlternativePM ? null : paymentProposal.getPaymentMethod(),
             selectedScheduledPaymentDetails, paymentProposal.isReceipt());
 
     final FieldProvider[] data = FIN_AddPayment.getShownScheduledPaymentDetails(vars,
@@ -275,7 +276,7 @@
     empty.put("finScheduledPaymentId", "");
     empty.put("salesOrderNr", "");
     empty.put("salesInvoiceNr", "");
-    empty.put("dueDate", "");
+    empty.put("expectedDate", "");
     empty.put("invoicedAmount", "");
     empty.put("expectedAmount", "");
     empty.put("paymentAmount", "");
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java	Fri Oct 05 10:33:28 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java	Tue Oct 30 12:16:46 2012 +0100
@@ -125,7 +125,7 @@
       whereClause.append(" order by psd.");
       whereClause.append(FIN_PaymentScheduleDetail.PROPERTY_INVOICEPAYMENTSCHEDULE);
       whereClause.append(".");
-      whereClause.append(FIN_PaymentSchedule.PROPERTY_DUEDATE);
+      whereClause.append(FIN_PaymentSchedule.PROPERTY_EXPECTEDDATE);
       whereClause.append(", psd.");
       whereClause.append(FIN_PaymentScheduleDetail.PROPERTY_AMOUNT);
       final OBQuery<FIN_PaymentScheduleDetail> obqPSD = OBDal.getInstance().createQuery(
@@ -160,7 +160,7 @@
       whereClause.append(" order by psd.");
       whereClause.append(FIN_PaymentScheduleDetail.PROPERTY_ORDERPAYMENTSCHEDULE);
       whereClause.append(".");
-      whereClause.append(FIN_PaymentSchedule.PROPERTY_DUEDATE);
+      whereClause.append(FIN_PaymentSchedule.PROPERTY_EXPECTEDDATE);
       whereClause.append(", psd.");
       whereClause.append(FIN_PaymentScheduleDetail.PROPERTY_AMOUNT);
       final OBQuery<FIN_PaymentScheduleDetail> obqPSD = OBDal.getInstance().createQuery(
@@ -188,14 +188,26 @@
       String strTransactionType, String strDocumentNo, FIN_PaymentMethod paymentMethod,
       List<FIN_PaymentScheduleDetail> selectedScheduledPaymentDetails, boolean isReceipt) {
     return getFilteredScheduledPaymentDetails(organization, businessPartner, currency, dueDateFrom,
-        dueDateTo, null, null, strTransactionType, "", paymentMethod,
-        selectedScheduledPaymentDetails, isReceipt, "", "");
+        dueDateTo, null, null, transactionDateFrom, transactionDateTo, strTransactionType, "",
+        paymentMethod, selectedScheduledPaymentDetails, isReceipt, "", "");
   }
 
   public List<FIN_PaymentScheduleDetail> getFilteredScheduledPaymentDetails(
       Organization organization, BusinessPartner businessPartner, Currency currency,
-      Date dueDateFrom, Date dueDateTo, Date transactionDateFrom, Date transactionDateTo,
-      String strTransactionType, String strDocumentNo, FIN_PaymentMethod paymentMethod,
+      Date dueDateFrom, Date dueDateTo, Date expectedDateFrom, Date expectedDateTo,
+      Date transactionDateFrom, Date transactionDateTo, String strTransactionType,
+      String strDocumentNo, FIN_PaymentMethod paymentMethod,
+      List<FIN_PaymentScheduleDetail> selectedScheduledPaymentDetails, boolean isReceipt) {
+    return getFilteredScheduledPaymentDetails(organization, businessPartner, currency, dueDateFrom,
+        dueDateTo, expectedDateFrom, expectedDateTo, null, null, strTransactionType, "",
+        paymentMethod, selectedScheduledPaymentDetails, isReceipt, "", "");
+  }
+
+  public List<FIN_PaymentScheduleDetail> getFilteredScheduledPaymentDetails(
+      Organization organization, BusinessPartner businessPartner, Currency currency,
+      Date dueDateFrom, Date dueDateTo, Date expectedDateFrom, Date expectedDateTo,
+      Date transactionDateFrom, Date transactionDateTo, String strTransactionType,
+      String strDocumentNo, FIN_PaymentMethod paymentMethod,
       List<FIN_PaymentScheduleDetail> selectedScheduledPaymentDetails, boolean isReceipt,
       String strAmountFrom, String strAmountTo) {
 
@@ -373,6 +385,25 @@
         parameters.add(dueDateTo);
       }
 
+      // expecteddateFrom
+      if (expectedDateFrom != null) {
+        whereClause.append(" and COALESCE(ips.");
+        whereClause.append(FIN_PaymentSchedule.PROPERTY_EXPECTEDDATE);
+        whereClause.append(", ops.");
+        whereClause.append(FIN_PaymentSchedule.PROPERTY_EXPECTEDDATE);
+        whereClause.append(") >= ?");
+        parameters.add(expectedDateFrom);
+      }
+      // expecteddateTo
+      if (expectedDateTo != null) {
+        whereClause.append(" and COALESCE(ips.");
+        whereClause.append(FIN_PaymentSchedule.PROPERTY_EXPECTEDDATE);
+        whereClause.append(", ops.");
+        whereClause.append(FIN_PaymentSchedule.PROPERTY_EXPECTEDDATE);
+        whereClause.append(") < ?");
+        parameters.add(expectedDateTo);
+      }
+
       // TODO: Add order to show first scheduled payments from invoices and later scheduled payments
       // from not invoiced orders.
       whereClause.append(" order by");
@@ -383,9 +414,9 @@
       whereClause.append(")");
       whereClause.append(", ");
       whereClause.append(" COALESCE(ips.");
-      whereClause.append(FIN_PaymentSchedule.PROPERTY_DUEDATE);
+      whereClause.append(FIN_PaymentSchedule.PROPERTY_EXPECTEDDATE);
       whereClause.append(", ops.");
-      whereClause.append(FIN_PaymentSchedule.PROPERTY_DUEDATE);
+      whereClause.append(FIN_PaymentSchedule.PROPERTY_EXPECTEDDATE);
       whereClause.append(")");
       whereClause.append(", COALESCE(inv.");
       whereClause.append(Invoice.PROPERTY_DOCUMENTNO);
@@ -558,7 +589,7 @@
     ps.setOrder(order);
     ps.setCurrency(invoice.getCurrency());
     ps.setDueDate(dueDate);
-    ps.setOrigDueDate(dueDate);
+    ps.setExpectedDate(dueDate);
     ps.setFinPaymentmethod(paymentMethod);
     ps.setOutstandingAmount(amount);
     ps.setPaidAmount(BigDecimal.ZERO);
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java	Fri Oct 05 10:33:28 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java	Tue Oct 30 12:16:46 2012 +0100
@@ -744,6 +744,12 @@
         if (FIN_PaymentScheduleDetails[i].getInvoicePaymentSchedule() != null) {
           FieldProviderFactory.setField(
               data[i],
+              "expectedDate",
+              dateFormater.format(
+                  FIN_PaymentScheduleDetails[i].getInvoicePaymentSchedule().getExpectedDate())
+                  .toString());
+          FieldProviderFactory.setField(
+              data[i],
               "dueDate",
               dateFormater.format(
                   FIN_PaymentScheduleDetails[i].getInvoicePaymentSchedule().getDueDate())
@@ -788,6 +794,12 @@
         } else {
           FieldProviderFactory.setField(
               data[i],
+              "expectedDate",
+              dateFormater.format(
+                  FIN_PaymentScheduleDetails[i].getOrderPaymentSchedule().getExpectedDate())
+                  .toString());
+          FieldProviderFactory.setField(
+              data[i],
               "dueDate",
               dateFormater.format(
                   FIN_PaymentScheduleDetails[i].getOrderPaymentSchedule().getDueDate()).toString());
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentMonitorProcess.java	Fri Oct 05 10:33:28 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentMonitorProcess.java	Tue Oct 30 12:16:46 2012 +0100
@@ -234,7 +234,7 @@
           paid = paid.add(psd.getAmount().add(psd.getWriteoffAmount()));
           // If an amount has been paid, let's check if any amount was paid late
           Date paymentDate = psd.getPaymentDetails().getFinPayment().getPaymentDate();
-          Date dueDate = psd.getInvoicePaymentSchedule().getOrigDueDate();
+          Date dueDate = psd.getInvoicePaymentSchedule().getDueDate();
           if (paymentDate.after(dueDate)) {
             overdue = overdue.add(psd.getAmount());
           }
@@ -259,7 +259,7 @@
         OBDal.getInstance().save(paymentSchedule);
       }
 
-      if (paymentSchedule.getOrigDueDate().before(new Date())
+      if (paymentSchedule.getDueDate().before(new Date())
           && paymentSchedule.getOutstandingAmount() != BigDecimal.ZERO) {
         overdueAmt = overdueAmt.add(paymentSchedule.getOutstandingAmount());
       }
@@ -285,7 +285,7 @@
     }
     obc.add(Restrictions.eq(FIN_PaymentSchedule.PROPERTY_INVOICE, invoice));
     obc.add(Restrictions.ne(FIN_PaymentSchedule.PROPERTY_OUTSTANDINGAMOUNT, BigDecimal.ZERO));
-    obc.setProjection(Projections.min(FIN_PaymentSchedule.PROPERTY_ORIGDUEDATE));
+    obc.setProjection(Projections.min(FIN_PaymentSchedule.PROPERTY_DUEDATE));
     Object o = obc.list().get(0);
     if (o != null) {
       return (FIN_Utility.getDaysToDue((Date) o));
--- a/src-db/database/model/tables/FIN_PAYMENT_SCHEDULE.xml	Fri Oct 05 10:33:28 2012 +0000
+++ b/src-db/database/model/tables/FIN_PAYMENT_SCHEDULE.xml	Tue Oct 30 12:16:46 2012 +0100
@@ -73,7 +73,7 @@
         <default><![CDATA[Y]]></default>
         <onCreateDefault/>
       </column>
-      <column name="ORIGDUEDATE" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
+      <column name="ORIGDUEDATE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false">
         <default/>
         <onCreateDefault><![CDATA[DUEDATE]]></onCreateDefault>
       </column>
@@ -81,6 +81,10 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="EXPECTEDDATE" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
+        <default/>
+        <onCreateDefault><![CDATA[DUEDATE]]></onCreateDefault>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="FIN_AD_CLIENT_PAYMENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
--- a/src-db/database/model/views/FIN_PAYMENT_DETAIL_V.xml	Fri Oct 05 10:33:28 2012 +0000
+++ b/src-db/database/model/views/FIN_PAYMENT_DETAIL_V.xml	Tue Oct 30 12:16:46 2012 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
   <database name="VIEW FIN_PAYMENT_DETAIL_V">
-    <view name="FIN_PAYMENT_DETAIL_V"><![CDATA[SELECT psd.fin_payment_scheduledetail_id AS fin_payment_detail_v_id, psd.ad_client_id, psd.ad_org_id, psd.isactive, psd.created, psd.createdby, psd.updated, psd.updatedby, psi.fin_payment_schedule_id AS fin_payment_sched_inv_v_id, pso.fin_payment_schedule_id AS fin_payment_sched_ord_v_id, i.documentno AS invoiceno, o.documentno AS orderno, p.documentno AS paymentno, pd.fin_payment_id, COALESCE(psi.duedate, pso.duedate) AS duedate, COALESCE(i.grandtotal, o.grandtotal) AS invoicedamt, COALESCE(psi.amount, pso.amount) AS expected, psd.amount AS paidamt, p.c_bpartner_id, p.fin_paymentmethod_id, p.fin_financial_account_id, p.c_currency_id, p.paymentdate, gli.name AS glitemname, pd.writeoffamt, fa.c_currency_id AS finacc_currency_id, p.finacc_txn_convert_rate, psd.amount * p.finacc_txn_convert_rate AS paidconverted, COALESCE(psi.amount, pso.amount) * p.finacc_txn_convert_rate AS expectedconverted, psd.iscanceled, psd.c_bpartner_id AS c_bpartner_id_dim, psd.c_activity_id, psd.m_product_id, psd.c_campaign_id, psd.c_project_id, psd.c_salesregion_id, p.status
+    <view name="FIN_PAYMENT_DETAIL_V"><![CDATA[SELECT psd.fin_payment_scheduledetail_id AS fin_payment_detail_v_id, psd.ad_client_id, psd.ad_org_id, psd.isactive, psd.created, psd.createdby, psd.updated, psd.updatedby, psi.fin_payment_schedule_id AS fin_payment_sched_inv_v_id, pso.fin_payment_schedule_id AS fin_payment_sched_ord_v_id, psi.fin_payment_schedule_id AS fin_payment_sched_inv_id, pso.fin_payment_schedule_id AS fin_payment_sched_ord_id, i.documentno AS invoiceno, o.documentno AS orderno, p.documentno AS paymentno, pd.fin_payment_id, COALESCE(psi.duedate, pso.duedate) AS duedate, COALESCE(i.grandtotal, o.grandtotal) AS invoicedamt, COALESCE(psi.amount, pso.amount) AS expected, psd.amount AS paidamt, p.c_bpartner_id, p.fin_paymentmethod_id, p.fin_financial_account_id, p.c_currency_id, p.paymentdate, gli.name AS glitemname, pd.writeoffamt, fa.c_currency_id AS finacc_currency_id, p.finacc_txn_convert_rate, psd.amount * p.finacc_txn_convert_rate AS paidconverted, COALESCE(psi.amount, pso.amount) * p.finacc_txn_convert_rate AS expectedconverted, psd.iscanceled, psd.c_bpartner_id AS c_bpartner_id_dim, psd.c_activity_id, psd.m_product_id, psd.c_campaign_id, psd.c_project_id, psd.c_salesregion_id, p.status
 FROM fin_payment p
 LEFT JOIN fin_financial_account fa ON p.fin_financial_account_id = fa.fin_financial_account_id, fin_payment_detail pd
 JOIN fin_payment_scheduledetail psd ON pd.fin_payment_detail_id = psd.fin_payment_detail_id
--- a/src-db/database/model/views/FIN_PAYMENT_PROP_DETAIL_V.xml	Fri Oct 05 10:33:28 2012 +0000
+++ b/src-db/database/model/views/FIN_PAYMENT_PROP_DETAIL_V.xml	Tue Oct 30 12:16:46 2012 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
   <database name="VIEW FIN_PAYMENT_PROP_DETAIL_V">
-    <view name="FIN_PAYMENT_PROP_DETAIL_V"><![CDATA[SELECT ppd.fin_payment_prop_detail_id AS fin_payment_prop_detail_v_id, ppd.ad_client_id, ppd.ad_org_id, ppd.isactive, ppd.created, ppd.createdby, ppd.updated, ppd.updatedby, psd.fin_payment_scheduledetail_id, ppd.fin_payment_proposal_id, i.documentno AS invoiceno, o.documentno AS orderno, p.documentno AS paymentno, pd.fin_payment_id, COALESCE(psi.duedate, pso.duedate) AS duedate, COALESCE(i.grandtotal, o.grandtotal) AS invoicedamt, COALESCE(psi.expected, pso.expected) AS expected, ppd.amount AS paidamt, COALESCE(p.c_bpartner_id, i.c_bpartner_id, o.c_bpartner_id) AS c_bpartner_id, ppd.writeoffamt
+    <view name="FIN_PAYMENT_PROP_DETAIL_V"><![CDATA[SELECT ppd.fin_payment_prop_detail_id AS fin_payment_prop_detail_v_id, ppd.ad_client_id, ppd.ad_org_id, ppd.isactive, ppd.created, ppd.createdby, ppd.updated, ppd.updatedby, psd.fin_payment_scheduledetail_id, ppd.fin_payment_proposal_id, i.documentno AS invoiceno, o.documentno AS orderno, p.documentno AS paymentno, pd.fin_payment_id, COALESCE(psi.duedate, pso.duedate) AS duedate, COALESCE(psi.expecteddate, pso.expecteddate) AS expecteddate, COALESCE(i.grandtotal, o.grandtotal) AS invoicedamt, COALESCE(psi.expected, pso.expected) AS expected, ppd.amount AS paidamt, COALESCE(p.c_bpartner_id, i.c_bpartner_id, o.c_bpartner_id) AS c_bpartner_id, ppd.writeoffamt
 FROM fin_payment_prop_detail ppd, fin_payment_scheduledetail psd
 LEFT JOIN fin_payment_sched_inv_v psi ON psd.fin_payment_schedule_invoice = psi.fin_payment_sched_inv_v_id
 LEFT JOIN c_invoice i ON psi.c_invoice_id = i.c_invoice_id
--- a/src-db/database/model/views/FIN_PAYMENT_SCHED_INV_V.xml	Fri Oct 05 10:33:28 2012 +0000
+++ b/src-db/database/model/views/FIN_PAYMENT_SCHED_INV_V.xml	Tue Oct 30 12:16:46 2012 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
   <database name="VIEW FIN_PAYMENT_SCHED_INV_V">
-    <view name="FIN_PAYMENT_SCHED_INV_V"><![CDATA[SELECT ps.fin_payment_schedule_id AS fin_payment_sched_inv_v_id, ps.ad_client_id, ps.ad_org_id, ps.isactive, ps.created, ps.createdby, ps.updated, ps.updatedby, ps.c_invoice_id, ps.c_order_id, ps.duedate, ps.fin_paymentmethod_id, ps.amount AS expected, ps.paidamt AS received, ps.outstandingamt AS outstanding, ps.c_currency_id, (SELECT max(p.paymentdate) AS max
+    <view name="FIN_PAYMENT_SCHED_INV_V"><![CDATA[SELECT ps.fin_payment_schedule_id AS fin_payment_sched_inv_v_id, ps.ad_client_id, ps.ad_org_id, ps.isactive, ps.created, ps.createdby, ps.updated, ps.updatedby, ps.c_invoice_id, ps.c_order_id, ps.duedate, ps.expecteddate, ps.fin_paymentmethod_id, ps.amount AS expected, ps.paidamt AS received, ps.outstandingamt AS outstanding, ps.c_currency_id, (SELECT max(p.paymentdate) AS max
 FROM fin_payment p
 LEFT JOIN fin_payment_detail pd ON pd.fin_payment_id = p.fin_payment_id
 LEFT JOIN fin_payment_scheduledetail psd ON pd.fin_payment_detail_id = psd.fin_payment_detail_id
--- a/src-db/database/model/views/FIN_PAYMENT_SCHED_ORD_V.xml	Fri Oct 05 10:33:28 2012 +0000
+++ b/src-db/database/model/views/FIN_PAYMENT_SCHED_ORD_V.xml	Tue Oct 30 12:16:46 2012 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
   <database name="VIEW FIN_PAYMENT_SCHED_ORD_V">
-    <view name="FIN_PAYMENT_SCHED_ORD_V"><![CDATA[SELECT ps.fin_payment_schedule_id AS fin_payment_sched_ord_v_id, ps.ad_client_id, ps.ad_org_id, ps.isactive, ps.created, ps.createdby, ps.updated, ps.updatedby, ps.c_invoice_id, ps.c_order_id, ps.duedate, ps.fin_paymentmethod_id, ps.amount AS expected, ps.paidamt AS received, ps.outstandingamt AS outstanding, ps.c_currency_id, (SELECT max(p.paymentdate) AS max
+    <view name="FIN_PAYMENT_SCHED_ORD_V"><![CDATA[SELECT ps.fin_payment_schedule_id AS fin_payment_sched_ord_v_id, ps.ad_client_id, ps.ad_org_id, ps.isactive, ps.created, ps.createdby, ps.updated, ps.updatedby, ps.c_invoice_id, ps.c_order_id, ps.duedate, ps.expecteddate, ps.fin_paymentmethod_id, ps.amount AS expected, ps.paidamt AS received, ps.outstandingamt AS outstanding, ps.c_currency_id, (SELECT max(p.paymentdate) AS max
 FROM fin_payment p
 LEFT JOIN fin_payment_detail pd ON pd.fin_payment_id = p.fin_payment_id
 LEFT JOIN fin_payment_scheduledetail psd ON pd.fin_payment_detail_id = psd.fin_payment_detail_id
--- a/src-db/database/sourcedata/AD_COLUMN.xml	Fri Oct 05 10:33:28 2012 +0000
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Tue Oct 30 12:16:46 2012 +0100
@@ -222696,7 +222696,7 @@
 <!--1C30BBC88DEA4E40831C616E1D34973B-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--1C30BBC88DEA4E40831C616E1D34973B-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--1C30BBC88DEA4E40831C616E1D34973B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1C30BBC88DEA4E40831C616E1D34973B-->  <POSITION><![CDATA[36]]></POSITION>
+<!--1C30BBC88DEA4E40831C616E1D34973B-->  <POSITION><![CDATA[37]]></POSITION>
 <!--1C30BBC88DEA4E40831C616E1D34973B-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--1C30BBC88DEA4E40831C616E1D34973B-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--1C30BBC88DEA4E40831C616E1D34973B-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -222878,6 +222878,41 @@
 <!--1D24F30B670940F38D1AD3377C36B534-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--1D24F30B670940F38D1AD3377C36B534--></AD_COLUMN>
 
+<!--1DA3007A3E1547AA95A420E351CB9759--><AD_COLUMN>
+<!--1DA3007A3E1547AA95A420E351CB9759-->  <AD_COLUMN_ID><![CDATA[1DA3007A3E1547AA95A420E351CB9759]]></AD_COLUMN_ID>
+<!--1DA3007A3E1547AA95A420E351CB9759-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1DA3007A3E1547AA95A420E351CB9759-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1DA3007A3E1547AA95A420E351CB9759-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1DA3007A3E1547AA95A420E351CB9759-->  <NAME><![CDATA[Expected Date]]></NAME>
+<!--1DA3007A3E1547AA95A420E351CB9759-->  <DESCRIPTION><![CDATA[The date when a specified request must be carried out by.]]></DESCRIPTION>
+<!--1DA3007A3E1547AA95A420E351CB9759-->  <HELP><![CDATA[Date when the payment is due without deductions or discount]]></HELP>
+<!--1DA3007A3E1547AA95A420E351CB9759-->  <COLUMNNAME><![CDATA[ExpectedDate]]></COLUMNNAME>
+<!--1DA3007A3E1547AA95A420E351CB9759-->  <AD_TABLE_ID><![CDATA[B5FCAD3055044508B4464B6078A711AD]]></AD_TABLE_ID>
+<!--1DA3007A3E1547AA95A420E351CB9759-->  <AD_REFERENCE_ID><![CDATA[15]]></AD_REFERENCE_ID>
+<!--1DA3007A3E1547AA95A420E351CB9759-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--1DA3007A3E1547AA95A420E351CB9759-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--1DA3007A3E1547AA95A420E351CB9759-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--1DA3007A3E1547AA95A420E351CB9759-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--1DA3007A3E1547AA95A420E351CB9759-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--1DA3007A3E1547AA95A420E351CB9759-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--1DA3007A3E1547AA95A420E351CB9759-->  <SEQNO><![CDATA[220]]></SEQNO>
+<!--1DA3007A3E1547AA95A420E351CB9759-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--1DA3007A3E1547AA95A420E351CB9759-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--1DA3007A3E1547AA95A420E351CB9759-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--1DA3007A3E1547AA95A420E351CB9759-->  <AD_ELEMENT_ID><![CDATA[C00EC2D7121949B18BE9D52FE3EB2468]]></AD_ELEMENT_ID>
+<!--1DA3007A3E1547AA95A420E351CB9759-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--1DA3007A3E1547AA95A420E351CB9759-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--1DA3007A3E1547AA95A420E351CB9759-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--1DA3007A3E1547AA95A420E351CB9759-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--1DA3007A3E1547AA95A420E351CB9759-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--1DA3007A3E1547AA95A420E351CB9759-->  <POSITION><![CDATA[16]]></POSITION>
+<!--1DA3007A3E1547AA95A420E351CB9759-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--1DA3007A3E1547AA95A420E351CB9759-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--1DA3007A3E1547AA95A420E351CB9759-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--1DA3007A3E1547AA95A420E351CB9759-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--1DA3007A3E1547AA95A420E351CB9759-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--1DA3007A3E1547AA95A420E351CB9759--></AD_COLUMN>
+
 <!--1DD4E1DE19554DF3920C7F5301943B60--><AD_COLUMN>
 <!--1DD4E1DE19554DF3920C7F5301943B60-->  <AD_COLUMN_ID><![CDATA[1DD4E1DE19554DF3920C7F5301943B60]]></AD_COLUMN_ID>
 <!--1DD4E1DE19554DF3920C7F5301943B60-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -223549,7 +223584,7 @@
 <!--20217D869BFD41938E250F7F7528E06F-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--20217D869BFD41938E250F7F7528E06F-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--20217D869BFD41938E250F7F7528E06F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--20217D869BFD41938E250F7F7528E06F-->  <POSITION><![CDATA[32]]></POSITION>
+<!--20217D869BFD41938E250F7F7528E06F-->  <POSITION><![CDATA[33]]></POSITION>
 <!--20217D869BFD41938E250F7F7528E06F-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--20217D869BFD41938E250F7F7528E06F-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--20217D869BFD41938E250F7F7528E06F-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -224504,7 +224539,7 @@
 <!--29292D14E1CA4C2E9F1219D50AF35491-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--29292D14E1CA4C2E9F1219D50AF35491-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--29292D14E1CA4C2E9F1219D50AF35491-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--29292D14E1CA4C2E9F1219D50AF35491-->  <POSITION><![CDATA[34]]></POSITION>
+<!--29292D14E1CA4C2E9F1219D50AF35491-->  <POSITION><![CDATA[35]]></POSITION>
 <!--29292D14E1CA4C2E9F1219D50AF35491-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--29292D14E1CA4C2E9F1219D50AF35491-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--29292D14E1CA4C2E9F1219D50AF35491-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -226590,7 +226625,7 @@
 <!--3DFAB9DBB8D143A3951271CBE02C224F-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--3DFAB9DBB8D143A3951271CBE02C224F-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--3DFAB9DBB8D143A3951271CBE02C224F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--3DFAB9DBB8D143A3951271CBE02C224F-->  <POSITION><![CDATA[26]]></POSITION>
+<!--3DFAB9DBB8D143A3951271CBE02C224F-->  <POSITION><![CDATA[28]]></POSITION>
 <!--3DFAB9DBB8D143A3951271CBE02C224F-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--3DFAB9DBB8D143A3951271CBE02C224F-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--3DFAB9DBB8D143A3951271CBE02C224F-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -228051,6 +228086,41 @@
 <!--47A925222BF44DED8FC19F413BD5821B-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--47A925222BF44DED8FC19F413BD5821B--></AD_COLUMN>
 
+<!--48D8B48A76CA4AF4B3F660AFC0A50279--><AD_COLUMN>
+<!--48D8B48A76CA4AF4B3F660AFC0A50279-->  <AD_COLUMN_ID><![CDATA[48D8B48A76CA4AF4B3F660AFC0A50279]]></AD_COLUMN_ID>
+<!--48D8B48A76CA4AF4B3F660AFC0A50279-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--48D8B48A76CA4AF4B3F660AFC0A50279-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--48D8B48A76CA4AF4B3F660AFC0A50279-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--48D8B48A76CA4AF4B3F660AFC0A50279-->  <NAME><![CDATA[ExpectedDate]]></NAME>
+<!--48D8B48A76CA4AF4B3F660AFC0A50279-->  <DESCRIPTION><![CDATA[The date when a specified request must be carried out by.]]></DESCRIPTION>
+<!--48D8B48A76CA4AF4B3F660AFC0A50279-->  <HELP><![CDATA[Date when the payment is due without deductions or discount]]></HELP>
+<!--48D8B48A76CA4AF4B3F660AFC0A50279-->  <COLUMNNAME><![CDATA[ExpectedDate]]></COLUMNNAME>
+<!--48D8B48A76CA4AF4B3F660AFC0A50279-->  <AD_TABLE_ID><![CDATA[CE9AFF5F51B846AEAB0B6CBF829092CD]]></AD_TABLE_ID>
+<!--48D8B48A76CA4AF4B3F660AFC0A50279-->  <AD_REFERENCE_ID><![CDATA[15]]></AD_REFERENCE_ID>
+<!--48D8B48A76CA4AF4B3F660AFC0A50279-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--48D8B48A76CA4AF4B3F660AFC0A50279-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--48D8B48A76CA4AF4B3F660AFC0A50279-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--48D8B48A76CA4AF4B3F660AFC0A50279-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--48D8B48A76CA4AF4B3F660AFC0A50279-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--48D8B48A76CA4AF4B3F660AFC0A50279-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--48D8B48A76CA4AF4B3F660AFC0A50279-->  <SEQNO><![CDATA[270]]></SEQNO>
+<!--48D8B48A76CA4AF4B3F660AFC0A50279-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--48D8B48A76CA4AF4B3F660AFC0A50279-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--48D8B48A76CA4AF4B3F660AFC0A50279-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--48D8B48A76CA4AF4B3F660AFC0A50279-->  <AD_ELEMENT_ID><![CDATA[C00EC2D7121949B18BE9D52FE3EB2468]]></AD_ELEMENT_ID>
+<!--48D8B48A76CA4AF4B3F660AFC0A50279-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--48D8B48A76CA4AF4B3F660AFC0A50279-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--48D8B48A76CA4AF4B3F660AFC0A50279-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--48D8B48A76CA4AF4B3F660AFC0A50279-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--48D8B48A76CA4AF4B3F660AFC0A50279-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--48D8B48A76CA4AF4B3F660AFC0A50279-->  <POSITION><![CDATA[23]]></POSITION>
+<!--48D8B48A76CA4AF4B3F660AFC0A50279-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--48D8B48A76CA4AF4B3F660AFC0A50279-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--48D8B48A76CA4AF4B3F660AFC0A50279-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--48D8B48A76CA4AF4B3F660AFC0A50279-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--48D8B48A76CA4AF4B3F660AFC0A50279-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--48D8B48A76CA4AF4B3F660AFC0A50279--></AD_COLUMN>
+
 <!--48DDC16B87A94F059EAE9BF72422A468--><AD_COLUMN>
 <!--48DDC16B87A94F059EAE9BF72422A468-->  <AD_COLUMN_ID><![CDATA[48DDC16B87A94F059EAE9BF72422A468]]></AD_COLUMN_ID>
 <!--48DDC16B87A94F059EAE9BF72422A468-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -228335,6 +228405,42 @@
 <!--4F6FBAF242EE43B98923BAC82AB94165-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--4F6FBAF242EE43B98923BAC82AB94165--></AD_COLUMN>
 
+<!--5050E5D10E5B4D94BF36BEF4E578313B--><AD_COLUMN>
+<!--5050E5D10E5B4D94BF36BEF4E578313B-->  <AD_COLUMN_ID><![CDATA[5050E5D10E5B4D94BF36BEF4E578313B]]></AD_COLUMN_ID>
+<!--5050E5D10E5B4D94BF36BEF4E578313B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5050E5D10E5B4D94BF36BEF4E578313B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5050E5D10E5B4D94BF36BEF4E578313B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5050E5D10E5B4D94BF36BEF4E578313B-->  <NAME><![CDATA[Payment Plan Order]]></NAME>
+<!--5050E5D10E5B4D94BF36BEF4E578313B-->  <DESCRIPTION><![CDATA[Set of payments in planned to be collected/paid for an order]]></DESCRIPTION>
+<!--5050E5D10E5B4D94BF36BEF4E578313B-->  <HELP><![CDATA[Set of payments in planned to be collected/paid for an order]]></HELP>
+<!--5050E5D10E5B4D94BF36BEF4E578313B-->  <COLUMNNAME><![CDATA[FIN_Payment_Sched_Ord_ID]]></COLUMNNAME>
+<!--5050E5D10E5B4D94BF36BEF4E578313B-->  <AD_TABLE_ID><![CDATA[DC63963AB3F1489BAAB5A9A7EFD1B407]]></AD_TABLE_ID>
+<!--5050E5D10E5B4D94BF36BEF4E578313B-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--5050E5D10E5B4D94BF36BEF4E578313B-->  <AD_REFERENCE_VALUE_ID><![CDATA[1FAD22496E6F468DBC46CA23FE204B41]]></AD_REFERENCE_VALUE_ID>
+<!--5050E5D10E5B4D94BF36BEF4E578313B-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--5050E5D10E5B4D94BF36BEF4E578313B-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--5050E5D10E5B4D94BF36BEF4E578313B-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--5050E5D10E5B4D94BF36BEF4E578313B-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--5050E5D10E5B4D94BF36BEF4E578313B-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--5050E5D10E5B4D94BF36BEF4E578313B-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--5050E5D10E5B4D94BF36BEF4E578313B-->  <SEQNO><![CDATA[450]]></SEQNO>
+<!--5050E5D10E5B4D94BF36BEF4E578313B-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--5050E5D10E5B4D94BF36BEF4E578313B-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--5050E5D10E5B4D94BF36BEF4E578313B-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--5050E5D10E5B4D94BF36BEF4E578313B-->  <AD_ELEMENT_ID><![CDATA[D83B9497015D4097989560C2348969BE]]></AD_ELEMENT_ID>
+<!--5050E5D10E5B4D94BF36BEF4E578313B-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--5050E5D10E5B4D94BF36BEF4E578313B-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--5050E5D10E5B4D94BF36BEF4E578313B-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--5050E5D10E5B4D94BF36BEF4E578313B-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--5050E5D10E5B4D94BF36BEF4E578313B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--5050E5D10E5B4D94BF36BEF4E578313B-->  <POSITION><![CDATA[12]]></POSITION>
+<!--5050E5D10E5B4D94BF36BEF4E578313B-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--5050E5D10E5B4D94BF36BEF4E578313B-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--5050E5D10E5B4D94BF36BEF4E578313B-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--5050E5D10E5B4D94BF36BEF4E578313B-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--5050E5D10E5B4D94BF36BEF4E578313B-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--5050E5D10E5B4D94BF36BEF4E578313B--></AD_COLUMN>
+
 <!--50C572BF5B0E46319FC8F32201A8408E--><AD_COLUMN>
 <!--50C572BF5B0E46319FC8F32201A8408E-->  <AD_COLUMN_ID><![CDATA[50C572BF5B0E46319FC8F32201A8408E]]></AD_COLUMN_ID>
 <!--50C572BF5B0E46319FC8F32201A8408E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -250545,7 +250651,7 @@
 <!--7299BF93D2984DF8932FE2800DA0ED2A-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--7299BF93D2984DF8932FE2800DA0ED2A-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--7299BF93D2984DF8932FE2800DA0ED2A-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--7299BF93D2984DF8932FE2800DA0ED2A-->  <POSITION><![CDATA[30]]></POSITION>
+<!--7299BF93D2984DF8932FE2800DA0ED2A-->  <POSITION><![CDATA[32]]></POSITION>
 <!--7299BF93D2984DF8932FE2800DA0ED2A-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--7299BF93D2984DF8932FE2800DA0ED2A-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--7299BF93D2984DF8932FE2800DA0ED2A-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -252660,8 +252766,8 @@
 <!--7890366979612CEFE040007F01013334-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
 <!--7890366979612CEFE040007F01013334-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--7890366979612CEFE040007F01013334-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--7890366979612CEFE040007F01013334-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--7890366979612CEFE040007F01013334-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--7890366979612CEFE040007F01013334-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--7890366979612CEFE040007F01013334-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
 <!--7890366979612CEFE040007F01013334-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
 <!--7890366979612CEFE040007F01013334-->  <SEQNO><![CDATA[100]]></SEQNO>
 <!--7890366979612CEFE040007F01013334-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -255359,7 +255465,7 @@
 <!--78D10D5CC295A0ADE040007F010152E6-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--78D10D5CC295A0ADE040007F010152E6-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--78D10D5CC295A0ADE040007F010152E6-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--78D10D5CC295A0ADE040007F010152E6-->  <POSITION><![CDATA[15]]></POSITION>
+<!--78D10D5CC295A0ADE040007F010152E6-->  <POSITION><![CDATA[16]]></POSITION>
 <!--78D10D5CC295A0ADE040007F010152E6-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--78D10D5CC295A0ADE040007F010152E6-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--78D10D5CC295A0ADE040007F010152E6-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -255393,7 +255499,7 @@
 <!--78D10D5CC296A0ADE040007F010152E6-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--78D10D5CC296A0ADE040007F010152E6-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--78D10D5CC296A0ADE040007F010152E6-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--78D10D5CC296A0ADE040007F010152E6-->  <POSITION><![CDATA[17]]></POSITION>
+<!--78D10D5CC296A0ADE040007F010152E6-->  <POSITION><![CDATA[18]]></POSITION>
 <!--78D10D5CC296A0ADE040007F010152E6-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--78D10D5CC296A0ADE040007F010152E6-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--78D10D5CC296A0ADE040007F010152E6-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -255426,7 +255532,7 @@
 <!--78D10D5CC297A0ADE040007F010152E6-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--78D10D5CC297A0ADE040007F010152E6-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--78D10D5CC297A0ADE040007F010152E6-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--78D10D5CC297A0ADE040007F010152E6-->  <POSITION><![CDATA[18]]></POSITION>
+<!--78D10D5CC297A0ADE040007F010152E6-->  <POSITION><![CDATA[19]]></POSITION>
 <!--78D10D5CC297A0ADE040007F010152E6-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--78D10D5CC297A0ADE040007F010152E6-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--78D10D5CC297A0ADE040007F010152E6-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -255743,7 +255849,7 @@
 <!--78D16B5B178F661EE040007F010152F7-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--78D16B5B178F661EE040007F010152F7-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--78D16B5B178F661EE040007F010152F7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--78D16B5B178F661EE040007F010152F7-->  <POSITION><![CDATA[23]]></POSITION>
+<!--78D16B5B178F661EE040007F010152F7-->  <POSITION><![CDATA[25]]></POSITION>
 <!--78D16B5B178F661EE040007F010152F7-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--78D16B5B178F661EE040007F010152F7-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--78D16B5B178F661EE040007F010152F7-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -256737,7 +256843,7 @@
 <!--7DC34559B3F7B45BE040007F0100784A-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--7DC34559B3F7B45BE040007F0100784A-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--7DC34559B3F7B45BE040007F0100784A-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--7DC34559B3F7B45BE040007F0100784A-->  <POSITION><![CDATA[20]]></POSITION>
+<!--7DC34559B3F7B45BE040007F0100784A-->  <POSITION><![CDATA[22]]></POSITION>
 <!--7DC34559B3F7B45BE040007F0100784A-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--7DC34559B3F7B45BE040007F0100784A-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--7DC34559B3F7B45BE040007F0100784A-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -256806,7 +256912,7 @@
 <!--7DC34559B3F9B45BE040007F0100784A-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--7DC34559B3F9B45BE040007F0100784A-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--7DC34559B3F9B45BE040007F0100784A-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--7DC34559B3F9B45BE040007F0100784A-->  <POSITION><![CDATA[12]]></POSITION>
+<!--7DC34559B3F9B45BE040007F0100784A-->  <POSITION><![CDATA[13]]></POSITION>
 <!--7DC34559B3F9B45BE040007F0100784A-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--7DC34559B3F9B45BE040007F0100784A-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--7DC34559B3F9B45BE040007F0100784A-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -258962,7 +259068,7 @@
 <!--7FF2234748E7844FE040007F01003861-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--7FF2234748E7844FE040007F01003861-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--7FF2234748E7844FE040007F01003861-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--7FF2234748E7844FE040007F01003861-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7FF2234748E7844FE040007F01003861-->  <DEVELOPMENTSTATUS><![CDATA[DP]]></DEVELOPMENTSTATUS>
 <!--7FF2234748E7844FE040007F01003861-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--7FF2234748E7844FE040007F01003861-->  <POSITION><![CDATA[9]]></POSITION>
 <!--7FF2234748E7844FE040007F01003861-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
@@ -259033,7 +259139,7 @@
 <!--7FF2234748E9844FE040007F01003861-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--7FF2234748E9844FE040007F01003861-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--7FF2234748E9844FE040007F01003861-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--7FF2234748E9844FE040007F01003861-->  <POSITION><![CDATA[11]]></POSITION>
+<!--7FF2234748E9844FE040007F01003861-->  <POSITION><![CDATA[13]]></POSITION>
 <!--7FF2234748E9844FE040007F01003861-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--7FF2234748E9844FE040007F01003861-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--7FF2234748E9844FE040007F01003861-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -259067,7 +259173,7 @@
 <!--7FF2234748EA844FE040007F01003861-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--7FF2234748EA844FE040007F01003861-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--7FF2234748EA844FE040007F01003861-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--7FF2234748EA844FE040007F01003861-->  <POSITION><![CDATA[12]]></POSITION>
+<!--7FF2234748EA844FE040007F01003861-->  <POSITION><![CDATA[14]]></POSITION>
 <!--7FF2234748EA844FE040007F01003861-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--7FF2234748EA844FE040007F01003861-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--7FF2234748EA844FE040007F01003861-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -259101,7 +259207,7 @@
 <!--7FF2234748EB844FE040007F01003861-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--7FF2234748EB844FE040007F01003861-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--7FF2234748EB844FE040007F01003861-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--7FF2234748EB844FE040007F01003861-->  <POSITION><![CDATA[13]]></POSITION>
+<!--7FF2234748EB844FE040007F01003861-->  <POSITION><![CDATA[15]]></POSITION>
 <!--7FF2234748EB844FE040007F01003861-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--7FF2234748EB844FE040007F01003861-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--7FF2234748EB844FE040007F01003861-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -259136,7 +259242,7 @@
 <!--7FF2234748EC844FE040007F01003861-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--7FF2234748EC844FE040007F01003861-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--7FF2234748EC844FE040007F01003861-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--7FF2234748EC844FE040007F01003861-->  <POSITION><![CDATA[14]]></POSITION>
+<!--7FF2234748EC844FE040007F01003861-->  <POSITION><![CDATA[16]]></POSITION>
 <!--7FF2234748EC844FE040007F01003861-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--7FF2234748EC844FE040007F01003861-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--7FF2234748EC844FE040007F01003861-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -259171,7 +259277,7 @@
 <!--7FF2234748ED844FE040007F01003861-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--7FF2234748ED844FE040007F01003861-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--7FF2234748ED844FE040007F01003861-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--7FF2234748ED844FE040007F01003861-->  <POSITION><![CDATA[15]]></POSITION>
+<!--7FF2234748ED844FE040007F01003861-->  <POSITION><![CDATA[17]]></POSITION>
 <!--7FF2234748ED844FE040007F01003861-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--7FF2234748ED844FE040007F01003861-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--7FF2234748ED844FE040007F01003861-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -259206,7 +259312,7 @@
 <!--7FF2234748EE844FE040007F01003861-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--7FF2234748EE844FE040007F01003861-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--7FF2234748EE844FE040007F01003861-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--7FF2234748EE844FE040007F01003861-->  <POSITION><![CDATA[16]]></POSITION>
+<!--7FF2234748EE844FE040007F01003861-->  <POSITION><![CDATA[18]]></POSITION>
 <!--7FF2234748EE844FE040007F01003861-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--7FF2234748EE844FE040007F01003861-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--7FF2234748EE844FE040007F01003861-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -259240,7 +259346,7 @@
 <!--7FF2234748EF844FE040007F01003861-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--7FF2234748EF844FE040007F01003861-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--7FF2234748EF844FE040007F01003861-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--7FF2234748EF844FE040007F01003861-->  <POSITION><![CDATA[17]]></POSITION>
+<!--7FF2234748EF844FE040007F01003861-->  <POSITION><![CDATA[19]]></POSITION>
 <!--7FF2234748EF844FE040007F01003861-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--7FF2234748EF844FE040007F01003861-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--7FF2234748EF844FE040007F01003861-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -259273,7 +259379,7 @@
 <!--7FF2234748F0844FE040007F01003861-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--7FF2234748F0844FE040007F01003861-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--7FF2234748F0844FE040007F01003861-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--7FF2234748F0844FE040007F01003861-->  <POSITION><![CDATA[18]]></POSITION>
+<!--7FF2234748F0844FE040007F01003861-->  <POSITION><![CDATA[20]]></POSITION>
 <!--7FF2234748F0844FE040007F01003861-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--7FF2234748F0844FE040007F01003861-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--7FF2234748F0844FE040007F01003861-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -259309,7 +259415,7 @@
 <!--7FF2234748F1844FE040007F01003861-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--7FF2234748F1844FE040007F01003861-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--7FF2234748F1844FE040007F01003861-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--7FF2234748F1844FE040007F01003861-->  <POSITION><![CDATA[19]]></POSITION>
+<!--7FF2234748F1844FE040007F01003861-->  <POSITION><![CDATA[21]]></POSITION>
 <!--7FF2234748F1844FE040007F01003861-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--7FF2234748F1844FE040007F01003861-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--7FF2234748F1844FE040007F01003861-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -259344,7 +259450,7 @@
 <!--7FF2234748F2844FE040007F01003861-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--7FF2234748F2844FE040007F01003861-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--7FF2234748F2844FE040007F01003861-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--7FF2234748F2844FE040007F01003861-->  <POSITION><![CDATA[21]]></POSITION>
+<!--7FF2234748F2844FE040007F01003861-->  <POSITION><![CDATA[23]]></POSITION>
 <!--7FF2234748F2844FE040007F01003861-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--7FF2234748F2844FE040007F01003861-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--7FF2234748F2844FE040007F01003861-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -261845,7 +261951,7 @@
 <!--80E839B1692C298FE040007F01005AAF-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--80E839B1692C298FE040007F01005AAF-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--80E839B1692C298FE040007F01005AAF-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--80E839B1692C298FE040007F01005AAF-->  <POSITION><![CDATA[16]]></POSITION>
+<!--80E839B1692C298FE040007F01005AAF-->  <POSITION><![CDATA[17]]></POSITION>
 <!--80E839B1692C298FE040007F01005AAF-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--80E839B1692C298FE040007F01005AAF-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--80E839B1692C298FE040007F01005AAF-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -261879,7 +261985,7 @@
 <!--80E839B1692D298FE040007F01005AAF-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--80E839B1692D298FE040007F01005AAF-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--80E839B1692D298FE040007F01005AAF-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--80E839B1692D298FE040007F01005AAF-->  <POSITION><![CDATA[17]]></POSITION>
+<!--80E839B1692D298FE040007F01005AAF-->  <POSITION><![CDATA[18]]></POSITION>
 <!--80E839B1692D298FE040007F01005AAF-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--80E839B1692D298FE040007F01005AAF-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--80E839B1692D298FE040007F01005AAF-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -261912,7 +262018,7 @@
 <!--80E839B1692E298FE040007F01005AAF-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--80E839B1692E298FE040007F01005AAF-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--80E839B1692E298FE040007F01005AAF-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--80E839B1692E298FE040007F01005AAF-->  <POSITION><![CDATA[18]]></POSITION>
+<!--80E839B1692E298FE040007F01005AAF-->  <POSITION><![CDATA[19]]></POSITION>
 <!--80E839B1692E298FE040007F01005AAF-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--80E839B1692E298FE040007F01005AAF-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--80E839B1692E298FE040007F01005AAF-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -261948,7 +262054,7 @@
 <!--80E839B1692F298FE040007F01005AAF-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--80E839B1692F298FE040007F01005AAF-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--80E839B1692F298FE040007F01005AAF-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--80E839B1692F298FE040007F01005AAF-->  <POSITION><![CDATA[19]]></POSITION>
+<!--80E839B1692F298FE040007F01005AAF-->  <POSITION><![CDATA[20]]></POSITION>
 <!--80E839B1692F298FE040007F01005AAF-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--80E839B1692F298FE040007F01005AAF-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--80E839B1692F298FE040007F01005AAF-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -261983,7 +262089,7 @@
 <!--80E839B16930298FE040007F01005AAF-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--80E839B16930298FE040007F01005AAF-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--80E839B16930298FE040007F01005AAF-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--80E839B16930298FE040007F01005AAF-->  <POSITION><![CDATA[20]]></POSITION>
+<!--80E839B16930298FE040007F01005AAF-->  <POSITION><![CDATA[21]]></POSITION>
 <!--80E839B16930298FE040007F01005AAF-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--80E839B16930298FE040007F01005AAF-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--80E839B16930298FE040007F01005AAF-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -267347,7 +267453,7 @@
 <!--84BE5A55A365CEFEE040007F01000402-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--84BE5A55A365CEFEE040007F01000402-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--84BE5A55A365CEFEE040007F01000402-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--84BE5A55A365CEFEE040007F01000402-->  <POSITION><![CDATA[24]]></POSITION>
+<!--84BE5A55A365CEFEE040007F01000402-->  <POSITION><![CDATA[26]]></POSITION>
 <!--84BE5A55A365CEFEE040007F01000402-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--84BE5A55A365CEFEE040007F01000402-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--84BE5A55A365CEFEE040007F01000402-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -267418,7 +267524,7 @@
 <!--85072D35A21C4487A9B16A210878D3C8-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--85072D35A21C4487A9B16A210878D3C8-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--85072D35A21C4487A9B16A210878D3C8-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--85072D35A21C4487A9B16A210878D3C8-->  <POSITION><![CDATA[27]]></POSITION>
+<!--85072D35A21C4487A9B16A210878D3C8-->  <POSITION><![CDATA[29]]></POSITION>
 <!--85072D35A21C4487A9B16A210878D3C8-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--85072D35A21C4487A9B16A210878D3C8-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--85072D35A21C4487A9B16A210878D3C8-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -272137,7 +272243,7 @@
 <!--8D6169322485477F8D53E2E246723D3A-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--8D6169322485477F8D53E2E246723D3A-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--8D6169322485477F8D53E2E246723D3A-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8D6169322485477F8D53E2E246723D3A-->  <POSITION><![CDATA[25]]></POSITION>
+<!--8D6169322485477F8D53E2E246723D3A-->  <POSITION><![CDATA[27]]></POSITION>
 <!--8D6169322485477F8D53E2E246723D3A-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--8D6169322485477F8D53E2E246723D3A-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--8D6169322485477F8D53E2E246723D3A-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -272242,7 +272348,7 @@
 <!--8DF9D8A154DC4353ACD4F91DA30CA06E-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--8DF9D8A154DC4353ACD4F91DA30CA06E-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--8DF9D8A154DC4353ACD4F91DA30CA06E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8DF9D8A154DC4353ACD4F91DA30CA06E-->  <POSITION><![CDATA[28]]></POSITION>
+<!--8DF9D8A154DC4353ACD4F91DA30CA06E-->  <POSITION><![CDATA[30]]></POSITION>
 <!--8DF9D8A154DC4353ACD4F91DA30CA06E-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--8DF9D8A154DC4353ACD4F91DA30CA06E-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--8DF9D8A154DC4353ACD4F91DA30CA06E-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -272843,7 +272949,7 @@
 <!--905AB9A1B3614382854CB0C686746F71-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--905AB9A1B3614382854CB0C686746F71-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--905AB9A1B3614382854CB0C686746F71-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--905AB9A1B3614382854CB0C686746F71-->  <POSITION><![CDATA[20]]></POSITION>
+<!--905AB9A1B3614382854CB0C686746F71-->  <POSITION><![CDATA[21]]></POSITION>
 <!--905AB9A1B3614382854CB0C686746F71-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--905AB9A1B3614382854CB0C686746F71-->  <ISAUTOSAVE><![CDATA[N]]></ISAUTOSAVE>
 <!--905AB9A1B3614382854CB0C686746F71-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -272913,7 +273019,7 @@
 <!--91375A8F85DF48FFA962C940E9BAF889-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--91375A8F85DF48FFA962C940E9BAF889-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--91375A8F85DF48FFA962C940E9BAF889-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--91375A8F85DF48FFA962C940E9BAF889-->  <POSITION><![CDATA[29]]></POSITION>
+<!--91375A8F85DF48FFA962C940E9BAF889-->  <POSITION><![CDATA[31]]></POSITION>
 <!--91375A8F85DF48FFA962C940E9BAF889-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--91375A8F85DF48FFA962C940E9BAF889-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--91375A8F85DF48FFA962C940E9BAF889-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -277021,7 +277127,7 @@
 <!--9C7C878101214039A2BEAE25ED564B4B-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--9C7C878101214039A2BEAE25ED564B4B-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--9C7C878101214039A2BEAE25ED564B4B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--9C7C878101214039A2BEAE25ED564B4B-->  <POSITION><![CDATA[33]]></POSITION>
+<!--9C7C878101214039A2BEAE25ED564B4B-->  <POSITION><![CDATA[34]]></POSITION>
 <!--9C7C878101214039A2BEAE25ED564B4B-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--9C7C878101214039A2BEAE25ED564B4B-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--9C7C878101214039A2BEAE25ED564B4B-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -278089,7 +278195,7 @@
 <!--9FFD173571C74908A5F48C4C44C5E8C1-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--9FFD173571C74908A5F48C4C44C5E8C1-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--9FFD173571C74908A5F48C4C44C5E8C1-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--9FFD173571C74908A5F48C4C44C5E8C1-->  <POSITION><![CDATA[35]]></POSITION>
+<!--9FFD173571C74908A5F48C4C44C5E8C1-->  <POSITION><![CDATA[36]]></POSITION>
 <!--9FFD173571C74908A5F48C4C44C5E8C1-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--9FFD173571C74908A5F48C4C44C5E8C1-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--9FFD173571C74908A5F48C4C44C5E8C1-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -278834,7 +278940,7 @@
 <!--A58DFDE11BF342779F8FAF40B84E8899-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--A58DFDE11BF342779F8FAF40B84E8899-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--A58DFDE11BF342779F8FAF40B84E8899-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--A58DFDE11BF342779F8FAF40B84E8899-->  <POSITION><![CDATA[37]]></POSITION>
+<!--A58DFDE11BF342779F8FAF40B84E8899-->  <POSITION><![CDATA[38]]></POSITION>
 <!--A58DFDE11BF342779F8FAF40B84E8899-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--A58DFDE11BF342779F8FAF40B84E8899-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--A58DFDE11BF342779F8FAF40B84E8899-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -280039,7 +280145,7 @@
 <!--ACE4EFA3342246E6920D9895478CFACB-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--ACE4EFA3342246E6920D9895478CFACB-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--ACE4EFA3342246E6920D9895478CFACB-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--ACE4EFA3342246E6920D9895478CFACB-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--ACE4EFA3342246E6920D9895478CFACB-->  <DEVELOPMENTSTATUS><![CDATA[DP]]></DEVELOPMENTSTATUS>
 <!--ACE4EFA3342246E6920D9895478CFACB-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--ACE4EFA3342246E6920D9895478CFACB-->  <POSITION><![CDATA[19]]></POSITION>
 <!--ACE4EFA3342246E6920D9895478CFACB-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
@@ -284414,7 +284520,7 @@
 <!--B1FF5DFD304CCC21E040A8C028011146-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--B1FF5DFD304CCC21E040A8C028011146-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--B1FF5DFD304CCC21E040A8C028011146-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--B1FF5DFD304CCC21E040A8C028011146-->  <POSITION><![CDATA[21]]></POSITION>
+<!--B1FF5DFD304CCC21E040A8C028011146-->  <POSITION><![CDATA[22]]></POSITION>
 <!--B1FF5DFD304CCC21E040A8C028011146-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--B1FF5DFD304CCC21E040A8C028011146-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--B1FF5DFD304CCC21E040A8C028011146-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -284447,7 +284553,7 @@
 <!--B20082A4E22F5613E040A8C028013599-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--B20082A4E22F5613E040A8C028013599-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--B20082A4E22F5613E040A8C028013599-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--B20082A4E22F5613E040A8C028013599-->  <POSITION><![CDATA[22]]></POSITION>
+<!--B20082A4E22F5613E040A8C028013599-->  <POSITION><![CDATA[23]]></POSITION>
 <!--B20082A4E22F5613E040A8C028013599-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--B20082A4E22F5613E040A8C028013599-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--B20082A4E22F5613E040A8C028013599-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -284724,7 +284830,7 @@
 <!--B40C56E6339AA169E040A8C091661452-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--B40C56E6339AA169E040A8C091661452-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--B40C56E6339AA169E040A8C091661452-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--B40C56E6339AA169E040A8C091661452-->  <POSITION><![CDATA[23]]></POSITION>
+<!--B40C56E6339AA169E040A8C091661452-->  <POSITION><![CDATA[24]]></POSITION>
 <!--B40C56E6339AA169E040A8C091661452-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--B40C56E6339AA169E040A8C091661452-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--B40C56E6339AA169E040A8C091661452-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -288612,7 +288718,7 @@
 <!--C1DE4479A025001AE040007F01000C7E-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--C1DE4479A025001AE040007F01000C7E-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--C1DE4479A025001AE040007F01000C7E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--C1DE4479A025001AE040007F01000C7E-->  <POSITION><![CDATA[31]]></POSITION>
+<!--C1DE4479A025001AE040007F01000C7E-->  <POSITION><![CDATA[39]]></POSITION>
 <!--C1DE4479A025001AE040007F01000C7E-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--C1DE4479A025001AE040007F01000C7E-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--C1DE4479A025001AE040007F01000C7E-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -288646,7 +288752,7 @@
 <!--C228CBC21EC74A0D8785A309736F0446-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--C228CBC21EC74A0D8785A309736F0446-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--C228CBC21EC74A0D8785A309736F0446-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--C228CBC21EC74A0D8785A309736F0446-->  <POSITION><![CDATA[14]]></POSITION>
+<!--C228CBC21EC74A0D8785A309736F0446-->  <POSITION><![CDATA[15]]></POSITION>
 <!--C228CBC21EC74A0D8785A309736F0446-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--C228CBC21EC74A0D8785A309736F0446-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--C228CBC21EC74A0D8785A309736F0446-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -290063,7 +290169,7 @@
 <!--CEC2AA7C93F4423A97CE96BDD1C4B49F-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--CEC2AA7C93F4423A97CE96BDD1C4B49F-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--CEC2AA7C93F4423A97CE96BDD1C4B49F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--CEC2AA7C93F4423A97CE96BDD1C4B49F-->  <POSITION><![CDATA[13]]></POSITION>
+<!--CEC2AA7C93F4423A97CE96BDD1C4B49F-->  <POSITION><![CDATA[14]]></POSITION>
 <!--CEC2AA7C93F4423A97CE96BDD1C4B49F-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--CEC2AA7C93F4423A97CE96BDD1C4B49F-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--CEC2AA7C93F4423A97CE96BDD1C4B49F-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -292036,7 +292142,7 @@
 <!--E94E132EFCCC422CA9DB4E98BB648E92-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--E94E132EFCCC422CA9DB4E98BB648E92-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--E94E132EFCCC422CA9DB4E98BB648E92-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--E94E132EFCCC422CA9DB4E98BB648E92-->  <POSITION><![CDATA[22]]></POSITION>
+<!--E94E132EFCCC422CA9DB4E98BB648E92-->  <POSITION><![CDATA[24]]></POSITION>
 <!--E94E132EFCCC422CA9DB4E98BB648E92-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--E94E132EFCCC422CA9DB4E98BB648E92-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--E94E132EFCCC422CA9DB4E98BB648E92-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -292465,7 +292571,7 @@
 <!--EE2F7ABA71F548EFB1204D22F9A91627-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--EE2F7ABA71F548EFB1204D22F9A91627-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--EE2F7ABA71F548EFB1204D22F9A91627-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--EE2F7ABA71F548EFB1204D22F9A91627-->  <POSITION><![CDATA[16]]></POSITION>
+<!--EE2F7ABA71F548EFB1204D22F9A91627-->  <POSITION><![CDATA[17]]></POSITION>
 <!--EE2F7ABA71F548EFB1204D22F9A91627-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--EE2F7ABA71F548EFB1204D22F9A91627-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--EE2F7ABA71F548EFB1204D22F9A91627-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -292756,7 +292862,7 @@
 <!--F02817A43E904DF394E07DE81E98C767-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
 <!--F02817A43E904DF394E07DE81E98C767-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
 <!--F02817A43E904DF394E07DE81E98C767-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--F02817A43E904DF394E07DE81E98C767-->  <SQLLOGIC><![CDATA[(SELECT CASE WHEN to_number(trunc((case when max(ps.outstandingamt) = 0 then max(p.paymentdate) else now() end)) -trunc(min(ps.origduedate))) > 0 THEN to_number(trunc((case when max(ps.outstandingamt) = 0 then max(p.paymentdate) else now() end)) -trunc(min(ps.origduedate)))ELSE 0 END AS "case" FROM fin_payment_schedule ps LEFT JOIN fin_payment_scheduledetail psd ON ps.fin_payment_schedule_id =  psd.fin_payment_schedule_invoice LEFT JOIN fin_payment_detail pd ON pd.fin_payment_detail_id = psd.fin_payment_detail_id LEFT JOIN fin_payment p ON p.fin_payment_id = pd.fin_payment_id WHERE ps.fin_payment_schedule_id = fin_payment_schedule_id)]]></SQLLOGIC>
+<!--F02817A43E904DF394E07DE81E98C767-->  <SQLLOGIC><![CDATA[(SELECT CASE WHEN to_number(trunc((case when max(ps.outstandingamt) = 0 then max(p.paymentdate) else now() end)) -trunc(min(ps.expecteddate))) > 0 THEN to_number(trunc((case when max(ps.outstandingamt) = 0 then max(p.paymentdate) else now() end)) -trunc(min(ps.expecteddate)))ELSE 0 END AS "case" FROM fin_payment_schedule ps LEFT JOIN fin_payment_scheduledetail psd ON ps.fin_payment_schedule_id =  psd.fin_payment_schedule_invoice LEFT JOIN fin_payment_detail pd ON pd.fin_payment_detail_id = psd.fin_payment_detail_id LEFT JOIN fin_payment p ON p.fin_payment_id = pd.fin_payment_id WHERE ps.fin_payment_schedule_id = fin_payment_schedule_id)]]></SQLLOGIC>
 <!--F02817A43E904DF394E07DE81E98C767--></AD_COLUMN>
 
 <!--F038FDD2AAEC47AAA752573384DF5DCB--><AD_COLUMN>
@@ -292939,6 +293045,42 @@
 <!--F1E72F248F3D4EE6B18D1F77FE514C16-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--F1E72F248F3D4EE6B18D1F77FE514C16--></AD_COLUMN>
 
+<!--F20FDC4004064C7CB665BD655B0F307D--><AD_COLUMN>
+<!--F20FDC4004064C7CB665BD655B0F307D-->  <AD_COLUMN_ID><![CDATA[F20FDC4004064C7CB665BD655B0F307D]]></AD_COLUMN_ID>
+<!--F20FDC4004064C7CB665BD655B0F307D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F20FDC4004064C7CB665BD655B0F307D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F20FDC4004064C7CB665BD655B0F307D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F20FDC4004064C7CB665BD655B0F307D-->  <NAME><![CDATA[Payment Plan Invoice]]></NAME>
+<!--F20FDC4004064C7CB665BD655B0F307D-->  <DESCRIPTION><![CDATA[Set of payments in planned to be collected/paid for an invoice]]></DESCRIPTION>
+<!--F20FDC4004064C7CB665BD655B0F307D-->  <HELP><![CDATA[Set of payments in planned to be collected/paid for an invoice]]></HELP>
+<!--F20FDC4004064C7CB665BD655B0F307D-->  <COLUMNNAME><![CDATA[FIN_Payment_Sched_Inv_ID]]></COLUMNNAME>
+<!--F20FDC4004064C7CB665BD655B0F307D-->  <AD_TABLE_ID><![CDATA[DC63963AB3F1489BAAB5A9A7EFD1B407]]></AD_TABLE_ID>
+<!--F20FDC4004064C7CB665BD655B0F307D-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--F20FDC4004064C7CB665BD655B0F307D-->  <AD_REFERENCE_VALUE_ID><![CDATA[1FAD22496E6F468DBC46CA23FE204B41]]></AD_REFERENCE_VALUE_ID>
+<!--F20FDC4004064C7CB665BD655B0F307D-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--F20FDC4004064C7CB665BD655B0F307D-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--F20FDC4004064C7CB665BD655B0F307D-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--F20FDC4004064C7CB665BD655B0F307D-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--F20FDC4004064C7CB665BD655B0F307D-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--F20FDC4004064C7CB665BD655B0F307D-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--F20FDC4004064C7CB665BD655B0F307D-->  <SEQNO><![CDATA[440]]></SEQNO>
+<!--F20FDC4004064C7CB665BD655B0F307D-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--F20FDC4004064C7CB665BD655B0F307D-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--F20FDC4004064C7CB665BD655B0F307D-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--F20FDC4004064C7CB665BD655B0F307D-->  <AD_ELEMENT_ID><![CDATA[CC3A45F8D7F94D6799DA24A88F0184F5]]></AD_ELEMENT_ID>
+<!--F20FDC4004064C7CB665BD655B0F307D-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--F20FDC4004064C7CB665BD655B0F307D-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--F20FDC4004064C7CB665BD655B0F307D-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--F20FDC4004064C7CB665BD655B0F307D-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--F20FDC4004064C7CB665BD655B0F307D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--F20FDC4004064C7CB665BD655B0F307D-->  <POSITION><![CDATA[11]]></POSITION>
+<!--F20FDC4004064C7CB665BD655B0F307D-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--F20FDC4004064C7CB665BD655B0F307D-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--F20FDC4004064C7CB665BD655B0F307D-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--F20FDC4004064C7CB665BD655B0F307D-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--F20FDC4004064C7CB665BD655B0F307D-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--F20FDC4004064C7CB665BD655B0F307D--></AD_COLUMN>
+
 <!--F298A824BEAB4A2EAC14C68E770940DA--><AD_COLUMN>
 <!--F298A824BEAB4A2EAC14C68E770940DA-->  <AD_COLUMN_ID><![CDATA[F298A824BEAB4A2EAC14C68E770940DA]]></AD_COLUMN_ID>
 <!--F298A824BEAB4A2EAC14C68E770940DA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -293045,6 +293187,41 @@
 <!--F3790639C5AE4E85B4B4DCADCF35B8CB-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--F3790639C5AE4E85B4B4DCADCF35B8CB--></AD_COLUMN>
 
+<!--F55387BA03C14531AA6A20E0AF799E1B--><AD_COLUMN>
+<!--F55387BA03C14531AA6A20E0AF799E1B-->  <AD_COLUMN_ID><![CDATA[F55387BA03C14531AA6A20E0AF799E1B]]></AD_COLUMN_ID>
+<!--F55387BA03C14531AA6A20E0AF799E1B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F55387BA03C14531AA6A20E0AF799E1B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F55387BA03C14531AA6A20E0AF799E1B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F55387BA03C14531AA6A20E0AF799E1B-->  <NAME><![CDATA[Expected Date]]></NAME>
+<!--F55387BA03C14531AA6A20E0AF799E1B-->  <DESCRIPTION><![CDATA[The date when a specified request must be carried out by.]]></DESCRIPTION>
+<!--F55387BA03C14531AA6A20E0AF799E1B-->  <HELP><![CDATA[Date when the payment is due without deductions or discount]]></HELP>
+<!--F55387BA03C14531AA6A20E0AF799E1B-->  <COLUMNNAME><![CDATA[Expecteddate]]></COLUMNNAME>
+<!--F55387BA03C14531AA6A20E0AF799E1B-->  <AD_TABLE_ID><![CDATA[77182DC88AA842D499C01FB0BAE39561]]></AD_TABLE_ID>
+<!--F55387BA03C14531AA6A20E0AF799E1B-->  <AD_REFERENCE_ID><![CDATA[15]]></AD_REFERENCE_ID>
+<!--F55387BA03C14531AA6A20E0AF799E1B-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--F55387BA03C14531AA6A20E0AF799E1B-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--F55387BA03C14531AA6A20E0AF799E1B-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--F55387BA03C14531AA6A20E0AF799E1B-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--F55387BA03C14531AA6A20E0AF799E1B-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--F55387BA03C14531AA6A20E0AF799E1B-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--F55387BA03C14531AA6A20E0AF799E1B-->  <SEQNO><![CDATA[300]]></SEQNO>
+<!--F55387BA03C14531AA6A20E0AF799E1B-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--F55387BA03C14531AA6A20E0AF799E1B-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--F55387BA03C14531AA6A20E0AF799E1B-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--F55387BA03C14531AA6A20E0AF799E1B-->  <AD_ELEMENT_ID><![CDATA[C00EC2D7121949B18BE9D52FE3EB2468]]></AD_ELEMENT_ID>
+<!--F55387BA03C14531AA6A20E0AF799E1B-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--F55387BA03C14531AA6A20E0AF799E1B-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--F55387BA03C14531AA6A20E0AF799E1B-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--F55387BA03C14531AA6A20E0AF799E1B-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--F55387BA03C14531AA6A20E0AF799E1B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--F55387BA03C14531AA6A20E0AF799E1B-->  <POSITION><![CDATA[12]]></POSITION>
+<!--F55387BA03C14531AA6A20E0AF799E1B-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--F55387BA03C14531AA6A20E0AF799E1B-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--F55387BA03C14531AA6A20E0AF799E1B-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--F55387BA03C14531AA6A20E0AF799E1B-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--F55387BA03C14531AA6A20E0AF799E1B-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--F55387BA03C14531AA6A20E0AF799E1B--></AD_COLUMN>
+
 <!--F576879F0F224D458765D4DAEF868FAA--><AD_COLUMN>
 <!--F576879F0F224D458765D4DAEF868FAA-->  <AD_COLUMN_ID><![CDATA[F576879F0F224D458765D4DAEF868FAA]]></AD_COLUMN_ID>
 <!--F576879F0F224D458765D4DAEF868FAA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -293073,7 +293250,7 @@
 <!--F576879F0F224D458765D4DAEF868FAA-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--F576879F0F224D458765D4DAEF868FAA-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--F576879F0F224D458765D4DAEF868FAA-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--F576879F0F224D458765D4DAEF868FAA-->  <POSITION><![CDATA[19]]></POSITION>
+<!--F576879F0F224D458765D4DAEF868FAA-->  <POSITION><![CDATA[20]]></POSITION>
 <!--F576879F0F224D458765D4DAEF868FAA-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--F576879F0F224D458765D4DAEF868FAA-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--F576879F0F224D458765D4DAEF868FAA-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
--- a/src-db/database/sourcedata/AD_ELEMENT.xml	Fri Oct 05 10:33:28 2012 +0000
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml	Tue Oct 30 12:16:46 2012 +0100
@@ -11010,8 +11010,8 @@
 <!--2000-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--2000-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--2000-->  <COLUMNNAME><![CDATA[DueDate]]></COLUMNNAME>
-<!--2000-->  <NAME><![CDATA[Expected Date]]></NAME>
-<!--2000-->  <PRINTNAME><![CDATA[Expected Date]]></PRINTNAME>
+<!--2000-->  <NAME><![CDATA[Due Date]]></NAME>
+<!--2000-->  <PRINTNAME><![CDATA[Due Date]]></PRINTNAME>
 <!--2000-->  <DESCRIPTION><![CDATA[The date when a specified request must be carried out by.]]></DESCRIPTION>
 <!--2000-->  <HELP><![CDATA[Date when the payment is due without deductions or discount]]></HELP>
 <!--2000-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -28588,6 +28588,20 @@
 <!--BFCF265606684D5D97E0EA19D6698145-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--BFCF265606684D5D97E0EA19D6698145--></AD_ELEMENT>
 
+<!--C00EC2D7121949B18BE9D52FE3EB2468--><AD_ELEMENT>
+<!--C00EC2D7121949B18BE9D52FE3EB2468-->  <AD_ELEMENT_ID><![CDATA[C00EC2D7121949B18BE9D52FE3EB2468]]></AD_ELEMENT_ID>
+<!--C00EC2D7121949B18BE9D52FE3EB2468-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C00EC2D7121949B18BE9D52FE3EB2468-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C00EC2D7121949B18BE9D52FE3EB2468-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C00EC2D7121949B18BE9D52FE3EB2468-->  <COLUMNNAME><![CDATA[ExpectedDate]]></COLUMNNAME>
+<!--C00EC2D7121949B18BE9D52FE3EB2468-->  <NAME><![CDATA[Expected Date]]></NAME>
+<!--C00EC2D7121949B18BE9D52FE3EB2468-->  <PRINTNAME><![CDATA[Expected Date]]></PRINTNAME>
+<!--C00EC2D7121949B18BE9D52FE3EB2468-->  <DESCRIPTION><![CDATA[The date when a specified request must be carried out by.]]></DESCRIPTION>
+<!--C00EC2D7121949B18BE9D52FE3EB2468-->  <HELP><![CDATA[Date when the payment is due without deductions or discount]]></HELP>
+<!--C00EC2D7121949B18BE9D52FE3EB2468-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--C00EC2D7121949B18BE9D52FE3EB2468-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--C00EC2D7121949B18BE9D52FE3EB2468--></AD_ELEMENT>
+
 <!--C0B77441B02C9E5FE040007F01005E72--><AD_ELEMENT>
 <!--C0B77441B02C9E5FE040007F01005E72-->  <AD_ELEMENT_ID><![CDATA[C0B77441B02C9E5FE040007F01005E72]]></AD_ELEMENT_ID>
 <!--C0B77441B02C9E5FE040007F01005E72-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -28831,6 +28845,24 @@
 <!--CB65CBB36988405DA4D2F2C36CD29DC4-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--CB65CBB36988405DA4D2F2C36CD29DC4--></AD_ELEMENT>
 
+<!--CC3A45F8D7F94D6799DA24A88F0184F5--><AD_ELEMENT>
+<!--CC3A45F8D7F94D6799DA24A88F0184F5-->  <AD_ELEMENT_ID><![CDATA[CC3A45F8D7F94D6799DA24A88F0184F5]]></AD_ELEMENT_ID>
+<!--CC3A45F8D7F94D6799DA24A88F0184F5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--CC3A45F8D7F94D6799DA24A88F0184F5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--CC3A45F8D7F94D6799DA24A88F0184F5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--CC3A45F8D7F94D6799DA24A88F0184F5-->  <COLUMNNAME><![CDATA[FIN_Payment_Sched_Inv_ID]]></COLUMNNAME>
+<!--CC3A45F8D7F94D6799DA24A88F0184F5-->  <NAME><![CDATA[Invoice Payment In Plan]]></NAME>
+<!--CC3A45F8D7F94D6799DA24A88F0184F5-->  <PRINTNAME><![CDATA[Invoice Payment In Plan]]></PRINTNAME>
+<!--CC3A45F8D7F94D6799DA24A88F0184F5-->  <DESCRIPTION><![CDATA[Set of payments in planned to be collected/paid for an invoice]]></DESCRIPTION>
+<!--CC3A45F8D7F94D6799DA24A88F0184F5-->  <HELP><![CDATA[Set of payments in planned to be collected/paid for an invoice]]></HELP>
+<!--CC3A45F8D7F94D6799DA24A88F0184F5-->  <PO_NAME><![CDATA[Invoice Payment Out Plan]]></PO_NAME>
+<!--CC3A45F8D7F94D6799DA24A88F0184F5-->  <PO_PRINTNAME><![CDATA[Invoice Payment Out Plan]]></PO_PRINTNAME>
+<!--CC3A45F8D7F94D6799DA24A88F0184F5-->  <PO_DESCRIPTION><![CDATA[Set of payments out planned to be collected/paid for an invoice]]></PO_DESCRIPTION>
+<!--CC3A45F8D7F94D6799DA24A88F0184F5-->  <PO_HELP><![CDATA[Set of payments out planned to be collected/paid for an invoice]]></PO_HELP>
+<!--CC3A45F8D7F94D6799DA24A88F0184F5-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--CC3A45F8D7F94D6799DA24A88F0184F5-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--CC3A45F8D7F94D6799DA24A88F0184F5--></AD_ELEMENT>
+
 <!--CD57A1DBADD440EC9551AE6BC51E8643--><AD_ELEMENT>
 <!--CD57A1DBADD440EC9551AE6BC51E8643-->  <AD_ELEMENT_ID><![CDATA[CD57A1DBADD440EC9551AE6BC51E8643]]></AD_ELEMENT_ID>
 <!--CD57A1DBADD440EC9551AE6BC51E8643-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -29028,6 +29060,24 @@
 <!--D86D2ACAE6A346BCBDDC688BE98AB843-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--D86D2ACAE6A346BCBDDC688BE98AB843--></AD_ELEMENT>
 
+<!--D83B9497015D4097989560C2348969BE--><AD_ELEMENT>
+<!--D83B9497015D4097989560C2348969BE-->  <AD_ELEMENT_ID><![CDATA[D83B9497015D4097989560C2348969BE]]></AD_ELEMENT_ID>
+<!--D83B9497015D4097989560C2348969BE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D83B9497015D4097989560C2348969BE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D83B9497015D4097989560C2348969BE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D83B9497015D4097989560C2348969BE-->  <COLUMNNAME><![CDATA[FIN_Payment_Sched_Ord_ID]]></COLUMNNAME>
+<!--D83B9497015D4097989560C2348969BE-->  <NAME><![CDATA[Order Payment In Plan]]></NAME>
+<!--D83B9497015D4097989560C2348969BE-->  <PRINTNAME><![CDATA[Order Payment In Plan]]></PRINTNAME>
+<!--D83B9497015D4097989560C2348969BE-->  <DESCRIPTION><![CDATA[Set of payments in planned to be collected/paid for an order]]></DESCRIPTION>
+<!--D83B9497015D4097989560C2348969BE-->  <HELP><![CDATA[Set of payments in planned to be collected/paid for an order]]></HELP>
+<!--D83B9497015D4097989560C2348969BE-->  <PO_NAME><![CDATA[Order Payment Out Plan]]></PO_NAME>
+<!--D83B9497015D4097989560C2348969BE-->  <PO_PRINTNAME><![CDATA[Order Payment Out Plan]]></PO_PRINTNAME>
+<!--D83B9497015D4097989560C2348969BE-->  <PO_DESCRIPTION><![CDATA[Set of payments out planned to be collected/paid for an order]]></PO_DESCRIPTION>
+<!--D83B9497015D4097989560C2348969BE-->  <PO_HELP><![CDATA[Set of payments out planned to be collected/paid for an order]]></PO_HELP>
+<!--D83B9497015D4097989560C2348969BE-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D83B9497015D4097989560C2348969BE-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--D83B9497015D4097989560C2348969BE--></AD_ELEMENT>
+
 <!--DB1DD8906C2F4881AC73CF445EDD2092--><AD_ELEMENT>
 <!--DB1DD8906C2F4881AC73CF445EDD2092-->  <AD_ELEMENT_ID><![CDATA[DB1DD8906C2F4881AC73CF445EDD2092]]></AD_ELEMENT_ID>
 <!--DB1DD8906C2F4881AC73CF445EDD2092-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_FIELD.xml	Fri Oct 05 10:33:28 2012 +0000
+++ b/src-db/database/sourcedata/AD_FIELD.xml	Tue Oct 30 12:16:46 2012 +0100
@@ -145504,7 +145504,7 @@
 <!--803330-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--803330-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--803330-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--803330-->  <NAME><![CDATA[Expected Date]]></NAME>
+<!--803330-->  <NAME><![CDATA[Due Date]]></NAME>
 <!--803330-->  <DESCRIPTION><![CDATA[The date when a specified request must be carried out by.]]></DESCRIPTION>
 <!--803330-->  <HELP><![CDATA[Date when the payment is due without deductions or discount]]></HELP>
 <!--803330-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
@@ -180007,10 +180007,10 @@
 <!--2C35866FFB62490998CCAA44F3C0DCE4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--2C35866FFB62490998CCAA44F3C0DCE4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--2C35866FFB62490998CCAA44F3C0DCE4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--2C35866FFB62490998CCAA44F3C0DCE4-->  <NAME><![CDATA[Due Date]]></NAME>
+<!--2C35866FFB62490998CCAA44F3C0DCE4-->  <NAME><![CDATA[Incl. documents up to this date]]></NAME>
 <!--2C35866FFB62490998CCAA44F3C0DCE4-->  <DESCRIPTION><![CDATA[The date when a specified request must be carried out by.]]></DESCRIPTION>
 <!--2C35866FFB62490998CCAA44F3C0DCE4-->  <HELP><![CDATA[Date when the payment is due without deductions or discount]]></HELP>
-<!--2C35866FFB62490998CCAA44F3C0DCE4-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--2C35866FFB62490998CCAA44F3C0DCE4-->  <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED>
 <!--2C35866FFB62490998CCAA44F3C0DCE4-->  <AD_TAB_ID><![CDATA[2DD6F1E2CAE0456AA9797A1D627BFF5E]]></AD_TAB_ID>
 <!--2C35866FFB62490998CCAA44F3C0DCE4-->  <AD_COLUMN_ID><![CDATA[6B105FAB5EBA4DB19DF94843871191DC]]></AD_COLUMN_ID>
 <!--2C35866FFB62490998CCAA44F3C0DCE4-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
@@ -199109,6 +199109,35 @@
 <!--7251F7A9C2CB450A830B24A1EA548CA4-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--7251F7A9C2CB450A830B24A1EA548CA4--></AD_FIELD>
 
+<!--7259D2188F354F7B9D978F112EDEDC25--><AD_FIELD>
+<!--7259D2188F354F7B9D978F112EDEDC25-->  <AD_FIELD_ID><![CDATA[7259D2188F354F7B9D978F112EDEDC25]]></AD_FIELD_ID>
+<!--7259D2188F354F7B9D978F112EDEDC25-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7259D2188F354F7B9D978F112EDEDC25-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7259D2188F354F7B9D978F112EDEDC25-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7259D2188F354F7B9D978F112EDEDC25-->  <NAME><![CDATA[Expected Date]]></NAME>
+<!--7259D2188F354F7B9D978F112EDEDC25-->  <DESCRIPTION><![CDATA[The date when a specified request must be carried out by.]]></DESCRIPTION>
+<!--7259D2188F354F7B9D978F112EDEDC25-->  <HELP><![CDATA[Date when the payment is due without deductions or discount]]></HELP>
+<!--7259D2188F354F7B9D978F112EDEDC25-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--7259D2188F354F7B9D978F112EDEDC25-->  <AD_TAB_ID><![CDATA[D4D450A66C754D65940DBC36B11779C8]]></AD_TAB_ID>
+<!--7259D2188F354F7B9D978F112EDEDC25-->  <AD_COLUMN_ID><![CDATA[F55387BA03C14531AA6A20E0AF799E1B]]></AD_COLUMN_ID>
+<!--7259D2188F354F7B9D978F112EDEDC25-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--7259D2188F354F7B9D978F112EDEDC25-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--7259D2188F354F7B9D978F112EDEDC25-->  <DISPLAYLENGTH><![CDATA[19]]></DISPLAYLENGTH>
+<!--7259D2188F354F7B9D978F112EDEDC25-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--7259D2188F354F7B9D978F112EDEDC25-->  <SEQNO><![CDATA[15]]></SEQNO>
+<!--7259D2188F354F7B9D978F112EDEDC25-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--7259D2188F354F7B9D978F112EDEDC25-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--7259D2188F354F7B9D978F112EDEDC25-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7259D2188F354F7B9D978F112EDEDC25-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--7259D2188F354F7B9D978F112EDEDC25-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--7259D2188F354F7B9D978F112EDEDC25-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7259D2188F354F7B9D978F112EDEDC25-->  <GRID_SEQNO><![CDATA[15]]></GRID_SEQNO>
+<!--7259D2188F354F7B9D978F112EDEDC25-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--7259D2188F354F7B9D978F112EDEDC25-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--7259D2188F354F7B9D978F112EDEDC25-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--7259D2188F354F7B9D978F112EDEDC25-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--7259D2188F354F7B9D978F112EDEDC25--></AD_FIELD>
+
 <!--7263E0F9835A4649A402195E065B97AA--><AD_FIELD>
 <!--7263E0F9835A4649A402195E065B97AA-->  <AD_FIELD_ID><![CDATA[7263E0F9835A4649A402195E065B97AA]]></AD_FIELD_ID>
 <!--7263E0F9835A4649A402195E065B97AA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -204045,7 +204074,7 @@
 <!--7FF2234748F8844FE040007F01003861-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--7FF2234748F8844FE040007F01003861-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7FF2234748F8844FE040007F01003861-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--7FF2234748F8844FE040007F01003861-->  <NAME><![CDATA[Expected Date]]></NAME>
+<!--7FF2234748F8844FE040007F01003861-->  <NAME><![CDATA[Due Date]]></NAME>
 <!--7FF2234748F8844FE040007F01003861-->  <DESCRIPTION><![CDATA[The date when a specified request must be carried out by.]]></DESCRIPTION>
 <!--7FF2234748F8844FE040007F01003861-->  <HELP><![CDATA[Date when the payment is due without deductions or discount]]></HELP>
 <!--7FF2234748F8844FE040007F01003861-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
@@ -204163,7 +204192,7 @@
 <!--7FF2234748FC844FE040007F01003861-->  <AD_TAB_ID><![CDATA[173B46EC4F91406E9B68DCF6464BB308]]></AD_TAB_ID>
 <!--7FF2234748FC844FE040007F01003861-->  <AD_COLUMN_ID><![CDATA[7FF2234748E7844FE040007F01003861]]></AD_COLUMN_ID>
 <!--7FF2234748FC844FE040007F01003861-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--7FF2234748FC844FE040007F01003861-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--7FF2234748FC844FE040007F01003861-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
 <!--7FF2234748FC844FE040007F01003861-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
 <!--7FF2234748FC844FE040007F01003861-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--7FF2234748FC844FE040007F01003861-->  <SEQNO><![CDATA[60]]></SEQNO>
@@ -212449,6 +212478,35 @@
 <!--921CE08F5F3A44EFAAA49F3D15F685F7-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--921CE08F5F3A44EFAAA49F3D15F685F7--></AD_FIELD>
 
+<!--9251087BCEC34A5EA1622E67701963EE--><AD_FIELD>
+<!--9251087BCEC34A5EA1622E67701963EE-->  <AD_FIELD_ID><![CDATA[9251087BCEC34A5EA1622E67701963EE]]></AD_FIELD_ID>
+<!--9251087BCEC34A5EA1622E67701963EE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9251087BCEC34A5EA1622E67701963EE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9251087BCEC34A5EA1622E67701963EE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9251087BCEC34A5EA1622E67701963EE-->  <NAME><![CDATA[Invoice Payment In Plan]]></NAME>
+<!--9251087BCEC34A5EA1622E67701963EE-->  <DESCRIPTION><![CDATA[Set of payments in planned to be collected/paid for an invoice]]></DESCRIPTION>
+<!--9251087BCEC34A5EA1622E67701963EE-->  <HELP><![CDATA[Set of payments in planned to be collected/paid for an invoice]]></HELP>
+<!--9251087BCEC34A5EA1622E67701963EE-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--9251087BCEC34A5EA1622E67701963EE-->  <AD_TAB_ID><![CDATA[173B46EC4F91406E9B68DCF6464BB308]]></AD_TAB_ID>
+<!--9251087BCEC34A5EA1622E67701963EE-->  <AD_COLUMN_ID><![CDATA[F20FDC4004064C7CB665BD655B0F307D]]></AD_COLUMN_ID>
+<!--9251087BCEC34A5EA1622E67701963EE-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--9251087BCEC34A5EA1622E67701963EE-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--9251087BCEC34A5EA1622E67701963EE-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--9251087BCEC34A5EA1622E67701963EE-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--9251087BCEC34A5EA1622E67701963EE-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--9251087BCEC34A5EA1622E67701963EE-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--9251087BCEC34A5EA1622E67701963EE-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--9251087BCEC34A5EA1622E67701963EE-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--9251087BCEC34A5EA1622E67701963EE-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--9251087BCEC34A5EA1622E67701963EE-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--9251087BCEC34A5EA1622E67701963EE-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--9251087BCEC34A5EA1622E67701963EE-->  <GRID_SEQNO><![CDATA[0]]></GRID_SEQNO>
+<!--9251087BCEC34A5EA1622E67701963EE-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--9251087BCEC34A5EA1622E67701963EE-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--9251087BCEC34A5EA1622E67701963EE-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--9251087BCEC34A5EA1622E67701963EE-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--9251087BCEC34A5EA1622E67701963EE--></AD_FIELD>
+
 <!--925D4741ECDC4F4B8194D704A6E0EF62--><AD_FIELD>
 <!--925D4741ECDC4F4B8194D704A6E0EF62-->  <AD_FIELD_ID><![CDATA[925D4741ECDC4F4B8194D704A6E0EF62]]></AD_FIELD_ID>
 <!--925D4741ECDC4F4B8194D704A6E0EF62-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -222227,7 +222285,7 @@
 <!--AF4090093DCC1431E040007F010048A5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--AF4090093DCC1431E040007F010048A5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--AF4090093DCC1431E040007F010048A5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--AF4090093DCC1431E040007F010048A5-->  <NAME><![CDATA[Expected Date]]></NAME>
+<!--AF4090093DCC1431E040007F010048A5-->  <NAME><![CDATA[Due Date]]></NAME>
 <!--AF4090093DCC1431E040007F010048A5-->  <DESCRIPTION><![CDATA[The date when a specified request must be carried out by.]]></DESCRIPTION>
 <!--AF4090093DCC1431E040007F010048A5-->  <HELP><![CDATA[Date when the payment is due without deductions or discount]]></HELP>
 <!--AF4090093DCC1431E040007F010048A5-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
@@ -222671,7 +222729,7 @@
 <!--AF4090093DDD1431E040007F010048A5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--AF4090093DDD1431E040007F010048A5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--AF4090093DDD1431E040007F010048A5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--AF4090093DDD1431E040007F010048A5-->  <NAME><![CDATA[Expected Date]]></NAME>
+<!--AF4090093DDD1431E040007F010048A5-->  <NAME><![CDATA[Due Date]]></NAME>
 <!--AF4090093DDD1431E040007F010048A5-->  <DESCRIPTION><![CDATA[The date when a specified request must be carried out by.]]></DESCRIPTION>
 <!--AF4090093DDD1431E040007F010048A5-->  <HELP><![CDATA[Date when the payment is due without deductions or discount]]></HELP>
 <!--AF4090093DDD1431E040007F010048A5-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
@@ -230521,7 +230579,7 @@
 <!--CD209A4B03CB49888E599377D73FD576-->  <AD_TAB_ID><![CDATA[07F009753DA647C2AF38697BA9F1B1A0]]></AD_TAB_ID>
 <!--CD209A4B03CB49888E599377D73FD576-->  <AD_COLUMN_ID><![CDATA[7FF2234748E7844FE040007F01003861]]></AD_COLUMN_ID>
 <!--CD209A4B03CB49888E599377D73FD576-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--CD209A4B03CB49888E599377D73FD576-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--CD209A4B03CB49888E599377D73FD576-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
 <!--CD209A4B03CB49888E599377D73FD576-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
 <!--CD209A4B03CB49888E599377D73FD576-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
 <!--CD209A4B03CB49888E599377D73FD576-->  <SEQNO><![CDATA[60]]></SEQNO>
@@ -233403,6 +233461,35 @@
 <!--E4B7092CA36E473ABEB7F10F417B2ED2-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--E4B7092CA36E473ABEB7F10F417B2ED2--></AD_FIELD>
 
+<!--E4E2E2ED0513472FA0A5C4E8B6A0AAD2--><AD_FIELD>
+<!--E4E2E2ED0513472FA0A5C4E8B6A0AAD2-->  <AD_FIELD_ID><![CDATA[E4E2E2ED0513472FA0A5C4E8B6A0AAD2]]></AD_FIELD_ID>
+<!--E4E2E2ED0513472FA0A5C4E8B6A0AAD2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E4E2E2ED0513472FA0A5C4E8B6A0AAD2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E4E2E2ED0513472FA0A5C4E8B6A0AAD2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E4E2E2ED0513472FA0A5C4E8B6A0AAD2-->  <NAME><![CDATA[Invoice Payment Out Plan]]></NAME>
+<!--E4E2E2ED0513472FA0A5C4E8B6A0AAD2-->  <DESCRIPTION><![CDATA[Set of payments out planned to be collected/paid for an invoice]]></DESCRIPTION>
+<!--E4E2E2ED0513472FA0A5C4E8B6A0AAD2-->  <HELP><![CDATA[Set of payments out planned to be collected/paid for an invoice]]></HELP>
+<!--E4E2E2ED0513472FA0A5C4E8B6A0AAD2-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--E4E2E2ED0513472FA0A5C4E8B6A0AAD2-->  <AD_TAB_ID><![CDATA[07F009753DA647C2AF38697BA9F1B1A0]]></AD_TAB_ID>
+<!--E4E2E2ED0513472FA0A5C4E8B6A0AAD2-->  <AD_COLUMN_ID><![CDATA[F20FDC4004064C7CB665BD655B0F307D]]></AD_COLUMN_ID>
+<!--E4E2E2ED0513472FA0A5C4E8B6A0AAD2-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--E4E2E2ED0513472FA0A5C4E8B6A0AAD2-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--E4E2E2ED0513472FA0A5C4E8B6A0AAD2-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--E4E2E2ED0513472FA0A5C4E8B6A0AAD2-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--E4E2E2ED0513472FA0A5C4E8B6A0AAD2-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--E4E2E2ED0513472FA0A5C4E8B6A0AAD2-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--E4E2E2ED0513472FA0A5C4E8B6A0AAD2-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--E4E2E2ED0513472FA0A5C4E8B6A0AAD2-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--E4E2E2ED0513472FA0A5C4E8B6A0AAD2-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--E4E2E2ED0513472FA0A5C4E8B6A0AAD2-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--E4E2E2ED0513472FA0A5C4E8B6A0AAD2-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--E4E2E2ED0513472FA0A5C4E8B6A0AAD2-->  <GRID_SEQNO><![CDATA[0]]></GRID_SEQNO>
+<!--E4E2E2ED0513472FA0A5C4E8B6A0AAD2-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--E4E2E2ED0513472FA0A5C4E8B6A0AAD2-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--E4E2E2ED0513472FA0A5C4E8B6A0AAD2-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--E4E2E2ED0513472FA0A5C4E8B6A0AAD2-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--E4E2E2ED0513472FA0A5C4E8B6A0AAD2--></AD_FIELD>
+
 <!--E524B9A940CC45EF945C03D724885D04--><AD_FIELD>
 <!--E524B9A940CC45EF945C03D724885D04-->  <AD_FIELD_ID><![CDATA[E524B9A940CC45EF945C03D724885D04]]></AD_FIELD_ID>
 <!--E524B9A940CC45EF945C03D724885D04-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -234840,6 +234927,35 @@
 <!--F2A3E9CCA3724925B1FCE8565BC75BC3-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--F2A3E9CCA3724925B1FCE8565BC75BC3--></AD_FIELD>
 
+<!--F2B6BDD8DD274536A49DB44C6A35C6EA--><AD_FIELD>
+<!--F2B6BDD8DD274536A49DB44C6A35C6EA-->  <AD_FIELD_ID><![CDATA[F2B6BDD8DD274536A49DB44C6A35C6EA]]></AD_FIELD_ID>
+<!--F2B6BDD8DD274536A49DB44C6A35C6EA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F2B6BDD8DD274536A49DB44C6A35C6EA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F2B6BDD8DD274536A49DB44C6A35C6EA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F2B6BDD8DD274536A49DB44C6A35C6EA-->  <NAME><![CDATA[Expected Date]]></NAME>
+<!--F2B6BDD8DD274536A49DB44C6A35C6EA-->  <DESCRIPTION><![CDATA[The date when a specified request must be carried out by.]]></DESCRIPTION>
+<!--F2B6BDD8DD274536A49DB44C6A35C6EA-->  <HELP><![CDATA[Date when the payment is due without deductions or discount]]></HELP>
+<!--F2B6BDD8DD274536A49DB44C6A35C6EA-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--F2B6BDD8DD274536A49DB44C6A35C6EA-->  <AD_TAB_ID><![CDATA[E13E29EB8CF349BAA3D4CB71873CC896]]></AD_TAB_ID>
+<!--F2B6BDD8DD274536A49DB44C6A35C6EA-->  <AD_COLUMN_ID><![CDATA[1DA3007A3E1547AA95A420E351CB9759]]></AD_COLUMN_ID>
+<!--F2B6BDD8DD274536A49DB44C6A35C6EA-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--F2B6BDD8DD274536A49DB44C6A35C6EA-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--F2B6BDD8DD274536A49DB44C6A35C6EA-->  <DISPLAYLENGTH><![CDATA[19]]></DISPLAYLENGTH>
+<!--F2B6BDD8DD274536A49DB44C6A35C6EA-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--F2B6BDD8DD274536A49DB44C6A35C6EA-->  <SEQNO><![CDATA[15]]></SEQNO>
+<!--F2B6BDD8DD274536A49DB44C6A35C6EA-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--F2B6BDD8DD274536A49DB44C6A35C6EA-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--F2B6BDD8DD274536A49DB44C6A35C6EA-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--F2B6BDD8DD274536A49DB44C6A35C6EA-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--F2B6BDD8DD274536A49DB44C6A35C6EA-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--F2B6BDD8DD274536A49DB44C6A35C6EA-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--F2B6BDD8DD274536A49DB44C6A35C6EA-->  <GRID_SEQNO><![CDATA[15]]></GRID_SEQNO>
+<!--F2B6BDD8DD274536A49DB44C6A35C6EA-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--F2B6BDD8DD274536A49DB44C6A35C6EA-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--F2B6BDD8DD274536A49DB44C6A35C6EA-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--F2B6BDD8DD274536A49DB44C6A35C6EA-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--F2B6BDD8DD274536A49DB44C6A35C6EA--></AD_FIELD>
+
 <!--F36C5360FCA7427AA77D5543BE7B0C46--><AD_FIELD>
 <!--F36C5360FCA7427AA77D5543BE7B0C46-->  <AD_FIELD_ID><![CDATA[F36C5360FCA7427AA77D5543BE7B0C46]]></AD_FIELD_ID>
 <!--F36C5360FCA7427AA77D5543BE7B0C46-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_PROCESS_PARA.xml	Fri Oct 05 10:33:28 2012 +0000
+++ b/src-db/database/sourcedata/AD_PROCESS_PARA.xml	Tue Oct 30 12:16:46 2012 +0100
@@ -4516,7 +4516,7 @@
 <!--F6C130E3B2DD4414A162FC6BA4F2808E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--F6C130E3B2DD4414A162FC6BA4F2808E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--F6C130E3B2DD4414A162FC6BA4F2808E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--F6C130E3B2DD4414A162FC6BA4F2808E-->  <NAME><![CDATA[Expected Date]]></NAME>
+<!--F6C130E3B2DD4414A162FC6BA4F2808E-->  <NAME><![CDATA[Due Date]]></NAME>
 <!--F6C130E3B2DD4414A162FC6BA4F2808E-->  <DESCRIPTION><![CDATA[The date when a specified request must be carried out by.]]></DESCRIPTION>
 <!--F6C130E3B2DD4414A162FC6BA4F2808E-->  <HELP><![CDATA[Date when the payment is due without deductions or discount]]></HELP>
 <!--F6C130E3B2DD4414A162FC6BA4F2808E-->  <AD_PROCESS_ID><![CDATA[FB740AB61B0E42B198D2C88D3A0D0CE6]]></AD_PROCESS_ID>
--- a/src-db/database/sourcedata/AD_REFERENCE.xml	Fri Oct 05 10:33:28 2012 +0000
+++ b/src-db/database/sourcedata/AD_REFERENCE.xml	Tue Oct 30 12:16:46 2012 +0100
@@ -4260,6 +4260,18 @@
 <!--1F603F334B704F53928B8DB908611657-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
 <!--1F603F334B704F53928B8DB908611657--></AD_REFERENCE>
 
+<!--1FAD22496E6F468DBC46CA23FE204B41--><AD_REFERENCE>
+<!--1FAD22496E6F468DBC46CA23FE204B41-->  <AD_REFERENCE_ID><![CDATA[1FAD22496E6F468DBC46CA23FE204B41]]></AD_REFERENCE_ID>
+<!--1FAD22496E6F468DBC46CA23FE204B41-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1FAD22496E6F468DBC46CA23FE204B41-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1FAD22496E6F468DBC46CA23FE204B41-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1FAD22496E6F468DBC46CA23FE204B41-->  <NAME><![CDATA[FIN_PaymentSchedule]]></NAME>
+<!--1FAD22496E6F468DBC46CA23FE204B41-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--1FAD22496E6F468DBC46CA23FE204B41-->  <ISBASEREFERENCE><![CDATA[N]]></ISBASEREFERENCE>
+<!--1FAD22496E6F468DBC46CA23FE204B41-->  <PARENTREFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></PARENTREFERENCE_ID>
+<!--1FAD22496E6F468DBC46CA23FE204B41-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
+<!--1FAD22496E6F468DBC46CA23FE204B41--></AD_REFERENCE>
+
 <!--21A4E92C455C432FACDC0C45372454F5--><AD_REFERENCE>
 <!--21A4E92C455C432FACDC0C45372454F5-->  <AD_REFERENCE_ID><![CDATA[21A4E92C455C432FACDC0C45372454F5]]></AD_REFERENCE_ID>
 <!--21A4E92C455C432FACDC0C45372454F5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/OBUISEL_SELECTOR.xml	Fri Oct 05 10:33:28 2012 +0000
+++ b/src-db/database/sourcedata/OBUISEL_SELECTOR.xml	Tue Oct 30 12:16:46 2012 +0100
@@ -152,6 +152,21 @@
 <!--EB3C41F0973A4EDA91E475833792A6D4-->  <CUSTOM_QUERY><![CDATA[Y]]></CUSTOM_QUERY>
 <!--EB3C41F0973A4EDA91E475833792A6D4--></OBUISEL_SELECTOR>
 
+<!--DE9CFEFB6F49404995BE8B0FBF3F7F9E--><OBUISEL_SELECTOR>
+<!--DE9CFEFB6F49404995BE8B0FBF3F7F9E-->  <OBUISEL_SELECTOR_ID><![CDATA[DE9CFEFB6F49404995BE8B0FBF3F7F9E]]></OBUISEL_SELECTOR_ID>
+<!--DE9CFEFB6F49404995BE8B0FBF3F7F9E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--DE9CFEFB6F49404995BE8B0FBF3F7F9E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--DE9CFEFB6F49404995BE8B0FBF3F7F9E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--DE9CFEFB6F49404995BE8B0FBF3F7F9E-->  <NAME><![CDATA[Payment Schedule]]></NAME>
+<!--DE9CFEFB6F49404995BE8B0FBF3F7F9E-->  <AD_REFERENCE_ID><![CDATA[1FAD22496E6F468DBC46CA23FE204B41]]></AD_REFERENCE_ID>
+<!--DE9CFEFB6F49404995BE8B0FBF3F7F9E-->  <AD_TABLE_ID><![CDATA[CE9AFF5F51B846AEAB0B6CBF829092CD]]></AD_TABLE_ID>
+<!--DE9CFEFB6F49404995BE8B0FBF3F7F9E-->  <OBCLKER_TEMPLATE_ID><![CDATA[9314DE8599AD44E7BFC4CC50699042AB]]></OBCLKER_TEMPLATE_ID>
+<!--DE9CFEFB6F49404995BE8B0FBF3F7F9E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--DE9CFEFB6F49404995BE8B0FBF3F7F9E-->  <SUGGESTIONTEXTMATCHSTYLE><![CDATA[startsWith]]></SUGGESTIONTEXTMATCHSTYLE>
+<!--DE9CFEFB6F49404995BE8B0FBF3F7F9E-->  <POPUPTEXTMATCHSTYLE><![CDATA[startsWith]]></POPUPTEXTMATCHSTYLE>
+<!--DE9CFEFB6F49404995BE8B0FBF3F7F9E-->  <CUSTOM_QUERY><![CDATA[N]]></CUSTOM_QUERY>
+<!--DE9CFEFB6F49404995BE8B0FBF3F7F9E--></OBUISEL_SELECTOR>
+
 <!--F132874BE0954A9B8C1301BE20704730--><OBUISEL_SELECTOR>
 <!--F132874BE0954A9B8C1301BE20704730-->  <OBUISEL_SELECTOR_ID><![CDATA[F132874BE0954A9B8C1301BE20704730]]></OBUISEL_SELECTOR_ID>
 <!--F132874BE0954A9B8C1301BE20704730-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
Binary file src-util/modulescript/build/classes/org/openbravo/modulescript/UpdateDueDate.class has changed
Binary file src-util/modulescript/build/classes/org/openbravo/modulescript/UpdateDueDateData.class has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-util/modulescript/build/javasqlc/src/org/openbravo/modulescript/UpdateDueDateData.java	Tue Oct 30 12:16:46 2012 +0100
@@ -0,0 +1,207 @@
+//Sqlc generated V1.O00-1
+package org.openbravo.modulescript;
+
+import java.sql.*;
+
+import org.apache.log4j.Logger;
+
+import javax.servlet.ServletException;
+
+import org.openbravo.data.FieldProvider;
+import org.openbravo.database.ConnectionProvider;
+import org.openbravo.data.UtilSql;
+import java.util.*;
+
+class UpdateDueDateData implements FieldProvider {
+static Logger log4j = Logger.getLogger(UpdateDueDateData.class);
+  private String InitRecordNumber="0";
+  public String count;
+
+  public String getInitRecordNumber() {
+    return InitRecordNumber;
+  }
+
+  public String getField(String fieldName) {
+    if (fieldName.equalsIgnoreCase("count"))
+      return count;
+   else {
+     log4j.debug("Field does not exist: " + fieldName);
+     return null;
+   }
+ }
+
+  public static UpdateDueDateData[] select(ConnectionProvider connectionProvider)    throws ServletException {
+    return select(connectionProvider, 0, 0);
+  }
+
+  public static UpdateDueDateData[] select(ConnectionProvider connectionProvider, int firstRegister, int numberRegisters)    throws ServletException {
+    String strSql = "";
+    strSql = strSql + 
+      "        select 1 as count from dual";
+
+    ResultSet result;
+    Vector<java.lang.Object> vector = new Vector<java.lang.Object>(0);
+    PreparedStatement st = null;
+
+    try {
+    st = connectionProvider.getPreparedStatement(strSql);
+
+      result = st.executeQuery();
+      long countRecord = 0;
+      long countRecordSkip = 1;
+      boolean continueResult = true;
+      while(countRecordSkip < firstRegister && continueResult) {
+        continueResult = result.next();
+        countRecordSkip++;
+      }
+      while(continueResult && result.next()) {
+        countRecord++;
+        UpdateDueDateData objectUpdateDueDateData = new UpdateDueDateData();
+        objectUpdateDueDateData.count = UtilSql.getValue(result, "count");
+        objectUpdateDueDateData.InitRecordNumber = Integer.toString(firstRegister);
+        vector.addElement(objectUpdateDueDateData);
+        if (countRecord >= numberRegisters && numberRegisters != 0) {
+          continueResult = false;
+        }
+      }
+      result.close();
+    } catch(SQLException e){
+      log4j.error("SQL error in query: " + strSql + "Exception:"+ e);
+      throw new ServletException("@CODE=" + Integer.toString(e.getErrorCode()) + "@" + e.getMessage());
+    } catch(Exception ex){
+      log4j.error("Exception in query: " + strSql + "Exception:"+ ex);
+      throw new ServletException("@CODE=@" + ex.getMessage());
+    } finally {
+      try {
+        connectionProvider.releasePreparedStatement(st);
+      } catch(Exception ignore){
+        ignore.printStackTrace();
+      }
+    }
+    UpdateDueDateData objectUpdateDueDateData[] = new UpdateDueDateData[vector.size()];
+    vector.copyInto(objectUpdateDueDateData);
+    return(objectUpdateDueDateData);
+  }
+
+  public static boolean needsUpdate(ConnectionProvider connectionProvider)    throws ServletException {
+    String strSql = "";
+    strSql = strSql + 
+      "        select count(1) as count from dual" +
+      "        where exists(select 1 from fin_payment_schedule" +
+      "                        where origduedate is not null)";
+
+    ResultSet result;
+    boolean boolReturn = false;
+    PreparedStatement st = null;
+
+    try {
+    st = connectionProvider.getPreparedStatement(strSql);
+
+      result = st.executeQuery();
+      if(result.next()) {
+        boolReturn = !UtilSql.getValue(result, "count").equals("0");
+      }
+      result.close();
+    } catch(SQLException e){
+      log4j.error("SQL error in query: " + strSql + "Exception:"+ e);
+      throw new ServletException("@CODE=" + Integer.toString(e.getErrorCode()) + "@" + e.getMessage());
+    } catch(Exception ex){
+      log4j.error("Exception in query: " + strSql + "Exception:"+ ex);
+      throw new ServletException("@CODE=@" + ex.getMessage());
+    } finally {
+      try {
+        connectionProvider.releasePreparedStatement(st);
+      } catch(Exception ignore){
+        ignore.printStackTrace();
+      }
+    }
+    return(boolReturn);
+  }
+
+  public static int updateExpectedDate(ConnectionProvider connectionProvider)    throws ServletException {
+    String strSql = "";
+    strSql = strSql + 
+      "        update fin_payment_schedule set expecteddate=duedate" +
+      "        where origduedate is not null";
+
+    int updateCount = 0;
+    PreparedStatement st = null;
+
+    try {
+    st = connectionProvider.getPreparedStatement(strSql);
+
+      updateCount = st.executeUpdate();
+    } catch(SQLException e){
+      log4j.error("SQL error in query: " + strSql + "Exception:"+ e);
+      throw new ServletException("@CODE=" + Integer.toString(e.getErrorCode()) + "@" + e.getMessage());
+    } catch(Exception ex){
+      log4j.error("Exception in query: " + strSql + "Exception:"+ ex);
+      throw new ServletException("@CODE=@" + ex.getMessage());
+    } finally {
+      try {
+        connectionProvider.releasePreparedStatement(st);
+      } catch(Exception ignore){
+        ignore.printStackTrace();
+      }
+    }
+    return(updateCount);
+  }
+
+  public static int updateDueDate(ConnectionProvider connectionProvider)    throws ServletException {
+    String strSql = "";
+    strSql = strSql + 
+      "        update fin_payment_schedule set duedate=origduedate" +
+      "        where origduedate is not null";
+
+    int updateCount = 0;
+    PreparedStatement st = null;
+
+    try {
+    st = connectionProvider.getPreparedStatement(strSql);
+
+      updateCount = st.executeUpdate();
+    } catch(SQLException e){
+      log4j.error("SQL error in query: " + strSql + "Exception:"+ e);
+      throw new ServletException("@CODE=" + Integer.toString(e.getErrorCode()) + "@" + e.getMessage());
+    } catch(Exception ex){
+      log4j.error("Exception in query: " + strSql + "Exception:"+ ex);
+      throw new ServletException("@CODE=@" + ex.getMessage());
+    } finally {
+      try {
+        connectionProvider.releasePreparedStatement(st);
+      } catch(Exception ignore){
+        ignore.printStackTrace();
+      }
+    }
+    return(updateCount);
+  }
+
+  public static int updateOrigDueDate(ConnectionProvider connectionProvider)    throws ServletException {
+    String strSql = "";
+    strSql = strSql + 
+      "        update fin_payment_schedule set origduedate=null" +
+      "        where origduedate is not null";
+
+    int updateCount = 0;
+    PreparedStatement st = null;
+
+    try {
+    st = connectionProvider.getPreparedStatement(strSql);
+
+      updateCount = st.executeUpdate();
+    } catch(SQLException e){
+      log4j.error("SQL error in query: " + strSql + "Exception:"+ e);
+      throw new ServletException("@CODE=" + Integer.toString(e.getErrorCode()) + "@" + e.getMessage());
+    } catch(Exception ex){
+      log4j.error("Exception in query: " + strSql + "Exception:"+ ex);
+      throw new ServletException("@CODE=@" + ex.getMessage());
+    } finally {
+      try {
+        connectionProvider.releasePreparedStatement(st);
+      } catch(Exception ignore){
+        ignore.printStackTrace();
+      }
+    }
+    return(updateCount);
+  }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-util/modulescript/src/org/openbravo/modulescript/UpdateDueDate.java	Tue Oct 30 12:16:46 2012 +0100
@@ -0,0 +1,45 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2010 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+ */
+package org.openbravo.modulescript;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.UUID;
+import org.apache.log4j.Logger;
+
+import javax.servlet.ServletException;
+
+import org.openbravo.database.ConnectionProvider;
+
+public class UpdateDueDate extends ModuleScript {
+  @Override
+  // Updates due date based on orig due date (now deprecated) and sets orig due date to null
+  public void execute() {
+    try {
+      ConnectionProvider cp = getConnectionProvider();
+      if(UpdateDueDateData.needsUpdate(cp)){
+        UpdateDueDateData.updateExpectedDate(cp);
+        UpdateDueDateData.updateDueDate(cp);
+        UpdateDueDateData.updateOrigDueDate(cp);
+      }
+    } catch (Exception e) {
+      handleError(e);
+    }
+  }
+}
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-util/modulescript/src/org/openbravo/modulescript/UpdateDueDate_data.xsql	Tue Oct 30 12:16:46 2012 +0100
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2012 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+-->
+<SqlClass name="UpdateDueDateData" package="org.openbravo.modulescript">
+   <SqlClassComment></SqlClassComment>
+   <SqlMethod name="select" type="preparedStatement" return="multiple">
+    <SqlMethodComment></SqlMethodComment>
+    <Sql>
+      <![CDATA[
+        select 1 as count from dual
+      ]]>
+    </Sql>
+  </SqlMethod>
+   <SqlMethod name="needsUpdate" type="preparedStatement" return="boolean">
+    <SqlMethodComment></SqlMethodComment>
+    <Sql>
+      <![CDATA[
+        select count(1) as count from dual
+        where exists(select 1 from fin_payment_schedule
+                        where origduedate is not null)
+      ]]>
+    </Sql>
+  </SqlMethod>
+   <SqlMethod name="updateExpectedDate" type="preparedStatement" return="rowcount">
+    <SqlMethodComment></SqlMethodComment>
+    <Sql>
+      <![CDATA[
+        update fin_payment_schedule set expecteddate=duedate
+        where origduedate is not null
+      ]]>
+    </Sql>
+  </SqlMethod>
+   <SqlMethod name="updateDueDate" type="preparedStatement" return="rowcount">
+    <SqlMethodComment></SqlMethodComment>
+    <Sql>
+      <![CDATA[
+        update fin_payment_schedule set duedate=origduedate
+        where origduedate is not null
+      ]]>
+    </Sql>
+  </SqlMethod>
+   <SqlMethod name="updateOrigDueDate" type="preparedStatement" return="rowcount">
+    <SqlMethodComment></SqlMethodComment>
+    <Sql>
+      <![CDATA[
+        update fin_payment_schedule set origduedate=null
+        where origduedate is not null
+      ]]>
+    </Sql>
+  </SqlMethod>
+</SqlClass>
\ No newline at end of file