Merge with pi changeset 18482:7b3cbd5e4146
authorMikel Irurita <mikel.irurita@openbravo.com>
Tue, 06 Nov 2012 08:30:48 +0100
changeset 18839 dcbcd97e71fc
parent 18837 7140fecfe3d4 (current diff)
parent 18482 7b3cbd5e4146 (diff)
child 18840 173f8a0b0ce7
Merge with pi changeset 18482:7b3cbd5e4146
src-db/database/model/functions/C_INVOICE_POST.xml
src-db/database/model/functions/C_ORDER_POST1.xml
src-db/database/model/functions/M_INOUT_POST.xml
src-db/database/model/tables/C_INVOICE.xml
src-db/database/model/tables/C_INVOICELINE.xml
src-db/database/model/tables/C_ORDER.xml
src-db/database/model/tables/C_ORDERLINE.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_MENU.xml
src-db/database/sourcedata/AD_MESSAGE.xml
src-db/database/sourcedata/AD_MODEL_OBJECT.xml
src-db/database/sourcedata/AD_PROCESS.xml
src-db/database/sourcedata/AD_REFERENCE.xml
src-db/database/sourcedata/AD_REF_LIST.xml
src-db/database/sourcedata/AD_TAB.xml
src-db/database/sourcedata/AD_TABLE.xml
src-db/database/sourcedata/AD_TREENODE.xml
src-db/database/sourcedata/AD_WINDOW.xml
src-db/database/sourcedata/OBUISEL_SELECTOR.xml
src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql
src/org/openbravo/erpCommon/ad_forms/DocLineInvoice_data.xsql
--- a/.hgsigs	Tue Oct 30 14:10:45 2012 +0100
+++ b/.hgsigs	Tue Nov 06 08:30:48 2012 +0100
@@ -81,6 +81,9 @@
 6476bb0e9da298f7adb7759265f784d9eb28884d 0 iEYEABECAAYFAlBkPuAACgkQCX/oGf+2qkMUxgCgglb7oUz6aO/2IC55x7u2xRy65HoAnj83lJHvsqrlllOquMxoLJ2UkTkO
 3ef42df4953f5813543c5d1cb2b323d13c8c0359 0 iEYEABECAAYFAlA/cv4ACgkQCX/oGf+2qkMT3gCgjbewzyw3X/1MOZjn6V5P3HqrQtoAoPdsUsBzwVelyg7jpbUhhzGW5Vbz
 d221450bb4d5334f101e6d0fe5d2e941bb714f0a 0 iEYEABECAAYFAlBqvAsACgkQCX/oGf+2qkNIogCfTU6AVwlfmEH2DZUjGkiE1zzo25MAoOkIN46+PHwWKslqp5lxFShVzVTd
+18d1c926f607a207a86f39f4cb0477d7abaea231 0 iEYEABECAAYFAlCITCEACgkQCX/oGf+2qkMxggCg0SsDTC/8I/S7f7HTRlKS8ZtABzwAoOiVWjBJkbhwi7ZxJDEVQA1E/6aH
 7643bde3a4855fc35ddf7269a221ba0e77863a75 0 iEYEABECAAYFAlBgQyAACgkQCX/oGf+2qkNE2ACfb7Xzd4dq5VTeUnFo9VSsPqoQHtsAn063Puz1dhXpBsvhgkpbDV7fXiR6
 2680cddd9aca96f87a83156d3ca27935a692dfb3 0 iEYEABECAAYFAlBsebEACgkQCX/oGf+2qkMexACdFPyyCM6bMSTiXilJF9M61iXNBQ4AnAwzonIXgFkr4tyY1WHa+PGw3caA
+12914c7ff338d71cdb942a1222174e6afa8771b2 0 iEYEABECAAYFAlCO6PcACgkQCX/oGf+2qkMl/wCfRObV0QOmE8SyyLxPPehcVX51Ho8AmwaEYe6MQiQDKgTY6rm/XMlBvBRa
 aee16f41346874b9e355af6007df8df57b7f0266 0 iEYEABECAAYFAlBut3kACgkQCX/oGf+2qkPE8gCaAyk5dQSNyoOSpzPeOEtOLBhrF0MAn3XWPPVJ1Pb7vCei3oE3aQ8Ctj9o
+99f8eda49e53a4782416f5b18442945c4b5e63b5 0 iEYEABECAAYFAlCRrN8ACgkQCX/oGf+2qkOAJQCdGW7u6kmDrbDAerqPP8WEjveCCA8AoKnuoxJ0oG4YoECyXIAAFwQPVR+/
--- a/.hgtags	Tue Oct 30 14:10:45 2012 +0100
+++ b/.hgtags	Tue Nov 06 08:30:48 2012 +0100
@@ -92,6 +92,9 @@
 141c70bce6606bca6bf2b8422b9c27fbf19e7ede 3.0MP13.2
 35168ddf12d33e94aeb18d2c79c6d9255a26c742 3.0MP14
 6861c9689350eae52de16fad01f78b37f5164c9e 3.0MP14.1
+91fb79467af4f71728e776b69dd1092dab8b2b5f 3.0MP14.2
 bf2e6628cebd62b56796fe8433c35378d516e375 3.0MP15
 fa0e90f7e9eed2e99536b6c372a15a2448c03d06 3.0MP15.1
+dd22f6b9902296a7d3f48b871fc8436ef20fdfdc 3.0MP15.2
 1cd80d4b32bbafca742ca1406fee082f97f5f254 3.0MP16
+84deb08844286485e5f948cdf06cec2ea727eddf 3.0MP16.1
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml	Tue Nov 06 08:30:48 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	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml	Tue Nov 06 08:30:48 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	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/views/APRM_PAYMENT_PROP_PICK_EDIT.xml	Tue Nov 06 08:30:48 2012 +0100
@@ -1,4 +1,4 @@
 <?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,  CASE WHEN ppd.writeoffamt <> 0 THEN 'Y' ELSE 'N' END AS writeoff,  CASE WHEN ppd.fin_payment_scheduledetail_id IS NULL THEN 'N' ELSE 'Y' END AS ob_selected, COALESCE(psi.fin_payment_priority_id, pso.fin_payment_priority_id) AS fin_payment_priority_id, COALESCE(i.c_currency_id, o.c_currency_id) AS c_currency_id, COALESCE(i.issotrx, o.issotrx) AS issotrx FROM fin_payment_scheduledetail psd LEFT JOIN fin_payment_prop_detail ppd ON psd.fin_payment_scheduledetail_id = ppd.fin_payment_scheduledetail_id LEFT JOIN fin_payment_schedule psi ON psd.fin_payment_schedule_invoice = psi.fin_payment_schedule_id LEFT JOIN fin_payment_schedule pso ON psd.fin_payment_schedule_order = pso.fin_payment_schedule_id LEFT JOIN c_invoice i ON psi.c_invoice_id = i.c_invoice_id LEFT JOIN c_order o ON pso.c_order_id = o.c_order_id WHERE psd.fin_payment_detail_id IS NULL]]></view>
+    <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' END AS writeoff,  CASE WHEN ppd.fin_payment_scheduledetail_id IS NULL THEN 'N' ELSE 'Y' END AS ob_selected, COALESCE(psi.fin_payment_priority_id, pso.fin_payment_priority_id) AS fin_payment_priority_id, COALESCE(i.c_currency_id, o.c_currency_id) AS c_currency_id, COALESCE(i.issotrx, o.issotrx) AS issotrx FROM fin_payment_scheduledetail psd LEFT JOIN fin_payment_prop_detail ppd ON psd.fin_payment_scheduledetail_id = ppd.fin_payment_scheduledetail_id LEFT JOIN fin_payment_schedule psi ON psd.fin_payment_schedule_invoice = psi.fin_payment_schedule_id LEFT JOIN fin_payment_schedule pso ON psd.fin_payment_schedule_order = pso.fin_payment_schedule_id LEFT JOIN c_invoice i ON psi.c_invoice_id = i.c_invoice_id LEFT JOIN c_order o ON pso.c_order_id = o.c_order_id WHERE psd.fin_payment_detail_id IS NULL]]></view>
   </database>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml	Tue Nov 06 08:30:48 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	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml	Tue Nov 06 08:30:48 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>
@@ -9374,7 +9578,7 @@
 <!--97E891BCB10B4487ABF5B0811CCF2AFC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--97E891BCB10B4487ABF5B0811CCF2AFC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--97E891BCB10B4487ABF5B0811CCF2AFC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--97E891BCB10B4487ABF5B0811CCF2AFC-->  <NAME><![CDATA[Expected Date]]></NAME>
+<!--97E891BCB10B4487ABF5B0811CCF2AFC-->  <NAME><![CDATA[Due Date]]></NAME>
 <!--97E891BCB10B4487ABF5B0811CCF2AFC-->  <DESCRIPTION><![CDATA[The date when a specified request must be carried out by.]]></DESCRIPTION>
 <!--97E891BCB10B4487ABF5B0811CCF2AFC-->  <HELP><![CDATA[Date when the payment is due without deductions or discount]]></HELP>
 <!--97E891BCB10B4487ABF5B0811CCF2AFC-->  <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>
@@ -11897,7 +12130,7 @@
 <!--B14B509740E585BBE040A8C0916624A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--B14B509740E585BBE040A8C0916624A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--B14B509740E585BBE040A8C0916624A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--B14B509740E585BBE040A8C0916624A4-->  <NAME><![CDATA[Expected Date]]></NAME>
+<!--B14B509740E585BBE040A8C0916624A4-->  <NAME><![CDATA[Due Date]]></NAME>
 <!--B14B509740E585BBE040A8C0916624A4-->  <DESCRIPTION><![CDATA[The date when a specified request must be carried out by.]]></DESCRIPTION>
 <!--B14B509740E585BBE040A8C0916624A4-->  <HELP><![CDATA[Date when the payment is due without deductions or discount]]></HELP>
 <!--B14B509740E585BBE040A8C0916624A4-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
@@ -12583,14 +12816,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>
@@ -13679,7 +13912,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>
@@ -14919,7 +15152,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>
@@ -14928,15 +15161,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_MODULE.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Tue Nov 06 08:30:48 2012 +0100
@@ -6,7 +6,7 @@
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></NAME>
-<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.18258]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.18388]]></VERSION>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <DESCRIPTION><![CDATA[Managing your finances with an ERP does not have to be difficult. Enjoy a radically improved user experience that combines the power of an enterprise grade financial application with the simplicity and ease of a web 2.0 personal accounting service.]]></DESCRIPTION>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <HELP><![CDATA[Advanced Payables and Receivables Management simplifies and automates the business processes around the management of financial accounts, from the receipt and issue of payment, to the reconciliation of those events with bank statements.
 If you would like to help shape this module you are welcome to take part in the forum discussions or register feature requests or issues in the corresponding (Forum and Bug Tracking) sections in the Advanced Payables and Receivable project in the OB Forge.]]></HELP>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Nov 06 08:30:48 2012 +0100
@@ -7,7 +7,7 @@
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID>
-<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.18258]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.18388]]></STARTVERSION>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Selector]]></DEPENDANT_MODULE_NAME>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--B97FC854C6DD41E692161585645A900F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--B97FC854C6DD41E692161585645A900F-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--B97FC854C6DD41E692161585645A900F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--B97FC854C6DD41E692161585645A900F-->  <STARTVERSION><![CDATA[3.0.18258]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->  <STARTVERSION><![CDATA[3.0.18388]]></STARTVERSION>
 <!--B97FC854C6DD41E692161585645A900F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--B97FC854C6DD41E692161585645A900F-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--B97FC854C6DD41E692161585645A900F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml	Tue Nov 06 08:30:48 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	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Tue Nov 06 08:30:48 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>
@@ -286,17 +297,6 @@
 <!--30E50BD12DB1498B817E07734F7A6D9C-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--30E50BD12DB1498B817E07734F7A6D9C--></AD_TEXTINTERFACES>
 
-<!--3276B307A1404A97A4F885E3B26A890C--><AD_TEXTINTERFACES>
-<!--3276B307A1404A97A4F885E3B26A890C-->  <AD_TEXTINTERFACES_ID><![CDATA[3276B307A1404A97A4F885E3B26A890C]]></AD_TEXTINTERFACES_ID>
-<!--3276B307A1404A97A4F885E3B26A890C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--3276B307A1404A97A4F885E3B26A890C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--3276B307A1404A97A4F885E3B26A890C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--3276B307A1404A97A4F885E3B26A890C-->  <TEXT><![CDATA[Due Date]]></TEXT>
-<!--3276B307A1404A97A4F885E3B26A890C-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html]]></FILENAME>
-<!--3276B307A1404A97A4F885E3B26A890C-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--3276B307A1404A97A4F885E3B26A890C-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--3276B307A1404A97A4F885E3B26A890C--></AD_TEXTINTERFACES>
-
 <!--354E5EF7FCD142078572A472031A4F8D--><AD_TEXTINTERFACES>
 <!--354E5EF7FCD142078572A472031A4F8D-->  <AD_TEXTINTERFACES_ID><![CDATA[354E5EF7FCD142078572A472031A4F8D]]></AD_TEXTINTERFACES_ID>
 <!--354E5EF7FCD142078572A472031A4F8D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -319,17 +319,6 @@
 <!--361C7BAF7DFE4D90B8A2B671B4548B34-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--361C7BAF7DFE4D90B8A2B671B4548B34--></AD_TEXTINTERFACES>
 
-<!--37495996C56F4D6D96FA89D5F2944CD4--><AD_TEXTINTERFACES>
-<!--37495996C56F4D6D96FA89D5F2944CD4-->  <AD_TEXTINTERFACES_ID><![CDATA[37495996C56F4D6D96FA89D5F2944CD4]]></AD_TEXTINTERFACES_ID>
-<!--37495996C56F4D6D96FA89D5F2944CD4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--37495996C56F4D6D96FA89D5F2944CD4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--37495996C56F4D6D96FA89D5F2944CD4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--37495996C56F4D6D96FA89D5F2944CD4-->  <TEXT><![CDATA[Due Date To]]></TEXT>
-<!--37495996C56F4D6D96FA89D5F2944CD4-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html]]></FILENAME>
-<!--37495996C56F4D6D96FA89D5F2944CD4-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--37495996C56F4D6D96FA89D5F2944CD4-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--37495996C56F4D6D96FA89D5F2944CD4--></AD_TEXTINTERFACES>
-
 <!--37B32EEA0B6C4342B63602C168810F8B--><AD_TEXTINTERFACES>
 <!--37B32EEA0B6C4342B63602C168810F8B-->  <AD_TEXTINTERFACES_ID><![CDATA[37B32EEA0B6C4342B63602C168810F8B]]></AD_TEXTINTERFACES_ID>
 <!--37B32EEA0B6C4342B63602C168810F8B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -363,17 +352,6 @@
 <!--37F61B2C4BBA44CD9E841C89E89A15DE-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--37F61B2C4BBA44CD9E841C89E89A15DE--></AD_TEXTINTERFACES>
 
-<!--39362908D8D14439B7D7C230905328CF--><AD_TEXTINTERFACES>
-<!--39362908D8D14439B7D7C230905328CF-->  <AD_TEXTINTERFACES_ID><![CDATA[39362908D8D14439B7D7C230905328CF]]></AD_TEXTINTERFACES_ID>
-<!--39362908D8D14439B7D7C230905328CF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--39362908D8D14439B7D7C230905328CF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--39362908D8D14439B7D7C230905328CF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--39362908D8D14439B7D7C230905328CF-->  <TEXT><![CDATA[Due Date To]]></TEXT>
-<!--39362908D8D14439B7D7C230905328CF-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME>
-<!--39362908D8D14439B7D7C230905328CF-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--39362908D8D14439B7D7C230905328CF-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--39362908D8D14439B7D7C230905328CF--></AD_TEXTINTERFACES>
-
 <!--3AE410B1911847BDBFA99B086E0F0F9C--><AD_TEXTINTERFACES>
 <!--3AE410B1911847BDBFA99B086E0F0F9C-->  <AD_TEXTINTERFACES_ID><![CDATA[3AE410B1911847BDBFA99B086E0F0F9C]]></AD_TEXTINTERFACES_ID>
 <!--3AE410B1911847BDBFA99B086E0F0F9C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -638,17 +616,6 @@
 <!--5B53F2467C2A43FEB0A480C4B0813FCA-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--5B53F2467C2A43FEB0A480C4B0813FCA--></AD_TEXTINTERFACES>
 
-<!--609C653E189A457A86E6AF48EC3750BA--><AD_TEXTINTERFACES>
-<!--609C653E189A457A86E6AF48EC3750BA-->  <AD_TEXTINTERFACES_ID><![CDATA[609C653E189A457A86E6AF48EC3750BA]]></AD_TEXTINTERFACES_ID>
-<!--609C653E189A457A86E6AF48EC3750BA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--609C653E189A457A86E6AF48EC3750BA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--609C653E189A457A86E6AF48EC3750BA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--609C653E189A457A86E6AF48EC3750BA-->  <TEXT><![CDATA[Due Date From]]></TEXT>
-<!--609C653E189A457A86E6AF48EC3750BA-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME>
-<!--609C653E189A457A86E6AF48EC3750BA-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--609C653E189A457A86E6AF48EC3750BA-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--609C653E189A457A86E6AF48EC3750BA--></AD_TEXTINTERFACES>
-
 <!--61655846581A4E85A62483FFD1550C0B--><AD_TEXTINTERFACES>
 <!--61655846581A4E85A62483FFD1550C0B-->  <AD_TEXTINTERFACES_ID><![CDATA[61655846581A4E85A62483FFD1550C0B]]></AD_TEXTINTERFACES_ID>
 <!--61655846581A4E85A62483FFD1550C0B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -682,17 +649,6 @@
 <!--62BA1CFBB74F40A8A7FABBE150773580-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--62BA1CFBB74F40A8A7FABBE150773580--></AD_TEXTINTERFACES>
 
-<!--6402E58FEDE74C20988E64541D441CE9--><AD_TEXTINTERFACES>
-<!--6402E58FEDE74C20988E64541D441CE9-->  <AD_TEXTINTERFACES_ID><![CDATA[6402E58FEDE74C20988E64541D441CE9]]></AD_TEXTINTERFACES_ID>
-<!--6402E58FEDE74C20988E64541D441CE9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--6402E58FEDE74C20988E64541D441CE9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--6402E58FEDE74C20988E64541D441CE9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--6402E58FEDE74C20988E64541D441CE9-->  <TEXT><![CDATA[Due Date From]]></TEXT>
-<!--6402E58FEDE74C20988E64541D441CE9-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html]]></FILENAME>
-<!--6402E58FEDE74C20988E64541D441CE9-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--6402E58FEDE74C20988E64541D441CE9-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--6402E58FEDE74C20988E64541D441CE9--></AD_TEXTINTERFACES>
-
 <!--641543349D994F628A62AFD96339F701--><AD_TEXTINTERFACES>
 <!--641543349D994F628A62AFD96339F701-->  <AD_TEXTINTERFACES_ID><![CDATA[641543349D994F628A62AFD96339F701]]></AD_TEXTINTERFACES_ID>
 <!--641543349D994F628A62AFD96339F701-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -825,6 +781,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>
@@ -990,17 +957,6 @@
 <!--7ED6FC64149A58B3E040007F01007327-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--7ED6FC64149A58B3E040007F01007327--></AD_TEXTINTERFACES>
 
-<!--7FCABF4ECC195B45E040007F010006FB--><AD_TEXTINTERFACES>
-<!--7FCABF4ECC195B45E040007F010006FB-->  <AD_TEXTINTERFACES_ID><![CDATA[7FCABF4ECC195B45E040007F010006FB]]></AD_TEXTINTERFACES_ID>
-<!--7FCABF4ECC195B45E040007F010006FB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--7FCABF4ECC195B45E040007F010006FB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--7FCABF4ECC195B45E040007F010006FB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--7FCABF4ECC195B45E040007F010006FB-->  <TEXT><![CDATA[Due Date]]></TEXT>
-<!--7FCABF4ECC195B45E040007F010006FB-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html]]></FILENAME>
-<!--7FCABF4ECC195B45E040007F010006FB-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--7FCABF4ECC195B45E040007F010006FB-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--7FCABF4ECC195B45E040007F010006FB--></AD_TEXTINTERFACES>
-
 <!--7FCABF4ECC1B5B45E040007F010006FB--><AD_TEXTINTERFACES>
 <!--7FCABF4ECC1B5B45E040007F010006FB-->  <AD_TEXTINTERFACES_ID><![CDATA[7FCABF4ECC1B5B45E040007F010006FB]]></AD_TEXTINTERFACES_ID>
 <!--7FCABF4ECC1B5B45E040007F010006FB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1122,17 +1078,6 @@
 <!--7FCB8195C2DD955EE040007F01002DC4-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--7FCB8195C2DD955EE040007F01002DC4--></AD_TEXTINTERFACES>
 
-<!--80E601570783ADBBE040007F01005FAE--><AD_TEXTINTERFACES>
-<!--80E601570783ADBBE040007F01005FAE-->  <AD_TEXTINTERFACES_ID><![CDATA[80E601570783ADBBE040007F01005FAE]]></AD_TEXTINTERFACES_ID>
-<!--80E601570783ADBBE040007F01005FAE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--80E601570783ADBBE040007F01005FAE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--80E601570783ADBBE040007F01005FAE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--80E601570783ADBBE040007F01005FAE-->  <TEXT><![CDATA[Due Date]]></TEXT>
-<!--80E601570783ADBBE040007F01005FAE-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/SelectExpectedPayments.html]]></FILENAME>
-<!--80E601570783ADBBE040007F01005FAE-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--80E601570783ADBBE040007F01005FAE-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--80E601570783ADBBE040007F01005FAE--></AD_TEXTINTERFACES>
-
 <!--80E60157078BADBBE040007F01005FAE--><AD_TEXTINTERFACES>
 <!--80E60157078BADBBE040007F01005FAE-->  <AD_TEXTINTERFACES_ID><![CDATA[80E60157078BADBBE040007F01005FAE]]></AD_TEXTINTERFACES_ID>
 <!--80E60157078BADBBE040007F01005FAE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1584,17 +1529,6 @@
 <!--85718201D5DDB0ADE040007F01006455-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--85718201D5DDB0ADE040007F01006455--></AD_TEXTINTERFACES>
 
-<!--85718201D5DFB0ADE040007F01006455--><AD_TEXTINTERFACES>
-<!--85718201D5DFB0ADE040007F01006455-->  <AD_TEXTINTERFACES_ID><![CDATA[85718201D5DFB0ADE040007F01006455]]></AD_TEXTINTERFACES_ID>
-<!--85718201D5DFB0ADE040007F01006455-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--85718201D5DFB0ADE040007F01006455-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--85718201D5DFB0ADE040007F01006455-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--85718201D5DFB0ADE040007F01006455-->  <TEXT><![CDATA[Due Date]]></TEXT>
-<!--85718201D5DFB0ADE040007F01006455-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html]]></FILENAME>
-<!--85718201D5DFB0ADE040007F01006455-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--85718201D5DFB0ADE040007F01006455-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--85718201D5DFB0ADE040007F01006455--></AD_TEXTINTERFACES>
-
 <!--85718201D5E1B0ADE040007F01006455--><AD_TEXTINTERFACES>
 <!--85718201D5E1B0ADE040007F01006455-->  <AD_TEXTINTERFACES_ID><![CDATA[85718201D5E1B0ADE040007F01006455]]></AD_TEXTINTERFACES_ID>
 <!--85718201D5E1B0ADE040007F01006455-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1793,6 +1727,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>
@@ -2156,17 +2101,6 @@
 <!--A437061218404865BF781A13704403AB-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--A437061218404865BF781A13704403AB--></AD_TEXTINTERFACES>
 
-<!--A4663E5CA5AF44FB9F2DF3F1586E9432--><AD_TEXTINTERFACES>
-<!--A4663E5CA5AF44FB9F2DF3F1586E9432-->  <AD_TEXTINTERFACES_ID><![CDATA[A4663E5CA5AF44FB9F2DF3F1586E9432]]></AD_TEXTINTERFACES_ID>
-<!--A4663E5CA5AF44FB9F2DF3F1586E9432-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--A4663E5CA5AF44FB9F2DF3F1586E9432-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--A4663E5CA5AF44FB9F2DF3F1586E9432-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--A4663E5CA5AF44FB9F2DF3F1586E9432-->  <TEXT><![CDATA[Due Date To]]></TEXT>
-<!--A4663E5CA5AF44FB9F2DF3F1586E9432-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html]]></FILENAME>
-<!--A4663E5CA5AF44FB9F2DF3F1586E9432-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--A4663E5CA5AF44FB9F2DF3F1586E9432-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--A4663E5CA5AF44FB9F2DF3F1586E9432--></AD_TEXTINTERFACES>
-
 <!--A4ACF6F90F7C42F9AA0B58DECDAB61B9--><AD_TEXTINTERFACES>
 <!--A4ACF6F90F7C42F9AA0B58DECDAB61B9-->  <AD_TEXTINTERFACES_ID><![CDATA[A4ACF6F90F7C42F9AA0B58DECDAB61B9]]></AD_TEXTINTERFACES_ID>
 <!--A4ACF6F90F7C42F9AA0B58DECDAB61B9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2332,16 +2266,16 @@
 <!--AD4B47A653588779E040007F010055A7-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--AD4B47A653588779E040007F010055A7--></AD_TEXTINTERFACES>
 
-<!--AF139B1C12C0477AB902B9DF23D53779--><AD_TEXTINTERFACES>
-<!--AF139B1C12C0477AB902B9DF23D53779-->  <AD_TEXTINTERFACES_ID><![CDATA[AF139B1C12C0477AB902B9DF23D53779]]></AD_TEXTINTERFACES_ID>
-<!--AF139B1C12C0477AB902B9DF23D53779-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--AF139B1C12C0477AB902B9DF23D53779-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--AF139B1C12C0477AB902B9DF23D53779-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--AF139B1C12C0477AB902B9DF23D53779-->  <TEXT><![CDATA[Due Date From]]></TEXT>
-<!--AF139B1C12C0477AB902B9DF23D53779-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html]]></FILENAME>
-<!--AF139B1C12C0477AB902B9DF23D53779-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--AF139B1C12C0477AB902B9DF23D53779-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--AF139B1C12C0477AB902B9DF23D53779--></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>
 
 <!--B3E7E0DFDE1D42B29FD5FF8622E83E67--><AD_TEXTINTERFACES>
 <!--B3E7E0DFDE1D42B29FD5FF8622E83E67-->  <AD_TEXTINTERFACES_ID><![CDATA[B3E7E0DFDE1D42B29FD5FF8622E83E67]]></AD_TEXTINTERFACES_ID>
@@ -2365,6 +2299,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>
@@ -2574,6 +2519,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>
@@ -2706,6 +2662,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>
@@ -2772,6 +2739,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>
@@ -2827,6 +2805,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>
@@ -2838,6 +2827,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	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/ModifyPaymentPlanActionHandler.java	Tue Nov 06 08:30:48 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	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html	Tue Nov 06 08:30:48 2012 +0100
@@ -181,15 +181,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 {
@@ -564,10 +564,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);
@@ -1138,25 +1138,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">
@@ -1188,25 +1203,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">
@@ -1474,7 +1489,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	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java	Tue Nov 06 08:30:48 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	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.xml	Tue Nov 06 08:30:48 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	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.html	Tue Nov 06 08:30:48 2012 +0100
@@ -1043,25 +1043,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">
@@ -1082,25 +1082,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">
@@ -1140,7 +1140,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	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java	Tue Nov 06 08:30:48 2012 +0100
@@ -33,7 +33,6 @@
 
 import org.codehaus.jettison.json.JSONException;
 import org.codehaus.jettison.json.JSONObject;
-import org.hibernate.Query;
 import org.hibernate.criterion.Restrictions;
 import org.openbravo.advpaymentmngt.dao.AdvPaymentMngtDao;
 import org.openbravo.advpaymentmngt.process.FIN_AddPayment;
@@ -96,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);
@@ -106,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", "");
@@ -270,7 +269,7 @@
       String strFinancialAccountId = vars.getRequiredStringParameter("inpFinancialAccount");
       String strOrgId = vars.getRequiredStringParameter("inpadOrgId");
       boolean isReceipt = vars.getRequiredStringParameter("isReceipt").equals("Y");
-      refreshProcessOptions(response, strPaymentMethodId, strFinancialAccountId, strOrgId,
+      refreshProcessOptions(response, vars, strPaymentMethodId, strFinancialAccountId, strOrgId,
           isReceipt);
     }
 
@@ -464,7 +463,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 {
 
@@ -488,10 +487,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);
@@ -595,9 +595,9 @@
     out.close();
   }
 
-  private void refreshProcessOptions(HttpServletResponse response, String strPaymentMethod,
-      String strFinancialAccountId, String strOrgId, boolean isReceipt) throws IOException,
-      ServletException {
+  private void refreshProcessOptions(HttpServletResponse response, VariablesSecureApp vars,
+      String strPaymentMethod, String strFinancialAccountId, String strOrgId, boolean isReceipt)
+      throws IOException, ServletException {
     log4j.debug("Callout: Financial Account has changed to" + strFinancialAccountId);
 
     FIN_PaymentMethod paymentMethod = OBDal.getInstance().get(FIN_PaymentMethod.class,
@@ -614,48 +614,22 @@
       }
     }
     String processOprtionsComboHtml = null;
-    if (isReceipt) {
-      if (finAccPaymentMethod.isAutomaticDeposit()) {
-        // 1 option: Process.
-        processOprtionsComboHtml = FIN_Utility.getOptionsList(
-            processActionWithDepositWithdrawn("F903F726B41A49D3860243101CEEBA25", true), null,
-            true, true);
 
-      } else {
-        // 2 options: Process or Process and Deposit.
-        try {
-          OBContext.setAdminMode(true);
-          org.openbravo.model.ad.domain.Reference reference = OBDal.getInstance().get(
-              org.openbravo.model.ad.domain.Reference.class, "F903F726B41A49D3860243101CEEBA25");
-          processOprtionsComboHtml = FIN_Utility.getOptionsList(reference.getADListList(), null,
-              true, true);
-        } catch (Exception e) {
+    boolean forcedFinancialAccountTransaction = finAccPaymentMethod.isAutomaticDeposit()
+        || finAccPaymentMethod.isAutomaticWithdrawn();
 
-        } finally {
-          OBContext.restorePreviousMode();
-        }
-      }
-    } else {
-      if (finAccPaymentMethod.isAutomaticWithdrawn()) {
-        // 1 option: Process.
-        processOprtionsComboHtml = FIN_Utility.getOptionsList(
-            processActionWithDepositWithdrawn("F15C13A199A748F1B0B00E985A64C036", false), null,
-            true, true);
+    try {
+      ComboTableData comboTableData = new ComboTableData(vars, this, "LIST", "",
+          (isReceipt ? "F903F726B41A49D3860243101CEEBA25" : "F15C13A199A748F1B0B00E985A64C036"),
+          forcedFinancialAccountTransaction ? "29010995FD39439D97A5C0CE8CE27D70" : "",
+          Utility.getContext(this, vars, "#AccessibleOrgTree", "AddPaymentFromInvoice"),
+          Utility.getContext(this, vars, "#User_Client", "AddPaymentFromInvoice"), 0);
+      Utility.fillSQLParameters(this, vars, null, comboTableData, "AddPaymentFromInvoice", "");
+      FieldProvider[] properOptions = comboTableData.select(false);
+      processOprtionsComboHtml = FIN_Utility.getOptionsListFromFieldProvider(properOptions, null,
+          true);
+    } catch (Exception e) {
 
-      } else {
-        // 2 Options: Process or Process and Withdrawn
-        try {
-          OBContext.setAdminMode(true);
-          org.openbravo.model.ad.domain.Reference reference = OBDal.getInstance().get(
-              org.openbravo.model.ad.domain.Reference.class, "F15C13A199A748F1B0B00E985A64C036");
-          processOprtionsComboHtml = FIN_Utility.getOptionsList(reference.getADListList(), null,
-              true, true);
-        } catch (Exception e) {
-
-        } finally {
-          OBContext.restorePreviousMode();
-        }
-      }
     }
 
     response.setContentType("text/html; charset=UTF-8");
@@ -665,37 +639,6 @@
     out.close();
   }
 
-  /**
-   * Returns the list of the reference list for payment process
-   * 
-   * @param refId
-   *          . Indicates the Id of the reference.
-   * @param deposit
-   *          . Indicates whether the method is being executed for deposit of withdrawn.
-   * @return. Returns the list of process actions.
-   */
-  private List processActionWithDepositWithdrawn(String refId, boolean deposit) {
-    try {
-      OBContext.setAdminMode(true);
-      StringBuilder hql = new StringBuilder();
-      hql.append("select l ");
-      hql.append("from ADReference r ");
-      hql.append("  left join r.aDListList l ");
-      hql.append("where r.id = '").append(refId).append("' ");
-      hql.append("  and lower(l.name) like '%").append((deposit == true) ? "deposit" : "withdrawn")
-          .append("%'");
-
-      final Query query = OBDal.getInstance().getSession().createQuery(hql.toString());
-
-      return query.list();
-    } catch (Exception e) {
-      return null;
-    } finally {
-      OBContext.restorePreviousMode();
-    }
-
-  }
-
   private BigDecimal findExchangeRate(VariablesSecureApp vars, Currency paymentCurrency,
       Currency financialAccountCurrency, Date paymentDate, Organization organization,
       int conversionRatePrecision) {
@@ -718,7 +661,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", "");
@@ -759,5 +702,4 @@
     }
     return false;
   }
-
 }
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.xml	Tue Nov 06 08:30:48 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	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html	Tue Nov 06 08:30:48 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	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.java	Tue Nov 06 08:30:48 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")) {
@@ -558,11 +558,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");
 
@@ -585,7 +585,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;
@@ -597,9 +597,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,
@@ -744,7 +744,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	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.xml	Tue Nov 06 08:30:48 2012 +0100
@@ -57,11 +57,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	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransactionGrid.srpt	Tue Nov 06 08:30:48 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	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransactionGrid.xml	Tue Nov 06 08:30:48 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	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentGrid.srpt	Tue Nov 06 08:30:48 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	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentGrid.xml	Tue Nov 06 08:30:48 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	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentProposalGrid.srpt	Tue Nov 06 08:30:48 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	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentProposalGrid.xml	Tue Nov 06 08:30:48 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/Reconciliation.html	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.html	Tue Nov 06 08:30:48 2012 +0100
@@ -257,6 +257,10 @@
 function saveTransactionLineStatus(isChecked, transLineId) {
   document.frmMain.inpCurrentTransIdSelected.value = transLineId;
   document.frmMain.inpIsCurrentTransSelected.value = isChecked;
+  document.frmMain.inpClearAll.disabled = true;
+  document.getElementById('buttonSave').disabled = true;
+  document.getElementById('buttonProcess').disabled = true;
+  document.getElementById('buttonCancel').disabled = true;
   try {
     var url = "../org.openbravo.advpaymentmngt.ad_actionbutton/Reconciliation.html";
     var paramXMLReq = null;
@@ -272,6 +276,10 @@
     try {
       if (XMLHttpRequestObj.responseText) {
         strText = XMLHttpRequestObj.responseText;
+        document.frmMain.inpClearAll.disabled = false;
+        document.getElementById('buttonSave').disabled = false;
+        document.getElementById('buttonProcess').disabled = false;
+        document.getElementById('buttonCancel').disabled = false;
       } else {
       }
     } catch (e) {
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/SelectExpectedPayments.html	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/SelectExpectedPayments.html	Tue Nov 06 08:30:48 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	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/SelectExpectedPayments.java	Tue Nov 06 08:30:48 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	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java	Tue Nov 06 08:30:48 2012 +0100
@@ -126,7 +126,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(
@@ -161,7 +161,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(
@@ -189,8 +189,8 @@
       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(
@@ -199,6 +199,29 @@
       String strTransactionType, String strDocumentNo, FIN_PaymentMethod paymentMethod,
       List<FIN_PaymentScheduleDetail> selectedScheduledPaymentDetails, boolean isReceipt,
       String strAmountFrom, String strAmountTo) {
+    return getFilteredScheduledPaymentDetails(organization, businessPartner, currency, dueDateFrom,
+        dueDateTo, null, null, transactionDateFrom, transactionDateTo, strTransactionType, "",
+        paymentMethod, selectedScheduledPaymentDetails, isReceipt, strAmountFrom, strAmountTo);
+  }
+
+  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) {
+    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) {
 
     final StringBuilder whereClause = new StringBuilder();
     final List<Object> parameters = new ArrayList<Object>();
@@ -397,6 +420,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");
@@ -407,9 +449,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);
@@ -582,7 +624,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	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java	Tue Nov 06 08:30:48 2012 +0100
@@ -764,6 +764,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())
@@ -808,6 +814,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	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentMonitorProcess.java	Tue Nov 06 08:30:48 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/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java	Tue Nov 06 08:30:48 2012 +0100
@@ -548,6 +548,23 @@
     return strOptions.toString();
   }
 
+  public static <T extends BaseOBObject> String getOptionsListFromFieldProvider(
+      FieldProvider[] fieldProvider, String selectedValue, boolean isMandatory) {
+    StringBuilder strOptions = new StringBuilder();
+    if (!isMandatory)
+      strOptions.append("<option value=\"\"></option>");
+
+    for (int i = 0; i < fieldProvider.length; i++) {
+      strOptions.append("<option value=\"").append(fieldProvider[i].getField("ID")).append("\"");
+      if (fieldProvider[i].getField("ID").equals(selectedValue))
+        strOptions.append(" selected=\"selected\"");
+      strOptions.append(">");
+      strOptions.append(escape(fieldProvider[i].getField("NAME")));
+      strOptions.append("</option>");
+    }
+    return strOptions.toString();
+  }
+
   /**
    * Method to replace special characters to print properly in an html. Changes are: ">" to "&gt"
    * and "<" to "&lt"
--- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Tue Nov 06 08:30:48 2012 +0100
@@ -6,7 +6,7 @@
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <NAME><![CDATA[JBoss Weld]]></NAME>
-<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.18258]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.18388]]></VERSION>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <DESCRIPTION><![CDATA[JBoss Weld]]></DESCRIPTION>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <HELP><![CDATA[Provides the JBoss Weld framework: Java Contexts and Dependency Injection for the Java EE platform (CDI). For more information see http://seamframework.org/Weld]]></HELP>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <URL><![CDATA[http://forge.openbravo.com/projects/weld]]></URL>
--- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Nov 06 08:30:48 2012 +0100
@@ -7,7 +7,7 @@
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <AD_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_MODULE_ID>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.18258]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.18388]]></STARTVERSION>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Tue Nov 06 08:30:48 2012 +0100
@@ -6,7 +6,7 @@
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <NAME><![CDATA[User Interface Application]]></NAME>
-<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.18258]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.18388]]></VERSION>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <DESCRIPTION><![CDATA[Provides the main application components for the openbravo user interface]]></DESCRIPTION>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <HELP><![CDATA[Provides the main application components for the openbravo user interface. The main layout incorporates a navigation bar and a main view area.]]></HELP>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <URL><![CDATA[http://forge.openbravo.com/projects/clientapplication]]></URL>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Nov 06 08:30:48 2012 +0100
@@ -7,7 +7,7 @@
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID>
-<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.18258]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.18388]]></STARTVERSION>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--60A170212F36499D83B8AD38D01F46B3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--60A170212F36499D83B8AD38D01F46B3-->  <STARTVERSION><![CDATA[2.1.18258]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->  <STARTVERSION><![CDATA[2.1.18388]]></STARTVERSION>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--824D60CB352E4099B1D8C903CA139DAE-->  <STARTVERSION><![CDATA[3.0.18258]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->  <STARTVERSION><![CDATA[3.0.18388]]></STARTVERSION>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID>
-<!--E8FD820AFE3D4FE08C02FC47769026AD-->  <STARTVERSION><![CDATA[8.1.18258]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->  <STARTVERSION><![CDATA[8.1.18388]]></STARTVERSION>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/AcctSchemaEventHandler.java	Tue Nov 06 08:30:48 2012 +0100
@@ -0,0 +1,206 @@
+/*
+ *************************************************************************
+ * 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):  ______________________________________.
+ ************************************************************************
+ */
+
+package org.openbravo.client.application.event;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.enterprise.event.Observes;
+
+import org.apache.log4j.Logger;
+import org.hibernate.ScrollMode;
+import org.hibernate.ScrollableResults;
+import org.hibernate.criterion.Restrictions;
+import org.openbravo.base.exception.OBException;
+import org.openbravo.base.model.Entity;
+import org.openbravo.base.model.ModelProvider;
+import org.openbravo.base.model.Property;
+import org.openbravo.client.kernel.event.EntityPersistenceEventObserver;
+import org.openbravo.client.kernel.event.EntityUpdateEvent;
+import org.openbravo.dal.service.OBCriteria;
+import org.openbravo.dal.service.OBDal;
+import org.openbravo.dal.service.OBQuery;
+import org.openbravo.erpCommon.utility.OBMessageUtils;
+import org.openbravo.model.financialmgmt.accounting.coa.AcctSchema;
+import org.openbravo.model.financialmgmt.accounting.coa.AcctSchemaElement;
+import org.openbravo.model.financialmgmt.accounting.coa.Element;
+import org.openbravo.model.financialmgmt.accounting.coa.ElementValue;
+
+public class AcctSchemaEventHandler extends EntityPersistenceEventObserver {
+
+  private static Entity[] entities = { ModelProvider.getInstance()
+      .getEntity(AcctSchema.ENTITY_NAME) };
+  protected Logger logger = Logger.getLogger(this.getClass());
+
+  @Override
+  protected Entity[] getObservedEntities() {
+    return entities;
+  }
+
+  public void onUpdate(@Observes
+  EntityUpdateEvent event) {
+    if (!isValidEvent(event)) {
+      return;
+    }
+    boolean eval = false;
+    if ((Boolean) event.getCurrentState(getProperty(AcctSchema.PROPERTY_CENTRALMAINTENANCE)) == true) {
+      if (!event.getPreviousState(getProperty(AcctSchema.PROPERTY_CENTRALMAINTENANCE)).equals(
+          event.getCurrentState(getProperty(AcctSchema.PROPERTY_CENTRALMAINTENANCE)))) {
+        eval = true;
+      }
+      if (!event.getPreviousState(getProperty(AcctSchema.PROPERTY_ASSETPOSITIVE)).equals(
+          event.getCurrentState(getProperty(AcctSchema.PROPERTY_ASSETPOSITIVE)))) {
+        eval = true;
+      }
+      if (!event.getPreviousState(getProperty(AcctSchema.PROPERTY_LIABILITYPOSITIVE)).equals(
+          event.getCurrentState(getProperty(AcctSchema.PROPERTY_LIABILITYPOSITIVE)))) {
+        eval = true;
+      }
+      if (!event.getPreviousState(getProperty(AcctSchema.PROPERTY_EQUITYPOSITIVE)).equals(
+          event.getCurrentState(getProperty(AcctSchema.PROPERTY_EQUITYPOSITIVE)))) {
+        eval = true;
+      }
+      if (!event.getPreviousState(getProperty(AcctSchema.PROPERTY_EXPENSEPOSITIVE)).equals(
+          event.getCurrentState(getProperty(AcctSchema.PROPERTY_EXPENSEPOSITIVE)))) {
+        eval = true;
+      }
+      if (!event.getPreviousState(getProperty(AcctSchema.PROPERTY_REVENUEPOSITIVE)).equals(
+          event.getCurrentState(getProperty(AcctSchema.PROPERTY_REVENUEPOSITIVE)))) {
+        eval = true;
+      }
+    }
+    if (eval) {
+      final AcctSchema acctSchema = (AcctSchema) event.getTargetInstance();
+      Element element = getAccountElement(acctSchema);
+      if (element == null) {
+        return;
+      }
+      if (countSchemas(element) > 1) {
+        throw new OBException(OBMessageUtils.messageBD("SharedAccountTree"));
+      }
+      updateElementValues(element, acctSchema,
+          (Boolean) event.getCurrentState(getProperty(AcctSchema.PROPERTY_ASSETPOSITIVE)),
+          (Boolean) event.getCurrentState(getProperty(AcctSchema.PROPERTY_LIABILITYPOSITIVE)),
+          (Boolean) event.getCurrentState(getProperty(AcctSchema.PROPERTY_EQUITYPOSITIVE)),
+          (Boolean) event.getCurrentState(getProperty(AcctSchema.PROPERTY_EXPENSEPOSITIVE)),
+          (Boolean) event.getCurrentState(getProperty(AcctSchema.PROPERTY_REVENUEPOSITIVE)));
+    }
+  }
+
+  private Property getProperty(String PROPERTY) {
+    return entities[0].getProperty(PROPERTY);
+  }
+
+  private Element getAccountElement(AcctSchema acctSchema) {
+    final String ELEMENTTYPE_ACCOUNT = "AC";
+    OBCriteria<AcctSchemaElement> aee = OBDal.getInstance().createCriteria(AcctSchemaElement.class);
+    aee.add(Restrictions.eq(AcctSchemaElement.PROPERTY_ACCOUNTINGSCHEMA, acctSchema));
+    aee.add(Restrictions.isNotNull(AcctSchemaElement.PROPERTY_ACCOUNTINGELEMENT));
+    aee.add(Restrictions.eq(AcctSchemaElement.PROPERTY_TYPE, ELEMENTTYPE_ACCOUNT));
+    aee.setMaxResults(1);
+    List<AcctSchemaElement> aees = aee.list();
+    if (aees.size() > 0) {
+      return aees.get(0).getAccountingElement();
+    } else {
+      return null;
+    }
+  }
+
+  private int countSchemas(Element element) {
+    Set<AcctSchema> schemas = new HashSet<AcctSchema>();
+    OBCriteria<AcctSchemaElement> aee = OBDal.getInstance().createCriteria(AcctSchemaElement.class);
+    aee.add(Restrictions.eq(AcctSchemaElement.PROPERTY_ACCOUNTINGELEMENT, element));
+    for (AcctSchemaElement acctSchemaElement : aee.list()) {
+      schemas.add(acctSchemaElement.getAccountingSchema());
+    }
+    return schemas.size();
+
+  }
+
+  private void updateElementValues(Element _element, AcctSchema acctSchema, boolean assetPositive,
+      boolean liabilityPositive, boolean ownersEquityPositive, boolean expensePositive,
+      boolean revenuePositive) {
+    StringBuffer where = new StringBuffer();
+    final String ACCOUNTSIGN_CREDIT = "C";
+    final String ACCOUNTSIGN_DEBIT = "D";
+    final String ACCOUNTTYPE_MEMO = "M";
+    Element element = OBDal.getInstance().get(Element.class, _element.getId());
+    where.append(ElementValue.PROPERTY_ACCOUNTINGELEMENT + ".id = :element");
+    OBQuery<ElementValue> elementValueQry = OBDal.getInstance().createQuery(ElementValue.class,
+        where.toString());
+    elementValueQry.setFilterOnActive(false);
+    elementValueQry.setFilterOnReadableClients(false);
+    elementValueQry.setFilterOnReadableOrganization(false);
+    elementValueQry.setNamedParameter("element", element.getId());
+    elementValueQry.setFetchSize(1000);
+
+    ScrollableResults elementvalues = elementValueQry.scroll(ScrollMode.FORWARD_ONLY);
+    // TODO: Review with Martin to see if flush is permitted in handlers
+    // int i = 0;
+    while (elementvalues.next()) {
+      ElementValue elementValue = (ElementValue) elementvalues.get(0);
+      boolean isCredit = getAccountSign(elementValue.getAccountType(), assetPositive,
+          liabilityPositive, ownersEquityPositive, expensePositive, revenuePositive);
+      if (!ACCOUNTTYPE_MEMO.equals(elementValue.getAccountType())) {
+        elementValue.setAccountSign(isCredit ? ACCOUNTSIGN_CREDIT : ACCOUNTSIGN_DEBIT);
+      }
+      // if ((i % 100) == 0) {
+      // OBDal.getInstance().flush();
+      // OBDal.getInstance().getSession().clear();
+      // element = OBDal.getInstance().get(Element.class, element.getId());
+      // }
+      // i++;
+    }
+  }
+
+  private boolean getAccountSign(String accountType, boolean assetPositive,
+      boolean liabilityPositive, boolean ownersEquityPositive, boolean expensePositive,
+      boolean revenuePositive) {
+    final String ACCOUNTTYPE_ASSET = "A";
+    final String ACCOUNTTYPE_LIABILITY = "L";
+    final String ACCOUNTTYPE_OWNERSEQUITY = "O";
+    final String ACCOUNTTYPE_EXPENSE = "E";
+    final String ACCOUNTTYPE_REVENUE = "R";
+    if (ACCOUNTTYPE_ASSET.equals(accountType) && assetPositive) {
+      return false;
+    } else if (ACCOUNTTYPE_LIABILITY.equals(accountType) && liabilityPositive) {
+      return true;
+    } else if (ACCOUNTTYPE_OWNERSEQUITY.equals(accountType) && ownersEquityPositive) {
+      return true;
+    } else if (ACCOUNTTYPE_EXPENSE.equals(accountType) && expensePositive) {
+      return false;
+    } else if (ACCOUNTTYPE_REVENUE.equals(accountType) && revenuePositive) {
+      return true;
+    } else if (ACCOUNTTYPE_ASSET.equals(accountType) && !assetPositive) {
+      return true;
+    } else if (ACCOUNTTYPE_LIABILITY.equals(accountType) && !liabilityPositive) {
+      return false;
+    } else if (ACCOUNTTYPE_OWNERSEQUITY.equals(accountType) && !ownersEquityPositive) {
+      return false;
+    } else if (ACCOUNTTYPE_EXPENSE.equals(accountType) && !expensePositive) {
+      return true;
+    } else if (ACCOUNTTYPE_REVENUE.equals(accountType) && !revenuePositive) {
+      return true;
+    }
+    return false;
+
+  }
+}
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-tab.js.ftl	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-tab.js.ftl	Tue Nov 06 08:30:48 2012 +0100
@@ -154,6 +154,7 @@
     initWidget: function() {
         this.prepareFields();
         this.dataSource = ${tabComponent.dataSourceJavaScript};
+        this.dataSource.potentiallyShared = true;
         this.viewForm = isc.OBViewForm.create(isc.clone(OB.ViewFormProperties), ${tabComponent.viewForm}); 
         this.viewGrid = ${tabComponent.viewGrid};
         this.Super('initWidget', arguments);
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-canvas.js	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-canvas.js	Tue Nov 06 08:30:48 2012 +0100
@@ -65,6 +65,13 @@
     return canvas;
   },
 
+  destroy: function () {
+    if (this.canvas && this.form) {
+      this.canvas.ignore(this.form, 'itemChanged');
+    }
+    return this.Super('destroy', arguments);
+  },
+
   redrawing: function () {
     if (this.canvas.redrawingItem) {
       this.canvas.redrawingItem();
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js	Tue Nov 06 08:30:48 2012 +0100
@@ -134,6 +134,9 @@
 
     this.Super('init', arguments);
 
+    // don't validate for FK filtering, any value is allowed
+    this.validators = [];
+
     // listen to data arrival in the grid
     // if data arrived we have to reload also
     this.observe(grid, "dataArrived", "observer.setForceReload()");
@@ -141,6 +144,14 @@
     this.multipleValueSeparator = ' or ';
   },
 
+  destroy: function () {
+    var grid = this.form && this.form.grid && this.form.grid.sourceWidget;
+    if (grid) {
+      this.ignore(grid, 'dataArrived');
+    }
+    return this.Super('destroy', arguments);
+  },
+
   // note: can't override changed as it is used by the filter editor 
   // itself, see the RecordEditor source code and the changed event
   change: function (form, item, value, oldValue) {
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js	Tue Nov 06 08:30:48 2012 +0100
@@ -965,7 +965,7 @@
       // handle the case that the FIC returns a null value as a string
       // should be repaired in the FIC
       // note: do not use clearvalue as this removes the value from the form
-      this.setValue(field.name, null);
+      this.setItemValue(field.name, null);
     } else if (columnValue.value || columnValue.value === 0 || columnValue.value === false) {
       isDate = field.type && (isc.SimpleType.getType(field.type).inheritsFrom === 'date' || isc.SimpleType.getType(field.type).inheritsFrom === 'time');
       isDateTime = field.type && isc.SimpleType.getType(field.type).inheritsFrom === 'datetime';
@@ -1010,7 +1010,7 @@
     } else {
       // note: do not use clearvalue as this removes the value from the form
       // which results it to not be sent to the server anymore
-      this.setValue(field.name, null);
+      this.setItemValue(field.name, null);
       if (this.getValue(field.name + OB.Constants.FIELDSEPARATOR + OB.Constants.IDENTIFIER)) {
         this.setItemValue(field.name + OB.Constants.FIELDSEPARATOR + OB.Constants.IDENTIFIER, null);
       }
@@ -1022,7 +1022,7 @@
 
     // store the textualvalue so that it is correctly send back to the server
     typeInstance = isc.SimpleType.getType(field.type);
-    if (columnValue.classicValue && typeInstance.decSeparator) {
+    if ((columnValue.classicValue || columnValue.classicValue === '') && typeInstance.decSeparator) {
       this.setTextualValue(field.name, assignClassicValue, typeInstance);
     }
   },
@@ -1095,7 +1095,7 @@
       // Adjust to formatting if exists value and classicValue.
       assignClassicValue = (field.typeInstance && field.typeInstance.parseInput && field.typeInstance.editFormatter) ? field.typeInstance.editFormatter(field.typeInstance.parseInput(columnValue.classicValue)) : columnValue.classicValue;
       typeInstance = isc.SimpleType.getType(field.type);
-      if (columnValue.classicValue && typeInstance.decSeparator) {
+      if ((columnValue.classicValue || columnValue.classicValue === '') && typeInstance.decSeparator) {
         this.setTextualValue(field.name, assignClassicValue, typeInstance, gridEditInformation);
       }
     }
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js	Tue Nov 06 08:30:48 2012 +0100
@@ -220,6 +220,17 @@
       }
     },
 
+    // always return false otherwise sc switches to local mode
+    // which does not work correctly for when doing inserts in form mode
+    // at that point the grid.data.allRows is being used which results 
+    // in mismatches with grid.data.localData, returning false here
+    // prevents allRows from being used. In our case we never really
+    // want to have all rows cached locally as we do all filtering
+    // server side.
+    allRowsCached: function () {
+      return false;
+    },
+
     transformData: function (newData, dsResponse) {
       var i, length, timeFields;
 
@@ -732,6 +743,11 @@
         editorProperties, len = fields.length,
         ds, dataSources = [];
 
+    if (this.getDataSource()) {
+      // will get destroyed in the super class then
+      this.getDataSource().potentiallyShared = false;
+    }
+
     for (i = 0; i < len; i++) {
       field = fields[i];
       editorProperties = field && field.editorProperties;
@@ -1447,7 +1463,7 @@
   dataArrived: function (startRow, endRow) {
     // do this now, to replace the loading message
     // TODO: add dynamic part of readonly (via setWindowSettings: see issue 17441)
-    if (this.uiPattern === 'SR' || this.uiPattern === 'RO' || this.uiPattern !== 'ED') {
+    if (this.uiPattern === 'SR' || this.uiPattern === 'RO' || this.uiPattern === 'ED') {
       this.noDataEmptyMessage = '<span class="' + this.emptyMessageStyle + '">' + OB.I18N.getLabel('OBUIAPP_NoDataInGrid') + '</span>';
     } else {
       this.noDataEmptyMessage = '<span class="' + this.emptyMessageStyle + '">' + OB.I18N.getLabel('OBUIAPP_GridNoRecords') + '</span>' + '<span onclick="this.onclick = new Function(); setTimeout(function() { window[\'' + this.ID + '\'].view.newRow(); }, 50); return false;" class="' + this.emptyMessageLinkStyle + '">' + OB.I18N.getLabel('OBUIAPP_GridCreateOne') + '</span>';
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js	Tue Nov 06 08:30:48 2012 +0100
@@ -217,7 +217,7 @@
           if (prevFocusedItem) {
             var myInterval;
             myInterval = setInterval(function () {
-              if (prevFocusedItem === isc.EH.getFocusCanvas()) {
+              if (me.children && prevFocusedItem === isc.EH.getFocusCanvas()) {
                 if (me.children[3] && me.children[3].items[0] && me.children[3].items[0].firstFocusedItem) {
                   me.children[3].items[0].firstFocusedItem.focus();
                 } else {
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form.js	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form.js	Tue Nov 06 08:30:48 2012 +0100
@@ -1139,7 +1139,7 @@
   // sets information about the current personalization record
   // in the status bar
   setStatusBarInformation: function () {
-    this.toolBar.updateButtonState();
+    this.toolBar.updateButtonState(false, false, true);
 
     var statusBarFields = null,
         barFieldValues = [],
--- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Tue Nov 06 08:30:48 2012 +0100
@@ -6,7 +6,7 @@
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <NAME><![CDATA[HTML Widget]]></NAME>
-<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.18258]]></VERSION>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.18388]]></VERSION>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <DESCRIPTION><![CDATA[Provides the HTML Widget superclass that allows to create widget classes that embed the html code.]]></DESCRIPTION>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <HELP><![CDATA[With this module you can define your own widget classes just setting up your own html code or the html code provided by third parties.]]></HELP>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <URL><![CDATA[http://forge.openbravo.com/projects/htmlwidget]]></URL>
--- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Nov 06 08:30:48 2012 +0100
@@ -7,7 +7,7 @@
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <AD_MODULE_ID><![CDATA[D393BE6F22BB44B7B728259B34FC795A]]></AD_MODULE_ID>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.18258]]></STARTVERSION>
+<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.18388]]></STARTVERSION>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Tue Nov 06 08:30:48 2012 +0100
@@ -6,7 +6,7 @@
 <!--4B828F4D03264080AA1D2057B13F613C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <NAME><![CDATA[User Interface Client Kernel]]></NAME>
-<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.18258]]></VERSION>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.18388]]></VERSION>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <DESCRIPTION><![CDATA[Provides framework functionality for the Openbravo User Interface]]></DESCRIPTION>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <HELP><![CDATA[The user interface client kernel is a generation framework for generating client (browser) components used in Openbravo. Its components are mainly used by other modules to provide customizable and extendable user interfaces.]]></HELP>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <URL><![CDATA[http://forge.openbravo.com/projects/openbravoclientkernel]]></URL>
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Nov 06 08:30:48 2012 +0100
@@ -7,7 +7,7 @@
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.18258]]></STARTVERSION>
+<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.18388]]></STARTVERSION>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <STARTVERSION><![CDATA[1.1.18258]]></STARTVERSION>
+<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <STARTVERSION><![CDATA[1.1.18388]]></STARTVERSION>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <AD_DEPENDENT_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_DEPENDENT_MODULE_ID>
-<!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <STARTVERSION><![CDATA[2.0.18258]]></STARTVERSION>
+<!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <STARTVERSION><![CDATA[2.0.18388]]></STARTVERSION>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON REST Webservice]]></DEPENDANT_MODULE_NAME>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_TREENODE.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_TREENODE.xml	Tue Nov 06 08:30:48 2012 +0100
@@ -8,7 +8,7 @@
 <!--3E38D7EEF9CF48E5B223D6D71DF7EA05-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--3E38D7EEF9CF48E5B223D6D71DF7EA05-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3E38D7EEF9CF48E5B223D6D71DF7EA05-->  <PARENT_ID><![CDATA[153]]></PARENT_ID>
-<!--3E38D7EEF9CF48E5B223D6D71DF7EA05-->  <SEQNO><![CDATA[140]]></SEQNO>
+<!--3E38D7EEF9CF48E5B223D6D71DF7EA05-->  <SEQNO><![CDATA[149]]></SEQNO>
 <!--3E38D7EEF9CF48E5B223D6D71DF7EA05--></AD_TREENODE>
 
 <!--EEDE9E704B114114BB8AF2A5453F3D77--><AD_TREENODE>
--- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Tue Nov 06 08:30:48 2012 +0100
@@ -6,7 +6,7 @@
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <NAME><![CDATA[Workspace & Widgets]]></NAME>
-<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.18258]]></VERSION>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.18388]]></VERSION>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <DESCRIPTION><![CDATA[Workspace & Widgets]]></DESCRIPTION>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <HELP><![CDATA[Provides the infrastructure of workspace tab (formerly My Openbravo)]]></HELP>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <URL><![CDATA[http://forge.openbravo.com/projects/myopenbravo]]></URL>
--- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Nov 06 08:30:48 2012 +0100
@@ -7,7 +7,7 @@
 <!--15F51F03882F444CAB6593B4566DC929-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--15F51F03882F444CAB6593B4566DC929-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
 <!--15F51F03882F444CAB6593B4566DC929-->  <AD_DEPENDENT_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_DEPENDENT_MODULE_ID>
-<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.18258]]></STARTVERSION>
+<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.18388]]></STARTVERSION>
 <!--15F51F03882F444CAB6593B4566DC929-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--15F51F03882F444CAB6593B4566DC929-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Application]]></DEPENDANT_MODULE_NAME>
 <!--15F51F03882F444CAB6593B4566DC929-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--E71B28FC949D481D9F59C17D01E46EF9-->  <STARTVERSION><![CDATA[3.0.18258]]></STARTVERSION>
+<!--E71B28FC949D481D9F59C17D01E46EF9-->  <STARTVERSION><![CDATA[3.0.18388]]></STARTVERSION>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-url-widget.js	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-url-widget.js	Tue Nov 06 08:30:48 2012 +0100
@@ -32,6 +32,10 @@
       this.contentSource = document.location.protocol + this.contentSource.substring(this.contentSource.indexOf('//'));
     }
 
+    if (this.contentSource.indexOf('google.com/calendar') !== -1) {
+      this.contentSource = this.contentSource.replace("account", OB.User.email);
+    }
+
     return isc.HTMLFlow.create({
       contentsType: 'page',
       contentsURL: this.contentSource,
--- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Tue Nov 06 08:30:48 2012 +0100
@@ -6,7 +6,7 @@
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <NAME><![CDATA[Query/List Widget]]></NAME>
-<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.18258]]></VERSION>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.18388]]></VERSION>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <DESCRIPTION><![CDATA[Provides the Query/List superclass widget that allows to create widget classes that prints a grid of data based on a query.]]></DESCRIPTION>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <HELP><![CDATA[With this module you can define your own widget classes that just with simple Application Dictionary shows a grid of data based on a HQL Query.]]></HELP>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <URL><![CDATA[http://forge.openbravo.com/projects/querylistwidget]]></URL>
--- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Nov 06 08:30:48 2012 +0100
@@ -7,7 +7,7 @@
 <!--26558497C31140BFAB067BA4BC47D799-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--26558497C31140BFAB067BA4BC47D799-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
 <!--26558497C31140BFAB067BA4BC47D799-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.18258]]></STARTVERSION>
+<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.18388]]></STARTVERSION>
 <!--26558497C31140BFAB067BA4BC47D799-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--26558497C31140BFAB067BA4BC47D799-->  <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME>
 <!--26558497C31140BFAB067BA4BC47D799-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Tue Nov 06 08:30:48 2012 +0100
@@ -6,7 +6,7 @@
 <!--FF8080812D842086012D844F3CC0003E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FF8080812D842086012D844F3CC0003E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080812D842086012D844F3CC0003E-->  <NAME><![CDATA[Widgets Collection]]></NAME>
-<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.18258]]></VERSION>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.18388]]></VERSION>
 <!--FF8080812D842086012D844F3CC0003E-->  <DESCRIPTION><![CDATA[Collection of Workspace Widgets]]></DESCRIPTION>
 <!--FF8080812D842086012D844F3CC0003E-->  <HELP><![CDATA[Collection of Workspace Widgets]]></HELP>
 <!--FF8080812D842086012D844F3CC0003E-->  <URL><![CDATA[http://forge.openbravo.com/projects/widgetscollection]]></URL>
--- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Nov 06 08:30:48 2012 +0100
@@ -7,7 +7,7 @@
 <!--FF8080812D842086012D845002070046-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080812D842086012D845002070046-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
 <!--FF8080812D842086012D845002070046-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.18258]]></STARTVERSION>
+<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.18388]]></STARTVERSION>
 <!--FF8080812D842086012D845002070046-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080812D842086012D845002070046-->  <DEPENDANT_MODULE_NAME><![CDATA[Workspace & Widgets]]></DEPENDANT_MODULE_NAME>
 <!--FF8080812D842086012D845002070046-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBKMO_WIDGET_URL.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBKMO_WIDGET_URL.xml	Tue Nov 06 08:30:48 2012 +0100
@@ -33,7 +33,7 @@
 <!--4769EE83CE8B472987A1648C8CDD6803-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--4769EE83CE8B472987A1648C8CDD6803-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--4769EE83CE8B472987A1648C8CDD6803-->  <OBKMO_WIDGET_CLASS_ID><![CDATA[DEEFF28410DD488E9EF2EB28DCD6ADA1]]></OBKMO_WIDGET_CLASS_ID>
-<!--4769EE83CE8B472987A1648C8CDD6803-->  <URL><![CDATA[https://www.google.com/calendar/ig?up_calendarFeeds&up_calendarColors&up_firstDay=0&up_dateFormat=0&up_timeFormat=1:00pm&up_showDatepicker=0&up_hideAgenda=0&up_showEmptyDays=0&up_showExpiredEvents=1&lang=en&country=us&.lang=en&.country=us&synd=ig&mid=95&ifpctok=-1351080279927728270&exp_rpc_js=1&exp_track_js=1&exp_ids=17259&parent=http://www.google.com&libs=7ndonz73vUA/lib/liberror_tracker.js,iHKb-4mKuMY/lib/librpc.js,ebbdPN3h-1s/lib/libcore.js,OqjxSeEKc8o/lib/libdynamic-height.js,a5j4V1JuNVE/lib/libsetprefs.js,WTy6QrAxdtg/lib/libviews.js&view=home&is_signedin=1&gsessionid=OK]]></URL>
+<!--4769EE83CE8B472987A1648C8CDD6803-->  <URL><![CDATA[https://www.google.com/calendar/embed?src=account]]></URL>
 <!--4769EE83CE8B472987A1648C8CDD6803--></OBKMO_WIDGET_URL>
 
 <!--8A6B99392E2B4192012E2B54616F0041--><OBKMO_WIDGET_URL>
--- a/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Tue Nov 06 08:30:48 2012 +0100
@@ -6,7 +6,7 @@
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <NAME><![CDATA[Payment Report]]></NAME>
-<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.18258]]></VERSION>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.18388]]></VERSION>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <DESCRIPTION><![CDATA[Payment Report]]></DESCRIPTION>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <URL><![CDATA[http://forge.openbravo.com/projects/paymentreport]]></URL>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <TYPE><![CDATA[M]]></TYPE>
--- a/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Nov 06 08:30:48 2012 +0100
@@ -7,7 +7,7 @@
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_DEPENDENT_MODULE_ID>
-<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.18258]]></STARTVERSION>
+<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.18388]]></STARTVERSION>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <DEPENDANT_MODULE_NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></DEPENDANT_MODULE_NAME>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Tue Nov 06 08:30:48 2012 +0100
@@ -6,7 +6,7 @@
 <!--3A3A943684D64DEF9EC39F588A656848-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <NAME><![CDATA[Orders Awaiting Delivery]]></NAME>
-<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.18258]]></VERSION>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.18388]]></VERSION>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <DESCRIPTION><![CDATA[Report displaying sales orders not shipped.]]></DESCRIPTION>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <URL><![CDATA[http://forge.openbravo.com/projects/ordersawaitingdlivery]]></URL>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <TYPE><![CDATA[M]]></TYPE>
--- a/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Nov 06 08:30:48 2012 +0100
@@ -7,7 +7,7 @@
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <AD_MODULE_ID><![CDATA[3A3A943684D64DEF9EC39F588A656848]]></AD_MODULE_ID>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.18258]]></STARTVERSION>
+<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.18388]]></STARTVERSION>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Tue Nov 06 08:30:48 2012 +0100
@@ -6,7 +6,7 @@
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <NAME><![CDATA[JSON Datasource]]></NAME>
-<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION><![CDATA[2.1.18258]]></VERSION>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION><![CDATA[2.1.18388]]></VERSION>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <DESCRIPTION><![CDATA[Provides data source CRUD functionality using JSON as the data format]]></DESCRIPTION>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <HELP><![CDATA[This module implements the datasource concept. Datasources play a central role in Smartclient applications. The datasource module automatically creates a datasource for each Openbravo entity. In addition custom data source implementations can be defined.]]></HELP>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <URL><![CDATA[http://forge.openbravo.com/projects/datasourceservice]]></URL>
--- a/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Nov 06 08:30:48 2012 +0100
@@ -7,7 +7,7 @@
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <STARTVERSION><![CDATA[1.1.18258]]></STARTVERSION>
+<!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <STARTVERSION><![CDATA[1.1.18388]]></STARTVERSION>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <AD_DEPENDENT_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_DEPENDENT_MODULE_ID>
-<!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <STARTVERSION><![CDATA[2.0.18258]]></STARTVERSION>
+<!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <STARTVERSION><![CDATA[2.0.18388]]></STARTVERSION>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON REST Webservice]]></DEPENDANT_MODULE_NAME>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--4FCE95802A854F7E8623AFF7C33D13EE-->  <STARTVERSION><![CDATA[3.0.18258]]></STARTVERSION>
+<!--4FCE95802A854F7E8623AFF7C33D13EE-->  <STARTVERSION><![CDATA[3.0.18388]]></STARTVERSION>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--54AF8B39C55E4E7496902893ECD82786-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--54AF8B39C55E4E7496902893ECD82786-->  <STARTVERSION><![CDATA[2.1.18258]]></STARTVERSION>
+<!--54AF8B39C55E4E7496902893ECD82786-->  <STARTVERSION><![CDATA[2.1.18388]]></STARTVERSION>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -63,7 +63,7 @@
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID>
-<!--D03C56D8A4E14F45A5466350E05C631F-->  <STARTVERSION><![CDATA[8.1.18258]]></STARTVERSION>
+<!--D03C56D8A4E14F45A5466350E05C631F-->  <STARTVERSION><![CDATA[8.1.18388]]></STARTVERSION>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Tue Nov 06 08:30:48 2012 +0100
@@ -6,7 +6,7 @@
 <!--FF8080813129ADA401312CA1222A0005-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FF8080813129ADA401312CA1222A0005-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813129ADA401312CA1222A0005-->  <NAME><![CDATA[Integration with Google APIs]]></NAME>
-<!--FF8080813129ADA401312CA1222A0005-->  <VERSION><![CDATA[0.1.18258]]></VERSION>
+<!--FF8080813129ADA401312CA1222A0005-->  <VERSION><![CDATA[0.1.18388]]></VERSION>
 <!--FF8080813129ADA401312CA1222A0005-->  <DESCRIPTION><![CDATA[Integration with Google APIs]]></DESCRIPTION>
 <!--FF8080813129ADA401312CA1222A0005-->  <TYPE><![CDATA[M]]></TYPE>
 <!--FF8080813129ADA401312CA1222A0005-->  <LICENSE><![CDATA[Licensed under the Openbravo Public License Version 1.1.
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Nov 06 08:30:48 2012 +0100
@@ -7,7 +7,7 @@
 <!--FF8080813141B198013141BA0F7D0012-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813141B198013141BA0F7D0012-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
 <!--FF8080813141B198013141BA0F7D0012-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813141B198013141BA0F7D0012-->  <STARTVERSION><![CDATA[0.1.18258]]></STARTVERSION>
+<!--FF8080813141B198013141BA0F7D0012-->  <STARTVERSION><![CDATA[0.1.18388]]></STARTVERSION>
 <!--FF8080813141B198013141BA0F7D0012-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080813141B198013141BA0F7D0012-->  <DEPENDANT_MODULE_NAME><![CDATA[OpenID Service Integration]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813141B198013141BA0F7D0012-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--FF8080813151AEE1013151C4ACE6001B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <AD_DEPENDENT_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813151AEE1013151C4ACE6001B-->  <STARTVERSION><![CDATA[2.1.18258]]></STARTVERSION>
+<!--FF8080813151AEE1013151C4ACE6001B-->  <STARTVERSION><![CDATA[2.1.18388]]></STARTVERSION>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.integration.google/src/org/openbravo/service/integration/google/GoogleAuthServlet.java	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.service.integration.google/src/org/openbravo/service/integration/google/GoogleAuthServlet.java	Tue Nov 06 08:30:48 2012 +0100
@@ -32,6 +32,7 @@
 import org.openbravo.base.exception.OBException;
 import org.openbravo.base.provider.OBProvider;
 import org.openbravo.base.secureApp.VariablesSecureApp;
+import org.openbravo.client.kernel.KernelUtils;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBCriteria;
 import org.openbravo.dal.service.OBDal;
@@ -158,8 +159,12 @@
         vars.setSessionValue("#LOGGINGIN", "Y");
       }
 
-      resp.sendRedirect(strDireccion + "/security/Menu.html");
-
+      if (Utility.isMobileBrowser(req)
+          && KernelUtils.getInstance().isModulePresent(Utility.OB_MOBILE_JAVAPACKAGE)) {
+        resp.sendRedirect("../web/org.openbravo.client.mobile/");
+      } else {
+        resp.sendRedirect(strDireccion + "/security/Menu.html");
+      }
     } catch (Exception e) {
       log.error("Error processing return of Google Auth Service:" + e.getMessage(), e);
       this.getServletContext().getRequestDispatcher(loginPageURL).forward(req, resp);
--- a/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Tue Nov 06 08:30:48 2012 +0100
@@ -6,7 +6,7 @@
 <!--FF8080813141B198013141B86DD70003-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FF8080813141B198013141B86DD70003-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813141B198013141B86DD70003-->  <NAME><![CDATA[OpenID Service Integration]]></NAME>
-<!--FF8080813141B198013141B86DD70003-->  <VERSION><![CDATA[0.1.18258]]></VERSION>
+<!--FF8080813141B198013141B86DD70003-->  <VERSION><![CDATA[0.1.18388]]></VERSION>
 <!--FF8080813141B198013141B86DD70003-->  <DESCRIPTION><![CDATA[OpenID Service Integration]]></DESCRIPTION>
 <!--FF8080813141B198013141B86DD70003-->  <TYPE><![CDATA[M]]></TYPE>
 <!--FF8080813141B198013141B86DD70003-->  <LICENSE><![CDATA[Licensed under the Openbravo Public License Version 1.1.
--- a/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Nov 06 08:30:48 2012 +0100
@@ -7,7 +7,7 @@
 <!--FF8080813141B198013141B8B21B0006-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813141B198013141B8B21B0006-->  <AD_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_MODULE_ID>
 <!--FF8080813141B198013141B8B21B0006-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813141B198013141B8B21B0006-->  <STARTVERSION><![CDATA[3.0.18258]]></STARTVERSION>
+<!--FF8080813141B198013141B8B21B0006-->  <STARTVERSION><![CDATA[3.0.18388]]></STARTVERSION>
 <!--FF8080813141B198013141B8B21B0006-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080813141B198013141B8B21B0006-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813141B198013141B8B21B0006-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Tue Nov 06 08:30:48 2012 +0100
@@ -6,7 +6,7 @@
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <NAME><![CDATA[JSON REST Webservice]]></NAME>
-<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION><![CDATA[2.0.18258]]></VERSION>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION><![CDATA[2.0.18388]]></VERSION>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <DESCRIPTION><![CDATA[Provides a JSON REST webservice for CRUD service requests]]></DESCRIPTION>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <HELP><![CDATA[Provides a JSON REST webservice for CRUD service requests. Both the servlet implementation (receiving HTTP REST requests in JSON) as the backend processing are provided.]]></HELP>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <URL><![CDATA[http://forge.openbravo.com/projects/openbravojsonrest]]></URL>
--- a/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Nov 06 08:30:48 2012 +0100
@@ -7,7 +7,7 @@
 <!--9E3E7B42DB16405FB794496D309D7044-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <AD_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_MODULE_ID>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--9E3E7B42DB16405FB794496D309D7044-->  <STARTVERSION><![CDATA[3.0.18258]]></STARTVERSION>
+<!--9E3E7B42DB16405FB794496D309D7044-->  <STARTVERSION><![CDATA[3.0.18388]]></STARTVERSION>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java	Tue Nov 06 08:30:48 2012 +0100
@@ -985,10 +985,11 @@
       int index = localWhereClause.toLowerCase().indexOf(key.toLowerCase());
       if (index != -1) {
         while (index != -1) {
+          final Object value = filterParameters.get(key);
           // substitute all occurrences of paramater
           localWhereClause = localWhereClause.substring(0, index) + getTypedParameterAlias() + " "
               + localWhereClause.substring(index + key.length());
-          typedParameters.add(filterParameters.get(key));
+          typedParameters.add("null".equals(value) ? null : value);
           index = localWhereClause.toLowerCase().indexOf(key.toLowerCase());
         }
       }
--- a/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Tue Nov 06 08:30:48 2012 +0100
@@ -6,7 +6,7 @@
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <NAME><![CDATA[User Interface Selector]]></NAME>
-<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION><![CDATA[2.1.18258]]></VERSION>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION><![CDATA[2.1.18388]]></VERSION>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <DESCRIPTION><![CDATA[Provides a selector with a suggestion box and popup grid window]]></DESCRIPTION>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <HELP><![CDATA[The Openbravo selector provides new selector functionality which is used inside of existing Openbravo forms. The selector is mainly used for supporting foreign key references in the user interface. The selector combines both suggestion box behavior with a popup grid.]]></HELP>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <URL><![CDATA[http://forge.openbravo.com/projects/selector]]></URL>
--- a/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Nov 06 08:30:48 2012 +0100
@@ -7,7 +7,7 @@
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID>
-<!--38825CAED43941D38CA0C78DB04FCFA0-->  <STARTVERSION><![CDATA[8.1.18258]]></STARTVERSION>
+<!--38825CAED43941D38CA0C78DB04FCFA0-->  <STARTVERSION><![CDATA[8.1.18388]]></STARTVERSION>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <AD_DEPENDENT_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_DEPENDENT_MODULE_ID>
-<!--6DDE7B1A70174242AF82B5022FB89279-->  <STARTVERSION><![CDATA[2.1.18258]]></STARTVERSION>
+<!--6DDE7B1A70174242AF82B5022FB89279-->  <STARTVERSION><![CDATA[2.1.18388]]></STARTVERSION>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Application]]></DEPENDANT_MODULE_NAME>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--94F9CD2CB5EF4467A67475C786C984A7-->  <STARTVERSION><![CDATA[2.1.18258]]></STARTVERSION>
+<!--94F9CD2CB5EF4467A67475C786C984A7-->  <STARTVERSION><![CDATA[2.1.18388]]></STARTVERSION>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <STARTVERSION><![CDATA[1.1.18258]]></STARTVERSION>
+<!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <STARTVERSION><![CDATA[1.1.18388]]></STARTVERSION>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -63,7 +63,7 @@
 <!--C8DAC574B88649D08C9468521B343F12-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--C8DAC574B88649D08C9468521B343F12-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--C8DAC574B88649D08C9468521B343F12-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--C8DAC574B88649D08C9468521B343F12-->  <STARTVERSION><![CDATA[3.0.18258]]></STARTVERSION>
+<!--C8DAC574B88649D08C9468521B343F12-->  <STARTVERSION><![CDATA[3.0.18388]]></STARTVERSION>
 <!--C8DAC574B88649D08C9468521B343F12-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--C8DAC574B88649D08C9468521B343F12-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--C8DAC574B88649D08C9468521B343F12-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -77,7 +77,7 @@
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID>
-<!--F14EB17946BE4724A46F80CB1A47EC70-->  <STARTVERSION><![CDATA[2.1.18258]]></STARTVERSION>
+<!--F14EB17946BE4724A46F80CB1A47EC70-->  <STARTVERSION><![CDATA[2.1.18388]]></STARTVERSION>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java	Tue Nov 06 08:30:48 2012 +0100
@@ -176,7 +176,9 @@
     final String orgs = getOrgs(parameters.get(JsonConstants.ORG_PARAMETER));
     if (StringUtils.isNotEmpty(orgs)) {
       additionalFilter.append(NEW_FILTER_CLAUSE);
-      additionalFilter.append(entityAlias + ".organization in (" + orgs + ")");
+      additionalFilter.append(entityAlias
+          + (sel.getTable().getName().equals("Organization") ? ".id in (" + orgs + ")"
+              : ".organization in (" + orgs + ")"));
     }
     additionalFilter.append(getDefaultFilterExpression(sel, parameters));
 
--- a/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js	Tue Nov 06 08:30:48 2012 +0100
@@ -131,9 +131,13 @@
         if (this.targetRecordId) {
           record = this.data.find(this.selector.valueField, this.targetRecordId);
           rowNum = this.getRecordIndex(record);
-          this.scrollToRow(rowNum);
           this.selectSingleRecord(record);
+          // give grid time to draw
+          this.fireOnPause('scrollRecordIntoView', this.scrollRecordIntoView, [rowNum, true], this);
           delete this.targetRecordId;
+        } else if (this.data.lengthIsKnown() && this.data.getLength() === 1) {
+          // only one record, select that one straight away
+          this.selectSingleRecord(0);
         } else {
           this.selectSingleRecord(null);
         }
--- a/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Tue Nov 06 08:30:48 2012 +0100
@@ -6,7 +6,7 @@
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <NAME><![CDATA[2.50 to 3.00 Compatibility Skin]]></NAME>
-<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION><![CDATA[2.0.18258]]></VERSION>
+<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION><![CDATA[2.0.18388]]></VERSION>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <DESCRIPTION><![CDATA[Skin module to proper visualization of classic windows inside the MDI interface]]></DESCRIPTION>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <HELP><![CDATA[With this skin module the classic windows styles will display in a way more coherent with the new 3.00 styles]]></HELP>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <URL><![CDATA[www.openbravo.com]]></URL>
--- a/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Nov 06 08:30:48 2012 +0100
@@ -7,7 +7,7 @@
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <AD_MODULE_ID><![CDATA[96998CBC42744B3DBEE28AC8095C9335]]></AD_MODULE_ID>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--39BF75AD9AB3453698BF5DE29E727AA9-->  <STARTVERSION><![CDATA[3.0.18258]]></STARTVERSION>
+<!--39BF75AD9AB3453698BF5DE29E727AA9-->  <STARTVERSION><![CDATA[3.0.18388]]></STARTVERSION>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Tue Nov 06 08:30:48 2012 +0100
@@ -6,7 +6,7 @@
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <NAME><![CDATA[Smartclient]]></NAME>
-<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION><![CDATA[8.1.18258]]></VERSION>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION><![CDATA[8.1.18388]]></VERSION>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <DESCRIPTION><![CDATA[SmartClient libraries for use within Openbravo]]></DESCRIPTION>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <HELP><![CDATA[This module contains the SmartClient libraries for usage by other modules. It also contains some simple test pages to validate that SmartClient is working correctly. Also contains generic Openbravo SmartClient components]]></HELP>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <URL><![CDATA[http://forge.openbravo.com/projects/obsmartclient]]></URL>
--- a/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Nov 06 08:30:48 2012 +0100
@@ -7,7 +7,7 @@
 <!--086331E18477496B8AC74D2CFEBD1307-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <AD_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_MODULE_ID>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--086331E18477496B8AC74D2CFEBD1307-->  <STARTVERSION><![CDATA[3.0.18258]]></STARTVERSION>
+<!--086331E18477496B8AC74D2CFEBD1307-->  <STARTVERSION><![CDATA[3.0.18388]]></STARTVERSION>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--DC5D4EF450244482BD2B458DAA496333-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--DC5D4EF450244482BD2B458DAA496333-->  <AD_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_MODULE_ID>
 <!--DC5D4EF450244482BD2B458DAA496333-->  <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--DC5D4EF450244482BD2B458DAA496333-->  <STARTVERSION><![CDATA[2.1.18258]]></STARTVERSION>
+<!--DC5D4EF450244482BD2B458DAA496333-->  <STARTVERSION><![CDATA[2.1.18388]]></STARTVERSION>
 <!--DC5D4EF450244482BD2B458DAA496333-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--DC5D4EF450244482BD2B458DAA496333-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
 <!--DC5D4EF450244482BD2B458DAA496333-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <AD_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_MODULE_ID>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--F2AF15C0AF5540E393D96BE506E20648-->  <STARTVERSION><![CDATA[1.1.18258]]></STARTVERSION>
+<!--F2AF15C0AF5540E393D96BE506E20648-->  <STARTVERSION><![CDATA[1.1.18388]]></STARTVERSION>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Tue Nov 06 08:30:48 2012 +0100
@@ -6,7 +6,7 @@
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <NAME><![CDATA[Standard Roles]]></NAME>
-<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION><![CDATA[3.0.18258]]></VERSION>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION><![CDATA[3.0.18388]]></VERSION>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <DESCRIPTION><![CDATA[Pre-configured collection of standard ERP roles]]></DESCRIPTION>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <HELP><![CDATA[This dataset contains the following roles with their access to corresponding Openbravo entities - windows, reports, actions.
 * Employee - Any person of the enterprise
--- a/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Nov 06 08:30:48 2012 +0100
@@ -7,7 +7,7 @@
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <AD_MODULE_ID><![CDATA[883B5872CA0548F9AF2BBBE7D2DDFA61]]></AD_MODULE_ID>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--148A000EE9A04A3CA653B1296A00B8E6-->  <STARTVERSION><![CDATA[3.0.18258]]></STARTVERSION>
+<!--148A000EE9A04A3CA653B1296A00B8E6-->  <STARTVERSION><![CDATA[3.0.18388]]></STARTVERSION>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--30F966407A6F4E15965821BAEE34D25B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--30F966407A6F4E15965821BAEE34D25B-->  <AD_MODULE_ID><![CDATA[883B5872CA0548F9AF2BBBE7D2DDFA61]]></AD_MODULE_ID>
 <!--30F966407A6F4E15965821BAEE34D25B-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_DEPENDENT_MODULE_ID>
-<!--30F966407A6F4E15965821BAEE34D25B-->  <STARTVERSION><![CDATA[3.0.18258]]></STARTVERSION>
+<!--30F966407A6F4E15965821BAEE34D25B-->  <STARTVERSION><![CDATA[3.0.18388]]></STARTVERSION>
 <!--30F966407A6F4E15965821BAEE34D25B-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--30F966407A6F4E15965821BAEE34D25B-->  <DEPENDANT_MODULE_NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></DEPENDANT_MODULE_NAME>
 <!--30F966407A6F4E15965821BAEE34D25B-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--F93CE30003B24F8F8886510B0065EECC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <AD_MODULE_ID><![CDATA[883B5872CA0548F9AF2BBBE7D2DDFA61]]></AD_MODULE_ID>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <AD_DEPENDENT_MODULE_ID><![CDATA[3A3A943684D64DEF9EC39F588A656848]]></AD_DEPENDENT_MODULE_ID>
-<!--F93CE30003B24F8F8886510B0065EECC-->  <STARTVERSION><![CDATA[1.1.18258]]></STARTVERSION>
+<!--F93CE30003B24F8F8886510B0065EECC-->  <STARTVERSION><![CDATA[1.1.18388]]></STARTVERSION>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <DEPENDANT_MODULE_NAME><![CDATA[Orders Awaiting Delivery]]></DEPENDANT_MODULE_NAME>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Tue Nov 06 08:30:48 2012 +0100
@@ -6,7 +6,7 @@
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <NAME><![CDATA[Openbravo 3.0 Framework]]></NAME>
-<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION><![CDATA[2.1.18258]]></VERSION>
+<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION><![CDATA[2.1.18388]]></VERSION>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <DESCRIPTION><![CDATA[Openbravo 3.0 Framework]]></DESCRIPTION>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <HELP><![CDATA[Contains all the components required to run the Openbravo 3.0 framework]]></HELP>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <URL><![CDATA[http://forge.openbravo.com/projects/openbravov30framework]]></URL>
--- a/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue Nov 06 08:30:48 2012 +0100
@@ -7,7 +7,7 @@
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--01E1BCCEC9114DE0960538DF34E30E6F-->  <STARTVERSION><![CDATA[2.1.18258]]></STARTVERSION>
+<!--01E1BCCEC9114DE0960538DF34E30E6F-->  <STARTVERSION><![CDATA[2.1.18388]]></STARTVERSION>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--025B181F63CA47B48A920F6983242390-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--025B181F63CA47B48A920F6983242390-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--025B181F63CA47B48A920F6983242390-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--025B181F63CA47B48A920F6983242390-->  <STARTVERSION><![CDATA[3.0.18258]]></STARTVERSION>
+<!--025B181F63CA47B48A920F6983242390-->  <STARTVERSION><![CDATA[3.0.18388]]></STARTVERSION>
 <!--025B181F63CA47B48A920F6983242390-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--025B181F63CA47B48A920F6983242390-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--025B181F63CA47B48A920F6983242390-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <AD_DEPENDENT_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_DEPENDENT_MODULE_ID>
-<!--054B4FEAF919478AA3FF27098A46D1D6-->  <STARTVERSION><![CDATA[2.1.18258]]></STARTVERSION>
+<!--054B4FEAF919478AA3FF27098A46D1D6-->  <STARTVERSION><![CDATA[2.1.18388]]></STARTVERSION>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Application]]></DEPENDANT_MODULE_NAME>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_DEPENDENT_MODULE_ID>
-<!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <STARTVERSION><![CDATA[1.0.18258]]></STARTVERSION>
+<!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <STARTVERSION><![CDATA[1.0.18388]]></STARTVERSION>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <DEPENDANT_MODULE_NAME><![CDATA[Query/List Widget]]></DEPENDANT_MODULE_NAME>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -63,7 +63,7 @@
 <!--224754C3EF674C93B0D468F47BAAB824-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID>
-<!--224754C3EF674C93B0D468F47BAAB824-->  <STARTVERSION><![CDATA[2.1.18258]]></STARTVERSION>
+<!--224754C3EF674C93B0D468F47BAAB824-->  <STARTVERSION><![CDATA[2.1.18388]]></STARTVERSION>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Selector]]></DEPENDANT_MODULE_NAME>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -77,7 +77,7 @@
 <!--5B72D24032DD4879A950194139D961B6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--5B72D24032DD4879A950194139D961B6-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--5B72D24032DD4879A950194139D961B6-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID>
-<!--5B72D24032DD4879A950194139D961B6-->  <STARTVERSION><![CDATA[2.1.18258]]></STARTVERSION>
+<!--5B72D24032DD4879A950194139D961B6-->  <STARTVERSION><![CDATA[2.1.18388]]></STARTVERSION>
 <!--5B72D24032DD4879A950194139D961B6-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--5B72D24032DD4879A950194139D961B6-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME>
 <!--5B72D24032DD4879A950194139D961B6-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -91,7 +91,7 @@
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <AD_DEPENDENT_MODULE_ID><![CDATA[D393BE6F22BB44B7B728259B34FC795A]]></AD_DEPENDENT_MODULE_ID>
-<!--8730CA6A4224439D82E0DD31B3806E36-->  <STARTVERSION><![CDATA[1.0.18258]]></STARTVERSION>
+<!--8730CA6A4224439D82E0DD31B3806E36-->  <STARTVERSION><![CDATA[1.0.18388]]></STARTVERSION>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <DEPENDANT_MODULE_NAME><![CDATA[HTML Widget]]></DEPENDANT_MODULE_NAME>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -105,7 +105,7 @@
 <!--98C47FF058F8413B8A2B26036061446E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--98C47FF058F8413B8A2B26036061446E-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--98C47FF058F8413B8A2B26036061446E-->  <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID>
-<!--98C47FF058F8413B8A2B26036061446E-->  <STARTVERSION><![CDATA[8.1.18258]]></STARTVERSION>
+<!--98C47FF058F8413B8A2B26036061446E-->  <STARTVERSION><![CDATA[8.1.18388]]></STARTVERSION>
 <!--98C47FF058F8413B8A2B26036061446E-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--98C47FF058F8413B8A2B26036061446E-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--98C47FF058F8413B8A2B26036061446E-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -119,7 +119,7 @@
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <AD_DEPENDENT_MODULE_ID><![CDATA[96998CBC42744B3DBEE28AC8095C9335]]></AD_DEPENDENT_MODULE_ID>
-<!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <STARTVERSION><![CDATA[2.0.18258]]></STARTVERSION>
+<!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <STARTVERSION><![CDATA[2.0.18388]]></STARTVERSION>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <DEPENDANT_MODULE_NAME><![CDATA[2.50 to 3.00 Compatibility Skin]]></DEPENDANT_MODULE_NAME>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -133,7 +133,7 @@
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--A9CB99330AF34944877F889DD8A0AB3C-->  <STARTVERSION><![CDATA[2.1.18258]]></STARTVERSION>
+<!--A9CB99330AF34944877F889DD8A0AB3C-->  <STARTVERSION><![CDATA[2.1.18388]]></STARTVERSION>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -147,7 +147,7 @@
 <!--E72A053A403C4A98A189C105B850ADB0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--E72A053A403C4A98A189C105B850ADB0-->  <STARTVERSION><![CDATA[1.1.18258]]></STARTVERSION>
+<!--E72A053A403C4A98A189C105B850ADB0-->  <STARTVERSION><![CDATA[1.1.18388]]></STARTVERSION>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -161,7 +161,7 @@
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <AD_DEPENDENT_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_DEPENDENT_MODULE_ID>
-<!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <STARTVERSION><![CDATA[2.0.18258]]></STARTVERSION>
+<!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <STARTVERSION><![CDATA[2.0.18388]]></STARTVERSION>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON REST Webservice]]></DEPENDANT_MODULE_NAME>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Tue Oct 30 14:10:45 2012 +0100
+++ b/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Tue Nov 06 08:30:48 2012 +0100
@@ -6,7 +6,7 @@
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <NAME><![CDATA[Openbravo 3.0]]></NAME>
-<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION><![CDATA[3.0.18258]]></VERSION>