[pool] Merge with pi
authorInigo Sanchez <inigo.sanchez@openbravo.com>
Thu, 02 Jul 2015 09:20:14 +0200
changeset 27460 f3a6ed5a2dea
parent 27459 e9195582325a (current diff)
parent 27176 80e3d00ad42c (diff)
child 27461 5ea79031665e
[pool] Merge with pi
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
src/org/openbravo/configuration/ConfigurationApp.java
src/org/openbravo/erpCommon/utility/Utility.java
--- a/.hgsigs	Wed Jul 01 14:47:16 2015 +0200
+++ b/.hgsigs	Thu Jul 02 09:20:14 2015 +0200
@@ -169,5 +169,7 @@
 295e0a259f619311101efee9f1d31aede5bdaa95 0 iEYEABECAAYFAlUZK3oACgkQCX/oGf+2qkOrywCdFORG9mDgA9SMY95tQrtMYtUftS0AoK6d8rFNeUz9xDvAP/y0B+2myvoN
 4d63b001f63758b1b79b9502621754878acdfdff 0 iEYEABECAAYFAlUwx7cACgkQCX/oGf+2qkOn2gCcCxKfDDCR1P8qYR9bNtxTIs81JY8AniiMcNvRgeOQ6DOF+jHHVksUM4eO
 ac3537eef819b48dc9888d5ab0d4fec470158bef 0 iEYEABECAAYFAlVbMyIACgkQCX/oGf+2qkPRzwCfYI94AYb2DYsvojxmVtqMVqKjGiQAoIfADynxGuktv9GHEwfJOnnLCxv3
+370bc533058038007007c659c47de628c4bdcfd6 0 iEYEABECAAYFAlWCjH4ACgkQCX/oGf+2qkP10wCgmhrDxV+DCix0YGwG3nzoCyoug9kAoMoxktPF74eqwpkmVy3uyn5RYT5O
 ac761ac78f576cee64046e115ac42d2a3b227682 0 iEYEABECAAYFAlVItlgACgkQCX/oGf+2qkPgSACeNz58xoUWpTvMywmncbWx7+r7bnUAn1Ba1al80Q9HMY/wiMNu1Vfpd9Jo
 fdb1e0cd936d09381ae1aa87be98cc4f0f334f31 0 iEYEABECAAYFAlVbM8QACgkQCX/oGf+2qkO+wACfTbKub/UT0e2V2iyIB21716NAn/oAoIHu7PYZ7w/BkTQDZWR0PXDdYkty
+bd0e758ae44eb624d8af403fb4764629c1a45b21 0 iEYEABECAAYFAlWChbsACgkQCX/oGf+2qkM6xACfXP4M7zXaih+uqkIpGHMqGPTzxD8An0r58zI1YN3gKOT9t0kZ3IdaNA7c
--- a/.hgtags	Wed Jul 01 14:47:16 2015 +0200
+++ b/.hgtags	Thu Jul 02 09:20:14 2015 +0200
@@ -180,5 +180,7 @@
 31dfe7896f8fcd9390b979d7c6972f5aea00d199 3.0PR15Q1.2
 ad409516bfa0b1c6f7ab128cab4526dd5058c787 3.0PR15Q1.3
 d5ec99ff8e8e301cf4bf673f37b9c04ea1758f98 3.0PR15Q1.4
+d2f1dd0d0b4c2e493c26a4b9cbdb20fdc50c5f13 3.0PR15Q1.5
 4239774eb8de8f0740bfbd6e3e36c075ee2a5a91 3.0PR15Q2
 e861122b0b1d2aa2ca6e177bfbb9ddf939e33dd7 3.0PR15Q2.1
+a28a880b5aeb9208eaf0ce569fd51b7a5fc2b48e 3.0PR15Q2.2
Binary file modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/AlertsForWrongOrdersData.class has changed
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -19,7 +19,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) 2011-2014 Openbravo SLU
+* All portions are Copyright (C) 2011-2015 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -33,6 +33,7 @@
   TYPE RECORD IS REF CURSOR;
   Cur_Dbprefix RECORD;
   v_invoicepaidstatus  VARCHAR2(32);
+  v_fin_payment_schedule_order VARCHAR(32);
   v_fin_payment_schedule_invoice VARCHAR(32);
   v_p_fin_psd_id VARCHAR(32);
 BEGIN
@@ -52,13 +53,13 @@
   END IF;
   
   IF (v_p_fin_psd_id is not null ) THEN
-  select isinvoicepaid , fin_payment_schedule_invoice
-  into v_isinvoicepaid , v_fin_payment_schedule_invoice
+  select isinvoicepaid, fin_payment_schedule_order, fin_payment_schedule_invoice
+  into v_isinvoicepaid, v_fin_payment_schedule_order, v_fin_payment_schedule_invoice
   from fin_payment_scheduledetail
   where fin_payment_scheduledetail_id=v_p_fin_psd_id;
   END IF;
 
-  IF (v_fin_payment_schedule_invoice is not null)THEN
+  IF (v_fin_payment_schedule_order is not null OR v_fin_payment_schedule_invoice is not null) THEN
     IF(v_isinvoicepaid='Y')THEN
     -- core intermediate statuses
     v_isPaymentConfirmed := 'Y';
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINANCIAL_ACCOUNT.xml	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINANCIAL_ACCOUNT.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -29,5 +29,9 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="EM_APRM_ADDMULTIPLEPAYMENTS" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault/>
+      </column>
     </table>
   </database>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -407,7 +407,7 @@
 <!--0F5C7245380C4C96841D3452F3C1FE47-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--0F5C7245380C4C96841D3452F3C1FE47-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--0F5C7245380C4C96841D3452F3C1FE47-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--0F5C7245380C4C96841D3452F3C1FE47-->  <POSITION><![CDATA[41]]></POSITION>
+<!--0F5C7245380C4C96841D3452F3C1FE47-->  <POSITION><![CDATA[40]]></POSITION>
 <!--0F5C7245380C4C96841D3452F3C1FE47-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--0F5C7245380C4C96841D3452F3C1FE47-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--0F5C7245380C4C96841D3452F3C1FE47-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -1830,7 +1830,7 @@
 <!--394FD1143C904A8C9E6A2AD42085CB9B-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--394FD1143C904A8C9E6A2AD42085CB9B-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--394FD1143C904A8C9E6A2AD42085CB9B-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--394FD1143C904A8C9E6A2AD42085CB9B-->  <POSITION><![CDATA[43]]></POSITION>
+<!--394FD1143C904A8C9E6A2AD42085CB9B-->  <POSITION><![CDATA[41]]></POSITION>
 <!--394FD1143C904A8C9E6A2AD42085CB9B-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--394FD1143C904A8C9E6A2AD42085CB9B-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--394FD1143C904A8C9E6A2AD42085CB9B-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -6909,7 +6909,7 @@
 <!--9DC8500B414640E09BF61A3D14FE13D1-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--9DC8500B414640E09BF61A3D14FE13D1-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--9DC8500B414640E09BF61A3D14FE13D1-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--9DC8500B414640E09BF61A3D14FE13D1-->  <POSITION><![CDATA[40]]></POSITION>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->  <POSITION><![CDATA[39]]></POSITION>
 <!--9DC8500B414640E09BF61A3D14FE13D1-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--9DC8500B414640E09BF61A3D14FE13D1-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--9DC8500B414640E09BF61A3D14FE13D1-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -7082,7 +7082,7 @@
 <!--A028C07508878CB9E040007F01007210-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--A028C07508878CB9E040007F01007210-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--A028C07508878CB9E040007F01007210-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--A028C07508878CB9E040007F01007210-->  <POSITION><![CDATA[36]]></POSITION>
+<!--A028C07508878CB9E040007F01007210-->  <POSITION><![CDATA[35]]></POSITION>
 <!--A028C07508878CB9E040007F01007210-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--A028C07508878CB9E040007F01007210-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--A028C07508878CB9E040007F01007210-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -7115,7 +7115,7 @@
 <!--A04179EAC69DF848E040007F01004523-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--A04179EAC69DF848E040007F01004523-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--A04179EAC69DF848E040007F01004523-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--A04179EAC69DF848E040007F01004523-->  <POSITION><![CDATA[37]]></POSITION>
+<!--A04179EAC69DF848E040007F01004523-->  <POSITION><![CDATA[36]]></POSITION>
 <!--A04179EAC69DF848E040007F01004523-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--A04179EAC69DF848E040007F01004523-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--A04179EAC69DF848E040007F01004523-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -7150,7 +7150,7 @@
 <!--A04179EAC69EF848E040007F01004523-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--A04179EAC69EF848E040007F01004523-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--A04179EAC69EF848E040007F01004523-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--A04179EAC69EF848E040007F01004523-->  <POSITION><![CDATA[38]]></POSITION>
+<!--A04179EAC69EF848E040007F01004523-->  <POSITION><![CDATA[37]]></POSITION>
 <!--A04179EAC69EF848E040007F01004523-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--A04179EAC69EF848E040007F01004523-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--A04179EAC69EF848E040007F01004523-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -7186,7 +7186,7 @@
 <!--A04179EAC69FF848E040007F01004523-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--A04179EAC69FF848E040007F01004523-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--A04179EAC69FF848E040007F01004523-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--A04179EAC69FF848E040007F01004523-->  <POSITION><![CDATA[39]]></POSITION>
+<!--A04179EAC69FF848E040007F01004523-->  <POSITION><![CDATA[38]]></POSITION>
 <!--A04179EAC69FF848E040007F01004523-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--A04179EAC69FF848E040007F01004523-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--A04179EAC69FF848E040007F01004523-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -10127,6 +10127,43 @@
 <!--CBAF582C3F674FEEB1D38C2A10E03E2F-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--CBAF582C3F674FEEB1D38C2A10E03E2F--></AD_COLUMN>
 
+<!--CD644D952B4945158005088D474CC529--><AD_COLUMN>
+<!--CD644D952B4945158005088D474CC529-->  <AD_COLUMN_ID><![CDATA[CD644D952B4945158005088D474CC529]]></AD_COLUMN_ID>
+<!--CD644D952B4945158005088D474CC529-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--CD644D952B4945158005088D474CC529-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--CD644D952B4945158005088D474CC529-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--CD644D952B4945158005088D474CC529-->  <NAME><![CDATA[EM_Aprm_AddMultiplePayments]]></NAME>
+<!--CD644D952B4945158005088D474CC529-->  <DESCRIPTION><![CDATA[User can select multiple payments at the same time. The system will create a separate transaction per selected payment]]></DESCRIPTION>
+<!--CD644D952B4945158005088D474CC529-->  <HELP><![CDATA[User can select multiple payments at the same time. The system will create a separate transaction per selected payment]]></HELP>
+<!--CD644D952B4945158005088D474CC529-->  <COLUMNNAME><![CDATA[EM_Aprm_AddMultiplePayments]]></COLUMNNAME>
+<!--CD644D952B4945158005088D474CC529-->  <AD_TABLE_ID><![CDATA[B129E53BC0E747879F7BA17F0AECEC32]]></AD_TABLE_ID>
+<!--CD644D952B4945158005088D474CC529-->  <AD_REFERENCE_ID><![CDATA[28]]></AD_REFERENCE_ID>
+<!--CD644D952B4945158005088D474CC529-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--CD644D952B4945158005088D474CC529-->  <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE>
+<!--CD644D952B4945158005088D474CC529-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--CD644D952B4945158005088D474CC529-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--CD644D952B4945158005088D474CC529-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--CD644D952B4945158005088D474CC529-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--CD644D952B4945158005088D474CC529-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--CD644D952B4945158005088D474CC529-->  <SEQNO><![CDATA[500]]></SEQNO>
+<!--CD644D952B4945158005088D474CC529-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--CD644D952B4945158005088D474CC529-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--CD644D952B4945158005088D474CC529-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--CD644D952B4945158005088D474CC529-->  <AD_ELEMENT_ID><![CDATA[FC01C8BFAB68409497398AB4C6D923F1]]></AD_ELEMENT_ID>
+<!--CD644D952B4945158005088D474CC529-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--CD644D952B4945158005088D474CC529-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--CD644D952B4945158005088D474CC529-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--CD644D952B4945158005088D474CC529-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--CD644D952B4945158005088D474CC529-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--CD644D952B4945158005088D474CC529-->  <POSITION><![CDATA[42]]></POSITION>
+<!--CD644D952B4945158005088D474CC529-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--CD644D952B4945158005088D474CC529-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--CD644D952B4945158005088D474CC529-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--CD644D952B4945158005088D474CC529-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--CD644D952B4945158005088D474CC529-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--CD644D952B4945158005088D474CC529-->  <EM_OBUIAPP_PROCESS_ID><![CDATA[4CE463C04CA0412CAC57EF58FE0F8498]]></EM_OBUIAPP_PROCESS_ID>
+<!--CD644D952B4945158005088D474CC529--></AD_COLUMN>
+
 <!--D06818A44BBB4E2CA7463CB4F03F8C04--><AD_COLUMN>
 <!--D06818A44BBB4E2CA7463CB4F03F8C04-->  <AD_COLUMN_ID><![CDATA[D06818A44BBB4E2CA7463CB4F03F8C04]]></AD_COLUMN_ID>
 <!--D06818A44BBB4E2CA7463CB4F03F8C04-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -1620,6 +1620,20 @@
 <!--F8CF71B37C84442EB5526AF3998BEBBF-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--F8CF71B37C84442EB5526AF3998BEBBF--></AD_ELEMENT>
 
+<!--FC01C8BFAB68409497398AB4C6D923F1--><AD_ELEMENT>
+<!--FC01C8BFAB68409497398AB4C6D923F1-->  <AD_ELEMENT_ID><![CDATA[FC01C8BFAB68409497398AB4C6D923F1]]></AD_ELEMENT_ID>
+<!--FC01C8BFAB68409497398AB4C6D923F1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FC01C8BFAB68409497398AB4C6D923F1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FC01C8BFAB68409497398AB4C6D923F1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FC01C8BFAB68409497398AB4C6D923F1-->  <COLUMNNAME><![CDATA[EM_Aprm_AddMultiplePayments]]></COLUMNNAME>
+<!--FC01C8BFAB68409497398AB4C6D923F1-->  <NAME><![CDATA[Add Multiple Payments]]></NAME>
+<!--FC01C8BFAB68409497398AB4C6D923F1-->  <PRINTNAME><![CDATA[Add Multiple Payments]]></PRINTNAME>
+<!--FC01C8BFAB68409497398AB4C6D923F1-->  <DESCRIPTION><![CDATA[User can select multiple payments at the same time. The system will create a separate transaction per selected payment]]></DESCRIPTION>
+<!--FC01C8BFAB68409497398AB4C6D923F1-->  <HELP><![CDATA[User can select multiple payments at the same time. The system will create a separate transaction per selected payment]]></HELP>
+<!--FC01C8BFAB68409497398AB4C6D923F1-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--FC01C8BFAB68409497398AB4C6D923F1-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--FC01C8BFAB68409497398AB4C6D923F1--></AD_ELEMENT>
+
 <!--FC780C136EFA4D98B2435A9448FA44AD--><AD_ELEMENT>
 <!--FC780C136EFA4D98B2435A9448FA44AD-->  <AD_ELEMENT_ID><![CDATA[FC780C136EFA4D98B2435A9448FA44AD]]></AD_ELEMENT_ID>
 <!--FC780C136EFA4D98B2435A9448FA44AD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -583,6 +583,34 @@
 <!--07EC2EF3577B4AAC84EBABCC8DA7C292-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--07EC2EF3577B4AAC84EBABCC8DA7C292--></AD_FIELD>
 
+<!--07FA7810A55745B8BCC4BC590253DA6A--><AD_FIELD>
+<!--07FA7810A55745B8BCC4BC590253DA6A-->  <AD_FIELD_ID><![CDATA[07FA7810A55745B8BCC4BC590253DA6A]]></AD_FIELD_ID>
+<!--07FA7810A55745B8BCC4BC590253DA6A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--07FA7810A55745B8BCC4BC590253DA6A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--07FA7810A55745B8BCC4BC590253DA6A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--07FA7810A55745B8BCC4BC590253DA6A-->  <NAME><![CDATA[Amount]]></NAME>
+<!--07FA7810A55745B8BCC4BC590253DA6A-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--07FA7810A55745B8BCC4BC590253DA6A-->  <AD_TAB_ID><![CDATA[2700A962BC484D4C9B3E30B1C3C66BFB]]></AD_TAB_ID>
+<!--07FA7810A55745B8BCC4BC590253DA6A-->  <AD_COLUMN_ID><![CDATA[7891269C83DD655DE040007F010155CE]]></AD_COLUMN_ID>
+<!--07FA7810A55745B8BCC4BC590253DA6A-->  <PROPERTY><![CDATA[amount]]></PROPERTY>
+<!--07FA7810A55745B8BCC4BC590253DA6A-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--07FA7810A55745B8BCC4BC590253DA6A-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--07FA7810A55745B8BCC4BC590253DA6A-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--07FA7810A55745B8BCC4BC590253DA6A-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--07FA7810A55745B8BCC4BC590253DA6A-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--07FA7810A55745B8BCC4BC590253DA6A-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--07FA7810A55745B8BCC4BC590253DA6A-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--07FA7810A55745B8BCC4BC590253DA6A-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--07FA7810A55745B8BCC4BC590253DA6A-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--07FA7810A55745B8BCC4BC590253DA6A-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--07FA7810A55745B8BCC4BC590253DA6A-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--07FA7810A55745B8BCC4BC590253DA6A-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
+<!--07FA7810A55745B8BCC4BC590253DA6A-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--07FA7810A55745B8BCC4BC590253DA6A-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--07FA7810A55745B8BCC4BC590253DA6A-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--07FA7810A55745B8BCC4BC590253DA6A-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--07FA7810A55745B8BCC4BC590253DA6A--></AD_FIELD>
+
 <!--0820A1FC00504292BC9280D5CBA30BB5--><AD_FIELD>
 <!--0820A1FC00504292BC9280D5CBA30BB5-->  <AD_FIELD_ID><![CDATA[0820A1FC00504292BC9280D5CBA30BB5]]></AD_FIELD_ID>
 <!--0820A1FC00504292BC9280D5CBA30BB5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -3166,6 +3194,35 @@
 <!--2FF77BE337D74C23BE0AF89A815C2FD3-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--2FF77BE337D74C23BE0AF89A815C2FD3--></AD_FIELD>
 
+<!--30B197597EBD41FE98B013F412583A6F--><AD_FIELD>
+<!--30B197597EBD41FE98B013F412583A6F-->  <AD_FIELD_ID><![CDATA[30B197597EBD41FE98B013F412583A6F]]></AD_FIELD_ID>
+<!--30B197597EBD41FE98B013F412583A6F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--30B197597EBD41FE98B013F412583A6F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--30B197597EBD41FE98B013F412583A6F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--30B197597EBD41FE98B013F412583A6F-->  <NAME><![CDATA[Currency]]></NAME>
+<!--30B197597EBD41FE98B013F412583A6F-->  <DESCRIPTION><![CDATA[An accepted medium of monetary exchange that may vary across countries.]]></DESCRIPTION>
+<!--30B197597EBD41FE98B013F412583A6F-->  <HELP><![CDATA[Indicates the currency to be used when processing this document.]]></HELP>
+<!--30B197597EBD41FE98B013F412583A6F-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--30B197597EBD41FE98B013F412583A6F-->  <AD_TAB_ID><![CDATA[2700A962BC484D4C9B3E30B1C3C66BFB]]></AD_TAB_ID>
+<!--30B197597EBD41FE98B013F412583A6F-->  <AD_COLUMN_ID><![CDATA[7891269C83DC655DE040007F010155CE]]></AD_COLUMN_ID>
+<!--30B197597EBD41FE98B013F412583A6F-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--30B197597EBD41FE98B013F412583A6F-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--30B197597EBD41FE98B013F412583A6F-->  <DISPLAYLENGTH><![CDATA[3]]></DISPLAYLENGTH>
+<!--30B197597EBD41FE98B013F412583A6F-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--30B197597EBD41FE98B013F412583A6F-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--30B197597EBD41FE98B013F412583A6F-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--30B197597EBD41FE98B013F412583A6F-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--30B197597EBD41FE98B013F412583A6F-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--30B197597EBD41FE98B013F412583A6F-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--30B197597EBD41FE98B013F412583A6F-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--30B197597EBD41FE98B013F412583A6F-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--30B197597EBD41FE98B013F412583A6F-->  <GRID_SEQNO><![CDATA[70]]></GRID_SEQNO>
+<!--30B197597EBD41FE98B013F412583A6F-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--30B197597EBD41FE98B013F412583A6F-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--30B197597EBD41FE98B013F412583A6F-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--30B197597EBD41FE98B013F412583A6F-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--30B197597EBD41FE98B013F412583A6F--></AD_FIELD>
+
 <!--3146FC101A9E422E93BE575164E758D6--><AD_FIELD>
 <!--3146FC101A9E422E93BE575164E758D6-->  <AD_FIELD_ID><![CDATA[3146FC101A9E422E93BE575164E758D6]]></AD_FIELD_ID>
 <!--3146FC101A9E422E93BE575164E758D6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -7593,6 +7650,35 @@
 <!--6A187B6CB94548AAA3ABE7629099D1A1-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--6A187B6CB94548AAA3ABE7629099D1A1--></AD_FIELD>
 
+<!--6AACBA272E5347899B134AD4FEBADB9A--><AD_FIELD>
+<!--6AACBA272E5347899B134AD4FEBADB9A-->  <AD_FIELD_ID><![CDATA[6AACBA272E5347899B134AD4FEBADB9A]]></AD_FIELD_ID>
+<!--6AACBA272E5347899B134AD4FEBADB9A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6AACBA272E5347899B134AD4FEBADB9A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6AACBA272E5347899B134AD4FEBADB9A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6AACBA272E5347899B134AD4FEBADB9A-->  <NAME><![CDATA[Add Multiple Payments]]></NAME>
+<!--6AACBA272E5347899B134AD4FEBADB9A-->  <DESCRIPTION><![CDATA[User can select multiple payments at the same time. The system will create a separate transaction per selected payment]]></DESCRIPTION>
+<!--6AACBA272E5347899B134AD4FEBADB9A-->  <HELP><![CDATA[User can select multiple payments at the same time. The system will create a separate transaction per selected payment]]></HELP>
+<!--6AACBA272E5347899B134AD4FEBADB9A-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--6AACBA272E5347899B134AD4FEBADB9A-->  <AD_TAB_ID><![CDATA[2845D761A8394468BD3BA4710AA888D4]]></AD_TAB_ID>
+<!--6AACBA272E5347899B134AD4FEBADB9A-->  <AD_COLUMN_ID><![CDATA[CD644D952B4945158005088D474CC529]]></AD_COLUMN_ID>
+<!--6AACBA272E5347899B134AD4FEBADB9A-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--6AACBA272E5347899B134AD4FEBADB9A-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--6AACBA272E5347899B134AD4FEBADB9A-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--6AACBA272E5347899B134AD4FEBADB9A-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--6AACBA272E5347899B134AD4FEBADB9A-->  <SEQNO><![CDATA[265]]></SEQNO>
+<!--6AACBA272E5347899B134AD4FEBADB9A-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--6AACBA272E5347899B134AD4FEBADB9A-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--6AACBA272E5347899B134AD4FEBADB9A-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--6AACBA272E5347899B134AD4FEBADB9A-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--6AACBA272E5347899B134AD4FEBADB9A-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--6AACBA272E5347899B134AD4FEBADB9A-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--6AACBA272E5347899B134AD4FEBADB9A-->  <GRID_SEQNO><![CDATA[90]]></GRID_SEQNO>
+<!--6AACBA272E5347899B134AD4FEBADB9A-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--6AACBA272E5347899B134AD4FEBADB9A-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--6AACBA272E5347899B134AD4FEBADB9A-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--6AACBA272E5347899B134AD4FEBADB9A-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--6AACBA272E5347899B134AD4FEBADB9A--></AD_FIELD>
+
 <!--6AC5E4662B404E019E4B610AFBCC309D--><AD_FIELD>
 <!--6AC5E4662B404E019E4B610AFBCC309D-->  <AD_FIELD_ID><![CDATA[6AC5E4662B404E019E4B610AFBCC309D]]></AD_FIELD_ID>
 <!--6AC5E4662B404E019E4B610AFBCC309D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -8323,6 +8409,36 @@
 <!--76314390FC424317A60214DBD7DE8882-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--76314390FC424317A60214DBD7DE8882--></AD_FIELD>
 
+<!--7646717C13CA46B18B80E6F6D9CDE888--><AD_FIELD>
+<!--7646717C13CA46B18B80E6F6D9CDE888-->  <AD_FIELD_ID><![CDATA[7646717C13CA46B18B80E6F6D9CDE888]]></AD_FIELD_ID>
+<!--7646717C13CA46B18B80E6F6D9CDE888-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7646717C13CA46B18B80E6F6D9CDE888-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7646717C13CA46B18B80E6F6D9CDE888-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7646717C13CA46B18B80E6F6D9CDE888-->  <NAME><![CDATA[Financial Account]]></NAME>
+<!--7646717C13CA46B18B80E6F6D9CDE888-->  <DESCRIPTION><![CDATA[Financial account used to deposit / withdrawal money such as bank accounts or petty cash]]></DESCRIPTION>
+<!--7646717C13CA46B18B80E6F6D9CDE888-->  <HELP><![CDATA[Financial account used to deposit / withdrawal money such as bank accounts or petty cash]]></HELP>
+<!--7646717C13CA46B18B80E6F6D9CDE888-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--7646717C13CA46B18B80E6F6D9CDE888-->  <AD_TAB_ID><![CDATA[2700A962BC484D4C9B3E30B1C3C66BFB]]></AD_TAB_ID>
+<!--7646717C13CA46B18B80E6F6D9CDE888-->  <AD_COLUMN_ID><![CDATA[03276FB53CC54CC1829E0AA6EC0F2EE6]]></AD_COLUMN_ID>
+<!--7646717C13CA46B18B80E6F6D9CDE888-->  <PROPERTY><![CDATA[account]]></PROPERTY>
+<!--7646717C13CA46B18B80E6F6D9CDE888-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--7646717C13CA46B18B80E6F6D9CDE888-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--7646717C13CA46B18B80E6F6D9CDE888-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--7646717C13CA46B18B80E6F6D9CDE888-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--7646717C13CA46B18B80E6F6D9CDE888-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--7646717C13CA46B18B80E6F6D9CDE888-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--7646717C13CA46B18B80E6F6D9CDE888-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--7646717C13CA46B18B80E6F6D9CDE888-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7646717C13CA46B18B80E6F6D9CDE888-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--7646717C13CA46B18B80E6F6D9CDE888-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--7646717C13CA46B18B80E6F6D9CDE888-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--7646717C13CA46B18B80E6F6D9CDE888-->  <GRID_SEQNO><![CDATA[10]]></GRID_SEQNO>
+<!--7646717C13CA46B18B80E6F6D9CDE888-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--7646717C13CA46B18B80E6F6D9CDE888-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--7646717C13CA46B18B80E6F6D9CDE888-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--7646717C13CA46B18B80E6F6D9CDE888-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--7646717C13CA46B18B80E6F6D9CDE888--></AD_FIELD>
+
 <!--7722431F4C9C4A9E9BAA150686682D57--><AD_FIELD>
 <!--7722431F4C9C4A9E9BAA150686682D57-->  <AD_FIELD_ID><![CDATA[7722431F4C9C4A9E9BAA150686682D57]]></AD_FIELD_ID>
 <!--7722431F4C9C4A9E9BAA150686682D57-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -12181,6 +12297,35 @@
 <!--8A0E2CF96C0E48D69B2652BB355AA6A6-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--8A0E2CF96C0E48D69B2652BB355AA6A6--></AD_FIELD>
 
+<!--8AA33C2BAE2F447680A672A3B8C16837--><AD_FIELD>
+<!--8AA33C2BAE2F447680A672A3B8C16837-->  <AD_FIELD_ID><![CDATA[8AA33C2BAE2F447680A672A3B8C16837]]></AD_FIELD_ID>
+<!--8AA33C2BAE2F447680A672A3B8C16837-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8AA33C2BAE2F447680A672A3B8C16837-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8AA33C2BAE2F447680A672A3B8C16837-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8AA33C2BAE2F447680A672A3B8C16837-->  <NAME><![CDATA[Status]]></NAME>
+<!--8AA33C2BAE2F447680A672A3B8C16837-->  <DESCRIPTION><![CDATA[A defined state or position of a payment.]]></DESCRIPTION>
+<!--8AA33C2BAE2F447680A672A3B8C16837-->  <HELP><![CDATA[Current status of a debt/payment.]]></HELP>
+<!--8AA33C2BAE2F447680A672A3B8C16837-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--8AA33C2BAE2F447680A672A3B8C16837-->  <AD_TAB_ID><![CDATA[2700A962BC484D4C9B3E30B1C3C66BFB]]></AD_TAB_ID>
+<!--8AA33C2BAE2F447680A672A3B8C16837-->  <AD_COLUMN_ID><![CDATA[7891269C83E2655DE040007F010155CE]]></AD_COLUMN_ID>
+<!--8AA33C2BAE2F447680A672A3B8C16837-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--8AA33C2BAE2F447680A672A3B8C16837-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--8AA33C2BAE2F447680A672A3B8C16837-->  <DISPLAYLENGTH><![CDATA[15]]></DISPLAYLENGTH>
+<!--8AA33C2BAE2F447680A672A3B8C16837-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--8AA33C2BAE2F447680A672A3B8C16837-->  <SEQNO><![CDATA[90]]></SEQNO>
+<!--8AA33C2BAE2F447680A672A3B8C16837-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--8AA33C2BAE2F447680A672A3B8C16837-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--8AA33C2BAE2F447680A672A3B8C16837-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--8AA33C2BAE2F447680A672A3B8C16837-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--8AA33C2BAE2F447680A672A3B8C16837-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--8AA33C2BAE2F447680A672A3B8C16837-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--8AA33C2BAE2F447680A672A3B8C16837-->  <GRID_SEQNO><![CDATA[90]]></GRID_SEQNO>
+<!--8AA33C2BAE2F447680A672A3B8C16837-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--8AA33C2BAE2F447680A672A3B8C16837-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--8AA33C2BAE2F447680A672A3B8C16837-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--8AA33C2BAE2F447680A672A3B8C16837-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--8AA33C2BAE2F447680A672A3B8C16837--></AD_FIELD>
+
 <!--8AFD30956A0E4A079AA0D80B41A0A494--><AD_FIELD>
 <!--8AFD30956A0E4A079AA0D80B41A0A494-->  <AD_FIELD_ID><![CDATA[8AFD30956A0E4A079AA0D80B41A0A494]]></AD_FIELD_ID>
 <!--8AFD30956A0E4A079AA0D80B41A0A494-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -16663,6 +16808,36 @@
 <!--B2010E9A0AC95338E040A8C0280132CB-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--B2010E9A0AC95338E040A8C0280132CB--></AD_FIELD>
 
+<!--B283607F4D9A4EE6BF2FF2BB7ADCF36A--><AD_FIELD>
+<!--B283607F4D9A4EE6BF2FF2BB7ADCF36A-->  <AD_FIELD_ID><![CDATA[B283607F4D9A4EE6BF2FF2BB7ADCF36A]]></AD_FIELD_ID>
+<!--B283607F4D9A4EE6BF2FF2BB7ADCF36A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B283607F4D9A4EE6BF2FF2BB7ADCF36A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B283607F4D9A4EE6BF2FF2BB7ADCF36A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B283607F4D9A4EE6BF2FF2BB7ADCF36A-->  <NAME><![CDATA[Document No.]]></NAME>
+<!--B283607F4D9A4EE6BF2FF2BB7ADCF36A-->  <DESCRIPTION><![CDATA[An often automatically generated identifier for all documents.]]></DESCRIPTION>
+<!--B283607F4D9A4EE6BF2FF2BB7ADCF36A-->  <HELP><![CDATA[The document number is usually automatically generated by the system and determined by the document type of the document. If the document is not saved, the preliminary number is displayed in "<>". If the document type of your document has no automatic document sequence defined, the field will be empty when creating a new document. This is for documents which usually have an external number (like vendor invoice).  If you leave the field empty, the system will generate a document number for you. The document sequence used for this fallback number is defined in the "Document Sequence" window with the name "DocumentNo_<TableName>", where TableName is the actual name of the table inside the database (e.g. C_Order).]]></HELP>
+<!--B283607F4D9A4EE6BF2FF2BB7ADCF36A-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--B283607F4D9A4EE6BF2FF2BB7ADCF36A-->  <AD_TAB_ID><![CDATA[2700A962BC484D4C9B3E30B1C3C66BFB]]></AD_TAB_ID>
+<!--B283607F4D9A4EE6BF2FF2BB7ADCF36A-->  <AD_COLUMN_ID><![CDATA[7891269C83E0655DE040007F010155CE]]></AD_COLUMN_ID>
+<!--B283607F4D9A4EE6BF2FF2BB7ADCF36A-->  <PROPERTY><![CDATA[documentNo]]></PROPERTY>
+<!--B283607F4D9A4EE6BF2FF2BB7ADCF36A-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--B283607F4D9A4EE6BF2FF2BB7ADCF36A-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--B283607F4D9A4EE6BF2FF2BB7ADCF36A-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--B283607F4D9A4EE6BF2FF2BB7ADCF36A-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--B283607F4D9A4EE6BF2FF2BB7ADCF36A-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--B283607F4D9A4EE6BF2FF2BB7ADCF36A-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--B283607F4D9A4EE6BF2FF2BB7ADCF36A-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--B283607F4D9A4EE6BF2FF2BB7ADCF36A-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--B283607F4D9A4EE6BF2FF2BB7ADCF36A-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--B283607F4D9A4EE6BF2FF2BB7ADCF36A-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--B283607F4D9A4EE6BF2FF2BB7ADCF36A-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--B283607F4D9A4EE6BF2FF2BB7ADCF36A-->  <GRID_SEQNO><![CDATA[30]]></GRID_SEQNO>
+<!--B283607F4D9A4EE6BF2FF2BB7ADCF36A-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--B283607F4D9A4EE6BF2FF2BB7ADCF36A-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--B283607F4D9A4EE6BF2FF2BB7ADCF36A-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--B283607F4D9A4EE6BF2FF2BB7ADCF36A-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--B283607F4D9A4EE6BF2FF2BB7ADCF36A--></AD_FIELD>
+
 <!--B29D7911F878431EA9434EA4FACBA023--><AD_FIELD>
 <!--B29D7911F878431EA9434EA4FACBA023-->  <AD_FIELD_ID><![CDATA[B29D7911F878431EA9434EA4FACBA023]]></AD_FIELD_ID>
 <!--B29D7911F878431EA9434EA4FACBA023-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -16723,6 +16898,35 @@
 <!--B2F1D76CA33240B69A4012D5CA370476-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--B2F1D76CA33240B69A4012D5CA370476--></AD_FIELD>
 
+<!--B3035C3662CF4A33B574693E8AB317C6--><AD_FIELD>
+<!--B3035C3662CF4A33B574693E8AB317C6-->  <AD_FIELD_ID><![CDATA[B3035C3662CF4A33B574693E8AB317C6]]></AD_FIELD_ID>
+<!--B3035C3662CF4A33B574693E8AB317C6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B3035C3662CF4A33B574693E8AB317C6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B3035C3662CF4A33B574693E8AB317C6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B3035C3662CF4A33B574693E8AB317C6-->  <NAME><![CDATA[Document Type]]></NAME>
+<!--B3035C3662CF4A33B574693E8AB317C6-->  <DESCRIPTION><![CDATA[A value defining what sequence and process setup are used to handle this document.]]></DESCRIPTION>
+<!--B3035C3662CF4A33B574693E8AB317C6-->  <HELP><![CDATA[The Document Type determines document sequence and processing rules]]></HELP>
+<!--B3035C3662CF4A33B574693E8AB317C6-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--B3035C3662CF4A33B574693E8AB317C6-->  <AD_TAB_ID><![CDATA[2700A962BC484D4C9B3E30B1C3C66BFB]]></AD_TAB_ID>
+<!--B3035C3662CF4A33B574693E8AB317C6-->  <AD_COLUMN_ID><![CDATA[8032E178607750D5E040007F01004282]]></AD_COLUMN_ID>
+<!--B3035C3662CF4A33B574693E8AB317C6-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--B3035C3662CF4A33B574693E8AB317C6-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--B3035C3662CF4A33B574693E8AB317C6-->  <DISPLAYLENGTH><![CDATA[20]]></DISPLAYLENGTH>
+<!--B3035C3662CF4A33B574693E8AB317C6-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--B3035C3662CF4A33B574693E8AB317C6-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--B3035C3662CF4A33B574693E8AB317C6-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--B3035C3662CF4A33B574693E8AB317C6-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--B3035C3662CF4A33B574693E8AB317C6-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--B3035C3662CF4A33B574693E8AB317C6-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--B3035C3662CF4A33B574693E8AB317C6-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--B3035C3662CF4A33B574693E8AB317C6-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--B3035C3662CF4A33B574693E8AB317C6-->  <GRID_SEQNO><![CDATA[20]]></GRID_SEQNO>
+<!--B3035C3662CF4A33B574693E8AB317C6-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--B3035C3662CF4A33B574693E8AB317C6-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--B3035C3662CF4A33B574693E8AB317C6-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--B3035C3662CF4A33B574693E8AB317C6-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--B3035C3662CF4A33B574693E8AB317C6--></AD_FIELD>
+
 <!--B30DFFA1BDD8442DA159BC24117DA96C--><AD_FIELD>
 <!--B30DFFA1BDD8442DA159BC24117DA96C-->  <AD_FIELD_ID><![CDATA[B30DFFA1BDD8442DA159BC24117DA96C]]></AD_FIELD_ID>
 <!--B30DFFA1BDD8442DA159BC24117DA96C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -17598,6 +17802,35 @@
 <!--BB0C947FC413441D98D676868EC89D94-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--BB0C947FC413441D98D676868EC89D94--></AD_FIELD>
 
+<!--BB3881C8631049FDB8BCB0176C2D8D21--><AD_FIELD>
+<!--BB3881C8631049FDB8BCB0176C2D8D21-->  <AD_FIELD_ID><![CDATA[BB3881C8631049FDB8BCB0176C2D8D21]]></AD_FIELD_ID>
+<!--BB3881C8631049FDB8BCB0176C2D8D21-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BB3881C8631049FDB8BCB0176C2D8D21-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BB3881C8631049FDB8BCB0176C2D8D21-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BB3881C8631049FDB8BCB0176C2D8D21-->  <NAME><![CDATA[Received (Financial Account)]]></NAME>
+<!--BB3881C8631049FDB8BCB0176C2D8D21-->  <DESCRIPTION><![CDATA[Amount received in currency of financial account]]></DESCRIPTION>
+<!--BB3881C8631049FDB8BCB0176C2D8D21-->  <HELP><![CDATA[The total amount of the payment, converted to the currency of the financial account.]]></HELP>
+<!--BB3881C8631049FDB8BCB0176C2D8D21-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--BB3881C8631049FDB8BCB0176C2D8D21-->  <AD_TAB_ID><![CDATA[2700A962BC484D4C9B3E30B1C3C66BFB]]></AD_TAB_ID>
+<!--BB3881C8631049FDB8BCB0176C2D8D21-->  <AD_COLUMN_ID><![CDATA[4028C9BC2DA5C491012DA689D11F03BD]]></AD_COLUMN_ID>
+<!--BB3881C8631049FDB8BCB0176C2D8D21-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--BB3881C8631049FDB8BCB0176C2D8D21-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--BB3881C8631049FDB8BCB0176C2D8D21-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--BB3881C8631049FDB8BCB0176C2D8D21-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--BB3881C8631049FDB8BCB0176C2D8D21-->  <SEQNO><![CDATA[80]]></SEQNO>
+<!--BB3881C8631049FDB8BCB0176C2D8D21-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--BB3881C8631049FDB8BCB0176C2D8D21-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--BB3881C8631049FDB8BCB0176C2D8D21-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--BB3881C8631049FDB8BCB0176C2D8D21-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--BB3881C8631049FDB8BCB0176C2D8D21-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--BB3881C8631049FDB8BCB0176C2D8D21-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--BB3881C8631049FDB8BCB0176C2D8D21-->  <GRID_SEQNO><![CDATA[80]]></GRID_SEQNO>
+<!--BB3881C8631049FDB8BCB0176C2D8D21-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--BB3881C8631049FDB8BCB0176C2D8D21-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--BB3881C8631049FDB8BCB0176C2D8D21-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--BB3881C8631049FDB8BCB0176C2D8D21-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--BB3881C8631049FDB8BCB0176C2D8D21--></AD_FIELD>
+
 <!--BB7E2DFBDCF94FBCA31B53E736CF9D57--><AD_FIELD>
 <!--BB7E2DFBDCF94FBCA31B53E736CF9D57-->  <AD_FIELD_ID><![CDATA[BB7E2DFBDCF94FBCA31B53E736CF9D57]]></AD_FIELD_ID>
 <!--BB7E2DFBDCF94FBCA31B53E736CF9D57-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -19569,6 +19802,33 @@
 <!--D75020C6BCC34E84ACDB10F8C95983AF-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--D75020C6BCC34E84ACDB10F8C95983AF--></AD_FIELD>
 
+<!--D82958A43B8D4FC18F9C24467ED00115--><AD_FIELD>
+<!--D82958A43B8D4FC18F9C24467ED00115-->  <AD_FIELD_ID><![CDATA[D82958A43B8D4FC18F9C24467ED00115]]></AD_FIELD_ID>
+<!--D82958A43B8D4FC18F9C24467ED00115-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D82958A43B8D4FC18F9C24467ED00115-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D82958A43B8D4FC18F9C24467ED00115-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D82958A43B8D4FC18F9C24467ED00115-->  <NAME><![CDATA[Payment Date]]></NAME>
+<!--D82958A43B8D4FC18F9C24467ED00115-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--D82958A43B8D4FC18F9C24467ED00115-->  <AD_TAB_ID><![CDATA[2700A962BC484D4C9B3E30B1C3C66BFB]]></AD_TAB_ID>
+<!--D82958A43B8D4FC18F9C24467ED00115-->  <AD_COLUMN_ID><![CDATA[7891269C83DB655DE040007F010155CE]]></AD_COLUMN_ID>
+<!--D82958A43B8D4FC18F9C24467ED00115-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--D82958A43B8D4FC18F9C24467ED00115-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--D82958A43B8D4FC18F9C24467ED00115-->  <DISPLAYLENGTH><![CDATA[9]]></DISPLAYLENGTH>
+<!--D82958A43B8D4FC18F9C24467ED00115-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--D82958A43B8D4FC18F9C24467ED00115-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--D82958A43B8D4FC18F9C24467ED00115-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--D82958A43B8D4FC18F9C24467ED00115-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--D82958A43B8D4FC18F9C24467ED00115-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--D82958A43B8D4FC18F9C24467ED00115-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--D82958A43B8D4FC18F9C24467ED00115-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--D82958A43B8D4FC18F9C24467ED00115-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--D82958A43B8D4FC18F9C24467ED00115-->  <GRID_SEQNO><![CDATA[40]]></GRID_SEQNO>
+<!--D82958A43B8D4FC18F9C24467ED00115-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--D82958A43B8D4FC18F9C24467ED00115-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--D82958A43B8D4FC18F9C24467ED00115-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--D82958A43B8D4FC18F9C24467ED00115-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--D82958A43B8D4FC18F9C24467ED00115--></AD_FIELD>
+
 <!--D8A3451B12AC4E0C964D9F53D9699449--><AD_FIELD>
 <!--D8A3451B12AC4E0C964D9F53D9699449-->  <AD_FIELD_ID><![CDATA[D8A3451B12AC4E0C964D9F53D9699449]]></AD_FIELD_ID>
 <!--D8A3451B12AC4E0C964D9F53D9699449-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -21808,6 +22068,35 @@
 <!--F9616FD8600E4650A96A241C1901ECFA-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--F9616FD8600E4650A96A241C1901ECFA--></AD_FIELD>
 
+<!--F98BFF6DF6EA41CB96E0B3042E5181A5--><AD_FIELD>
+<!--F98BFF6DF6EA41CB96E0B3042E5181A5-->  <AD_FIELD_ID><![CDATA[F98BFF6DF6EA41CB96E0B3042E5181A5]]></AD_FIELD_ID>
+<!--F98BFF6DF6EA41CB96E0B3042E5181A5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F98BFF6DF6EA41CB96E0B3042E5181A5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F98BFF6DF6EA41CB96E0B3042E5181A5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F98BFF6DF6EA41CB96E0B3042E5181A5-->  <NAME><![CDATA[Business Partner]]></NAME>
+<!--F98BFF6DF6EA41CB96E0B3042E5181A5-->  <DESCRIPTION><![CDATA[Anyone who takes part in daily business operations by acting as a customer, employee, etc.]]></DESCRIPTION>
+<!--F98BFF6DF6EA41CB96E0B3042E5181A5-->  <HELP><![CDATA[A Business Partner is anyone with whom you transact.  This can include a customer, vendor, employee or any combination of these.]]></HELP>
+<!--F98BFF6DF6EA41CB96E0B3042E5181A5-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--F98BFF6DF6EA41CB96E0B3042E5181A5-->  <AD_TAB_ID><![CDATA[2700A962BC484D4C9B3E30B1C3C66BFB]]></AD_TAB_ID>
+<!--F98BFF6DF6EA41CB96E0B3042E5181A5-->  <AD_COLUMN_ID><![CDATA[7891269C83D9655DE040007F010155CE]]></AD_COLUMN_ID>
+<!--F98BFF6DF6EA41CB96E0B3042E5181A5-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--F98BFF6DF6EA41CB96E0B3042E5181A5-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--F98BFF6DF6EA41CB96E0B3042E5181A5-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--F98BFF6DF6EA41CB96E0B3042E5181A5-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--F98BFF6DF6EA41CB96E0B3042E5181A5-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--F98BFF6DF6EA41CB96E0B3042E5181A5-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--F98BFF6DF6EA41CB96E0B3042E5181A5-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--F98BFF6DF6EA41CB96E0B3042E5181A5-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--F98BFF6DF6EA41CB96E0B3042E5181A5-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--F98BFF6DF6EA41CB96E0B3042E5181A5-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--F98BFF6DF6EA41CB96E0B3042E5181A5-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--F98BFF6DF6EA41CB96E0B3042E5181A5-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
+<!--F98BFF6DF6EA41CB96E0B3042E5181A5-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--F98BFF6DF6EA41CB96E0B3042E5181A5-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--F98BFF6DF6EA41CB96E0B3042E5181A5-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--F98BFF6DF6EA41CB96E0B3042E5181A5-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--F98BFF6DF6EA41CB96E0B3042E5181A5--></AD_FIELD>
+
 <!--F9AE3E6335AF43F0B179C808694CFE90--><AD_FIELD>
 <!--F9AE3E6335AF43F0B179C808694CFE90-->  <AD_FIELD_ID><![CDATA[F9AE3E6335AF43F0B179C808694CFE90]]></AD_FIELD_ID>
 <!--F9AE3E6335AF43F0B179C808694CFE90-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -769,6 +769,18 @@
 <!--8444D07DF4214ED793366B83F5BDD042-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--8444D07DF4214ED793366B83F5BDD042--></AD_MESSAGE>
 
+<!--84E37050C028475886A8988DB250D0EB--><AD_MESSAGE>
+<!--84E37050C028475886A8988DB250D0EB-->  <AD_MESSAGE_ID><![CDATA[84E37050C028475886A8988DB250D0EB]]></AD_MESSAGE_ID>
+<!--84E37050C028475886A8988DB250D0EB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--84E37050C028475886A8988DB250D0EB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--84E37050C028475886A8988DB250D0EB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--84E37050C028475886A8988DB250D0EB-->  <VALUE><![CDATA[APRM_MULTIPLE_TRANSACTIONS_ADDED]]></VALUE>
+<!--84E37050C028475886A8988DB250D0EB-->  <MSGTEXT><![CDATA[%d transaction(s) added to the Financial Account.]]></MSGTEXT>
+<!--84E37050C028475886A8988DB250D0EB-->  <MSGTYPE><![CDATA[S]]></MSGTYPE>
+<!--84E37050C028475886A8988DB250D0EB-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--84E37050C028475886A8988DB250D0EB-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--84E37050C028475886A8988DB250D0EB--></AD_MESSAGE>
+
 <!--89C77284A85346C6923D858E3AB3D363--><AD_MESSAGE>
 <!--89C77284A85346C6923D858E3AB3D363-->  <AD_MESSAGE_ID><![CDATA[89C77284A85346C6923D858E3AB3D363]]></AD_MESSAGE_ID>
 <!--89C77284A85346C6923D858E3AB3D363-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1453,6 +1465,18 @@
 <!--F0BBB5C1155F46378B6FF74A8F561046-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--F0BBB5C1155F46378B6FF74A8F561046--></AD_MESSAGE>
 
+<!--F1570980691E4FB1983519F8F6A9CD31--><AD_MESSAGE>
+<!--F1570980691E4FB1983519F8F6A9CD31-->  <AD_MESSAGE_ID><![CDATA[F1570980691E4FB1983519F8F6A9CD31]]></AD_MESSAGE_ID>
+<!--F1570980691E4FB1983519F8F6A9CD31-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F1570980691E4FB1983519F8F6A9CD31-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F1570980691E4FB1983519F8F6A9CD31-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F1570980691E4FB1983519F8F6A9CD31-->  <VALUE><![CDATA[APRM_NO_PAYMENTS_SELECTED]]></VALUE>
+<!--F1570980691E4FB1983519F8F6A9CD31-->  <MSGTEXT><![CDATA[One or more payments must be selected]]></MSGTEXT>
+<!--F1570980691E4FB1983519F8F6A9CD31-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--F1570980691E4FB1983519F8F6A9CD31-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--F1570980691E4FB1983519F8F6A9CD31-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--F1570980691E4FB1983519F8F6A9CD31--></AD_MESSAGE>
+
 <!--F302E4040E1B45318BA270BDFA37179C--><AD_MESSAGE>
 <!--F302E4040E1B45318BA270BDFA37179C-->  <AD_MESSAGE_ID><![CDATA[F302E4040E1B45318BA270BDFA37179C]]></AD_MESSAGE_ID>
 <!--F302E4040E1B45318BA270BDFA37179C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -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.26933]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.27055]]></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	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -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.26933]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.27055]]></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.26933]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->  <STARTVERSION><![CDATA[3.0.27055]]></STARTVERSION>
 <!--B97FC854C6DD41E692161585645A900F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--B97FC854C6DD41E692161585645A900F-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--B97FC854C6DD41E692161585645A900F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -337,6 +337,20 @@
 <!--C20E5E22588E40E5B8CC6D80ED3015C5-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
 <!--C20E5E22588E40E5B8CC6D80ED3015C5--></AD_REFERENCE>
 
+<!--D9B6068A6D3E4B7487470E7D2F033A54--><AD_REFERENCE>
+<!--D9B6068A6D3E4B7487470E7D2F033A54-->  <AD_REFERENCE_ID><![CDATA[D9B6068A6D3E4B7487470E7D2F033A54]]></AD_REFERENCE_ID>
+<!--D9B6068A6D3E4B7487470E7D2F033A54-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D9B6068A6D3E4B7487470E7D2F033A54-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D9B6068A6D3E4B7487470E7D2F033A54-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D9B6068A6D3E4B7487470E7D2F033A54-->  <NAME><![CDATA[Add Multiple Payments P&E]]></NAME>
+<!--D9B6068A6D3E4B7487470E7D2F033A54-->  <DESCRIPTION><![CDATA[User can select multiple payments at the same time. The system will create a separate transaction per selected payment]]></DESCRIPTION>
+<!--D9B6068A6D3E4B7487470E7D2F033A54-->  <HELP><![CDATA[User can select multiple payments at the same time. The system will create a separate transaction per selected payment]]></HELP>
+<!--D9B6068A6D3E4B7487470E7D2F033A54-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--D9B6068A6D3E4B7487470E7D2F033A54-->  <ISBASEREFERENCE><![CDATA[N]]></ISBASEREFERENCE>
+<!--D9B6068A6D3E4B7487470E7D2F033A54-->  <PARENTREFERENCE_ID><![CDATA[FF80818132D8F0F30132D9BC395D0038]]></PARENTREFERENCE_ID>
+<!--D9B6068A6D3E4B7487470E7D2F033A54-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
+<!--D9B6068A6D3E4B7487470E7D2F033A54--></AD_REFERENCE>
+
 <!--DA5377445D8D468DB17743F8082B3CFD--><AD_REFERENCE>
 <!--DA5377445D8D468DB17743F8082B3CFD-->  <AD_REFERENCE_ID><![CDATA[DA5377445D8D468DB17743F8082B3CFD]]></AD_REFERENCE_ID>
 <!--DA5377445D8D468DB17743F8082B3CFD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -68,6 +68,42 @@
 <!--1EA4A3F31A27483A8C6E93176AE912D3-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
 <!--1EA4A3F31A27483A8C6E93176AE912D3--></AD_TAB>
 
+<!--2700A962BC484D4C9B3E30B1C3C66BFB--><AD_TAB>
+<!--2700A962BC484D4C9B3E30B1C3C66BFB-->  <AD_TAB_ID><![CDATA[2700A962BC484D4C9B3E30B1C3C66BFB]]></AD_TAB_ID>
+<!--2700A962BC484D4C9B3E30B1C3C66BFB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2700A962BC484D4C9B3E30B1C3C66BFB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2700A962BC484D4C9B3E30B1C3C66BFB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2700A962BC484D4C9B3E30B1C3C66BFB-->  <NAME><![CDATA[Add Multiple Payments P&E]]></NAME>
+<!--2700A962BC484D4C9B3E30B1C3C66BFB-->  <DESCRIPTION><![CDATA[User can select multiple payments at the same time. The system will create a separate transaction per selected payment]]></DESCRIPTION>
+<!--2700A962BC484D4C9B3E30B1C3C66BFB-->  <HELP><![CDATA[User can select multiple payments at the same time. The system will create a separate transaction per selected payment]]></HELP>
+<!--2700A962BC484D4C9B3E30B1C3C66BFB-->  <AD_TABLE_ID><![CDATA[D1A97202E832470285C9B1EB026D54E2]]></AD_TABLE_ID>
+<!--2700A962BC484D4C9B3E30B1C3C66BFB-->  <AD_WINDOW_ID><![CDATA[A73B5E3D037A49CC8ACCE8B844FF7D14]]></AD_WINDOW_ID>
+<!--2700A962BC484D4C9B3E30B1C3C66BFB-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--2700A962BC484D4C9B3E30B1C3C66BFB-->  <TABLEVEL><![CDATA[0]]></TABLEVEL>
+<!--2700A962BC484D4C9B3E30B1C3C66BFB-->  <ISSINGLEROW><![CDATA[N]]></ISSINGLEROW>
+<!--2700A962BC484D4C9B3E30B1C3C66BFB-->  <ISINFOTAB><![CDATA[N]]></ISINFOTAB>
+<!--2700A962BC484D4C9B3E30B1C3C66BFB-->  <ISTRANSLATIONTAB><![CDATA[N]]></ISTRANSLATIONTAB>
+<!--2700A962BC484D4C9B3E30B1C3C66BFB-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--2700A962BC484D4C9B3E30B1C3C66BFB-->  <HASTREE><![CDATA[N]]></HASTREE>
+<!--2700A962BC484D4C9B3E30B1C3C66BFB-->  <PROCESSING><![CDATA[N]]></PROCESSING>
+<!--2700A962BC484D4C9B3E30B1C3C66BFB-->  <IMPORTFIELDS><![CDATA[N]]></IMPORTFIELDS>
+<!--2700A962BC484D4C9B3E30B1C3C66BFB-->  <ISSORTTAB><![CDATA[N]]></ISSORTTAB>
+<!--2700A962BC484D4C9B3E30B1C3C66BFB-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--2700A962BC484D4C9B3E30B1C3C66BFB-->  <UIPATTERN><![CDATA[RO]]></UIPATTERN>
+<!--2700A962BC484D4C9B3E30B1C3C66BFB-->  <HQLWHERECLAUSE><![CDATA[e.status in ('RPR', 'PPM') and e.amount <>0 and exists ( select 1 from FinancialMgmtFinAccPaymentMethod as  fapm join fapm.account as fa where fapm.paymentMethod = e.paymentMethod and fa.id = @FIN_Financial_Account.id@ and (case when e.receipt = true then fapm.payinAllow else fapm.payoutAllow end) = true and fa.currency = e.account.currency) and not exists (select 1 from FIN_Finacc_Transaction as ft where e = ft.finPayment) and AD_ISORGINCLUDED(e.organization.id, @FIN_Financial_Account.organization@, e.client.id)<>-1]]></HQLWHERECLAUSE>
+<!--2700A962BC484D4C9B3E30B1C3C66BFB-->  <HQLORDERBYCLAUSE><![CDATA[paymentDate, documentNo]]></HQLORDERBYCLAUSE>
+<!--2700A962BC484D4C9B3E30B1C3C66BFB-->  <HQLFILTERCLAUSE><![CDATA[e.account.id = @FIN_Financial_Account.id@]]></HQLFILTERCLAUSE>
+<!--2700A962BC484D4C9B3E30B1C3C66BFB-->  <FILTERNAME><![CDATA[Payments are filtered by the selected Financial Account]]></FILTERNAME>
+<!--2700A962BC484D4C9B3E30B1C3C66BFB-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--2700A962BC484D4C9B3E30B1C3C66BFB-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
+<!--2700A962BC484D4C9B3E30B1C3C66BFB-->  <ISREADONLYTREE><![CDATA[N]]></ISREADONLYTREE>
+<!--2700A962BC484D4C9B3E30B1C3C66BFB-->  <ISSHOWTREENODEICONS><![CDATA[Y]]></ISSHOWTREENODEICONS>
+<!--2700A962BC484D4C9B3E30B1C3C66BFB-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--2700A962BC484D4C9B3E30B1C3C66BFB-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
+<!--2700A962BC484D4C9B3E30B1C3C66BFB-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
+<!--2700A962BC484D4C9B3E30B1C3C66BFB-->  <EM_OBUIAPP_SELECTION_TYPE><![CDATA[M]]></EM_OBUIAPP_SELECTION_TYPE>
+<!--2700A962BC484D4C9B3E30B1C3C66BFB--></AD_TAB>
+
 <!--2A9BA5FDA0F8470D881F8EA9DEDCC598--><AD_TAB>
 <!--2A9BA5FDA0F8470D881F8EA9DEDCC598-->  <AD_TAB_ID><![CDATA[2A9BA5FDA0F8470D881F8EA9DEDCC598]]></AD_TAB_ID>
 <!--2A9BA5FDA0F8470D881F8EA9DEDCC598-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_WINDOW.xml	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_WINDOW.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -115,6 +115,23 @@
 <!--81BAC97FE7754C669254C9CF4FA20292-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--81BAC97FE7754C669254C9CF4FA20292--></AD_WINDOW>
 
+<!--A73B5E3D037A49CC8ACCE8B844FF7D14--><AD_WINDOW>
+<!--A73B5E3D037A49CC8ACCE8B844FF7D14-->  <AD_WINDOW_ID><![CDATA[A73B5E3D037A49CC8ACCE8B844FF7D14]]></AD_WINDOW_ID>
+<!--A73B5E3D037A49CC8ACCE8B844FF7D14-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A73B5E3D037A49CC8ACCE8B844FF7D14-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A73B5E3D037A49CC8ACCE8B844FF7D14-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A73B5E3D037A49CC8ACCE8B844FF7D14-->  <NAME><![CDATA[Add Multiple Payments P&E]]></NAME>
+<!--A73B5E3D037A49CC8ACCE8B844FF7D14-->  <DESCRIPTION><![CDATA[User can select multiple payments at the same time. The system will create a separate transaction per selected payment]]></DESCRIPTION>
+<!--A73B5E3D037A49CC8ACCE8B844FF7D14-->  <HELP><![CDATA[User can select multiple payments at the same time. The system will create a separate transaction per selected payment]]></HELP>
+<!--A73B5E3D037A49CC8ACCE8B844FF7D14-->  <WINDOWTYPE><![CDATA[OBUIAPP_PickAndExecute]]></WINDOWTYPE>
+<!--A73B5E3D037A49CC8ACCE8B844FF7D14-->  <ISSOTRX><![CDATA[Y]]></ISSOTRX>
+<!--A73B5E3D037A49CC8ACCE8B844FF7D14-->  <PROCESSING><![CDATA[N]]></PROCESSING>
+<!--A73B5E3D037A49CC8ACCE8B844FF7D14-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
+<!--A73B5E3D037A49CC8ACCE8B844FF7D14-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--A73B5E3D037A49CC8ACCE8B844FF7D14-->  <ISTHREADSAFE><![CDATA[N]]></ISTHREADSAFE>
+<!--A73B5E3D037A49CC8ACCE8B844FF7D14-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
+<!--A73B5E3D037A49CC8ACCE8B844FF7D14--></AD_WINDOW>
+
 <!--C57DED2495184380AFBAAA3CA720C3DA--><AD_WINDOW>
 <!--C57DED2495184380AFBAAA3CA720C3DA-->  <AD_WINDOW_ID><![CDATA[C57DED2495184380AFBAAA3CA720C3DA]]></AD_WINDOW_ID>
 <!--C57DED2495184380AFBAAA3CA720C3DA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -673,6 +673,31 @@
 <!--61059745E59240A998ED90DC83E5DA4F-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
 <!--61059745E59240A998ED90DC83E5DA4F--></OBUIAPP_PARAMETER>
 
+<!--65AFBD9140014688A842ACF5ECF9E5A1--><OBUIAPP_PARAMETER>
+<!--65AFBD9140014688A842ACF5ECF9E5A1-->  <OBUIAPP_PARAMETER_ID><![CDATA[65AFBD9140014688A842ACF5ECF9E5A1]]></OBUIAPP_PARAMETER_ID>
+<!--65AFBD9140014688A842ACF5ECF9E5A1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--65AFBD9140014688A842ACF5ECF9E5A1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--65AFBD9140014688A842ACF5ECF9E5A1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--65AFBD9140014688A842ACF5ECF9E5A1-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--65AFBD9140014688A842ACF5ECF9E5A1-->  <NAME><![CDATA[Transaction Date]]></NAME>
+<!--65AFBD9140014688A842ACF5ECF9E5A1-->  <DESCRIPTION><![CDATA[The date the transaction is carried out and registered in the cash journal.]]></DESCRIPTION>
+<!--65AFBD9140014688A842ACF5ECF9E5A1-->  <HELP><![CDATA[The Statement Date field defines the date of the statement being processed.]]></HELP>
+<!--65AFBD9140014688A842ACF5ECF9E5A1-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--65AFBD9140014688A842ACF5ECF9E5A1-->  <AD_REFERENCE_ID><![CDATA[15]]></AD_REFERENCE_ID>
+<!--65AFBD9140014688A842ACF5ECF9E5A1-->  <COLUMNNAME><![CDATA[statementDate]]></COLUMNNAME>
+<!--65AFBD9140014688A842ACF5ECF9E5A1-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--65AFBD9140014688A842ACF5ECF9E5A1-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--65AFBD9140014688A842ACF5ECF9E5A1-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--65AFBD9140014688A842ACF5ECF9E5A1-->  <DEFAULTVALUE><![CDATA[OB.getSession().getAttribute('#DATE')]]></DEFAULTVALUE>
+<!--65AFBD9140014688A842ACF5ECF9E5A1-->  <AD_ELEMENT_ID><![CDATA[1434]]></AD_ELEMENT_ID>
+<!--65AFBD9140014688A842ACF5ECF9E5A1-->  <ISFIXED><![CDATA[N]]></ISFIXED>
+<!--65AFBD9140014688A842ACF5ECF9E5A1-->  <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE>
+<!--65AFBD9140014688A842ACF5ECF9E5A1-->  <OBUIAPP_PROCESS_ID><![CDATA[4CE463C04CA0412CAC57EF58FE0F8498]]></OBUIAPP_PROCESS_ID>
+<!--65AFBD9140014688A842ACF5ECF9E5A1-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
+<!--65AFBD9140014688A842ACF5ECF9E5A1-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
+<!--65AFBD9140014688A842ACF5ECF9E5A1-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--65AFBD9140014688A842ACF5ECF9E5A1--></OBUIAPP_PARAMETER>
+
 <!--6AF091FD5F1440BB9F0E0C674A168144--><OBUIAPP_PARAMETER>
 <!--6AF091FD5F1440BB9F0E0C674A168144-->  <OBUIAPP_PARAMETER_ID><![CDATA[6AF091FD5F1440BB9F0E0C674A168144]]></OBUIAPP_PARAMETER_ID>
 <!--6AF091FD5F1440BB9F0E0C674A168144-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -779,6 +804,29 @@
 <!--6F1DACE3F9744318948C5A0154FAFEF2-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
 <!--6F1DACE3F9744318948C5A0154FAFEF2--></OBUIAPP_PARAMETER>
 
+<!--74479AE073FF4FA5A527DC79EC0A1C82--><OBUIAPP_PARAMETER>
+<!--74479AE073FF4FA5A527DC79EC0A1C82-->  <OBUIAPP_PARAMETER_ID><![CDATA[74479AE073FF4FA5A527DC79EC0A1C82]]></OBUIAPP_PARAMETER_ID>
+<!--74479AE073FF4FA5A527DC79EC0A1C82-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--74479AE073FF4FA5A527DC79EC0A1C82-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--74479AE073FF4FA5A527DC79EC0A1C82-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--74479AE073FF4FA5A527DC79EC0A1C82-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--74479AE073FF4FA5A527DC79EC0A1C82-->  <NAME><![CDATA[Payment]]></NAME>
+<!--74479AE073FF4FA5A527DC79EC0A1C82-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--74479AE073FF4FA5A527DC79EC0A1C82-->  <AD_REFERENCE_ID><![CDATA[FF80818132D8F0F30132D9BC395D0038]]></AD_REFERENCE_ID>
+<!--74479AE073FF4FA5A527DC79EC0A1C82-->  <AD_REFERENCE_VALUE_ID><![CDATA[D9B6068A6D3E4B7487470E7D2F033A54]]></AD_REFERENCE_VALUE_ID>
+<!--74479AE073FF4FA5A527DC79EC0A1C82-->  <COLUMNNAME><![CDATA[payments]]></COLUMNNAME>
+<!--74479AE073FF4FA5A527DC79EC0A1C82-->  <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED>
+<!--74479AE073FF4FA5A527DC79EC0A1C82-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
+<!--74479AE073FF4FA5A527DC79EC0A1C82-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--74479AE073FF4FA5A527DC79EC0A1C82-->  <AD_ELEMENT_ID><![CDATA[7891269C83EA655DE040007F010155CE]]></AD_ELEMENT_ID>
+<!--74479AE073FF4FA5A527DC79EC0A1C82-->  <ISFIXED><![CDATA[N]]></ISFIXED>
+<!--74479AE073FF4FA5A527DC79EC0A1C82-->  <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE>
+<!--74479AE073FF4FA5A527DC79EC0A1C82-->  <OBUIAPP_PROCESS_ID><![CDATA[4CE463C04CA0412CAC57EF58FE0F8498]]></OBUIAPP_PROCESS_ID>
+<!--74479AE073FF4FA5A527DC79EC0A1C82-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
+<!--74479AE073FF4FA5A527DC79EC0A1C82-->  <DISPLAYEDROWS><![CDATA[18]]></DISPLAYEDROWS>
+<!--74479AE073FF4FA5A527DC79EC0A1C82-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
+<!--74479AE073FF4FA5A527DC79EC0A1C82--></OBUIAPP_PARAMETER>
+
 <!--76E43D5C34244BBDA6FE6678F94C3B7C--><OBUIAPP_PARAMETER>
 <!--76E43D5C34244BBDA6FE6678F94C3B7C-->  <OBUIAPP_PARAMETER_ID><![CDATA[76E43D5C34244BBDA6FE6678F94C3B7C]]></OBUIAPP_PARAMETER_ID>
 <!--76E43D5C34244BBDA6FE6678F94C3B7C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PROCESS.xml	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PROCESS.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -19,6 +19,26 @@
 <!--154CB4F9274A479CB38A285E16984539-->  <ISCANADDRECORDSTOSELECTOR><![CDATA[N]]></ISCANADDRECORDSTOSELECTOR>
 <!--154CB4F9274A479CB38A285E16984539--></OBUIAPP_PROCESS>
 
+<!--4CE463C04CA0412CAC57EF58FE0F8498--><OBUIAPP_PROCESS>
+<!--4CE463C04CA0412CAC57EF58FE0F8498-->  <OBUIAPP_PROCESS_ID><![CDATA[4CE463C04CA0412CAC57EF58FE0F8498]]></OBUIAPP_PROCESS_ID>
+<!--4CE463C04CA0412CAC57EF58FE0F8498-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4CE463C04CA0412CAC57EF58FE0F8498-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4CE463C04CA0412CAC57EF58FE0F8498-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4CE463C04CA0412CAC57EF58FE0F8498-->  <VALUE><![CDATA[Add Multiple Payments]]></VALUE>
+<!--4CE463C04CA0412CAC57EF58FE0F8498-->  <NAME><![CDATA[Add Multiple Payments]]></NAME>
+<!--4CE463C04CA0412CAC57EF58FE0F8498-->  <DESCRIPTION><![CDATA[User can select multiple payments at the same time. The system will create a separate transaction per selected payment]]></DESCRIPTION>
+<!--4CE463C04CA0412CAC57EF58FE0F8498-->  <HELP><![CDATA[User can select multiple payments at the same time. The system will create a separate transaction per selected payment]]></HELP>
+<!--4CE463C04CA0412CAC57EF58FE0F8498-->  <ACCESSLEVEL><![CDATA[1]]></ACCESSLEVEL>
+<!--4CE463C04CA0412CAC57EF58FE0F8498-->  <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.actionHandler.AddMultiplePaymentsHandler]]></CLASSNAME>
+<!--4CE463C04CA0412CAC57EF58FE0F8498-->  <ISBACKGROUND><![CDATA[N]]></ISBACKGROUND>
+<!--4CE463C04CA0412CAC57EF58FE0F8498-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--4CE463C04CA0412CAC57EF58FE0F8498-->  <UIPATTERN><![CDATA[OBUIAPP_PickAndExecute]]></UIPATTERN>
+<!--4CE463C04CA0412CAC57EF58FE0F8498-->  <ISMULTIRECORD><![CDATA[N]]></ISMULTIRECORD>
+<!--4CE463C04CA0412CAC57EF58FE0F8498-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
+<!--4CE463C04CA0412CAC57EF58FE0F8498-->  <ISGRIDLEGACY><![CDATA[N]]></ISGRIDLEGACY>
+<!--4CE463C04CA0412CAC57EF58FE0F8498-->  <ISCANADDRECORDSTOSELECTOR><![CDATA[N]]></ISCANADDRECORDSTOSELECTOR>
+<!--4CE463C04CA0412CAC57EF58FE0F8498--></OBUIAPP_PROCESS>
+
 <!--4EEB3497082C4F2182E16A4371CD5D96--><OBUIAPP_PROCESS>
 <!--4EEB3497082C4F2182E16A4371CD5D96-->  <OBUIAPP_PROCESS_ID><![CDATA[4EEB3497082C4F2182E16A4371CD5D96]]></OBUIAPP_PROCESS_ID>
 <!--4EEB3497082C4F2182E16A4371CD5D96-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_REF_WINDOW.xml	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_REF_WINDOW.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -72,4 +72,13 @@
 <!--98B655EC65BF4D669F3474F07CF22131-->  <AD_WINDOW_ID><![CDATA[C57DED2495184380AFBAAA3CA720C3DA]]></AD_WINDOW_ID>
 <!--98B655EC65BF4D669F3474F07CF22131--></OBUIAPP_REF_WINDOW>
 
+<!--B1A15F9CDFA34F459B7B9A7011625D29--><OBUIAPP_REF_WINDOW>
+<!--B1A15F9CDFA34F459B7B9A7011625D29-->  <OBUIAPP_REF_WINDOW_ID><![CDATA[B1A15F9CDFA34F459B7B9A7011625D29]]></OBUIAPP_REF_WINDOW_ID>
+<!--B1A15F9CDFA34F459B7B9A7011625D29-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B1A15F9CDFA34F459B7B9A7011625D29-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B1A15F9CDFA34F459B7B9A7011625D29-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B1A15F9CDFA34F459B7B9A7011625D29-->  <AD_REFERENCE_ID><![CDATA[D9B6068A6D3E4B7487470E7D2F033A54]]></AD_REFERENCE_ID>
+<!--B1A15F9CDFA34F459B7B9A7011625D29-->  <AD_WINDOW_ID><![CDATA[A73B5E3D037A49CC8ACCE8B844FF7D14]]></AD_WINDOW_ID>
+<!--B1A15F9CDFA34F459B7B9A7011625D29--></OBUIAPP_REF_WINDOW>
+
 </data>
--- a/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/AlertsForWrongOrders_data.xsql	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/AlertsForWrongOrders_data.xsql	Thu Jul 02 09:20:14 2015 +0200
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
  ************************************************************************************
- * Copyright (C) 2014 Openbravo S.L.U.
+ * Copyright (C) 2014-2015 Openbravo S.L.U.
  * Licensed under the Openbravo Commercial License version 1.0
  * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
  * or in the legal folder of this module distribution.
@@ -18,7 +18,7 @@
       from c_order, fin_payment_schedule, fin_payment_scheduledetail 
       where c_order.c_order_id = fin_payment_schedule.c_order_id
       and fin_payment_schedule.fin_payment_schedule_id = fin_payment_scheduledetail.fin_payment_schedule_order 
-      and fin_payment_scheduledetail.iscanceled = 'N' 
+      and fin_payment_scheduledetail.isinvoicepaid = 'Y'
       and fin_payment_scheduledetail.fin_payment_detail_id IS NOT NULL 
       group by fin_payment_schedule.ad_org_id, fin_payment_schedule.ad_client_id, c_order.issotrx, fin_payment_schedule.fin_payment_schedule_id, 
       fin_payment_schedule.c_order_id, fin_payment_schedule.paidamt 
--- a/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/src/org/openbravo/advpaymentmngt/modulescript/AlertsForWrongOrdersData.java	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/src/org/openbravo/advpaymentmngt/modulescript/AlertsForWrongOrdersData.java	Thu Jul 02 09:20:14 2015 +0200
@@ -63,7 +63,7 @@
       "      from c_order, fin_payment_schedule, fin_payment_scheduledetail " +
       "      where c_order.c_order_id = fin_payment_schedule.c_order_id" +
       "      and fin_payment_schedule.fin_payment_schedule_id = fin_payment_scheduledetail.fin_payment_schedule_order " +
-      "      and fin_payment_scheduledetail.iscanceled = 'N' " +
+      "      and fin_payment_scheduledetail.isinvoicepaid = 'Y'" +
       "      and fin_payment_scheduledetail.fin_payment_detail_id IS NOT NULL " +
       "      group by fin_payment_schedule.ad_org_id, fin_payment_schedule.ad_client_id, c_order.issotrx, fin_payment_schedule.fin_payment_schedule_id, " +
       "      fin_payment_schedule.c_order_id, fin_payment_schedule.paidamt " +
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddMultiplePaymentsHandler.java	Thu Jul 02 09:20:14 2015 +0200
@@ -0,0 +1,150 @@
+/*
+ *************************************************************************
+ * 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) 2015 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+ */
+package org.openbravo.advpaymentmngt.actionHandler;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+import org.codehaus.jettison.json.JSONArray;
+import org.codehaus.jettison.json.JSONException;
+import org.codehaus.jettison.json.JSONObject;
+import org.openbravo.advpaymentmngt.dao.TransactionsDao;
+import org.openbravo.advpaymentmngt.process.FIN_TransactionProcess;
+import org.openbravo.client.application.process.BaseProcessActionHandler;
+import org.openbravo.dal.core.OBContext;
+import org.openbravo.dal.service.OBDal;
+import org.openbravo.erpCommon.utility.OBMessageUtils;
+import org.openbravo.model.financialmgmt.payment.FIN_FinaccTransaction;
+import org.openbravo.model.financialmgmt.payment.FIN_FinancialAccount;
+import org.openbravo.model.financialmgmt.payment.FIN_Payment;
+import org.openbravo.service.db.DbUtility;
+import org.openbravo.service.json.JsonUtils;
+
+public class AddMultiplePaymentsHandler extends BaseProcessActionHandler {
+  private static final Logger log = Logger.getLogger(AddMultiplePaymentsHandler.class);
+  private static final SimpleDateFormat jsDateFormat = JsonUtils.createDateFormat();
+  private static final String ACTION_PROCESS_TRANSACTION = "P";
+
+  @Override
+  protected JSONObject doExecute(Map<String, Object> parameters, String data) {
+    try {
+      final JSONObject jsonData = new JSONObject(data);
+      final JSONObject jsonparams = jsonData.getJSONObject("_params");
+
+      final JSONArray selectedPayments = jsonparams.getJSONObject("payments").getJSONArray(
+          "_selection");
+      final Date statementDate = jsDateFormat.parse(jsonparams.getString("statementDate"));
+      final String strAccountId = jsonData.getString("Fin_Financial_Account_ID");
+
+      int selectedPaymentsLength = selectedPayments.length();
+      if (selectedPaymentsLength == 0) {
+        // Validation error: No lines selected
+        return getErrorMessage(OBMessageUtils.messageBD("APRM_NO_PAYMENTS_SELECTED"));
+      }
+
+      for (int i = 0; i < selectedPaymentsLength; i++) {
+        final JSONObject paymentJS = selectedPayments.getJSONObject(i);
+        createAndProcessTransactionFromPayment(paymentJS, statementDate, strAccountId);
+      }
+      // Success Message
+      return getSuccessMessage(String.format(
+          OBMessageUtils.messageBD("APRM_MULTIPLE_TRANSACTIONS_ADDED"), selectedPaymentsLength));
+
+    } catch (Exception e) {
+      OBDal.getInstance().rollbackAndClose();
+      log.error("Exception creating multiple transactions from payments", e);
+
+      try {
+        Throwable ex = DbUtility.getUnderlyingSQLException(e);
+        String message = OBMessageUtils.translateError(ex.getMessage()).getMessage();
+        return getErrorMessage(message);
+      } catch (Exception ignore) {
+      }
+    }
+
+    return new JSONObject();
+  }
+
+  /**
+   * Creates a new transaction from the payment and then it processes the transaction
+   */
+  private void createAndProcessTransactionFromPayment(final JSONObject paymentJS,
+      final Date transactionDate, String strAccountId) throws JSONException {
+
+    try {
+      OBContext.setAdminMode(true);
+      final String paymentId = paymentJS.getString("id");
+      log.debug("Creating transaction for FIN_Payment_ID: " + paymentId);
+      final FIN_Payment payment = OBDal.getInstance().get(FIN_Payment.class, paymentId);
+      FIN_FinancialAccount account = OBDal.getInstance().get(FIN_FinancialAccount.class,
+          strAccountId);
+
+      if (payment != null) {
+        final FIN_FinaccTransaction transaction = TransactionsDao.createFinAccTransaction(payment);
+        transaction.setTransactionDate(transactionDate);
+        transaction.setAccount(account);
+        FIN_TransactionProcess.doTransactionProcess(ACTION_PROCESS_TRANSACTION, transaction);
+      }
+    } finally {
+      OBContext.restorePreviousMode();
+    }
+  }
+
+  /**
+   * Returns a JSONObject with the success message to be printed
+   */
+  private static JSONObject getSuccessMessage(final String msgText) {
+    final JSONObject result = new JSONObject();
+    try {
+      final JSONArray actions = new JSONArray();
+      final JSONObject msgInBPTab = new JSONObject();
+      msgInBPTab.put("msgType", "success");
+      msgInBPTab.put("msgTitle", OBMessageUtils.messageBD("success"));
+      msgInBPTab.put("msgText", msgText);
+      final JSONObject msgInBPTabAction = new JSONObject();
+      msgInBPTabAction.put("showMsgInProcessView", msgInBPTab);
+      actions.put(msgInBPTabAction);
+      result.put("responseActions", actions);
+    } catch (Exception e) {
+      log.error(e);
+    }
+
+    return result;
+  }
+
+  /**
+   * Returns a JSONObject with the error message to be printed and retry execution
+   */
+  private static JSONObject getErrorMessage(final String msgText) {
+    final JSONObject result = new JSONObject();
+    try {
+      final JSONObject msg = new JSONObject();
+      msg.put("severity", "error");
+      msg.put("text", msgText);
+      result.put("message", msg);
+      result.put("retryExecution", true);
+    } catch (Exception e) {
+      log.error(e);
+    }
+    return result;
+  }
+
+}
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java	Thu Jul 02 09:20:14 2015 +0200
@@ -361,6 +361,7 @@
     return ((FIN_ReconciliationLine_v) obc.uniqueResult()).getTransactionDate();
   }
 
+  @SuppressWarnings("unused")
   private void printPage(HttpServletResponse response, VariablesSecureApp vars, String strOrgId,
       String strWindowId, String strTabId, String strPaymentTypeFilter,
       String strFinancialAccountId, String reconciliationId, String strShowCleared,
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java	Thu Jul 02 09:20:14 2015 +0200
@@ -332,7 +332,7 @@
                   FIN_ExecutePayment executePayment = new FIN_ExecutePayment();
                   executePayment.init("APP", executionProcess, payments, null,
                       payment.getOrganization());
-                  executePayment.addInternalParameter("comingFrom", "TRANSACTION");
+                  executePayment.addInternalParameter("comingFrom", comingFrom);
                   OBError result = executePayment.execute();
                   if ("Error".equals(result.getType())) {
                     msg = OBMessageUtils.messageBD(result.getMessage());
@@ -392,10 +392,7 @@
                     .invoicePaymentStatus(payment)));
                 paymentScheduleDetail.setInvoicePaid(false);
                 // Payment = 0 when the payment is generated by a invoice that consume credit
-                if ((invoicePaidAmounts && paymentScheduleDetail.getInvoicePaymentSchedule() != null)
-                    || (paymentScheduleDetail.getOrderPaymentSchedule() != null)
-                    || (paymentScheduleDetail.getInvoicePaymentSchedule() == null && paymentScheduleDetail
-                        .getOrderPaymentSchedule() == null)
+                if (invoicePaidAmounts
                     || (payment.getAmount().compareTo(new BigDecimal("0.00")) == 0)) {
                   if (paymentScheduleDetail.getInvoicePaymentSchedule() != null) {
                     // BP SO_CreditUsed
@@ -454,6 +451,7 @@
                         paymentScheduleDetail.getOrderPaymentSchedule(),
                         paymentScheduleDetail.getAmount(),
                         paymentScheduleDetail.getWriteoffAmount());
+                    paymentScheduleDetail.setInvoicePaid(true);
                   }
                   // when generating credit for a BP SO_CreditUsed is also updated
                   if (paymentScheduleDetail.getInvoicePaymentSchedule() == null
@@ -1342,8 +1340,14 @@
     OBContext.setAdminMode();
     try {
       FIN_Payment payment = OBDal.getInstance().get(FIN_Payment.class, strRecordId);
-      List<FinAccPaymentMethod> lines = payment.getPaymentMethod()
-          .getFinancialMgmtFinAccPaymentMethodList();
+      OBCriteria<FinAccPaymentMethod> obCriteria = OBDal.getInstance().createCriteria(
+          FinAccPaymentMethod.class);
+      obCriteria.add(Restrictions.eq(FinAccPaymentMethod.PROPERTY_ACCOUNT, payment.getAccount()));
+      obCriteria.add(Restrictions.eq(FinAccPaymentMethod.PROPERTY_PAYMENTMETHOD,
+          payment.getPaymentMethod()));
+      obCriteria.setFilterOnReadableClients(false);
+      obCriteria.setFilterOnReadableOrganization(false);
+      List<FinAccPaymentMethod> lines = obCriteria.list();
       List<FIN_FinancialAccountAccounting> accounts = payment.getAccount()
           .getFINFinancialAccountAcctList();
       for (FIN_FinancialAccountAccounting account : accounts) {
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java	Thu Jul 02 09:20:14 2015 +0200
@@ -137,8 +137,7 @@
             for (FIN_PaymentScheduleDetail psd : pd.getFINPaymentScheduleDetailList()) {
               invoicePaidold = psd.isInvoicePaid();
               if (!invoicePaidold) {
-                if (FIN_Utility.invoicePaymentStatus(payment).equals(payment.getStatus())
-                    && psd.getInvoicePaymentSchedule() != null) {
+                if ((FIN_Utility.invoicePaymentStatus(payment).equals(payment.getStatus()))) {
                   psd.setInvoicePaid(true);
                 }
                 if (psd.isInvoicePaid()) {
--- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -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.26933]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.27055]]></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	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -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.26933]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.27055]]></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	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -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.26933]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.27055]]></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	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -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.26933]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.27055]]></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.26933]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->  <STARTVERSION><![CDATA[2.1.27055]]></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.26933]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->  <STARTVERSION><![CDATA[3.0.27055]]></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.26933]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->  <STARTVERSION><![CDATA[8.1.27055]]></STARTVERSION>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/ElementValueEventHandler.java	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/ElementValueEventHandler.java	Thu Jul 02 09:20:14 2015 +0200
@@ -54,8 +54,8 @@
     return entities;
   }
 
-  public void onSave(@Observes
-  EntityNewEvent event) {
+  @SuppressWarnings("unused")
+  public void onSave(@Observes EntityNewEvent event) {
     if (!isValidEvent(event)) {
       return;
     }
@@ -84,8 +84,7 @@
     doIt(account);
   }
 
-  public void onUpdate(@Observes
-  EntityUpdateEvent event) {
+  public void onUpdate(@Observes EntityUpdateEvent event) {
     if (!isValidEvent(event)) {
       return;
     }
@@ -97,6 +96,7 @@
     doIt(account);
   }
 
+  @SuppressWarnings("unused")
   private void doIt(ElementValue account) {
     boolean isNumber = true;
     try {
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/LocationSettingsHandler.java	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/LocationSettingsHandler.java	Thu Jul 02 09:20:14 2015 +0200
@@ -49,8 +49,7 @@
     return entities;
   }
 
-  public void onUpdate(@Observes
-  EntityUpdateEvent event) {
+  public void onUpdate(@Observes EntityUpdateEvent event) {
     if (!isValidEvent(event)) {
       return;
     }
@@ -59,8 +58,7 @@
         instanceCountry.getDateformat());
   }
 
-  public void onSave(@Observes
-  EntityNewEvent event) {
+  public void onSave(@Observes EntityNewEvent event) {
     if (!isValidEvent(event)) {
       return;
     }
@@ -69,13 +67,13 @@
         instanceCountry.getDateformat());
   }
 
-  public void onDelete(@Observes
-  EntityDeleteEvent event) {
+  public void onDelete(@Observes EntityDeleteEvent event) {
     if (!isValidEvent(event)) {
       return;
     }
   }
 
+  @SuppressWarnings("unused")
   private void checkCorrectValues(String numericmask, String datetimeformat, String dateformat) {
     if (numericmask != null) {
       if (checkNumericMask(numericmask)) {
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js	Thu Jul 02 09:20:14 2015 +0200
@@ -2195,7 +2195,7 @@
                 });
               }
               view.viewGrid.data.handleUpdate('remove', recordInfos, false, req);
-              if (view.treeGrid) {
+              if (view.treeGrid && view.treeGrid.data && view.treeGrid.data.handleUpdate) {
                 view.treeGrid.data.handleUpdate('remove', recordInfos, false, req);
               }
               if (updateTotalRows) {
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js	Thu Jul 02 09:20:14 2015 +0200
@@ -641,21 +641,23 @@
   },
 
   /**
-   * Given a string value, it returns the proper value according to the provided type
+   * Given a value, it returns the proper value according to the provided type
    */
-  getTypeSafeValue: function (type, stringValue) {
+  getTypeSafeValue: function (type, value) {
     var isNumber;
     if (!type) {
-      return stringValue;
+      return value;
     }
     isNumber = isc.SimpleType.inheritsFrom(type, 'integer') || isc.SimpleType.inheritsFrom(type, 'float');
-    if (isNumber && OB.Utilities.Number.IsValidValueString(type, stringValue)) {
-      return OB.Utilities.Number.OBMaskedToJS(stringValue, type.decSeparator, type.groupSeparator);
-    } else if (isNumber && isc.isA.Number(OB.Utilities.Number.OBMaskedToJS(stringValue, '.', ','))) {
+    if (isNumber && isc.isA.Number(value)) {
+      return value;
+    } else if (isNumber && OB.Utilities.Number.IsValidValueString(type, value)) {
+      return OB.Utilities.Number.OBMaskedToJS(value, type.decSeparator, type.groupSeparator);
+    } else if (isNumber && isc.isA.Number(OB.Utilities.Number.OBMaskedToJS(value, '.', ','))) {
       // it might happen that default value uses the default '.' and ',' as decimal and group separator
-      return OB.Utilities.Number.OBMaskedToJS(stringValue, '.', ',');
+      return OB.Utilities.Number.OBMaskedToJS(value, '.', ',');
     } else {
-      return stringValue;
+      return value;
     }
   },
 
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/return-material/ob-return-material.js	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/return-material/ob-return-material.js	Thu Jul 02 09:20:14 2015 +0200
@@ -11,7 +11,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) 2011-2014 Openbravo SLU
+ * All portions are Copyright (C) 2011-2015 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -132,10 +132,11 @@
       availableQty = new BigDecimal(String(record.availableQty)),
       storageBin = record.storageBin,
       editedRecord = null,
+      isstocked = record.stocked,
       i;
   if (state) {
-    //Cheking available stock
-    if (storageBin === null) {
+    // Checking available stock
+    if (storageBin === null && isstocked) {
       grid.view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR, null, OB.I18N.getLabel('OBUIAPP_RM_NotAvailableStock', [record.rMOrderNo]));
       return false;
     }
--- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -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.26933]]></VERSION>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.27055]]></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	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -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.26933]]></STARTVERSION>
+<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.27055]]></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	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -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.26933]]></VERSION>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.27055]]></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	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -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.26933]]></STARTVERSION>
+<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.27055]]></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.26933]]></STARTVERSION>
+<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <STARTVERSION><![CDATA[1.1.27055]]></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.26933]]></STARTVERSION>
+<!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <STARTVERSION><![CDATA[2.0.27055]]></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/org/openbravo/client/kernel/KernelApplicationInitializer.java	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelApplicationInitializer.java	Thu Jul 02 09:20:14 2015 +0200
@@ -18,11 +18,17 @@
  */
 package org.openbravo.client.kernel;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 import javax.enterprise.context.ApplicationScoped;
 
+import org.apache.log4j.Logger;
 import org.hibernate.dialect.function.StandardSQLFunction;
 import org.hibernate.type.StringType;
 import org.openbravo.dal.service.OBDal;
+import org.openbravo.erpCommon.utility.DateTimeData;
+import org.openbravo.service.db.DalConnectionProvider;
 
 /**
  * An example {@link ApplicationInitializer}.
@@ -31,8 +37,17 @@
  */
 @ApplicationScoped
 public class KernelApplicationInitializer implements ApplicationInitializer {
+  private static Logger log4j = Logger.getLogger(KernelApplicationInitializer.class);
+  private static final String sqlDateTimeFormat = "DD-MM-YYYY HH24:MI:SS";
+  private static final String javaDateTimeFormat = "dd-MM-yyyy HH:mm:ss";
+  private static final long THRESHOLD = 5000; // 5 seconds
 
   public void initialize() {
+    registerSQLFunctions();
+    checkDatabaseAndTomcatDateTime();
+  }
+
+  private void registerSQLFunctions() {
     OBDal.getInstance().registerSQLFunction("ad_org_getcalendarowner",
         new StandardSQLFunction("ad_org_getcalendarowner", new StringType()));
     OBDal.getInstance().registerSQLFunction("ad_org_getperiodcontrolallow",
@@ -40,4 +55,39 @@
     OBDal.getInstance().registerSQLFunction("m_isparent_ch_value",
         new StandardSQLFunction("m_isparent_ch_value", new StringType()));
   }
+
+  private void checkDatabaseAndTomcatDateTime() {
+    // This method checks if both Tomcat and DB are configured to use the same time. If there
+    // is a difference bigger than a few seconds, it logs a warning.
+    try {
+      Date tomcatDate = new Date(); // Tomcat time
+      Date dbDate = getDatabaseDateTime(); // Database time
+      log4j.debug("Tomcat Time: " + tomcatDate + ", Database Time: " + dbDate);
+      if (dbDate != null) {
+        long difference = Math.abs(tomcatDate.getTime() - dbDate.getTime());
+        if (difference > THRESHOLD) {
+          log4j.warn("Tomcat and Database do not have the same time. Tomcat Time: " + tomcatDate
+              + ", Database Time: " + dbDate);
+        }
+      } else {
+        log4j
+            .error("Received null as Database time. Not possible to check time differences with Tomcat.");
+      }
+    } catch (Exception ex) {
+      log4j.error("Could not check if Tomcat and Database have the same time.", ex);
+    }
+  }
+
+  private Date getDatabaseDateTime() {
+    Date date = null;
+    try {
+      // We retrieve the time from the database, using the predefined sql date-time format
+      String now = DateTimeData.now(new DalConnectionProvider(), sqlDateTimeFormat);
+      SimpleDateFormat formatter = new SimpleDateFormat(javaDateTimeFormat);
+      date = formatter.parse(now);
+    } catch (Exception ex) {
+      log4j.error("Could not get the Database time.", ex);
+    }
+    return date;
+  }
 }
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/freemarker/FreemarkerTemplateProcessor.java	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/freemarker/FreemarkerTemplateProcessor.java	Thu Jul 02 09:20:14 2015 +0200
@@ -93,6 +93,7 @@
    * @see
    * org.openbravo.client.kernel.TemplateProcessor#validate(org.openbravo.client.kernel.Template)
    */
+  @SuppressWarnings("unused")
   public void validate(Template template) throws ValidationException {
     try {
       final String source = createTemplateSource(template);
--- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -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.26933]]></VERSION>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.27055]]></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	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -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.26933]]></STARTVERSION>
+<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.27055]]></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.26933]]></STARTVERSION>
+<!--E71B28FC949D481D9F59C17D01E46EF9-->  <STARTVERSION><![CDATA[3.0.27055]]></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.querylist/src-db/database/sourcedata/AD_MODULE.xml	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -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.26933]]></VERSION>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.27055]]></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	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -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.26933]]></STARTVERSION>
+<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.27055]]></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	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -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.26933]]></VERSION>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.27055]]></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	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -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.26933]]></STARTVERSION>
+<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.27055]]></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.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -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.26933]]></VERSION>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.27055]]></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	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -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.26933]]></STARTVERSION>
+<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.27055]]></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	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -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.26933]]></VERSION>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.27055]]></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	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -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.26933]]></STARTVERSION>
+<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.27055]]></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	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -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.26933]]></VERSION>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION><![CDATA[2.1.27055]]></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	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -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.26933]]></STARTVERSION>
+<!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <STARTVERSION><![CDATA[1.1.27055]]></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.26933]]></STARTVERSION>
+<!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <STARTVERSION><![CDATA[2.0.27055]]></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.26933]]></STARTVERSION>
+<!--4FCE95802A854F7E8623AFF7C33D13EE-->  <STARTVERSION><![CDATA[3.0.27055]]></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.26933]]></STARTVERSION>
+<!--54AF8B39C55E4E7496902893ECD82786-->  <STARTVERSION><![CDATA[2.1.27055]]></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.26933]]></STARTVERSION>
+<!--D03C56D8A4E14F45A5466350E05C631F-->  <STARTVERSION><![CDATA[8.1.27055]]></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	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -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.26933]]></VERSION>
+<!--FF8080813129ADA401312CA1222A0005-->  <VERSION><![CDATA[0.1.27055]]></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	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -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.26933]]></STARTVERSION>
+<!--FF8080813141B198013141BA0F7D0012-->  <STARTVERSION><![CDATA[0.1.27055]]></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.26933]]></STARTVERSION>
+<!--FF8080813151AEE1013151C4ACE6001B-->  <STARTVERSION><![CDATA[2.1.27055]]></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.openid/src-db/database/sourcedata/AD_MODULE.xml	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -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.26933]]></VERSION>
+<!--FF8080813141B198013141B86DD70003-->  <VERSION><![CDATA[0.1.27055]]></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	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -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.26933]]></STARTVERSION>
+<!--FF8080813141B198013141B8B21B0006-->  <STARTVERSION><![CDATA[3.0.27055]]></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	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -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.26933]]></VERSION>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION><![CDATA[2.0.27055]]></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	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -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.26933]]></STARTVERSION>
+<!--9E3E7B42DB16405FB794496D309D7044-->  <STARTVERSION><![CDATA[3.0.27055]]></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.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -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.26933]]></VERSION>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION><![CDATA[2.1.27055]]></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	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -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.26933]]></STARTVERSION>
+<!--38825CAED43941D38CA0C78DB04FCFA0-->  <STARTVERSION><![CDATA[8.1.27055]]></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.26933]]></STARTVERSION>
+<!--6DDE7B1A70174242AF82B5022FB89279-->  <STARTVERSION><![CDATA[2.1.27055]]></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.26933]]></STARTVERSION>
+<!--94F9CD2CB5EF4467A67475C786C984A7-->  <STARTVERSION><![CDATA[2.1.27055]]></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.26933]]></STARTVERSION>
+<!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <STARTVERSION><![CDATA[1.1.27055]]></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.26933]]></STARTVERSION>
+<!--C8DAC574B88649D08C9468521B343F12-->  <STARTVERSION><![CDATA[3.0.27055]]></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.26933]]></STARTVERSION>
+<!--F14EB17946BE4724A46F80CB1A47EC70-->  <STARTVERSION><![CDATA[2.1.27055]]></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.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -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.26933]]></VERSION>
+<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION><![CDATA[2.0.27055]]></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	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -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.26933]]></STARTVERSION>
+<!--39BF75AD9AB3453698BF5DE29E727AA9-->  <STARTVERSION><![CDATA[3.0.27055]]></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	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -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.26933]]></VERSION>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION><![CDATA[8.1.27055]]></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	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -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.26933]]></STARTVERSION>
+<!--086331E18477496B8AC74D2CFEBD1307-->  <STARTVERSION><![CDATA[3.0.27055]]></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.26933]]></STARTVERSION>
+<!--DC5D4EF450244482BD2B458DAA496333-->  <STARTVERSION><![CDATA[2.1.27055]]></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.26933]]></STARTVERSION>
+<!--F2AF15C0AF5540E393D96BE506E20648-->  <STARTVERSION><![CDATA[1.1.27055]]></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.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -6,7 +6,7 @@
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <NAME><![CDATA[Log Clean Up Utility]]></NAME>
-<!--8A34B301DC524EA3A07513DF9F42CC90-->  <VERSION><![CDATA[1.0.26933]]></VERSION>
+<!--8A34B301DC524EA3A07513DF9F42CC90-->  <VERSION><![CDATA[1.0.27055]]></VERSION>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <DESCRIPTION><![CDATA[Log Clean Up Utility]]></DESCRIPTION>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <HELP><![CDATA[Utility to periodically cleanup log tables]]></HELP>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <URL><![CDATA[http://centralrepository.openbravo.com/heartbeat-server/org.openbravo.forge.ui/ForgeProjectDetail?projectId=7DC25E3B7ADE426CAD71E7804B95C1BF]]></URL>
--- a/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -7,7 +7,7 @@
 <!--86EBD30DEB8045508185B457896C9F6D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <AD_MODULE_ID><![CDATA[8A34B301DC524EA3A07513DF9F42CC90]]></AD_MODULE_ID>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <AD_DEPENDENT_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_DEPENDENT_MODULE_ID>
-<!--86EBD30DEB8045508185B457896C9F6D-->  <STARTVERSION><![CDATA[2.1.26933]]></STARTVERSION>
+<!--86EBD30DEB8045508185B457896C9F6D-->  <STARTVERSION><![CDATA[2.1.27055]]></STARTVERSION>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -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.26933]]></VERSION>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION><![CDATA[3.0.27055]]></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	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -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.26933]]></STARTVERSION>
+<!--148A000EE9A04A3CA653B1296A00B8E6-->  <STARTVERSION><![CDATA[3.0.27055]]></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.26933]]></STARTVERSION>
+<!--30F966407A6F4E15965821BAEE34D25B-->  <STARTVERSION><![CDATA[3.0.27055]]></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.26933]]></STARTVERSION>
+<!--F93CE30003B24F8F8886510B0065EECC-->  <STARTVERSION><![CDATA[1.1.27055]]></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	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -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.26933]]></VERSION>
+<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION><![CDATA[2.1.27055]]></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	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -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.26933]]></STARTVERSION>
+<!--01E1BCCEC9114DE0960538DF34E30E6F-->  <STARTVERSION><![CDATA[2.1.27055]]></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.26933]]></STARTVERSION>
+<!--025B181F63CA47B48A920F6983242390-->  <STARTVERSION><![CDATA[3.0.27055]]></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.26933]]></STARTVERSION>
+<!--054B4FEAF919478AA3FF27098A46D1D6-->  <STARTVERSION><![CDATA[2.1.27055]]></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.26933]]></STARTVERSION>
+<!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <STARTVERSION><![CDATA[1.0.27055]]></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.26933]]></STARTVERSION>
+<!--224754C3EF674C93B0D468F47BAAB824-->  <STARTVERSION><![CDATA[2.1.27055]]></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.26933]]></STARTVERSION>
+<!--5B72D24032DD4879A950194139D961B6-->  <STARTVERSION><![CDATA[2.1.27055]]></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.26933]]></STARTVERSION>
+<!--8730CA6A4224439D82E0DD31B3806E36-->  <STARTVERSION><![CDATA[1.0.27055]]></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.26933]]></STARTVERSION>
+<!--98C47FF058F8413B8A2B26036061446E-->  <STARTVERSION><![CDATA[8.1.27055]]></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.26933]]></STARTVERSION>
+<!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <STARTVERSION><![CDATA[2.0.27055]]></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.26933]]></STARTVERSION>
+<!--A9CB99330AF34944877F889DD8A0AB3C-->  <STARTVERSION><![CDATA[2.1.27055]]></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.26933]]></STARTVERSION>
+<!--E72A053A403C4A98A189C105B850ADB0-->  <STARTVERSION><![CDATA[1.1.27055]]></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.26933]]></STARTVERSION>
+<!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <STARTVERSION><![CDATA[2.0.27055]]></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	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -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.26933]]></VERSION>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION><![CDATA[3.0.27055]]></VERSION>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <DESCRIPTION><![CDATA[Openbravo 3.0 distribution template]]></DESCRIPTION>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <HELP><![CDATA[Openbravo 3.0 is a collection (distribution) of modules. This template is a container of all the modules and configuration changes that compose Openbravo 3.0.]]></HELP>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <URL><![CDATA[http://forge.openbravo.com/projects/vthree]]></URL>
--- a/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Jul 01 14:47:16 2015 +0200
+++ b/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -21,7 +21,7 @@
 <!--4D11E3A70650475381139522373CD191-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--4D11E3A70650475381139522373CD191-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--4D11E3A70650475381139522373CD191-->  <AD_DEPENDENT_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_DEPENDENT_MODULE_ID>
-<!--4D11E3A70650475381139522373CD191-->  <STARTVERSION><![CDATA[2.1.26933]]></STARTVERSION>
+<!--4D11E3A70650475381139522373CD191-->  <STARTVERSION><![CDATA[2.1.27055]]></STARTVERSION>
 <!--4D11E3A70650475381139522373CD191-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--4D11E3A70650475381139522373CD191-->  <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME>
 <!--4D11E3A70650475381139522373CD191-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_DEPENDENT_MODULE_ID>
-<!--52CE523C40634C47A99C6EBBD9C3125C-->  <STARTVERSION><![CDATA[3.0.26933]]></STARTVERSION>
+<!--52CE523C40634C47A99C6EBBD9C3125C-->  <STARTVERSION><![CDATA[3.0.27055]]></STARTVERSION>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <DEPENDANT_MODULE_NAME><![CDATA[Payment Report]]></DEPENDANT_MODULE_NAME>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--60834727BB114764ACEF019F40A34562-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--60834727BB114764ACEF019F40A34562-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--60834727BB114764ACEF019F40A34562-->  <AD_DEPENDENT_MODULE_ID><![CDATA[3A3A943684D64DEF9EC39F588A656848]]></AD_DEPENDENT_MODULE_ID>
-<!--60834727BB114764ACEF019F40A34562-->  <STARTVERSION><![CDATA[1.1.26933]]></STARTVERSION>
+<!--60834727BB114764ACEF019F40A34562-->  <STARTVERSION><![CDATA[1.1.27055]]></STARTVERSION>
 <!--60834727BB114764ACEF019F40A34562-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--60834727BB114764ACEF019F40A34562-->  <DEPENDANT_MODULE_NAME><![CDATA[Orders Awaiting Delivery]]></DEPENDANT_MODULE_NAME>
 <!--60834727BB114764ACEF019F40A34562-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -63,7 +63,7 @@
 <!--8418885E97D643138B6D907671351E3D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8418885E97D643138B6D907671351E3D-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--8418885E97D643138B6D907671351E3D-->  <AD_DEPENDENT_MODULE_ID><![CDATA[883B5872CA0548F9AF2BBBE7D2DDFA61]]></AD_DEPENDENT_MODULE_ID>
-<!--8418885E97D643138B6D907671351E3D-->  <STARTVERSION><![CDATA[3.0.26933]]></STARTVERSION>
+<!--8418885E97D643138B6D907671351E3D-->  <STARTVERSION><![CDATA[3.0.27055]]></STARTVERSION>
 <!--8418885E97D643138B6D907671351E3D-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--8418885E97D643138B6D907671351E3D-->  <DEPENDANT_MODULE_NAME><![CDATA[Standard Roles]]></DEPENDANT_MODULE_NAME>
 <!--8418885E97D643138B6D907671351E3D-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -77,7 +77,7 @@
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--A32F3279B3374FC0A6CFEA2368BB7053-->  <STARTVERSION><![CDATA[3.0.26933]]></STARTVERSION>
+<!--A32F3279B3374FC0A6CFEA2368BB7053-->  <STARTVERSION><![CDATA[3.0.27055]]></STARTVERSION>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MINOR]]></DEPENDENCY_ENFORCEMENT>
@@ -91,7 +91,7 @@
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_DEPENDENT_MODULE_ID>
-<!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <STARTVERSION><![CDATA[3.0.26933]]></STARTVERSION>
+<!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <STARTVERSION><![CDATA[3.0.27055]]></STARTVERSION>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <DEPENDANT_MODULE_NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></DEPENDANT_MODULE_NAME>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -105,7 +105,7 @@
 <!--FEF6E40F244A4061B7C62CB755663712-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FEF6E40F244A4061B7C62CB755663712-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--FEF6E40F244A4061B7C62CB755663712-->  <AD_DEPENDENT_MODULE_ID><![CDATA[8A34B301DC524EA3A07513DF9F42CC90]]></AD_DEPENDENT_MODULE_ID>
-<!--FEF6E40F244A4061B7C62CB755663712-->  <STARTVERSION><![CDATA[1.0.26933]]></STARTVERSION>
+<!--FEF6E40F244A4061B7C62CB755663712-->  <STARTVERSION><![CDATA[1.0.27055]]></STARTVERSION>
 <!--FEF6E40F244A4061B7C62CB755663712-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FEF6E40F244A4061B7C62CB755663712-->  <DEPENDANT_MODULE_NAME><![CDATA[Log Clean Up Utility]]></DEPENDANT_MODULE_NAME>
 <!--FEF6E40F244A4061B7C62CB755663712-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -119,7 +119,7 @@
 <!--FF8080813189932B013189B45B59003A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813189932B013189B45B59003A-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--FF8080813189932B013189B45B59003A-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813189932B013189B45B59003A-->  <STARTVERSION><![CDATA[0.1.26933]]></STARTVERSION>
+<!--FF8080813189932B013189B45B59003A-->  <STARTVERSION><![CDATA[0.1.27055]]></STARTVERSION>
 <!--FF8080813189932B013189B45B59003A-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8080813189932B013189B45B59003A-->  <DEPENDANT_MODULE_NAME><![CDATA[OpenID Service Integration]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813189932B013189B45B59003A-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -133,7 +133,7 @@
 <!--FF8080813189932B013189B4C00F003D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813189932B013189B4C00F003D-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--FF8080813189932B013189B4C00F003D-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813189932B013189B4C00F003D-->  <STARTVERSION><![CDATA[0.1.26933]]></STARTVERSION>
+<!--FF8080813189932B013189B4C00F003D-->  <STARTVERSION><![CDATA[0.1.27055]]></STARTVERSION>
 <!--FF8080813189932B013189B4C00F003D-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8080813189932B013189B4C00F003D-->  <DEPENDANT_MODULE_NAME><![CDATA[Integration with Google APIs]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813189932B013189B4C00F003D-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -147,7 +147,7 @@
 <!--FF8081812E2F6F3C012E2F750109001C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8081812E2F6F3C012E2F750109001C-->  <STARTVERSION><![CDATA[0.0.26933]]></STARTVERSION>
+<!--FF8081812E2F6F3C012E2F750109001C-->  <STARTVERSION><![CDATA[0.0.27055]]></STARTVERSION>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <DEPENDANT_MODULE_NAME><![CDATA[Widgets Collection]]></DEPENDANT_MODULE_NAME>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/referencedata/sampledata/F_B_International_Group/AD_CLIENT_ACCTDIMENSION.xml	Wed Jul 01 14:47:16 2015 +0200
+++ b/referencedata/sampledata/F_B_International_Group/AD_CLIENT_ACCTDIMENSION.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -199,11 +199,11 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:45:48.998]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:45:48.998]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-06-04 09:48:16.736]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <DIMENSION><![CDATA[BP]]></DIMENSION>
   <DOCBASETYPE><![CDATA[ARR]]></DOCBASETYPE>
-  <SHOW_IN_HEADER><![CDATA[N]]></SHOW_IN_HEADER>
+  <SHOW_IN_HEADER><![CDATA[Y]]></SHOW_IN_HEADER>
   <SHOW_IN_LINES><![CDATA[Y]]></SHOW_IN_LINES>
   <SHOW_IN_BREAKDOWN><![CDATA[N]]></SHOW_IN_BREAKDOWN>
 </AD_CLIENT_ACCTDIMENSION>
@@ -487,11 +487,11 @@
   <ISACTIVE><![CDATA[Y]]></ISACTIVE>
   <CREATED><![CDATA[2013-07-04 23:45:48.997]]></CREATED>
   <CREATEDBY><![CDATA[0]]></CREATEDBY>
-  <UPDATED><![CDATA[2013-07-04 23:45:48.997]]></UPDATED>
-  <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
+  <UPDATED><![CDATA[2015-06-04 18:20:40.767]]></UPDATED>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
   <DIMENSION><![CDATA[BP]]></DIMENSION>
   <DOCBASETYPE><![CDATA[APP]]></DOCBASETYPE>
-  <SHOW_IN_HEADER><![CDATA[N]]></SHOW_IN_HEADER>
+  <SHOW_IN_HEADER><![CDATA[Y]]></SHOW_IN_HEADER>
   <SHOW_IN_LINES><![CDATA[Y]]></SHOW_IN_LINES>
   <SHOW_IN_BREAKDOWN><![CDATA[N]]></SHOW_IN_BREAKDOWN>
 </AD_CLIENT_ACCTDIMENSION>
--- a/src-core/src/org/openbravo/base/filter/NumberFilter.java	Wed Jul 01 14:47:16 2015 +0200
+++ b/src-core/src/org/openbravo/base/filter/NumberFilter.java	Thu Jul 02 09:20:14 2015 +0200
@@ -23,6 +23,7 @@
 
   public static final NumberFilter instance = new NumberFilter();
 
+  @SuppressWarnings("unused")
   @Override
   public boolean accept(String value) {
     try {
--- a/src-db/database/model/functions/C_COMMISSION_PROCESS.xml	Wed Jul 01 14:47:16 2015 +0200
+++ b/src-db/database/model/functions/C_COMMISSION_PROCESS.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -249,7 +249,7 @@
           IF(v_ListDetails='Y' OR v_IsCascade='Y') THEN
             IF(v_BasisAmt='N') THEN
               IF(v_BasisStatus='F') THEN
-                v_Cmd:='SELECT DISTINCT h.C_Currency_ID, CASE WHEN dt.docbasetype IN (''ARC'',''APC'') THEN -1 ELSE 1 END * l.LineNetAmt * (psv.expected / h.grandtotal),'
+                v_Cmd:='SELECT h.C_Currency_ID, CASE WHEN dt.docbasetype IN (''ARC'',''APC'') THEN -1 ELSE 1 END * l.LineNetAmt * (psv.expected / h.grandtotal),'
                 || 'CASE WHEN dt.docbasetype IN (''ARC'',''APC'') THEN -1 ELSE 1 END * l.QtyInvoiced, '
                 || 'NULL, l.C_InvoiceLine_ID, h.DocumentNo, substr(COALESCE(prd.Name,l.Description),1,60), ''Y'' '
                 || 'FROM C_Invoice h JOIN C_InvoiceLine l ON h.C_Invoice_ID = l.C_Invoice_ID'
--- a/src-db/database/model/functions/M_INOUT_CREATE.xml	Wed Jul 01 14:47:16 2015 +0200
+++ b/src-db/database/model/functions/M_INOUT_CREATE.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -147,6 +147,9 @@
   v_AllowPartialShipment VARCHAR2(2000);
   v_ForceDelivery CHAR(1);
   v_DeliveryRule CHAR(1);
+  v_isreturn C_Doctype.IsReturn%TYPE;
+  v_returnbin M_Warehouse.M_ReturnLocator_ID%TYPE;
+
 BEGIN
   -- Process Parameters
   IF (p_pinstance_id IS NOT NULL) THEN
@@ -401,6 +404,14 @@
             'N', Cur_Order.SALESREP_ID,Cur_Order.A_Asset_ID, Cur_Order.C_CostCenter_ID,
             Cur_Order.DELIVERY_LOCATION_ID -- Added by Rafa Roda to include delivery location
         );
+        SELECT IsReturn INTO v_IsReturn
+          FROM C_DocType where C_DocType_ID  = Cur_Order.C_DocType_ID;
+        IF(v_IsReturn = 'Y' AND Cur_Order.Issotrx = 'Y') THEN
+          SELECT M_ReturnLocator_ID INTO v_ReturnBin
+            FROM M_Warehouse WHERE M_Warehouse_ID = Cur_Order.M_Warehouse_ID;
+        ELSE
+          v_ReturnBin:=NULL;
+        END IF;
 
         /**
         * Create InOut Lines
@@ -551,7 +562,7 @@
                         (v_NextNo, v_lines, p_InOut_ID, ol.C_OrderLine_ID,
                         ol.AD_Client_ID, ol.AD_Org_ID, 'Y', now(),
                         v_User_ID, now(), v_User_ID, ol.M_Product_ID,
-                        v_storage.C_UOM_ID, v_storage.M_Locator_ID, v_LocatorQty, ol.Description,
+                        v_storage.C_UOM_ID, COALESCE(v_ReturnBin, v_storage.M_Locator_ID), v_LocatorQty, ol.Description,
                         'N',
                         --MODIFIED BY F.IRIAZABAL
                         v_ActualQty, v_storage.M_PRODUCT_UOM_ID, v_storage.M_AttributeSetInstance_ID,
--- a/src-db/database/model/triggers/AD_ACCOUNTINGRPT_ELEMENT_TRG.xml	Wed Jul 01 14:47:16 2015 +0200
+++ b/src-db/database/model/triggers/AD_ACCOUNTINGRPT_ELEMENT_TRG.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
   <database name="TRIGGER AD_ACCOUNTINGRPT_ELEMENT_TRG">
-    <trigger name="AD_ACCOUNTINGRPT_ELEMENT_TRG" table="AD_ACCOUNTINGRPT_ELEMENT" fires="after" insert="true" update="true" delete="true" foreach="row">
+    <trigger name="AD_ACCOUNTINGRPT_ELEMENT_TRG" table="AD_ACCOUNTINGRPT_ELEMENT" fires="after" insert="true" update="true" delete="false" foreach="row">
       <body><![CDATA[
 
 
@@ -18,13 +18,12 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2001-2015 Openbravo SLU
+* All portions are Copyright (C) 2001-2012 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
   v_xTree_ID VARCHAR2(32);
   v_xParent_ID VARCHAR2(32);
-  v_count NUMBER;
     
 BEGIN
     
@@ -91,28 +90,6 @@
 WHEN NO_DATA_FOUND THEN
   RAISE_APPLICATION_ERROR(-20000, '@20002@') ;
   */
-  IF (DELETING) THEN
-    --  Delete TreeNode --
-    --  get AD_Tree_ID
-    SELECT t.AD_Tree_ID
-    INTO v_xTree_ID
-    FROM AD_Tree t
-    WHERE t.AD_Client_ID=:old.AD_Client_ID
-    AND t.treetype = 'AR';
-    select COUNT(*) INTO v_count
-    from AD_TREENODE
-    INNER JOIN AD_Accountingrpt_Element ON AD_Accountingrpt_Element.AD_Accountingrpt_Element_ID = AD_TREENODE.NODE_ID
-    where parent_id=:old.AD_Accountingrpt_Element_ID
-    and AD_TREE_ID=v_xTree_ID;
-    IF(v_count>0) THEN
-        RAISE_APPLICATION_ERROR(-20000, '@ChildAccountingRptElementCheck@') ;
-    END IF;
-    DELETE
-    FROM AD_TREENODE
-    WHERE AD_CLIENT_ID=:old.AD_Client_ID
-      AND AD_Tree_ID=v_xTree_ID
-      AND Node_ID=:old.AD_Accountingrpt_Element_ID;
-  END IF;
 END AD_ACCOUNTINGRPT_ELEMENT_TRG
 ]]></body>
     </trigger>
--- a/src-db/database/model/views/M_CREATEPOLINES_PE_V.xml	Wed Jul 01 14:47:16 2015 +0200
+++ b/src-db/database/model/views/M_CREATEPOLINES_PE_V.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
   <database name="VIEW M_CREATEPOLINES_PE_V">
-    <view name="M_CREATEPOLINES_PE_V"><![CDATA[SELECT pp.m_productprice_id AS m_createpolines_pe_v_id, pp.ad_client_id, pp.ad_org_id, pp.isactive, pp.created, pp.createdby, pp.updated, pp.updatedby, 'N' AS ob_selected, pp.m_product_id, plv.m_pricelist_id, pp.pricestd, NULL AS qtyordered FROM m_productprice pp JOIN m_product p ON pp.m_product_id = p.m_product_id AND COALESCE(p.isgeneric, 'N') = 'N' JOIN m_pricelist_version plv ON pp.m_pricelist_version_id = plv.m_pricelist_version_id JOIN m_pricelist pl ON pl.m_pricelist_id = plv.m_pricelist_id WHERE pl.issopricelist = 'N' AND plv.validfrom = ((SELECT max(plv2.validfrom) AS max FROM m_pricelist_version plv2 WHERE plv2.m_pricelist_id = pl.m_pricelist_id AND plv2.validfrom <= now()))]]></view>
+    <view name="M_CREATEPOLINES_PE_V"><![CDATA[SELECT pp.m_productprice_id AS m_createpolines_pe_v_id, pp.ad_client_id, pp.ad_org_id, pp.isactive, pp.created, pp.createdby, pp.updated, pp.updatedby, 'N' AS ob_selected, pp.m_product_id, plv.m_pricelist_id, pp.pricestd, NULL AS qtyordered FROM m_productprice pp JOIN m_product p ON pp.m_product_id = p.m_product_id AND COALESCE(p.isgeneric, 'N') = 'N' JOIN m_pricelist_version plv ON pp.m_pricelist_version_id = plv.m_pricelist_version_id JOIN m_pricelist pl ON pl.m_pricelist_id = plv.m_pricelist_id WHERE p.isactive = 'Y' AND pl.issopricelist = 'N' AND plv.validfrom = ((SELECT max(plv2.validfrom) AS max FROM m_pricelist_version plv2 WHERE plv2.m_pricelist_id = pl.m_pricelist_id AND plv2.validfrom <= now()))]]></view>
   </database>
--- a/src-db/database/model/views/M_RM_SHIPMENT_PICK_EDIT.xml	Wed Jul 01 14:47:16 2015 +0200
+++ b/src-db/database/model/views/M_RM_SHIPMENT_PICK_EDIT.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
   <database name="VIEW M_RM_SHIPMENT_PICK_EDIT">
-    <view name="M_RM_SHIPMENT_PICK_EDIT"><![CDATA[SELECT COALESCE(sd.m_storage_detail_id, '') || ol.c_orderline_id AS m_rm_shipment_pick_edit_id, ol.ad_client_id, COALESCE(iol.ad_org_id, ol.ad_org_id) AS ad_org_id, ol.isactive, ol.createdby, ol.created, ol.updatedby, ol.updated, o.documentno AS returnorderno, ol.m_product_id, ol.m_attributesetinstance_id, ol.c_uom_id, (-1) * ol.qtyordered AS returned, (-1) * iol.movementqty AS movementqty, sd.m_locator_id, CASE WHEN sd.m_locator_id IS NULL THEN (-1) * ol.qtyordered ELSE COALESCE(sd.qtyonhand, 0) END AS availableqty, (-1) * (ol.qtyordered - to_number(COALESCE((SELECT to_char(sum(COALESCE(iol3.movementqty, 0))) AS sum FROM m_inoutline iol3 JOIN m_inout io3 ON iol3.m_inout_id = io3.m_inout_id AND io3.processed = 'Y' WHERE iol3.c_orderline_id = ol.c_orderline_id), '0'))) AS pendingqty, iol.m_inout_id, CASE WHEN iol.m_inout_id IS NOT NULL THEN 'Y' ELSE 'N' END AS ob_selected, ol.c_orderline_id, ol.line, iol.m_inoutline_id FROM c_orderline ol JOIN c_order o ON o.c_order_id = ol.c_order_id AND o.processed = 'Y' AND o.issotrx = 'N' LEFT JOIN m_storage_detail sd ON sd.m_product_id = ol.m_product_id AND COALESCE(sd.m_attributesetinstance_id, '0') = COALESCE(ol.m_attributesetinstance_id, '0') AND sd.qtyonhand > 0 LEFT JOIN m_locator l ON sd.m_locator_id = l.m_locator_id JOIN c_doctype dt ON o.c_doctypetarget_id = dt.c_doctype_id AND dt.isreturn = 'Y' LEFT JOIN (SELECT iol2.m_inoutline_id, iol2.m_inout_id, iol2.movementqty, iol2.c_orderline_id, iol2.ad_org_id, iol2.m_locator_id FROM m_inoutline iol2 JOIN m_inout io2 ON iol2.m_inout_id = io2.m_inout_id AND io2.processed = 'N') iol ON iol.c_orderline_id = ol.c_orderline_id AND iol.m_locator_id = sd.m_locator_id WHERE o.docstatus = 'CO']]></view>
+    <view name="M_RM_SHIPMENT_PICK_EDIT"><![CDATA[SELECT COALESCE(sd.m_storage_detail_id, '') || ol.c_orderline_id AS m_rm_shipment_pick_edit_id, ol.ad_client_id, COALESCE(iol.ad_org_id, ol.ad_org_id) AS ad_org_id, ol.isactive, ol.createdby, ol.created, ol.updatedby, ol.updated, o.documentno AS returnorderno, ol.m_product_id, ol.m_attributesetinstance_id, ol.c_uom_id, (-1) * ol.qtyordered AS returned, (-1) * iol.movementqty AS movementqty, sd.m_locator_id, CASE WHEN sd.m_locator_id IS NULL THEN (-1) * ol.qtyordered ELSE COALESCE(sd.qtyonhand, 0) END AS availableqty, (-1) * (ol.qtyordered - to_number(COALESCE((SELECT to_char(sum(COALESCE(iol3.movementqty, 0))) AS sum FROM m_inoutline iol3 JOIN m_inout io3 ON iol3.m_inout_id = io3.m_inout_id AND io3.processed = 'Y' WHERE iol3.c_orderline_id = ol.c_orderline_id), '0'))) AS pendingqty, iol.m_inout_id, CASE WHEN iol.m_inout_id IS NOT NULL THEN 'Y' ELSE 'N' END AS ob_selected, ol.c_orderline_id, ol.line, iol.m_inoutline_id, p.isstocked FROM c_orderline ol JOIN c_order o ON o.c_order_id = ol.c_order_id AND o.processed = 'Y' AND o.issotrx = 'N' LEFT JOIN m_storage_detail sd ON sd.m_product_id = ol.m_product_id AND COALESCE(sd.m_attributesetinstance_id, '0') = COALESCE(ol.m_attributesetinstance_id, '0') AND sd.qtyonhand > 0 LEFT JOIN m_locator l ON sd.m_locator_id = l.m_locator_id JOIN m_product p ON p.m_product_id = ol.m_product_id JOIN c_doctype dt ON o.c_doctypetarget_id = dt.c_doctype_id AND dt.isreturn = 'Y' LEFT JOIN (SELECT iol2.m_inoutline_id, iol2.m_inout_id, iol2.movementqty, iol2.c_orderline_id, iol2.ad_org_id, iol2.m_locator_id FROM m_inoutline iol2 JOIN m_inout io2 ON iol2.m_inout_id = io2.m_inout_id AND io2.processed = 'N') iol ON iol.c_orderline_id = ol.c_orderline_id AND iol.m_locator_id = sd.m_locator_id WHERE o.docstatus = 'CO']]></view>
   </database>
--- a/src-db/database/sourcedata/AD_COLUMN.xml	Wed Jul 01 14:47:16 2015 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -316862,6 +316862,40 @@
 <!--C0CDDF800B2D463792B4BBCF11E65FBE-->  <ENTITY_ALIAS><![CDATA[lcm.amountInInvoiceCurrency]]></ENTITY_ALIAS>
 <!--C0CDDF800B2D463792B4BBCF11E65FBE--></AD_COLUMN>
 
+<!--C0D9A7D1D5B043A4B8AE9F6AC683FD50--><AD_COLUMN>
+<!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <AD_COLUMN_ID><![CDATA[C0D9A7D1D5B043A4B8AE9F6AC683FD50]]></AD_COLUMN_ID>
+<!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <NAME><![CDATA[Stocked]]></NAME>
+<!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <DESCRIPTION><![CDATA[Organization stocks this product]]></DESCRIPTION>
+<!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <HELP><![CDATA[The Stocked check box indicates if this product is stocked by this Organization.]]></HELP>
+<!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <COLUMNNAME><![CDATA[IsStocked]]></COLUMNNAME>
+<!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <AD_TABLE_ID><![CDATA[347B0AA5C3CD4D18910D2FE4990B790E]]></AD_TABLE_ID>
+<!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <SEQNO><![CDATA[230]]></SEQNO>
+<!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <AD_ELEMENT_ID><![CDATA[415]]></AD_ELEMENT_ID>
+<!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--C0D9A7D1D5B043A4B8AE9F6AC683FD50-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--C0D9A7D1D5B043A4B8AE9F6AC683FD50--></AD_COLUMN>
+
 <!--C0FF55F981BB47279B6BA18A2D811482--><AD_COLUMN>
 <!--C0FF55F981BB47279B6BA18A2D811482-->  <AD_COLUMN_ID><![CDATA[C0FF55F981BB47279B6BA18A2D811482]]></AD_COLUMN_ID>
 <!--C0FF55F981BB47279B6BA18A2D811482-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_DIMENSION_MAPPING.xml	Wed Jul 01 14:47:16 2015 +0200
+++ b/src-db/database/sourcedata/AD_DIMENSION_MAPPING.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -3493,7 +3493,7 @@
 <!--AC74E74370754AA3A9EF8424E256CBD1-->  <DOCBASETYPE><![CDATA[APP]]></DOCBASETYPE>
 <!--AC74E74370754AA3A9EF8424E256CBD1-->  <AD_TABLE_ID><![CDATA[D1A97202E832470285C9B1EB026D54E2]]></AD_TABLE_ID>
 <!--AC74E74370754AA3A9EF8424E256CBD1-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--AC74E74370754AA3A9EF8424E256CBD1-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--AC74E74370754AA3A9EF8424E256CBD1-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
 <!--AC74E74370754AA3A9EF8424E256CBD1-->  <DOCUMENTLEVEL><![CDATA[H]]></DOCUMENTLEVEL>
 <!--AC74E74370754AA3A9EF8424E256CBD1--></AD_DIMENSION_MAPPING>
 
@@ -4650,7 +4650,7 @@
 <!--EFB91B3A715E45B6A358B9E33D7C08D0-->  <DOCBASETYPE><![CDATA[ARR]]></DOCBASETYPE>
 <!--EFB91B3A715E45B6A358B9E33D7C08D0-->  <AD_TABLE_ID><![CDATA[D1A97202E832470285C9B1EB026D54E2]]></AD_TABLE_ID>
 <!--EFB91B3A715E45B6A358B9E33D7C08D0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--EFB91B3A715E45B6A358B9E33D7C08D0-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--EFB91B3A715E45B6A358B9E33D7C08D0-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
 <!--EFB91B3A715E45B6A358B9E33D7C08D0-->  <DOCUMENTLEVEL><![CDATA[H]]></DOCUMENTLEVEL>
 <!--EFB91B3A715E45B6A358B9E33D7C08D0--></AD_DIMENSION_MAPPING>
 
--- a/src-db/database/sourcedata/AD_FIELD.xml	Wed Jul 01 14:47:16 2015 +0200
+++ b/src-db/database/sourcedata/AD_FIELD.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -191466,6 +191466,35 @@
 <!--2526270E8A04456087642F766B1A8ED5-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--2526270E8A04456087642F766B1A8ED5--></AD_FIELD>
 
+<!--2569A250B0A143B59B7023153426759B--><AD_FIELD>
+<!--2569A250B0A143B59B7023153426759B-->  <AD_FIELD_ID><![CDATA[2569A250B0A143B59B7023153426759B]]></AD_FIELD_ID>
+<!--2569A250B0A143B59B7023153426759B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2569A250B0A143B59B7023153426759B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2569A250B0A143B59B7023153426759B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2569A250B0A143B59B7023153426759B-->  <NAME><![CDATA[Stocked]]></NAME>
+<!--2569A250B0A143B59B7023153426759B-->  <DESCRIPTION><![CDATA[Organization stocks this product]]></DESCRIPTION>
+<!--2569A250B0A143B59B7023153426759B-->  <HELP><![CDATA[The Stocked check box indicates if this product is stocked by this Organization.]]></HELP>
+<!--2569A250B0A143B59B7023153426759B-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--2569A250B0A143B59B7023153426759B-->  <AD_TAB_ID><![CDATA[9195CC43B5A4419195030A4DB17D8737]]></AD_TAB_ID>
+<!--2569A250B0A143B59B7023153426759B-->  <AD_COLUMN_ID><![CDATA[C0D9A7D1D5B043A4B8AE9F6AC683FD50]]></AD_COLUMN_ID>
+<!--2569A250B0A143B59B7023153426759B-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--2569A250B0A143B59B7023153426759B-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--2569A250B0A143B59B7023153426759B-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--2569A250B0A143B59B7023153426759B-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--2569A250B0A143B59B7023153426759B-->  <SEQNO><![CDATA[110]]></SEQNO>
+<!--2569A250B0A143B59B7023153426759B-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--2569A250B0A143B59B7023153426759B-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--2569A250B0A143B59B7023153426759B-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--2569A250B0A143B59B7023153426759B-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--2569A250B0A143B59B7023153426759B-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--2569A250B0A143B59B7023153426759B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--2569A250B0A143B59B7023153426759B-->  <GRID_SEQNO><![CDATA[100]]></GRID_SEQNO>
+<!--2569A250B0A143B59B7023153426759B-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--2569A250B0A143B59B7023153426759B-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--2569A250B0A143B59B7023153426759B-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--2569A250B0A143B59B7023153426759B-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--2569A250B0A143B59B7023153426759B--></AD_FIELD>
+
 <!--256F28FE31F84CB38E1BB3D61C669F7E--><AD_FIELD>
 <!--256F28FE31F84CB38E1BB3D61C669F7E-->  <AD_FIELD_ID><![CDATA[256F28FE31F84CB38E1BB3D61C669F7E]]></AD_FIELD_ID>
 <!--256F28FE31F84CB38E1BB3D61C669F7E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_MESSAGE.xml	Wed Jul 01 14:47:16 2015 +0200
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -26287,18 +26287,6 @@
 <!--F977FE65113F43B0ADD5D6BF3E4819A1-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--F977FE65113F43B0ADD5D6BF3E4819A1--></AD_MESSAGE>
 
-<!--F9BFC7160B3645CA95941E5276BAD3C0--><AD_MESSAGE>
-<!--F9BFC7160B3645CA95941E5276BAD3C0-->  <AD_MESSAGE_ID><![CDATA[F9BFC7160B3645CA95941E5276BAD3C0]]></AD_MESSAGE_ID>
-<!--F9BFC7160B3645CA95941E5276BAD3C0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--F9BFC7160B3645CA95941E5276BAD3C0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--F9BFC7160B3645CA95941E5276BAD3C0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--F9BFC7160B3645CA95941E5276BAD3C0-->  <VALUE><![CDATA[ChildAccountingRptElementCheck]]></VALUE>
-<!--F9BFC7160B3645CA95941E5276BAD3C0-->  <MSGTEXT><![CDATA[This accounting report element cannot be deleted because it has child accounting elements. Please, delete the child element first.]]></MSGTEXT>
-<!--F9BFC7160B3645CA95941E5276BAD3C0-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
-<!--F9BFC7160B3645CA95941E5276BAD3C0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--F9BFC7160B3645CA95941E5276BAD3C0-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
-<!--F9BFC7160B3645CA95941E5276BAD3C0--></AD_MESSAGE>
-
 <!--FA5C4E4CAED74DEFA58E298F8771E547--><AD_MESSAGE>
 <!--FA5C4E4CAED74DEFA58E298F8771E547-->  <AD_MESSAGE_ID><![CDATA[FA5C4E4CAED74DEFA58E298F8771E547]]></AD_MESSAGE_ID>
 <!--FA5C4E4CAED74DEFA58E298F8771E547-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_MODULE.xml	Wed Jul 01 14:47:16 2015 +0200
+++ b/src-db/database/sourcedata/AD_MODULE.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -6,7 +6,7 @@
 <!--0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0-->  <NAME><![CDATA[Core]]></NAME>
-<!--0-->  <VERSION><![CDATA[3.0.26933]]></VERSION>
+<!--0-->  <VERSION><![CDATA[3.0.27055]]></VERSION>
 <!--0-->  <DESCRIPTION><![CDATA[Core module is the base one]]></DESCRIPTION>
 <!--0-->  <HELP><![CDATA[Core module is the base one, all developments in core are included as part of the standard Openbravo ERP.]]></HELP>
 <!--0-->  <URL><![CDATA[www.openbravo.com]]></URL>
--- a/src-db/database/sourcedata/AD_TAB.xml	Wed Jul 01 14:47:16 2015 +0200
+++ b/src-db/database/sourcedata/AD_TAB.xml	Thu Jul 02 09:20:14 2015 +0200
@@ -16985,7 +16985,7 @@
 <!--9195CC43B5A4419195030A4DB17D8737-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--9195CC43B5A4419195030A4DB17D8737-->  <HQLWHERECLAUSE><![CDATA[COALESCE(e.goodsShipment.id, @MaterialMgmtShipmentInOut.id@) = @MaterialMgmtShipmentInOut.id@
 AND @MaterialMgmtShipmentInOut.businessPartner@ = e.orderLine.salesOrder.businessPartner.id
-AND e.pending <> 0 AND ad_org_isinnaturaltree(@MaterialMgmtShipmentInOut.organization@, e.storageBin.organization.id, @MaterialMgmtShipmentInOut.client@) = 'Y']]></HQLWHERECLAUSE>
+AND e.pending <> 0 AND (e.storageBin is null OR ad_org_isinnaturaltree(@MaterialMgmtShipmentInOut.organization@, (select organization.id from Locator a where a.id = e.storageBin.id), @MaterialMgmtShipmentInOut.client@) = 'Y')]]></HQLWHERECLAUSE>
 <!--9195CC43B5A4419195030A4DB17D8737-->  <HQLORDERBYCLAUSE><![CDATA[obSelected DESC, rMOrderNo, product]]></HQLORDERBYCLAUSE>
 <!--9195CC43B5A4419195030A4DB17D8737-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
 <!--9195CC43B5A4419195030A4DB17D8737-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
Binary file src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DatabaseVersionCheck.class has changed
Binary file src-util/buildvalidation/build/classes/org/openbravo/buildvalidation/DatabaseVersionCheckData.class has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-util/buildvalidation/src/org/openbravo/buildvalidation/DatabaseVersionCheck.java	Thu Jul 02 09:20:14 2015 +0200
@@ -0,0 +1,120 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2015 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s):  
+ *************************************************************************
+ */
+package org.openbravo.buildvalidation;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+import org.openbravo.buildvalidation.BuildValidation;
+import org.openbravo.database.ConnectionProvider;
+
+/**
+ * This validation prevents system to be built in unsupported database versions.
+ */
+public class DatabaseVersionCheck extends BuildValidation {
+  private static Logger log4j = Logger.getLogger(DatabaseVersionCheck.class);
+  private final static String POSTGRES = "PostgreSQL";
+  private final static String ORACLE = "Oracle";
+  private final static String MIN_PG_VERSION = "9.1";
+  private final static String MIN_ORA_VERSION = "11";
+  private final static String[] WARNING_PG_VERSIONS = {};
+  private final static String[] WARNING_ORA_VERSIONS = {};
+
+  @Override
+  public List<String> execute() {
+    ConnectionProvider cp = getConnectionProvider();
+    try {
+      if (cp.getRDBMS().equalsIgnoreCase("POSTGRE")) {
+        String postgresVersion = DatabaseVersionCheckData.getPostgresVersion(cp);
+        return checkDatabaseVersion(postgresVersion, MIN_PG_VERSION, WARNING_PG_VERSIONS, POSTGRES);
+      } else if (cp.getRDBMS().equalsIgnoreCase("ORACLE")) {
+        String oracleVersion = getVersion(DatabaseVersionCheckData.getOracleVersion(cp));
+        return checkDatabaseVersion(oracleVersion, MIN_ORA_VERSION, WARNING_ORA_VERSIONS, ORACLE);
+      } else {
+        return new ArrayList<String>();
+      }
+    } catch (Exception e) {
+      return handleError(e);
+    }
+  }
+
+  private ArrayList<String> checkDatabaseVersion(String databaseVersion, String minVersion,
+      String[] warningVersions, String databaseType) {
+    ArrayList<String> errors = new ArrayList<String>();
+    if (databaseVersion != null && !StringUtils.isEmpty(databaseVersion)) {
+      if (compareVersion(databaseVersion, minVersion) < 0) {
+        String msg1 = "The current " + databaseType + " database version (" + databaseVersion
+            + ") is not supported.";
+        String msg2 = "Please, visit the following link: http://wiki.openbravo.com/wiki/System_Requirements "
+            + "to check the list of supported versions.";
+        errors.add(msg1);
+        errors.add(msg2);
+      } else {
+        for (String version : warningVersions) {
+          if (compareVersion(databaseVersion, version) == 0) {
+            log4j
+                .warn("The current "
+                    + databaseType
+                    + " database version ("
+                    + databaseVersion
+                    + ") is not the recommended one. Please, visit the following link: http://wiki.openbravo.com/wiki/System_Requirements "
+                    + "to check the current recommended version.");
+            break;
+          }
+        }
+      }
+    }
+    return errors;
+  }
+
+  private int compareVersion(String v1, String v2) {
+    if (v1.equals(v2))
+      return 0;
+    final String[] version1 = v1.split("\\.");
+    final String[] version2 = v2.split("\\.");
+    final int minorVers = version1.length > version2.length ? version2.length : version1.length;
+    for (int i = 0; i < minorVers; i++) {
+      if (version1[i].equals(version2[i]))
+        continue;
+      try {
+        return new Integer(version1[i]).compareTo(new Integer(version2[i]));
+      } catch (NumberFormatException e) {
+        // Not possible to compare
+        return -1;
+      }
+    }
+    return 0;
+  }
+
+  private String getVersion(String str) {
+    String version = "";
+    if (str == null)
+      return "";
+    final Pattern pattern = Pattern.compile("((\\d+\\.)+)\\d+");
+    final Matcher matcher = pattern.matcher(str);
+    if (matcher.find()) {
+      version = matcher.group();
+    }
+    return version;
+  }
+}
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-util/buildvalidation/src/org/openbravo/buildvalidation/DatabaseVersionCheck_data.xsql	Thu Jul 02 09:20:14 2015 +0200
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2015 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+-->
+
+<SqlClass name="DatabaseVersionCheckData" package="org.openbravo.buildvalidation">
+  <SqlMethod name="getPostgresVersion" type="preparedStatement" return="String">
+      <Sql><![CDATA[
+         SELECT banner as version
+         FROM v$version
+          ]]>
+      </Sql>
+  </SqlMethod>
+  <SqlMethod name="getOracleVersion" type="preparedStatement" return="String">
+      <Sql><![CDATA[
+         SELECT banner as version
+         FROM v$version
+         WHERE banner LIKE '%Oracle%'
+          ]]>
+      </Sql>
+  </SqlMethod>
+</SqlClass>
\ No newline at end of file
Binary file src-util/modulescript/build/classes/org/openbravo/modulescript/UpdatePaymentBPClientDimension.class has changed
Binary file src-util/modulescript/build/classes/org/openbravo/modulescript/UpdatePaymentBPClientDimensionData.class has changed
Binary file src-util/modulescript/build/classes/org/openbravo/modulescript/UpdatePaymentPlan.class has changed
Binary file src-util/modulescript/build/classes/org/openbravo/modulescript/UpdatePaymentPlanData.class has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-util/modulescript/src/org/openbravo/modulescript/UpdatePaymentBPClientDimension.java	Thu Jul 02 09:20:14 2015 +0200
@@ -0,0 +1,41 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2015 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s):  ______________________________________.
+ *************************************************************************
+ */
+package org.openbravo.modulescript;
+
+import java.sql.PreparedStatement;
+import org.apache.log4j.Logger;
+
+import org.openbravo.database.ConnectionProvider;
+import org.openbravo.modulescript.ModuleScript;
+
+public class UpdatePaymentBPClientDimension extends ModuleScript {
+  private static final Logger log4j = Logger.getLogger(UpdatePaymentBPClientDimension.class);
+  public void execute() {
+    try {
+      ConnectionProvider cp = getConnectionProvider();
+      boolean isExecuted = UpdatePaymentBPClientDimensionData.isExecuted(cp);
+      if (!isExecuted) {
+        UpdatePaymentBPClientDimensionData.update(cp);
+        UpdatePaymentBPClientDimensionData.createPreference(cp);
+      }
+    } catch (Exception e) {
+      handleError(e);
+    }
+  }
+}
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-util/modulescript/src/org/openbravo/modulescript/UpdatePaymentBPClientDimension_data.xsql	Thu Jul 02 09:20:14 2015 +0200
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2015 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+-->
+<SqlClass name="UpdatePaymentBPClientDimensionData" package="org.openbravo.modulescript">
+   <SqlClassComment></SqlClassComment>  
+   <SqlMethod name="dummy" type="preparedStatement" return="multiple">
+    <SqlMethodComment></SqlMethodComment>
+    <Sql>
+      <![CDATA[
+      SELECT '' AS show_in_header FROM DUAL
+      ]]>
+    </Sql>
+    <Field name="rownum" value="count"/>
+  </SqlMethod> 
+  <SqlMethod name="update" type="preparedStatement" return="rowCount">
+    <SqlMethodComment></SqlMethodComment>
+    <Sql>
+      <![CDATA[
+        UPDATE AD_Client_AcctDimension
+        SET show_in_header = 'Y'
+        WHERE (docbasetype = 'ARR'
+        OR docbasetype = 'APP')
+        AND dimension = 'BP'
+        AND show_in_header = 'N'
+        AND ad_client_id IN (
+            SELECT ad_client_id
+            FROM ad_client
+            WHERE acctdim_centrally_maintained = 'Y'
+        )
+      ]]>
+    </Sql>
+  </SqlMethod>
+  <SqlMethod name="isExecuted" type="preparedStatement" return="boolean">
+    <SqlMethodComment></SqlMethodComment>
+    <Sql>
+      <![CDATA[
+        SELECT count(*) as exist
+        FROM DUAL
+        WHERE EXISTS (SELECT 1 FROM ad_preference
+                      WHERE attribute = 'PaymentBPClientDimensionUpdated')
+      ]]>
+    </Sql>
+  </SqlMethod>
+   <SqlMethod name="createPreference" type="preparedStatement" return="rowcount">
+      <SqlMethodComment></SqlMethodComment>
+       <Sql> 
+       <![CDATA[ 
+           INSERT INTO ad_preference (
+           ad_preference_id, ad_client_id, ad_org_id, isactive,
+           createdby, created, updatedby, updated,attribute
+           ) VALUES (
+           get_uuid(), '0', '0', 'Y', '0', NOW(), '0', NOW(),'PaymentBPClientDimensionUpdated')
+         ]]>
+        </Sql>
+   </SqlMethod>
+</SqlClass>
--- a/src-util/modulescript/src/org/openbravo/modulescript/UpdatePaymentPlan.java	Wed Jul 01 14:47:16 2015 +0200
+++ b/src-util/modulescript/src/org/openbravo/modulescript/UpdatePaymentPlan.java	Thu Jul 02 09:20:14 2015 +0200
@@ -31,7 +31,9 @@
       ConnectionProvider cp = getConnectionProvider();
       boolean isExecuted = UpdatePaymentPlanData.isExecuted(cp);
       if (!isExecuted) {
-        UpdatePaymentPlanData.update(cp);
+        for (UpdatePaymentPlanData record : UpdatePaymentPlanData.getWrongRecords(cp)) {
+          UpdatePaymentPlanData.update(cp, record.amount, record.amount, record.id);
+        }        
         UpdatePaymentPlanData.createPreference(cp);
       }
     } catch (Exception e) {
--- a/src-util/modulescript/src/org/openbravo/modulescript/UpdatePaymentPlan_data.xsql	Wed Jul 01 14:47:16 2015 +0200
+++ b/src-util/modulescript/src/org/openbravo/modulescript/UpdatePaymentPlan_data.xsql	Thu Jul 02 09:20:14 2015 +0200
@@ -23,29 +23,41 @@
     <SqlMethodComment></SqlMethodComment>
     <Sql>
       <![CDATA[
-      SELECT '' AS finpaymentscheduleid, '' AS paidamt FROM DUAL
+      SELECT '' AS id, '' AS amount FROM DUAL
       ]]>
     </Sql>
     <Field name="rownum" value="count"/>
   </SqlMethod>
+  <SqlMethod name="getWrongRecords" type="preparedStatement" return="multiple">
+    <SqlMethodComment></SqlMethodComment>
+    <Sql>
+      <![CDATA[
+        SELECT ps.fin_payment_schedule_id as id, sum(psd.amount + COALESCE(psd.writeoffamt, 0)) as amount
+        FROM fin_payment_scheduledetail psd
+        INNER JOIN fin_payment_schedule ps 
+        ON (ps.fin_payment_schedule_id = psd.fin_payment_schedule_order 
+        OR ps.fin_payment_schedule_id = psd.fin_payment_schedule_invoice)
+        WHERE psd.isinvoicepaid = 'Y'
+        AND psd.iscanceled = 'N' 
+        AND psd.fin_payment_detail_id IS NOT NULL
+        GROUP BY ps.fin_payment_schedule_id, ps.paidamt, ps.outstandingamt, ps.amount
+        HAVING (ps.paidamt <> sum(psd.amount + COALESCE(psd.writeoffamt, 0))
+        OR (ps.outstandingamt <> ps.amount - sum(psd.amount + COALESCE(psd.writeoffamt, 0))))
+      ]]>
+    </Sql>
+  </SqlMethod>
   <SqlMethod name="update" type="preparedStatement" return="rowCount">
     <SqlMethodComment></SqlMethodComment>
     <Sql>
       <![CDATA[
-     update fin_payment_schedule set outstandingamt = amount - (select sum(psd.amount)
-                                                                from fin_payment_scheduledetail psd
-                                                                where isinvoicepaid='Y'
-                                                                and psd.fin_payment_schedule_order = fin_payment_schedule.fin_payment_schedule_id),
-                                                     paidamt = (select sum(psd.amount)
-                                                                from fin_payment_scheduledetail psd
-                                                                where isinvoicepaid='Y'
-                                                                and psd.fin_payment_schedule_order = fin_payment_schedule.fin_payment_schedule_id)
-     WHERE fin_payment_schedule.paidamt/2 = (select sum(psd.amount)
-     from fin_payment_scheduledetail psd
-     where isinvoicepaid='Y'
-     and psd.fin_payment_schedule_order = fin_payment_schedule.fin_payment_schedule_id)
+        UPDATE fin_payment_schedule 
+        SET paidamt = to_number(?), outstandingamt = amount - to_number(?)
+        WHERE fin_payment_schedule_id = ?
       ]]>
-    </Sql>
+    </Sql>    
+    <Parameter name="amount1"/>
+    <Parameter name="amount2"/>
+    <Parameter name="id"/>
   </SqlMethod>
   <SqlMethod name="isExecuted" type="preparedStatement" return="boolean">
     <SqlMethodComment></SqlMethodComment>
@@ -54,7 +66,7 @@
         SELECT count(*) as exist
         FROM DUAL
         WHERE EXISTS (SELECT 1 FROM ad_preference
-                      WHERE attribute = 'PaymentPlanUpdatedV3')
+                      WHERE attribute = 'PaymentPlanUpdatedV4')
       ]]>
     </Sql>
   </SqlMethod>
@@ -66,7 +78,7 @@
            ad_preference_id, ad_client_id, ad_org_id, isactive,
            createdby, created, updatedby, updated,attribute
            ) VALUES (
-           get_uuid(), '0', '0', 'Y', '0', NOW(), '0', NOW(),'PaymentPlanUpdatedV3')
+           get_uuid(), '0', '0', 'Y', '0', NOW(), '0', NOW(),'PaymentPlanUpdatedV4')
          ]]>
         </Sql>
    </SqlMethod>
--- a/src/org/openbravo/configuration/ConfigurationApp.java	Wed Jul 01 14:47:16 2015 +0200
+++ b/src/org/openbravo/configuration/ConfigurationApp.java	Thu Jul 02 09:20:14 2015 +0200
@@ -32,6 +32,7 @@
 import java.util.Scanner;
 
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.SystemUtils;
 import org.apache.tools.ant.Project;
 
 /**
@@ -48,7 +49,7 @@
   private static List<ConfigureOption> optionForOpenbravo = new ArrayList<ConfigureOption>();
   private static Map<String, String> replaceProperties = new HashMap<String, String>();
 
-  private final static String BASEDIR = System.getProperty("user.dir");
+  private final static String BASEDIR = getUserDir();
   private final static String BASEDIR_CONFIG = BASEDIR + "/config/";
   private final static String SUFFIX_AUX = ".aux";
   private final static String OPENBRAVO_PROPERTIES = BASEDIR_CONFIG + "Openbravo.properties";
@@ -781,7 +782,7 @@
         replaceProperties.put(PREFIX_CONTEXT_URL, optionFirstForReplace.getChosenOption());
       }
     }
-    replaceProperties.put(PREFIX_SOURCE_PATH, System.getProperty("user.dir"));
+    replaceProperties.put(PREFIX_SOURCE_PATH, getUserDir());
 
     if (dateFormat.substring(0, 1).equals("D")) {
       replaceProperties.put(PREFIX_DATE_FORMAT_JAVA, "dd" + dateSeparator + "MM" + dateSeparator
@@ -943,7 +944,7 @@
 
   /**
    * This method delete a File:filePath and rename File:fileAuxPath to File:filePath
-   *
+   * 
    * @param filePath
    *          file to delete
    * @param fileAuxPath
@@ -963,7 +964,7 @@
   /**
    * This method replace a value changeOption in addressFilePath. FileR is used to check that exists
    * searchOption with different value.
-   *
+   * 
    * @param fileR
    *          old file to read
    * @param addressFilePath
@@ -1007,14 +1008,14 @@
    * This method replaceGeneralProperty(...) replaces in addressFilePath the value in any option
    * searchOption with value changeOption. Concatenated searchOption+changeOption. For example:
    * "bbdd.user=" + "admin".
-   *
+   * 
    * @param addressFilePath
    *          Replace in this file
    * @param searchOption
    *          Prefix to search
    * @param changeOption
    *          Value to write in addressFilePath
-   *
+   * 
    */
   private static void replaceGeneralProperty(String addressFilePath, String searchOption,
       String changeOption, Project p) {
@@ -1511,4 +1512,17 @@
       }
     }
   }
+
+  /**
+   * This function returns the user.dir directory replacing backslashes for the case of Windows
+   * operative systems.
+   * 
+   */
+  private static String getUserDir() {
+    String userDir = System.getProperty("user.dir");
+    if (SystemUtils.IS_OS_WINDOWS) {
+      userDir = userDir.replace("\\", "/");
+    }
+    return userDir;
+  }
 }
\ No newline at end of file
--- a/src/org/openbravo/costing/CostingAlgorithmAdjustmentImp.java	Wed Jul 01 14:47:16 2015 +0200
+++ b/src/org/openbravo/costing/CostingAlgorithmAdjustmentImp.java	Thu Jul 02 09:20:14 2015 +0200
@@ -446,6 +446,14 @@
     BigDecimal adjAmt = BigDecimal.ZERO;
     TrxType calTrxType = TrxType.getTrxType(costAdjLine.getInventoryTransaction());
 
+    if (costAdjLine.getInventoryTransaction().isCostPermanent() && costAdjLine.isUnitCost()) {
+      costAdjLine.setCurrency((Currency) OBDal.getInstance().getProxy(Currency.ENTITY_NAME,
+          strCostCurrencyId));
+      costAdjLine.setAdjustmentAmount(BigDecimal.ZERO);
+      OBDal.getInstance().save(costAdjLine);
+      return;
+    }
+
     // Incoming transactions does not modify the calculated cost
     switch (calTrxType) {
     case ShipmentVoid:
--- a/src/org/openbravo/costing/CostingBackground.java	Wed Jul 01 14:47:16 2015 +0200
+++ b/src/org/openbravo/costing/CostingBackground.java	Thu Jul 02 09:20:14 2015 +0200
@@ -112,6 +112,7 @@
               trxId);
           if ("S".equals(transaction.getCostingStatus())) {
             // Do not calculate trx in skip status.
+            transaction.setProcessed(true);
             continue;
           }
           log4j.debug("Start transaction process: " + transaction.getId());
@@ -211,7 +212,7 @@
     where.append(" join trx." + MaterialTransaction.PROPERTY_PRODUCT + " as p");
     where.append("\n , " + org.openbravo.model.ad.domain.List.ENTITY_NAME + " as trxtype");
     where.append("\n where trx." + MaterialTransaction.PROPERTY_ISPROCESSED + " = false");
-    where.append("   and trx." + MaterialTransaction.PROPERTY_ISCOSTCALCULATED + " = false");
+    where.append("   and trx." + MaterialTransaction.PROPERTY_COSTINGSTATUS + " <> 'S'");
     where.append("   and p." + Product.PROPERTY_PRODUCTTYPE + " = 'I'");
     where.append("   and p." + Product.PROPERTY_STOCKED + " = true");
     where.append("   and trxtype." + CostAdjustmentUtils.propADListReference + ".id = :refid");
@@ -246,7 +247,7 @@
     where.append(" join trx." + MaterialTransaction.PROPERTY_PRODUCT + " as p");
     where.append("\n , " + org.openbravo.model.ad.domain.List.ENTITY_NAME + " as trxtype");
     where.append("\n where trx." + MaterialTransaction.PROPERTY_ISPROCESSED + " = false");
-    where.append("   and trx." + MaterialTransaction.PROPERTY_ISCOSTCALCULATED + " = false");
+    where.append("   and trx." + MaterialTransaction.PROPERTY_COSTINGSTATUS + " <> 'S'");
     where.append("   and p." + Product.PROPERTY_PRODUCTTYPE + " = 'I'");
     where.append("   and p." + Product.PROPERTY_STOCKED + " = true");
     where.append("   and trxtype." + CostAdjustmentUtils.propADListReference + ".id = :refid");
--- a/src/org/openbravo/erpCommon/ad_forms/AcctServer.java	Wed Jul 01 14:47:16 2015 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/AcctServer.java	Thu Jul 02 09:20:14 2015 +0200
@@ -1115,6 +1115,8 @@
         setMessageResult(OBMessageUtils.translateError(strMessageError));
         if ("@NotConvertible@".equals(strMessageError)) {
           return STATUS_NotConvertible;
+        } else if (StringUtils.equals(strMessageError, "@PeriodNotAvailable@")) {
+          return STATUS_PeriodClosed;
         }
       }
       return STATUS_Error;
--- a/src/org/openbravo/erpCommon/ad_forms/DocInvoice.java	Wed Jul 01 14:47:16 2015 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/DocInvoice.java	Thu Jul 02 09:20:14 2015 +0200
@@ -28,6 +28,7 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
+import org.openbravo.base.exception.OBException;
 import org.openbravo.base.secureApp.VariablesSecureApp;
 import org.openbravo.client.kernel.RequestContext;
 import org.openbravo.dal.core.OBContext;
@@ -1194,7 +1195,7 @@
             DocumentType, AD_Org_ID, OBDateUtils.formatDate(period.getEndingDate()));
         if ("".equals(data[0].period)) {
           setStatus(STATUS_PeriodClosed);
-          throw new IllegalStateException("DocInvoice - Error getting next year period");
+          throw new OBException("@PeriodNotAvailable@");
         }
       } catch (ServletException e) {
         log4j.warn("DocInvoice - Error checking period open.", e);
--- a/src/org/openbravo/erpCommon/security/Login.html	Wed Jul 01 14:47:16 2015 +0200
+++ b/src/org/openbravo/erpCommon/security/Login.html	Thu Jul 02 09:20:14 2015 +0200
@@ -43,12 +43,12 @@
 
 <script language="JavaScript" type="text/javascript">
 var validBrowserFirefox = '31.0.0.0';
-var validBrowserChrome = '40.0.0.0';
+var validBrowserChrome = '42.0.0.0';
 var validBrowserExplorer = '9.0.0.0';
 var validBrowserSafari = '7.0.0.0';
 
-var recBrowserFirefox = '31.0.0.0';
-var recBrowserChrome = '41.0.0.0';
+var recBrowserFirefox = '38.0.0.0';
+var recBrowserChrome = '43.0.0.0';
 var recBrowserExplorer = '11.0.0.0';
 var recBrowserSafari = '8.0.0.0';
 </script>
--- a/src/org/openbravo/erpCommon/utility/DateTime_data.xsql	Wed Jul 01 14:47:16 2015 +0200
+++ b/src/org/openbravo/erpCommon/utility/DateTime_data.xsql	Thu Jul 02 09:20:14 2015 +0200
@@ -44,6 +44,13 @@
       <Parameter name="fecha"/>
       <Parameter name="dias"/>
    </SqlMethod>
+   <SqlMethod name="now" type="preparedStatement" return="String">
+      <SqlMethodComment></SqlMethodComment>
+      <Sql>
+        SELECT TO_CHAR(now(),?) AS now FROM DUAL
+      </Sql>
+      <Parameter name="formatPattern"/>
+   </SqlMethod>
    <SqlMethod name="compare" type="preparedStatement" return="String">
       <SqlMethodComment></SqlMethodComment>
       <Sql>
--- a/src/org/openbravo/erpCommon/utility/Utility.java	Wed Jul 01 14:47:16 2015 +0200
+++ b/src/org/openbravo/erpCommon/utility/Utility.java	Thu Jul 02 09:20:14 2015 +0200
@@ -1872,6 +1872,7 @@
    *          a String
    * @return true if the string can be parsed
    */
+  @SuppressWarnings("unused")
   public static boolean isBigDecimal(String str) {
     try {
       new BigDecimal(str.trim());
--- a/src/org/openbravo/event/PaidStatusEventHandler.java	Wed Jul 01 14:47:16 2015 +0200
+++ b/src/org/openbravo/event/PaidStatusEventHandler.java	Thu Jul 02 09:20:14 2015 +0200
@@ -11,7 +11,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) 2014-2015 Openbravo SLU
+ * All portions are Copyright (C) 2014 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  *************************************************************************
@@ -72,8 +72,7 @@
             for (FIN_PaymentScheduleDetail psd : pd.getFINPaymentScheduleDetailList()) {
               invoicePaidold = psd.isInvoicePaid();
               if (!invoicePaidold) {
-                if (newStatus.equals(transaction.getFinPayment().getStatus())
-                    && psd.getInvoicePaymentSchedule() != null) {
+                if (newStatus.equals(transaction.getFinPayment().getStatus())) {
                   psd.setInvoicePaid(true);
                 }
                 if (psd.isInvoicePaid()) {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/openbravo/event/RoleEventHandler.java	Thu Jul 02 09:20:14 2015 +0200
@@ -0,0 +1,173 @@
+/*
+ *************************************************************************
+ * 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) 2015 Openbravo SLU 
+ * All Rights Reserved. 
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+ */
+package org.openbravo.event;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.enterprise.event.Observes;
+
+import org.apache.commons.lang.StringUtils;
+import org.hibernate.ScrollMode;
+import org.hibernate.ScrollableResults;
+import org.hibernate.criterion.Restrictions;
+import org.openbravo.base.model.Entity;
+import org.openbravo.base.model.ModelProvider;
+import org.openbravo.base.model.Property;
+import org.openbravo.base.provider.OBProvider;
+import org.openbravo.client.kernel.event.EntityNewEvent;
+import org.openbravo.client.kernel.event.EntityPersistenceEventObserver;
+import org.openbravo.dal.service.OBCriteria;
+import org.openbravo.dal.service.OBDal;
+import org.openbravo.model.ad.access.Role;
+import org.openbravo.model.ad.access.RoleOrganization;
+import org.openbravo.model.common.enterprise.Organization;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class RoleEventHandler extends EntityPersistenceEventObserver {
+  private static final String InitialOrgSetup_CLASSNAME = "org.openbravo.erpCommon.businessUtility.InitialOrgSetup";
+  private static final String InitialClientSetup_CLASSNAME = "org.openbravo.erpCommon.businessUtility.InitialClientSetup";
+
+  private static Entity[] entities = { ModelProvider.getInstance().getEntity(Role.ENTITY_NAME) };
+
+  protected Logger logger = LoggerFactory.getLogger(RoleEventHandler.class);
+
+  @Override
+  protected Entity[] getObservedEntities() {
+    return entities;
+  }
+
+  public void onNew(@Observes
+  EntityNewEvent event) {
+    if (!isValidEvent(event)) {
+      return;
+    }
+
+    final Entity roleEntity = ModelProvider.getInstance().getEntity(Role.class);
+    final Property roleProperty = roleEntity.getProperty(Role.PROPERTY_ADROLEORGANIZATIONLIST);
+    final Role role = (Role) event.getTargetInstance();
+
+    populateOrgAccess(event, role, roleProperty);
+  }
+
+  /**
+   * Creates the necessary Org Access records only when the role is set Manual=N and when we don't
+   * come from the Initial Client/Organization setup
+   */
+  private void populateOrgAccess(EntityNewEvent event, Role role, Property roleProperty) {
+    // Create org access for new automatic role
+    try {
+      if (!role.isManual() && !isComingFromInitialClientOrganizationSetup()) {
+        List<RoleOrganization> roleOrganizationList = getRoleOrganizationList(role);
+        @SuppressWarnings("unchecked")
+        final List<Object> roleOrganizations = (List<Object>) event.getCurrentState(roleProperty);
+        roleOrganizations.addAll(roleOrganizationList);
+      }
+    } catch (Exception e) {
+      logger
+          .error("Error in RoleEventHandler while inserting Org Access to role " + role.getName());
+    }
+  }
+
+  // Get org access list
+  private List<RoleOrganization> getRoleOrganizationList(Role role) throws Exception {
+    List<RoleOrganization> roleOrganizationList = new ArrayList<RoleOrganization>();
+
+    // Client or System level: Only * [isOrgAdmin=N]
+    if (StringUtils.equals(role.getUserLevel(), " C")
+        || StringUtils.equals(role.getUserLevel(), "S")) {
+      roleOrganizationList.add(getRoleOrganization(role,
+          OBDal.getInstance().get(Organization.class, "0"), false));
+      logger.debug("Added organization * to role " + role.getName());
+    }
+
+    // Client/Organization level: * [isOrgAdmin=N], other Orgs (but *) [isOrgAdmin=Y]
+    else if (StringUtils.equals(role.getUserLevel(), " CO")) {
+      roleOrganizationList.add(getRoleOrganization(role,
+          OBDal.getInstance().get(Organization.class, "0"), false));
+      logger.debug("Added organization * to role " + role.getName());
+
+      OBCriteria<Organization> criteria = OBDal.getInstance().createCriteria(Organization.class);
+      criteria.add(Restrictions.eq(Organization.PROPERTY_CLIENT, role.getClient()));
+      criteria.add(Restrictions.ne(Organization.PROPERTY_ID, "0"));
+      ScrollableResults scroll = criteria.scroll(ScrollMode.FORWARD_ONLY);
+      try {
+        while (scroll.next()) {
+          final Organization organization = (Organization) scroll.get()[0];
+          roleOrganizationList.add(getRoleOrganization(role, organization, true));
+          logger.debug("Added organization " + organization.getName() + " to role "
+              + role.getName());
+        }
+      } finally {
+        scroll.close();
+      }
+    }
+
+    // Organization level: Orgs (but *) [isOrgAdmin=Y]
+    else if (StringUtils.equals(role.getUserLevel(), "  O")) {
+      OBCriteria<Organization> criteria = OBDal.getInstance().createCriteria(Organization.class);
+      criteria.add(Restrictions.eq(Organization.PROPERTY_CLIENT, role.getClient()));
+      ScrollableResults scroll = criteria.scroll(ScrollMode.FORWARD_ONLY);
+      try {
+        while (scroll.next()) {
+          final Organization organization = (Organization) scroll.get()[0];
+          roleOrganizationList.add(getRoleOrganization(role, organization, true));
+          logger.debug("Added organization " + organization.getName() + " to role "
+              + role.getName());
+        }
+      } finally {
+        scroll.close();
+      }
+    }
+
+    return roleOrganizationList;
+  }
+
+  // Get org access
+  private RoleOrganization getRoleOrganization(Role role, Organization orgProvided,
+      boolean isOrgAdmin) throws Exception {
+    final RoleOrganization newRoleOrganization = OBProvider.getInstance().get(
+        RoleOrganization.class);
+    newRoleOrganization.setClient(role.getClient());
+    newRoleOrganization.setOrganization(orgProvided);
+    newRoleOrganization.setRole(role);
+    newRoleOrganization.setOrgAdmin(isOrgAdmin);
+    return newRoleOrganization;
+  }
+
+  /**
+   * Returns true if the Initial Client/Organization Setup is in the stack trace
+   */
+  private boolean isComingFromInitialClientOrganizationSetup() {
+    boolean comeFrom_ICS_IOS = false;
+    for (final StackTraceElement ste : Thread.currentThread().getStackTrace()) {
+      final String clazz = ste.getClassName();
+      if (StringUtils.equals(clazz, InitialOrgSetup_CLASSNAME)
+          || StringUtils.equals(clazz, InitialClientSetup_CLASSNAME)) {
+        comeFrom_ICS_IOS = true;
+        logger
+            .debug("Coming from Initial Client/Organization Setup. RoleEventHandler will not insert Org Access records");
+        break;
+      }
+    }
+    return comeFrom_ICS_IOS;
+  }
+
+}
\ No newline at end of file