CI: promote changesets from pi to main
authorRM packaging bot <staff.rm@openbravo.com>
Sun, 01 Apr 2012 20:25:01 +0200
changeset 15783 640de9acc2d5
parent 15719 6816181a56e7 (current diff)
parent 15782 7b464c37ef2b (diff)
child 15997 aed65e62a3b3
CI: promote changesets from pi to main
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-date.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_ELEMENT.xml
src-db/database/sourcedata/AD_FIELD.xml
src-db/database/sourcedata/AD_MODULE.xml
--- a/.hgignore	Thu Mar 29 16:27:58 2012 +0000
+++ b/.hgignore	Sun Apr 01 20:25:01 2012 +0200
@@ -24,6 +24,7 @@
 config/setup*
 config/checksums
 config/instance.revision
+config/eclipse/hibernate.cfg.xml
 src/result.xml
 
 src-db/database/lib/dbmanager.jar
--- a/build.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/build.xml	Sun Apr 01 20:25:01 2012 +0200
@@ -1066,11 +1066,18 @@
       <arg value="id"/>
       <arg value="-n"/>
     </exec>
-    <taskdef name="CoreRevision" classname="org.openbravo.erpCommon.utility.CalculateCoreRevision">
-            <classpath refid="project.class.path" />
-          </taskdef>
-
-    <CoreRevision hgRevNo="${hg.idno}" revision="core.rev"/>
+        <propertyfile file="currentRevision.tmp">
+          <entry key="core.rev" value="3.0.${hg.idno}"/>
+        </propertyfile>
+        <replaceregexp file="currentRevision.tmp"
+                       match="\+"
+                       replace=""
+                       byline="true"
+        />
+        <loadproperties> 
+          <file file="currentRevision.tmp"/> 
+        </loadproperties>
+        <delete file="currentRevision.tmp"/>
   </target>
   
   <target name="set.version.from.file" if="xml.core.rev">
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_TAX_PAYMENT.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_TAX_PAYMENT.xml	Sun Apr 01 20:25:01 2012 +0200
@@ -30,8 +30,11 @@
 p_result NUMBER;
 
 v_TaxPaymentName VARCHAR2(60);
+v_FinancialAccountName VARCHAR2(60);
+V_PaymentMethodName VARCHAR2(60);
 v_GLItemName VARCHAR2(60);
 v_ResultStr VARCHAR2(2000):='';
+v_FinancialAccountCurrency_ID VARCHAR2(32);
 v_FIN_PAYMENT_ID FIN_PAYMENT.FIN_PAYMENT_ID%TYPE;
 v_PaymentDocType_ID FIN_PAYMENT.C_DOCTYPE_ID%TYPE;
 v_PaymentDocumentNo FIN_PAYMENT.DOCUMENTNO%TYPE;
@@ -51,6 +54,8 @@
 v_Processed CHAR(1);
 v_Posted CHAR(1);
 v_Count NUMBER;
+v_PAYIN_ISMULTICURRENCY CHAR(1);
+v_PAYOUT_ISMULTICURRENCY CHAR(1);
 
 TYPE RECORD IS REF CURSOR;
 Cur_Params RECORD;
@@ -115,6 +120,21 @@
     IF(v_PaymentMethod_ID IS NULL) THEN
       RAISE_APPLICATION_ERROR(-20000, '@APRM_PAYMENTMETHOD_MISSING@');
     END IF;
+    
+    SELECT FFA.C_CURRENCY_ID, FFP.PAYIN_ISMULTICURRENCY, FFP.PAYOUT_ISMULTICURRENCY, FFA.NAME, FPM.NAME
+    INTO v_FinancialAccountCurrency_ID, v_PAYIN_ISMULTICURRENCY, v_PAYOUT_ISMULTICURRENCY, v_FinancialAccountName, v_PaymentMethodName
+    FROM FIN_FINANCIAL_ACCOUNT FFA LEFT JOIN FIN_FINACC_PAYMENTMETHOD FFP ON FFA.FIN_FINANCIAL_ACCOUNT_ID=FFP.FIN_FINANCIAL_ACCOUNT_ID
+		LEFT JOIN FIN_PAYMENTMETHOD FPM ON FPM.FIN_PAYMENTMETHOD_ID = FFP.FIN_PAYMENTMETHOD_ID
+    WHERE FFA.FIN_FINANCIAL_ACCOUNT_ID=v_Financial_Account_ID AND FFP.FIN_PAYMENTMETHOD_ID=v_PaymentMethod_ID;
+
+    IF (v_Currency_id <> v_FinancialAccountCurrency_ID) THEN
+	IF(p_isreceipt = 'Y' AND v_PAYIN_ISMULTICURRENCY = 'N') THEN
+	  RAISE_APPLICATION_ERROR(-20000, '@APRM_INMULTICURRENCYNOTSUPPORTED@' || ' ' || v_PaymentMethodName || ', ' || '@APRM_INFINANCIALACCOUNT@' || ' ' || v_FinancialAccountName || '.');
+	ELSIF (p_isreceipt = 'N' AND v_PAYOUT_ISMULTICURRENCY = 'N') THEN
+          RAISE_APPLICATION_ERROR(-20000, '@APRM_OUTMULTICURRENCYNOTSUPPORTED@' || ' ' || v_PaymentMethodName || ', ' || '@APRM_INFINANCIALACCOUNT@' || ' ' || v_FinancialAccountName || '.');
+	END IF;
+    END IF;
+
     INSERT INTO fin_payment(
       fin_payment_id, ad_client_id, ad_org_id, created, createdby, 
       updated, updatedby, isactive, isreceipt, c_bpartner_id, paymentdate, 
@@ -124,7 +144,7 @@
       processed, processing, posted, description, 
       fin_financial_account_id, c_doctype_id, c_project_id, c_campaign_id, 
       c_activity_id, user1_id, user2_id, em_aprm_process_payment, em_aprm_reconcile_payment, 
-      em_aprm_add_scheduledpayments)
+      em_aprm_add_scheduledpayments,finacc_txn_convert_rate,finacc_txn_amount)
     VALUES (v_FIN_PAYMENT_ID, v_client_id, v_org_id, now(), p_user, 
       now(), p_user, 'Y', p_isreceipt, v_bpartner_id, v_date, 
       v_currency_id, p_amount, 0, v_PaymentMethod_ID, v_PaymentDocumentNo, 
@@ -136,7 +156,8 @@
       END,
       'N', 'N', 'N', 'GL Item: '|| v_GLItemName || 'n' || 'Tax Payment: '|| v_TaxPaymentName, 
       v_Financial_Account_ID, v_PaymentDocType_ID, NULL, NULL, 
-      NULL, NULL, NULL, 'N', 'N', 'N');
+      NULL, NULL, NULL, 'N', 'N', 'N',1,p_amount);
+    
     v_FIN_PAYMENT_DETAIL_ID := GET_UUID();
     INSERT INTO fin_payment_detail(
       fin_payment_detail_id, ad_client_id, ad_org_id, created, createdby, 
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml	Sun Apr 01 20:25:01 2012 +0200
@@ -540,6 +540,17 @@
 <!--9C50BA94A0294449A16B26A91F8F06C4-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--9C50BA94A0294449A16B26A91F8F06C4--></AD_MESSAGE>
 
+<!--9CFC61CBF0C84814B6DB7729427A2E38--><AD_MESSAGE>
+<!--9CFC61CBF0C84814B6DB7729427A2E38-->  <AD_MESSAGE_ID><![CDATA[9CFC61CBF0C84814B6DB7729427A2E38]]></AD_MESSAGE_ID>
+<!--9CFC61CBF0C84814B6DB7729427A2E38-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9CFC61CBF0C84814B6DB7729427A2E38-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9CFC61CBF0C84814B6DB7729427A2E38-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9CFC61CBF0C84814B6DB7729427A2E38-->  <VALUE><![CDATA[APRM_INFINANCIALACCOUNT]]></VALUE>
+<!--9CFC61CBF0C84814B6DB7729427A2E38-->  <MSGTEXT><![CDATA[in the Financial Account]]></MSGTEXT>
+<!--9CFC61CBF0C84814B6DB7729427A2E38-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--9CFC61CBF0C84814B6DB7729427A2E38-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--9CFC61CBF0C84814B6DB7729427A2E38--></AD_MESSAGE>
+
 <!--A0F2DD5EF309448084FB6F3F44B59798--><AD_MESSAGE>
 <!--A0F2DD5EF309448084FB6F3F44B59798-->  <AD_MESSAGE_ID><![CDATA[A0F2DD5EF309448084FB6F3F44B59798]]></AD_MESSAGE_ID>
 <!--A0F2DD5EF309448084FB6F3F44B59798-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -716,6 +727,17 @@
 <!--C36865A47B99485980CC8B56AAF59057-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--C36865A47B99485980CC8B56AAF59057--></AD_MESSAGE>
 
+<!--C5133F7FD55D4AF6B8B7FB527BFB9920--><AD_MESSAGE>
+<!--C5133F7FD55D4AF6B8B7FB527BFB9920-->  <AD_MESSAGE_ID><![CDATA[C5133F7FD55D4AF6B8B7FB527BFB9920]]></AD_MESSAGE_ID>
+<!--C5133F7FD55D4AF6B8B7FB527BFB9920-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C5133F7FD55D4AF6B8B7FB527BFB9920-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C5133F7FD55D4AF6B8B7FB527BFB9920-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C5133F7FD55D4AF6B8B7FB527BFB9920-->  <VALUE><![CDATA[APRM_OUTMULTICURRENCYNOTSUPPORTED]]></VALUE>
+<!--C5133F7FD55D4AF6B8B7FB527BFB9920-->  <MSGTEXT><![CDATA[Making Payments in other currencies is not allowed for the Payment Mehod]]></MSGTEXT>
+<!--C5133F7FD55D4AF6B8B7FB527BFB9920-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--C5133F7FD55D4AF6B8B7FB527BFB9920-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--C5133F7FD55D4AF6B8B7FB527BFB9920--></AD_MESSAGE>
+
 <!--D374CA8D2FF541E5BF1149FCFDAEED86--><AD_MESSAGE>
 <!--D374CA8D2FF541E5BF1149FCFDAEED86-->  <AD_MESSAGE_ID><![CDATA[D374CA8D2FF541E5BF1149FCFDAEED86]]></AD_MESSAGE_ID>
 <!--D374CA8D2FF541E5BF1149FCFDAEED86-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -815,6 +837,17 @@
 <!--EFA31753A0BB4C4AB3E6BC741FEE811E-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--EFA31753A0BB4C4AB3E6BC741FEE811E--></AD_MESSAGE>
 
+<!--F0BBB5C1155F46378B6FF74A8F561046--><AD_MESSAGE>
+<!--F0BBB5C1155F46378B6FF74A8F561046-->  <AD_MESSAGE_ID><![CDATA[F0BBB5C1155F46378B6FF74A8F561046]]></AD_MESSAGE_ID>
+<!--F0BBB5C1155F46378B6FF74A8F561046-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F0BBB5C1155F46378B6FF74A8F561046-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F0BBB5C1155F46378B6FF74A8F561046-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F0BBB5C1155F46378B6FF74A8F561046-->  <VALUE><![CDATA[APRM_INMULTICURRENCYNOTSUPPORTED]]></VALUE>
+<!--F0BBB5C1155F46378B6FF74A8F561046-->  <MSGTEXT><![CDATA[Receiving Payments in other currencies is not allowed for the Payment Mehod]]></MSGTEXT>
+<!--F0BBB5C1155F46378B6FF74A8F561046-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--F0BBB5C1155F46378B6FF74A8F561046-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--F0BBB5C1155F46378B6FF74A8F561046--></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	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Sun Apr 01 20:25:01 2012 +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.15716]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.15749]]></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>
@@ -25,7 +25,7 @@
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <UPDATEINFO><![CDATA[Fixed issue with document sequence numbers reset in case of applying dataset second time.
 Fixed issue 15305.]]></UPDATEINFO>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <REFERENCEDATAINFO><![CDATA[Document types and default algorithm for bank statement auto matching]]></REFERENCEDATAINFO>
-<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION_LABEL><![CDATA[MP9]]></VERSION_LABEL>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--A918E3331C404B889D69AA9BFAFB23AC--></AD_MODULE>
 
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Apr 01 20:25:01 2012 +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.15716]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.15749]]></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.15716]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->  <STARTVERSION><![CDATA[3.0.15749]]></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.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Sun Apr 01 20:25:01 2012 +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.15716]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.15749]]></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>
@@ -22,7 +22,7 @@
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <UPDATEINFO><![CDATA[Bug fixing.]]></UPDATEINFO>
-<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION_LABEL><![CDATA[MP9]]></VERSION_LABEL>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--C70732EA90A14EC0916078B85CC33D2D--></AD_MODULE>
 
--- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Apr 01 20:25:01 2012 +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.15716]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.15749]]></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_FIELD.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml	Sun Apr 01 20:25:01 2012 +0200
@@ -1944,7 +1944,7 @@
 <!--87DDE03149A94326BE55DC158625D244-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--87DDE03149A94326BE55DC158625D244-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--87DDE03149A94326BE55DC158625D244-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--87DDE03149A94326BE55DC158625D244-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--87DDE03149A94326BE55DC158625D244-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--87DDE03149A94326BE55DC158625D244-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--87DDE03149A94326BE55DC158625D244-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--87DDE03149A94326BE55DC158625D244-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
@@ -2430,7 +2430,7 @@
 <!--B79252A201AA41C091F9498DF820A0AC-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--B79252A201AA41C091F9498DF820A0AC-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--B79252A201AA41C091F9498DF820A0AC-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--B79252A201AA41C091F9498DF820A0AC-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--B79252A201AA41C091F9498DF820A0AC-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--B79252A201AA41C091F9498DF820A0AC-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--B79252A201AA41C091F9498DF820A0AC-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--B79252A201AA41C091F9498DF820A0AC-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Sun Apr 01 20:25:01 2012 +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.15716]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.15749]]></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>
@@ -22,7 +22,7 @@
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <UPDATEINFO><![CDATA[Styling bugfixing]]></UPDATEINFO>
-<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION_LABEL><![CDATA[MP9]]></VERSION_LABEL>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--9BA0836A3CD74EE4AB48753A47211BCC--></AD_MODULE>
 
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Apr 01 20:25:01 2012 +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.15716]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.15749]]></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.15716]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->  <STARTVERSION><![CDATA[2.1.15749]]></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.15716]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->  <STARTVERSION><![CDATA[3.0.15749]]></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.15716]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->  <STARTVERSION><![CDATA[8.1.15749]]></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/AlertActionHandler.java	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/AlertActionHandler.java	Sun Apr 01 20:25:01 2012 +0200
@@ -11,16 +11,16 @@
  * under the License. 
  * The Original Code is Openbravo ERP. 
  * The Initial Developer of the Original Code is Openbravo SLU 
- * All portions are Copyright (C) 2009-2011 Openbravo SLU 
+ * All portions are Copyright (C) 2009-2012 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
  */
 package org.openbravo.client.application;
 
-import java.util.ArrayList;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
 import java.util.Date;
-import java.util.List;
 import java.util.Map;
 
 import javax.enterprise.context.ApplicationScoped;
@@ -29,11 +29,8 @@
 import javax.servlet.http.HttpSession;
 
 import org.apache.log4j.Logger;
-import org.codehaus.jettison.json.JSONArray;
 import org.codehaus.jettison.json.JSONObject;
 import org.hibernate.Query;
-import org.hibernate.SQLQuery;
-import org.hibernate.exception.SQLGrammarException;
 import org.openbravo.base.secureApp.VariablesSecureApp;
 import org.openbravo.client.kernel.BaseActionHandler;
 import org.openbravo.client.kernel.RequestContext;
@@ -42,11 +39,9 @@
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.erpCommon.utility.UsedByLink;
 import org.openbravo.model.ad.access.Session;
-import org.openbravo.model.ad.alert.Alert;
 import org.openbravo.model.ad.alert.AlertRecipient;
 import org.openbravo.model.ad.alert.AlertRule;
-import org.openbravo.service.json.DataResolvingMode;
-import org.openbravo.service.json.DataToJsonConverter;
+import org.openbravo.service.db.DalConnectionProvider;
 import org.openbravo.service.json.JsonConstants;
 
 /**
@@ -70,6 +65,7 @@
    */
   @Override
   public void execute() {
+    final long t = System.currentTimeMillis();
     OBContext.setAdminMode();
     try {
       final HttpServletRequest request = RequestContext.get().getRequest();
@@ -95,39 +91,45 @@
       final Query qry = OBDal.getInstance().getSession().createQuery(hql);
       qry.setParameter(0, OBContext.getOBContext().getUser().getId());
       qry.setParameter(1, OBContext.getOBContext().getRole().getId());
-      final JSONObject result = new JSONObject();
-      final List<JSONObject> alertJsonObjects = new ArrayList<JSONObject>();
+
+      Long total = 0L;
       for (Object o : qry.list()) {
         final AlertRule alertRule = (AlertRule) o;
         final String whereClause = new UsedByLink().getWhereClause(vars, "",
             alertRule.getFilterClause() == null ? "" : alertRule.getFilterClause());
-        final String sql = "select * from AD_ALERT where COALESCE(to_char(STATUS), 'NEW')='NEW'"
-            + " AND AD_CLIENT_ID " + OBDal.getInstance().getReadableClientsInClause()
-            + " AND AD_ORG_ID " + OBDal.getInstance().getReadableOrganizationsInClause()
+        final String sql = "select count(*) from AD_ALERT where COALESCE(to_char(STATUS), 'NEW')='NEW'"
+            + " AND AD_CLIENT_ID "
+            + OBDal.getInstance().getReadableClientsInClause()
+            + " AND AD_ORG_ID "
+            + OBDal.getInstance().getReadableOrganizationsInClause()
             + " AND AD_ALERTRULE_ID = ? " + (whereClause == null ? "" : whereClause);
-        final SQLQuery sqlQuery = OBDal.getInstance().getSession().createSQLQuery(sql)
-            .addEntity(Alert.ENTITY_NAME);
-        sqlQuery.setParameter(0, alertRule.getId());
-        final DataToJsonConverter converter = new DataToJsonConverter();
+
         try {
-          log4j.debug("Alert " + alertRule.getName() + " (" + alertRule.getId() + ") - SQL:'" + sql
-              + "' - Rows: " + sqlQuery.list().size());
-          for (Object alertObject : sqlQuery.list()) {
-            final Alert alert = (Alert) alertObject;
-            alertJsonObjects.add(converter.toJsonObject(alert, DataResolvingMode.FULL));
+          final PreparedStatement sqlQuery = new DalConnectionProvider(false)
+              .getPreparedStatement(sql);
+          sqlQuery.setString(1, alertRule.getId());
+          sqlQuery.execute();
+          ResultSet rs = sqlQuery.getResultSet();
+          if (rs.next()) {
+            long rows = rs.getLong(1);
+            total += rs.getLong(1);
+            log4j.debug("Alert " + alertRule.getName() + " (" + alertRule.getId() + ") - SQL:'"
+                + sql + "' - Rows: " + rows);
           }
-        } catch (SQLGrammarException e) {
+        } catch (Exception e) {
           log4j.error("An error has ocurred when trying to process the alerts: " + e.getMessage(),
               e);
         }
       }
-      result.put("cnt", alertJsonObjects.size());
-      result.put("data", new JSONArray(alertJsonObjects));
+
+      final JSONObject result = new JSONObject();
+      result.put("cnt", total);
       result.put("result", "success");
 
       response.setContentType(JsonConstants.JSON_CONTENT_TYPE);
       response.setHeader("Content-Type", JsonConstants.JSON_CONTENT_TYPE);
       response.getWriter().write(result.toString());
+      log4j.debug("Time spent: " + (System.currentTimeMillis() - t));
     } catch (Exception e) {
       throw new IllegalStateException(e);
     } finally {
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java	Sun Apr 01 20:25:01 2012 +0200
@@ -69,6 +69,7 @@
   private String code;
   private Tab tab;
   private StringBuffer jsCode;
+  private ApplicationDictionaryCachedStructures cachedStructures;
 
   public DynamicExpressionParser(String code, Tab tab) {
     this.code = code;
@@ -76,6 +77,14 @@
     parse();
   }
 
+  public DynamicExpressionParser(String code, Tab tab,
+      ApplicationDictionaryCachedStructures cachedStructures) {
+    this.cachedStructures = cachedStructures;
+    this.code = code;
+    this.tab = tab;
+    parse();
+  }
+
   /*
    * Note: This method was partially copied from WadUtility.
    */
@@ -222,8 +231,10 @@
     List<Field> fields;
     List<AuxiliaryInput> auxIns;
     try {
-      ApplicationDictionaryCachedStructures cachedStructures = WeldUtils
-          .getInstanceFromStaticBeanManager(ApplicationDictionaryCachedStructures.class);
+      if (cachedStructures == null) {
+        cachedStructures = WeldUtils
+            .getInstanceFromStaticBeanManager(ApplicationDictionaryCachedStructures.class);
+      }
       fields = cachedStructures.getFieldsOfTab(tab.getId());
       auxIns = cachedStructures.getAuxiliarInputList(tab.getId());
     } catch (NullPointerException e) {
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/QuickLaunchDataSource.java	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/QuickLaunchDataSource.java	Sun Apr 01 20:25:01 2012 +0200
@@ -27,8 +27,8 @@
 
 import org.openbravo.client.application.ApplicationConstants;
 import org.openbravo.client.application.MenuManager;
+import org.openbravo.client.application.MenuManager.MenuOption;
 import org.openbravo.client.application.MenuParameter;
-import org.openbravo.client.application.MenuManager.MenuOption;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.service.datasource.ReadOnlyDataSourceService;
 import org.openbravo.service.json.JsonConstants;
@@ -116,6 +116,9 @@
         } else if (menuOption.isForm()) {
           data.put(OPTION_TYPE, OPTION_TYPE_URL);
           data.put(FORM_ID, menuOption.getFormId());
+        } else if (menuOption.isReport()) {
+          data.put(OPTION_TYPE, OPTION_TYPE_URL);
+          data.put(PROCESS_ID, menuOption.getMenu().getProcess().getId());
         } else {
           data.put(OPTION_TYPE, OPTION_TYPE_URL);
         }
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ApplicationDictionaryCachedStructures.java	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ApplicationDictionaryCachedStructures.java	Sun Apr 01 20:25:01 2012 +0200
@@ -54,6 +54,8 @@
 public class ApplicationDictionaryCachedStructures implements Serializable {
   private static final long serialVersionUID = 1L;
 
+  private Map<String, Tab> tabMap = new HashMap<String, Tab>();
+  private Map<String, Table> tableMap = new HashMap<String, Table>();
   private Map<String, List<Field>> fieldMap = new HashMap<String, List<Field>>();
   private Map<String, List<Column>> columnMap = new HashMap<String, List<Column>>();
   private Map<String, List<AuxiliaryInput>> auxInputMap = new HashMap<String, List<AuxiliaryInput>>();
@@ -68,11 +70,35 @@
     useCache = indevelMods.list().size() == 0;
   }
 
+  public Tab getTab(String tabId) {
+    if (useCache() && tabMap.containsKey(tabId)) {
+      return tabMap.get(tabId);
+    }
+    Tab tab = OBDal.getInstance().get(Tab.class, tabId);
+    Hibernate.initialize(tab);
+    Hibernate.initialize(tab.getADAuxiliaryInputList());
+    Hibernate.initialize(tab.getADFieldList());
+    Hibernate.initialize(tab.getTable());
+    Hibernate.initialize(tab.getTable().getADColumnList());
+    tabMap.put(tabId, tab);
+    return tab;
+  }
+
+  public Table getTable(String tableId) {
+    if (useCache() && tableMap.containsKey(tableId)) {
+      return tableMap.get(tableId);
+    }
+    Table table = OBDal.getInstance().get(Table.class, tableId);
+    Hibernate.initialize(table);
+    tableMap.put(tableId, table);
+    return table;
+  }
+
   public List<Field> getFieldsOfTab(String tabId) {
     if (useCache() && fieldMap.containsKey(tabId)) {
       return fieldMap.get(tabId);
     }
-    Tab tab = OBDal.getInstance().get(Tab.class, tabId);
+    Tab tab = getTab(tabId);
     List<Field> fields = tab.getADFieldList();
     for (Field f : fields) {
       if (f.getColumn() == null) {
@@ -89,7 +115,7 @@
     if (useCache() && columnMap.get(tableId) != null) {
       return columnMap.get(tableId);
     }
-    Table table = OBDal.getInstance().get(Table.class, tableId);
+    Table table = getTable(tableId);
     List<Column> columns = table.getADColumnList();
     for (Column c : columns) {
       initializeColumn(c);
@@ -137,7 +163,7 @@
     if (useCache() && auxInputMap.get(tabId) != null) {
       return auxInputMap.get(tabId);
     }
-    Tab tab = OBDal.getInstance().get(Tab.class, tabId);
+    Tab tab = getTab(tabId);
     Hibernate.initialize(tab.getADAuxiliaryInputList());
     List<AuxiliaryInput> auxInputs = new ArrayList<AuxiliaryInput>(tab.getADAuxiliaryInputList());
     for (AuxiliaryInput auxIn : auxInputs) {
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java	Sun Apr 01 20:25:01 2012 +0200
@@ -35,6 +35,7 @@
 import org.codehaus.jettison.json.JSONArray;
 import org.codehaus.jettison.json.JSONException;
 import org.codehaus.jettison.json.JSONObject;
+import org.hibernate.Query;
 import org.hibernate.criterion.Restrictions;
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.NativeArray;
@@ -64,6 +65,7 @@
 import org.openbravo.dal.service.OBCriteria;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.dal.service.OBDao;
+import org.openbravo.dal.service.OBQuery;
 import org.openbravo.data.Sqlc;
 import org.openbravo.erpCommon.utility.Utility;
 import org.openbravo.model.ad.datamodel.Column;
@@ -73,7 +75,6 @@
 import org.openbravo.model.ad.ui.Field;
 import org.openbravo.model.ad.ui.Tab;
 import org.openbravo.model.ad.ui.Window;
-import org.openbravo.model.ad.utility.Attachment;
 import org.openbravo.service.db.DalConnectionProvider;
 import org.openbravo.service.json.JsonConstants;
 import org.openbravo.service.json.JsonToDataConverter;
@@ -124,7 +125,7 @@
       String multipleRowIds[] = (String[]) parameters.get("MULTIPLE_ROW_IDS");
       // The column changed by the user. Only relevant on CHANGE mode
       String changedColumn = readParameter(parameters, "CHANGED_COLUMN");
-      Tab tab = OBDal.getInstance().get(Tab.class, tabId);
+      Tab tab = getTab(tabId);
       BaseOBObject row = null;
       BaseOBObject parentRecord = null;
       Map<String, JSONObject> columnValues = new HashMap<String, JSONObject>();
@@ -277,10 +278,11 @@
   }
 
   private int computeNoteCount(Tab tab, String rowId) {
-    OBCriteria<Note> criteria = OBDao.getFilteredCriteria(Note.class,
-        Restrictions.eq("table.id", (String) DalUtil.getId(tab.getTable())),
-        Restrictions.eq("record", rowId));
-    return criteria.count();
+    OBQuery<Note> obq = OBDal.getInstance().createQuery(Note.class,
+        " table.id=:tableId and record=:recordId");
+    obq.setNamedParameter("tableId", (String) DalUtil.getId(tab.getTable()));
+    obq.setNamedParameter("recordId", rowId);
+    return obq.count();
   }
 
   private List<String> convertJSONArray(JSONArray jsonArray) {
@@ -298,22 +300,27 @@
   private List<JSONObject> attachmentForRows(Tab tab, String rowId, String[] multipleRowIds) {
     String tableId = (String) DalUtil.getId(tab.getTable());
     List<JSONObject> attachmentList = new ArrayList<JSONObject>();
-    OBCriteria<Attachment> attachments;
+    Query q;
     if (multipleRowIds == null) {
-      attachments = OBDao.getFilteredCriteria(Attachment.class,
-          Restrictions.eq("table.id", tableId), Restrictions.eq("record", rowId));
+      String hql = "select n.name, n.id, n.updated, n.updatedBy.name from org.openbravo.model.ad.utility.Attachment n where n.table.id=:tableId and n.record=:recordId";
+      q = OBDal.getInstance().getSession().createQuery(hql);
+      q.setParameter("tableId", tableId);
+      q.setParameter("recordId", rowId);
     } else {
-      attachments = OBDao.getFilteredCriteria(Attachment.class,
-          Restrictions.eq("table.id", tableId), Restrictions.in("record", multipleRowIds));
+
+      String hql = "select n.name, n.id, n.updated, n.updatedBy.name from org.openbravo.model.ad.utility.Attachment n where n.table.id=:tableId and n.record in :recordId";
+      q = OBDal.getInstance().getSession().createQuery(hql);
+      q.setParameter("tableId", tableId);
+      q.setParameterList("recordId", multipleRowIds);
     }
-    attachments.addOrderBy("creationDate", false);
-    for (Attachment attachment : attachments.list()) {
+    for (Object qobj : q.list()) {
+      Object[] array = (Object[]) qobj;
       JSONObject obj = new JSONObject();
       try {
-        obj.put("name", attachment.getName());
-        obj.put("id", attachment.getId());
-        obj.put("age", (new Date().getTime() - attachment.getUpdated().getTime()));
-        obj.put("updatedby", attachment.getUpdatedBy().getName());
+        obj.put("name", (String) array[0]);
+        obj.put("id", (String) array[1]);
+        obj.put("age", (new Date().getTime() - ((Date) array[2]).getTime()));
+        obj.put("updatedby", (String) array[3]);
       } catch (JSONException e) {
         log.error("Error while reading attachments", e);
       }
@@ -381,7 +388,7 @@
           // This session attributes could be a preference
           if (field.getDisplayLogic() != null && field.isDisplayed() && field.isActive()) {
             final DynamicExpressionParser parser = new DynamicExpressionParser(
-                field.getDisplayLogic(), tab);
+                field.getDisplayLogic(), tab, cachedStructures);
             setSessionAttributesFromParserResult(parser, sessionAttributesMap, tab.getWindow()
                 .getId());
           }
@@ -389,7 +396,7 @@
           if (field.getColumn().getReadOnlyLogic() != null && field.isDisplayed()
               && field.isActive()) {
             final DynamicExpressionParser parser = new DynamicExpressionParser(field.getColumn()
-                .getReadOnlyLogic(), tab);
+                .getReadOnlyLogic(), tab, cachedStructures);
             setSessionAttributesFromParserResult(parser, sessionAttributesMap, tab.getWindow()
                 .getId());
           }
@@ -1547,6 +1554,10 @@
     return null;
   }
 
+  private Tab getTab(String tabId) {
+    return cachedStructures.getTab(tabId);
+  }
+
   private List<Field> getADFieldList(String tabId) {
     return cachedStructures.getFieldsOfTab(tabId);
   }
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-date.js	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-date.js	Sun Apr 01 20:25:01 2012 +0200
@@ -79,39 +79,6 @@
 
     this.Super('init', arguments);
 
-    if (this.textField) {
-      this.textField.changed = function () {
-        // when the textfield of the date is updated, the date
-        // field should be flagged as changed
-        // see issue 20071 (https://issues.openbravo.com/view.php?id=20071)
-        this._textChanged = true;
-        this.parentItem._hasChanged = true;
-        // There is a mechanism to prevent infinite looping in number fields 
-        // (see issue https://issues.openbravo.com/view.php?id=17290) that
-        // interferes with the correct behaviour of the date fields 
-        // The infinite looping described in the issue does not apply to date fields, 
-        // so it is safe to delete the saveFocusItemChanged flag when a date is modified
-        if (this.parentItem.form && this.parentItem.form.view && this.parentItem.form.view.viewForm) {
-          delete this.parentItem.form.view.viewForm.saveFocusItemChanged;
-        }
-      };
-      // This is needed for the unit tests to be able to enter the dates using the setValue method
-      this.dateTextField.setValue = function (newValue) {
-        var oldValue = this.getValue();
-        this.Super('setValue', newValue);
-        // only flag the date as changed if it had a value, and it
-        // has been actually changed
-        if (!newValue || !oldValue || (oldValue === newValue)) {
-          return;
-        }
-        this.parentItem.textField._textChanged = true;
-        this.parentItem._hasChanged = true;
-        if (this.parentItem.form && this.parentItem.form.view && this.parentItem.form.view.viewForm) {
-          delete this.parentItem.form.view.viewForm.saveFocusItemChanged;
-        }
-      };
-    }
-
     if (this.showDisabled === false) {
       this.textField.showDisabled = false;
     }
@@ -124,14 +91,15 @@
 
   parseValue: function () {
     var i, str = this.blurValue(),
-        length, parts = ['', '', ''],
+        length = str.length,
+        parts = ['', '', ''],
         partIndex = 0,
         result;
 
     if (!str || isc.isA.Date(str) || str.replace(/0/g, '') === '') {
       return str;
     }
-    length = str.length;
+
     for (i = 0; i < length; i++) {
       if (this.isNumber(str, i)) {
         if (this.reachedLength(parts[partIndex], partIndex)) {
@@ -209,10 +177,8 @@
 
   pickerDataChanged: function (picker) {
     this.Super('pickerDataChanged', arguments);
-    // update the date field after picking a new date 
-    this.textField._textChanged = true;
-    this.updateValue();
     if (this.form.focusInNextItem) {
+
       if (this.form.handleItemChange) {
         this._hasChanged = true;
         this.form.handleItemChange(this);
@@ -241,32 +207,13 @@
   },
 
   // update the value in update value as this is called from cellEditEnd in the
-  // grid, after losing the focus on the form and when autosaving
+  // grid, or after losing the focus on the form
   updateValue: function () {
-    if (this.grid && this.grid._preventDateParsing && !this.grid._autoSaving) {
+    if (this.grid && this.grid._preventDateParsing) {
       return;
     }
-    if (this.textField._textChanged) {
-      this.expandValue();
-      this.Super('updateValue', arguments);
-      //  when the date field has a callout and all the mandatory fields have been entered, 
-      //  the grid does not save the value before making the FIC call, so the value has to 
-      //  be saved explicitly
-      //  See issue 19694 (https://issues.openbravo.com/view.php?id=19694)
-      if (this.grid && this.grid.getEditRow()) {
-        this.grid.getEditValues(this.grid.getEditRow())[this.name] = this.getValue();
-      }
-      this.textField._textChanged = false;
-    }
-  },
-
-  blur: function () {
-    // force the update of the date when its field loses the focus
-    // it has to be done before the call to the super because the
-    // date should be updated before calling handleItemChange, 
-    // which is called in the super blur  
-    this.updateValue();
-    this.Super('blur', arguments);
+    this.expandValue();
+    this.Super('updateValue', arguments);
   },
 
   blurValue: function () {
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-search.js	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-search.js	Sun Apr 01 20:25:01 2012 +0200
@@ -55,6 +55,8 @@
       targetFld.form.handleItemChange(targetFld);
       // fire with a delay otherwise results in strange errors
       targetFld.fireOnPause('validate', targetFld.validate, null, targetFld);
+
+      targetFld.form.focusInNextItem(targetFld.name);
     }
     isc.OBSearchItem.openedWindow.close();
     isc.OBSearchItem.openSearchItem = null;
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js	Sun Apr 01 20:25:01 2012 +0200
@@ -654,7 +654,15 @@
     // also remember the valuemaps
     for (i = 0; i < length; i++) {
       if (flds[i].valueMap) {
-        flds[i]._rememberedValueMap = flds[i].valueMap;
+        //This ensures that the valueMap of the createdBy and updatedBy fields will be properly initialized when adding a new record in form view
+        //See issue #19843
+        if (isc.isA.emptyObject(flds[i].valueMap) && (flds[i].name === 'createdBy' || flds[i].name === 'updatedBy') && flds[i].form.getValue(flds[i].displayField)) {
+          flds[i].valueMap = {};
+          flds[i].valueMap[flds[i].form.getValue(flds[i].name)] = flds[i].form.getValue(flds[i].displayField);
+          flds[i]._rememberedValueMap = flds[i].valueMap;
+        } else {
+          flds[i]._rememberedValueMap = flds[i].valueMap;
+        }
       }
     }
   },
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js	Sun Apr 01 20:25:01 2012 +0200
@@ -2021,8 +2021,7 @@
     // sometimes rowNum and colnum are not set, then don't compute the next cell
     var nextEditCell = ((rowNum || rowNum === 0) && (colNum || colNum === 0) ? this.getNextEditCell(rowNum, colNum, editCompletionEvent) : null);
     var newRow = nextEditCell && nextEditCell[0] !== rowNum;
-    var enterKey = editCompletionEvent === 'enter';
-    if (this.view.standardWindow.isAutoSaveEnabled() && !enterKey && !autoSaveDone && newRow && (editForm.hasChanged || editForm.isNew)) {
+    if (this.view.standardWindow.isAutoSaveEnabled() && !autoSaveDone && newRow && (editForm.hasChanged || editForm.isNew)) {
       var actionObject = {
         target: this,
         method: this.cellEditEnd,
@@ -2165,11 +2164,7 @@
   },
 
   autoSave: function () {
-    // flag to force the parsing of date fields when autosaving
-    // see issue 20071 (https://issues.openbravo.com/view.php?id=20071)
-    this._autoSaving = true;
     this.storeUpdatedEditorValue();
-    delete this._autoSaving;
     this.endEditing();
   },
 
--- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Sun Apr 01 20:25:01 2012 +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.15716]]></VERSION>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.15749]]></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>
@@ -21,7 +21,7 @@
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION_LABEL><![CDATA[MP9]]></VERSION_LABEL>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--D393BE6F22BB44B7B728259B34FC795A--></AD_MODULE>
 
--- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Apr 01 20:25:01 2012 +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.15716]]></STARTVERSION>
+<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.15749]]></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	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Sun Apr 01 20:25:01 2012 +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.15716]]></VERSION>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.15749]]></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>
@@ -22,7 +22,7 @@
 <!--4B828F4D03264080AA1D2057B13F613C-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <UPDATEINFO><![CDATA[Bug fix for issue 15289]]></UPDATEINFO>
-<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION_LABEL><![CDATA[MP9]]></VERSION_LABEL>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--4B828F4D03264080AA1D2057B13F613C--></AD_MODULE>
 
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Apr 01 20:25:01 2012 +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.15716]]></STARTVERSION>
+<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.15749]]></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.15716]]></STARTVERSION>
+<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <STARTVERSION><![CDATA[1.1.15749]]></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.15716]]></STARTVERSION>
+<!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <STARTVERSION><![CDATA[2.0.15749]]></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.myob/src-db/database/sourcedata/AD_MODULE.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Sun Apr 01 20:25:01 2012 +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.15716]]></VERSION>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.15749]]></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>
@@ -22,7 +22,7 @@
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <UPDATEINFO><![CDATA[Styling bugfixing]]></UPDATEINFO>
-<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION_LABEL><![CDATA[MP9]]></VERSION_LABEL>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--2758CD25B2704AF6BBAD10365FC82C06--></AD_MODULE>
 
--- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Apr 01 20:25:01 2012 +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.15716]]></STARTVERSION>
+<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.15749]]></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.15716]]></STARTVERSION>
+<!--E71B28FC949D481D9F59C17D01E46EF9-->  <STARTVERSION><![CDATA[3.0.15749]]></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	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Sun Apr 01 20:25:01 2012 +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.15716]]></VERSION>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.15749]]></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>
@@ -21,7 +21,7 @@
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION_LABEL><![CDATA[MP9]]></VERSION_LABEL>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC--></AD_MODULE>
 
--- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Apr 01 20:25:01 2012 +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.15716]]></STARTVERSION>
+<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.15749]]></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	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Sun Apr 01 20:25:01 2012 +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.15716]]></VERSION>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.15749]]></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>
@@ -22,7 +22,7 @@
 <!--FF8080812D842086012D844F3CC0003E-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--FF8080812D842086012D844F3CC0003E-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--FF8080812D842086012D844F3CC0003E-->  <UPDATEINFO><![CDATA[Added Currency Converter. Added Google Docs]]></UPDATEINFO>
-<!--FF8080812D842086012D844F3CC0003E-->  <VERSION_LABEL><![CDATA[MP9]]></VERSION_LABEL>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--FF8080812D842086012D844F3CC0003E-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--FF8080812D842086012D844F3CC0003E--></AD_MODULE>
 
--- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Apr 01 20:25:01 2012 +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.15716]]></STARTVERSION>
+<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.15749]]></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	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Sun Apr 01 20:25:01 2012 +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.15716]]></VERSION>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.15749]]></VERSION>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <DESCRIPTION><![CDATA[Payment Report]]></DESCRIPTION>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <URL><![CDATA[http://forge.openbravo.com/projects/paymentreport]]></URL>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <TYPE><![CDATA[M]]></TYPE>
@@ -22,7 +22,7 @@
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION_LABEL><![CDATA[MP9]]></VERSION_LABEL>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--2A5EE903D7974AC298C0504FBC4501A7--></AD_MODULE>
 
--- a/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Apr 01 20:25:01 2012 +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.15716]]></STARTVERSION>
+<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.15749]]></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	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Sun Apr 01 20:25:01 2012 +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.15716]]></VERSION>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.15749]]></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>
@@ -19,7 +19,7 @@
 <!--3A3A943684D64DEF9EC39F588A656848-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION_LABEL><![CDATA[MP9]]></VERSION_LABEL>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--3A3A943684D64DEF9EC39F588A656848--></AD_MODULE>
 
--- a/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Apr 01 20:25:01 2012 +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.15716]]></STARTVERSION>
+<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.15749]]></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	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Sun Apr 01 20:25:01 2012 +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.15716]]></VERSION>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION><![CDATA[2.1.15749]]></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>
@@ -22,7 +22,7 @@
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <UPDATEINFO><![CDATA[Bug fixing & new development for 3.0]]></UPDATEINFO>
-<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION_LABEL><![CDATA[MP9]]></VERSION_LABEL>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4--></AD_MODULE>
 
--- a/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Apr 01 20:25:01 2012 +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.15716]]></STARTVERSION>
+<!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <STARTVERSION><![CDATA[1.1.15749]]></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.15716]]></STARTVERSION>
+<!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <STARTVERSION><![CDATA[2.0.15749]]></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.15716]]></STARTVERSION>
+<!--4FCE95802A854F7E8623AFF7C33D13EE-->  <STARTVERSION><![CDATA[3.0.15749]]></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.15716]]></STARTVERSION>
+<!--54AF8B39C55E4E7496902893ECD82786-->  <STARTVERSION><![CDATA[2.1.15749]]></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.15716]]></STARTVERSION>
+<!--D03C56D8A4E14F45A5466350E05C631F-->  <STARTVERSION><![CDATA[8.1.15749]]></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.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java	Sun Apr 01 20:25:01 2012 +0200
@@ -559,7 +559,8 @@
   public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException,
       ServletException {
     final Map<String, String> parameters = getParameterMap(request);
-    UsageAudit.auditAction(request, parameters);
+    final VariablesSecureApp vars = new VariablesSecureApp(request, false);
+    UsageAudit.auditActionNoDal(this, vars, this.getClass().getName());
 
     try {
       if (!hasAccess(request, parameters.get("tabId"))) {
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Sun Apr 01 20:25:01 2012 +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.15716]]></VERSION>
+<!--FF8080813129ADA401312CA1222A0005-->  <VERSION><![CDATA[0.1.15749]]></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.
@@ -18,7 +18,7 @@
 <!--FF8080813129ADA401312CA1222A0005-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--FF8080813129ADA401312CA1222A0005-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--FF8080813129ADA401312CA1222A0005-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--FF8080813129ADA401312CA1222A0005-->  <VERSION_LABEL><![CDATA[MP9]]></VERSION_LABEL>
+<!--FF8080813129ADA401312CA1222A0005-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--FF8080813129ADA401312CA1222A0005-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--FF8080813129ADA401312CA1222A0005--></AD_MODULE>
 
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Apr 01 20:25:01 2012 +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.15716]]></STARTVERSION>
+<!--FF8080813141B198013141BA0F7D0012-->  <STARTVERSION><![CDATA[0.1.15749]]></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.15716]]></STARTVERSION>
+<!--FF8080813151AEE1013151C4ACE6001B-->  <STARTVERSION><![CDATA[2.1.15749]]></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	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Sun Apr 01 20:25:01 2012 +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.15716]]></VERSION>
+<!--FF8080813141B198013141B86DD70003-->  <VERSION><![CDATA[0.1.15749]]></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.
@@ -19,7 +19,7 @@
 <!--FF8080813141B198013141B86DD70003-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--FF8080813141B198013141B86DD70003-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--FF8080813141B198013141B86DD70003-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--FF8080813141B198013141B86DD70003-->  <VERSION_LABEL><![CDATA[MP9]]></VERSION_LABEL>
+<!--FF8080813141B198013141B86DD70003-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--FF8080813141B198013141B86DD70003-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--FF8080813141B198013141B86DD70003--></AD_MODULE>
 
--- a/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Apr 01 20:25:01 2012 +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.15716]]></STARTVERSION>
+<!--FF8080813141B198013141B8B21B0006-->  <STARTVERSION><![CDATA[3.0.15749]]></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	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Sun Apr 01 20:25:01 2012 +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.15716]]></VERSION>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION><![CDATA[2.0.15749]]></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>
@@ -22,7 +22,7 @@
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <UPDATEINFO><![CDATA[Bug fixing & new development for 3.0]]></UPDATEINFO>
-<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION_LABEL><![CDATA[MP9]]></VERSION_LABEL>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1--></AD_MODULE>
 
--- a/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Apr 01 20:25:01 2012 +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.15716]]></STARTVERSION>
+<!--9E3E7B42DB16405FB794496D309D7044-->  <STARTVERSION><![CDATA[3.0.15749]]></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	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Sun Apr 01 20:25:01 2012 +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.15716]]></VERSION>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION><![CDATA[2.1.15749]]></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>
@@ -22,7 +22,7 @@
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <UPDATEINFO><![CDATA[Bug fixing & new development for 3.0]]></UPDATEINFO>
-<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION_LABEL><![CDATA[MP9]]></VERSION_LABEL>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--5EB4F15C80684ACA904756BDC12ADBE5--></AD_MODULE>
 
--- a/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Apr 01 20:25:01 2012 +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.15716]]></STARTVERSION>
+<!--38825CAED43941D38CA0C78DB04FCFA0-->  <STARTVERSION><![CDATA[8.1.15749]]></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.15716]]></STARTVERSION>
+<!--6DDE7B1A70174242AF82B5022FB89279-->  <STARTVERSION><![CDATA[2.1.15749]]></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.15716]]></STARTVERSION>
+<!--94F9CD2CB5EF4467A67475C786C984A7-->  <STARTVERSION><![CDATA[2.1.15749]]></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.15716]]></STARTVERSION>
+<!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <STARTVERSION><![CDATA[1.1.15749]]></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.15716]]></STARTVERSION>
+<!--C8DAC574B88649D08C9468521B343F12-->  <STARTVERSION><![CDATA[3.0.15749]]></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.15716]]></STARTVERSION>
+<!--F14EB17946BE4724A46F80CB1A47EC70-->  <STARTVERSION><![CDATA[2.1.15749]]></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	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Sun Apr 01 20:25:01 2012 +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.15716]]></VERSION>
+<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION><![CDATA[2.0.15749]]></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>
@@ -23,7 +23,7 @@
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION_LABEL><![CDATA[MP9]]></VERSION_LABEL>
+<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--96998CBC42744B3DBEE28AC8095C9335--></AD_MODULE>
 
--- a/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Apr 01 20:25:01 2012 +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.15716]]></STARTVERSION>
+<!--39BF75AD9AB3453698BF5DE29E727AA9-->  <STARTVERSION><![CDATA[3.0.15749]]></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	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Sun Apr 01 20:25:01 2012 +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.15716]]></VERSION>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION><![CDATA[8.1.15749]]></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>
@@ -23,7 +23,7 @@
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <UPDATEINFO><![CDATA[Bug fixing & new development for 3.0
 Updated to new smartclient 8.1 04-02-2012]]></UPDATEINFO>
-<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION_LABEL><![CDATA[MP9]]></VERSION_LABEL>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9--></AD_MODULE>
 
--- a/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Apr 01 20:25:01 2012 +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.15716]]></STARTVERSION>
+<!--086331E18477496B8AC74D2CFEBD1307-->  <STARTVERSION><![CDATA[3.0.15749]]></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.15716]]></STARTVERSION>
+<!--DC5D4EF450244482BD2B458DAA496333-->  <STARTVERSION><![CDATA[2.1.15749]]></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.15716]]></STARTVERSION>
+<!--F2AF15C0AF5540E393D96BE506E20648-->  <STARTVERSION><![CDATA[1.1.15749]]></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.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/load_skin.js	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/load_skin.js	Sun Apr 01 20:25:01 2012 +0200
@@ -12,14 +12,15 @@
 //----------------------------------------
 // Specify skin directory
 //----------------------------------------
-     // must be relative to your application file or isomorphicDir
- //   isc.Page.setSkinDir("[ISOMORPHIC]/skins/Enterprise/")
-  isc.Page.setSkinDir("[ISOMORPHIC]/../openbravo/skins/Default/smartclient/");  
+    // must be relative to your application file or isomorphicDir
+    // isc.Page.setSkinDir("[ISOMORPHIC]/skins/Enterprise/")
+    isc.Page.setSkinDir("[ISOMORPHIC]/../openbravo/skins/Default/smartclient/");
+
 
 //----------------------------------------
 // Load skin style sheet(s)
 //----------------------------------------
- //   isc.Page.loadStyleSheet("[SKIN]/skin_styles.css", theWindow)
+    // isc.Page.loadStyleSheet("[SKIN]/skin_styles.css", theWindow)
 
 
 
--- a/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Sun Apr 01 20:25:01 2012 +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.15716]]></VERSION>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION><![CDATA[3.0.15749]]></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
@@ -27,7 +27,7 @@
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
-<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION_LABEL><![CDATA[MP9]]></VERSION_LABEL>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61--></AD_MODULE>
 
--- a/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Apr 01 20:25:01 2012 +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.15716]]></STARTVERSION>
+<!--148A000EE9A04A3CA653B1296A00B8E6-->  <STARTVERSION><![CDATA[3.0.15749]]></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.15716]]></STARTVERSION>
+<!--30F966407A6F4E15965821BAEE34D25B-->  <STARTVERSION><![CDATA[3.0.15749]]></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.15716]]></STARTVERSION>
+<!--F93CE30003B24F8F8886510B0065EECC-->  <STARTVERSION><![CDATA[1.1.15749]]></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	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Sun Apr 01 20:25:01 2012 +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.15716]]></VERSION>
+<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION><![CDATA[2.1.15749]]></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>
@@ -24,7 +24,7 @@
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <UPDATEINFO><![CDATA[minor bugfix release to include latest client.application 2.0.1, client.myob 2.0.2 and client.kernel 2.0.1]]></UPDATEINFO>
-<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION_LABEL><![CDATA[MP9]]></VERSION_LABEL>
+<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--7E48CDD73B7E493A8BED4F7253E7C989--></AD_MODULE>
 
--- a/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Apr 01 20:25:01 2012 +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.15716]]></STARTVERSION>
+<!--01E1BCCEC9114DE0960538DF34E30E6F-->  <STARTVERSION><![CDATA[2.1.15749]]></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.15716]]></STARTVERSION>
+<!--025B181F63CA47B48A920F6983242390-->  <STARTVERSION><![CDATA[3.0.15749]]></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.15716]]></STARTVERSION>
+<!--054B4FEAF919478AA3FF27098A46D1D6-->  <STARTVERSION><![CDATA[2.1.15749]]></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.15716]]></STARTVERSION>
+<!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <STARTVERSION><![CDATA[1.0.15749]]></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.15716]]></STARTVERSION>
+<!--224754C3EF674C93B0D468F47BAAB824-->  <STARTVERSION><![CDATA[2.1.15749]]></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.15716]]></STARTVERSION>
+<!--5B72D24032DD4879A950194139D961B6-->  <STARTVERSION><![CDATA[2.1.15749]]></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.15716]]></STARTVERSION>
+<!--8730CA6A4224439D82E0DD31B3806E36-->  <STARTVERSION><![CDATA[1.0.15749]]></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.15716]]></STARTVERSION>
+<!--98C47FF058F8413B8A2B26036061446E-->  <STARTVERSION><![CDATA[8.1.15749]]></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.15716]]></STARTVERSION>
+<!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <STARTVERSION><![CDATA[2.0.15749]]></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.15716]]></STARTVERSION>
+<!--A9CB99330AF34944877F889DD8A0AB3C-->  <STARTVERSION><![CDATA[2.1.15749]]></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.15716]]></STARTVERSION>
+<!--E72A053A403C4A98A189C105B850ADB0-->  <STARTVERSION><![CDATA[1.1.15749]]></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.15716]]></STARTVERSION>
+<!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <STARTVERSION><![CDATA[2.0.15749]]></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/configScript.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.v3/src-db/database/configScript.xml	Sun Apr 01 20:25:01 2012 +0200
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
   <vector>
-    <versionInfo version="3.0.15265"/>
+    <versionInfo version="3.0.15680"/>
     <columnDataChange tablename="AD_PROCESS" columnname="ISACTIVE" pkRow="800026">
       <oldValue><![CDATA[Y]]></oldValue>
       <newValue><![CDATA[N]]></newValue>
@@ -21,6 +21,10 @@
       <oldValue><![CDATA[Y]]></oldValue>
       <newValue><![CDATA[N]]></newValue>
     </columnDataChange>
+    <columnDataChange tablename="AD_COLUMN" columnname="DEFAULTVALUE" pkRow="17FDE34256AC11DE8CD0DFCC30CA23CC">
+      <oldValue><![CDATA[""]]></oldValue>
+      <newValue><![CDATA[" "]]></newValue>
+    </columnDataChange>
     <columnDataChange tablename="AD_TAB" columnname="ISACTIVE" pkRow="134">
       <oldValue><![CDATA[Y]]></oldValue>
       <newValue><![CDATA[N]]></newValue>
@@ -1645,10 +1649,6 @@
       <oldValue><![CDATA[Y]]></oldValue>
       <newValue><![CDATA[N]]></newValue>
     </columnDataChange>
-    <columnDataChange tablename="AD_FIELD" columnname="ISDISPLAYED" pkRow="075A8BF00D2744878F8424E87FD18E71">
-      <oldValue><![CDATA[Y]]></oldValue>
-      <newValue><![CDATA[N]]></newValue>
-    </columnDataChange>
     <columnDataChange tablename="AD_FIELD" columnname="ISDISPLAYED" pkRow="2828AC0401C54F0FBE5B4E8CFC799B76">
       <oldValue><![CDATA[Y]]></oldValue>
       <newValue><![CDATA[N]]></newValue>
@@ -1765,10 +1765,6 @@
       <oldValue><![CDATA[Y]]></oldValue>
       <newValue><![CDATA[N]]></newValue>
     </columnDataChange>
-    <columnDataChange tablename="AD_FIELD" columnname="ISDISPLAYED" pkRow="BD54082ED2A740CDBD66AE26F52B860F">
-      <oldValue><![CDATA[Y]]></oldValue>
-      <newValue><![CDATA[N]]></newValue>
-    </columnDataChange>
     <columnDataChange tablename="AD_FIELD" columnname="ISDISPLAYED" pkRow="C925D6B656AC11DEAE52E723C9919EF7">
       <oldValue><![CDATA[Y]]></oldValue>
       <newValue><![CDATA[N]]></newValue>
--- a/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Sun Apr 01 20:25:01 2012 +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.15716]]></VERSION>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION><![CDATA[3.0.15749]]></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>
@@ -20,7 +20,7 @@
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
-<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION_LABEL><![CDATA[MP9]]></VERSION_LABEL>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--0138E7A89B5E4DC3932462252801FFBC--></AD_MODULE>
 
--- a/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sun Apr 01 20:25:01 2012 +0200
@@ -7,7 +7,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.15716]]></STARTVERSION>
+<!--4D11E3A70650475381139522373CD191-->  <STARTVERSION><![CDATA[2.1.15749]]></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>
@@ -21,7 +21,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.15716]]></STARTVERSION>
+<!--52CE523C40634C47A99C6EBBD9C3125C-->  <STARTVERSION><![CDATA[3.0.15749]]></STARTVERSION>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <DEPENDANT_MODULE_NAME><![CDATA[Payment Report]]></DEPENDANT_MODULE_NAME>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,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.15716]]></STARTVERSION>
+<!--60834727BB114764ACEF019F40A34562-->  <STARTVERSION><![CDATA[1.1.15749]]></STARTVERSION>
 <!--60834727BB114764ACEF019F40A34562-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--60834727BB114764ACEF019F40A34562-->  <DEPENDANT_MODULE_NAME><![CDATA[Orders Awaiting Delivery]]></DEPENDANT_MODULE_NAME>
 <!--60834727BB114764ACEF019F40A34562-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,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.15716]]></STARTVERSION>
+<!--8418885E97D643138B6D907671351E3D-->  <STARTVERSION><![CDATA[3.0.15749]]></STARTVERSION>
 <!--8418885E97D643138B6D907671351E3D-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--8418885E97D643138B6D907671351E3D-->  <DEPENDANT_MODULE_NAME><![CDATA[Standard Roles]]></DEPENDANT_MODULE_NAME>
 <!--8418885E97D643138B6D907671351E3D-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -63,7 +63,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.15716]]></STARTVERSION>
+<!--A32F3279B3374FC0A6CFEA2368BB7053-->  <STARTVERSION><![CDATA[3.0.15749]]></STARTVERSION>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MINOR]]></DEPENDENCY_ENFORCEMENT>
@@ -77,7 +77,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.15716]]></STARTVERSION>
+<!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <STARTVERSION><![CDATA[3.0.15749]]></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>
@@ -91,7 +91,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.15716]]></STARTVERSION>
+<!--FF8080813189932B013189B45B59003A-->  <STARTVERSION><![CDATA[0.1.15749]]></STARTVERSION>
 <!--FF8080813189932B013189B45B59003A-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8080813189932B013189B45B59003A-->  <DEPENDANT_MODULE_NAME><![CDATA[OpenID Service Integration]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813189932B013189B45B59003A-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -105,7 +105,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.15716]]></STARTVERSION>
+<!--FF8080813189932B013189B4C00F003D-->  <STARTVERSION><![CDATA[0.1.15749]]></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>
@@ -119,7 +119,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.15716]]></STARTVERSION>
+<!--FF8081812E2F6F3C012E2F750109001C-->  <STARTVERSION><![CDATA[0.0.15749]]></STARTVERSION>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <DEPENDANT_MODULE_NAME><![CDATA[Widgets Collection]]></DEPENDANT_MODULE_NAME>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
Binary file src-db/database/lib/dbsourcemanager.jar has changed
--- a/src-db/database/model/functions/AD_PARENT_TREE.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/src-db/database/model/functions/AD_PARENT_TREE.xml	Sun Apr 01 20:25:01 2012 +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) 2001-2008 Openbravo SLU
+* All portions are Copyright (C) 2001-2012 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -33,8 +33,12 @@
    WHERE node_id = p_node_id
      AND ad_tree_id = p_tree_id;
 
+    IF vp IS NULL THEN
+      RETURN ' ';
+    ELSE
+      p := ad_parent_tree(p_tree_id, vp);
+    END IF;
 
-    p := ad_parent_tree(p_tree_id, vp);
     IF p != ' ' THEN
       RETURN '|'||vp||'|'||p;
     END IF;
--- a/src-db/database/model/functions/MA_PRODUCTIONRUN_STANDARD.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/src-db/database/model/functions/MA_PRODUCTIONRUN_STANDARD.xml	Sun Apr 01 20:25:01 2012 +0200
@@ -131,6 +131,14 @@
       v_Message:='@ProductionRunProcessed@';
       RAISE_APPLICATION_ERROR(-20000, v_Message);
     END IF;
+
+    IF (v_DoneQuantity <= 0) THEN
+      v_ResultStr:='Completed Quantity must be greater than zero';
+      DBMS_OUTPUT.PUT_LINE('Completed Quantity must be greater than zero') ;
+      v_Message:='@CompletedQuantityGreaterZero@';
+      RAISE_APPLICATION_ERROR(-20000, v_Message);
+    END IF;
+    
       --Insert toolsets if necessary
       v_ResultStr:='ToolsetProcess Processing';
       FOR Cur_ToolsetProcess IN
@@ -309,14 +317,16 @@
               AD_PINSTANCE_PARA_INSERT(v_AD_Pinstance_ID, '60', 'AuxID', v_Production_ID, null, null, null, null, null);
               AD_PINSTANCE_PARA_INSERT(v_AD_Pinstance_ID, '70', 'TableId', '325', null, null, null, null, null);
               AD_PINSTANCE_PARA_INSERT(v_AD_Pinstance_ID, '80', 'LineNo', null, null, v_PlanLine, null, null, null);
+              AD_PINSTANCE_PARA_INSERT(v_AD_Pinstance_ID, '90', 'ProcessID', '800105', null, null, null, null, null);
+              
               SELECT COALESCE(SP.UNIQUEATTCONSUM, 'N')
                 INTO v_UniqueAttConsum
               FROM MA_WRPHASEPRODUCT WRPP
                       LEFT JOIN MA_SEQUENCEPRODUCT SP ON WRPP.MA_SEQUENCEPRODUCT_ID = SP.MA_SEQUENCEPRODUCT_ID
               WHERE MA_WRPHASEPRODUCT_ID = Cur_WRPUsed.MA_WRPhaseProduct_ID;
               IF (v_UniqueAttConsum='Y') THEN 
-                AD_PINSTANCE_PARA_INSERT(v_AD_Pinstance_ID, '90', 'UniqueAttribute', v_UniqueAttConsum, null, null, null, null, null);
-                AD_PINSTANCE_PARA_INSERT(v_AD_Pinstance_ID, '100', 'Quantity', null, null, v_DoneQuantity*Cur_WRPUsed.MovementQty, null, null, null);
+                AD_PINSTANCE_PARA_INSERT(v_AD_Pinstance_ID, '100', 'UniqueAttribute', v_UniqueAttConsum, null, null, null, null, null);
+                AD_PINSTANCE_PARA_INSERT(v_AD_Pinstance_ID, '110', 'Quantity', null, null, v_DoneQuantity*Cur_WRPUsed.MovementQty, null, null, null);
               END IF;
               M_GET_STOCK(v_AD_Pinstance_ID, 'N');
               -- Check result
@@ -455,7 +465,7 @@
           END IF;
         ELSE
           IF Cur_WRPUsed.M_Locator_ID IS NULL THEN
-            v_Message:='El producto ' || Cur_WRPUsed.pname || ' no tiene almacen definido.';
+            v_Message:='@DefineLocatorProduct@ ' || Cur_WRPUsed.pname;
             RAISE_APPLICATION_ERROR(-20000, v_Message);
           END IF;
           IF (v_GlobalUse='Y') THEN
--- a/src-db/database/model/functions/MRP_RUN_INITIALIZE.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/src-db/database/model/functions/MRP_RUN_INITIALIZE.xml	Sun Apr 01 20:25:01 2012 +0200
@@ -64,6 +64,8 @@
   v_Count NUMBER;
   v_Aux_ID VARCHAR2(32);
   v_ParentLine VARCHAR2(32);
+  v_AD_Pinstance_ID VARCHAR2(32);
+  v_QtyOnHand NUMBER;
 
   FINISH_PROCESS BOOLEAN DEFAULT FALSE;
   --  Parameter
@@ -77,14 +79,11 @@
 BEGIN
   BEGIN --BODY
     -- Get Parameters
-    FOR Cur_Product IN (SELECT p.M_Product_ID, COALESCE(sd.qtyonhand,0) AS qtyonhand,
+    FOR Cur_Product IN (SELECT p.M_Product_ID,
                         COALESCE(po.STOCKMIN, p.STOCKMIN, 0) AS STOCKMIN,
                         COALESCE(po.MRP_PlanningMethod_ID, p.MRP_PlanningMethod_ID) AS MRP_PlanningMethod_ID
                         FROM M_PRODUCT p LEFT JOIN M_PRODUCT_ORG po ON p.M_PRODUCT_ID = po.M_PRODUCT_ID
                                                                        AND po.AD_ORG_ID = p_Org_ID
-                                         LEFT JOIN (SELECT M_Product_ID, SUM(qtyonhand) as qtyonhand
-                                                    FROM M_STORAGE_DETAIL
-                                                    GROUP BY M_Product_ID) sd ON p.M_Product_ID = sd.M_Product_ID
                         WHERE (p_product_ID IS NULL OR p.M_PRODUCT_ID = p_Product_ID)
                           AND (p_Product_Category_ID IS NULL OR p.M_PRODUCT_CATEGORY_ID = p_Product_Category_ID)
                           AND (p_Planner_ID IS NULL OR COALESCE(po.MRP_PLANNER_ID, p.MRP_Planner_ID) = p_Planner_ID)
@@ -170,10 +169,53 @@
             AND inouttrxtype = 'MS';
         END IF;
 
+	-- Call M_GET_STOCK
+	DECLARE
+		v_pinstance_result AD_PInstance.result%TYPE;
+		v_pinstance_msg AD_PInstance.errormsg%TYPE;
+	BEGIN
+		v_AD_Pinstance_ID := GET_UUID();
+		INSERT INTO AD_PINSTANCE (
+		  AD_PINSTANCE_ID, AD_PROCESS_ID, RECORD_ID, ISACTIVE, 
+		  AD_USER_ID, AD_CLIENT_ID, AD_ORG_ID, CREATED, CREATEDBY,
+		  UPDATED, UPDATEDBY
+		) VALUES (
+		  v_AD_Pinstance_ID,'FF80818132C964E30132C9747257002E',p_Run,'Y',
+		  p_user_id, p_client_id, p_org_id, now(), p_user_id,
+		  now(), p_user_id
+		);
+
+	 AD_PINSTANCE_PARA_INSERT(v_AD_Pinstance_ID, '10', 'AD_Client_ID', p_client_id, null, null, null, null, null);
+	 AD_PINSTANCE_PARA_INSERT(v_AD_Pinstance_ID, '20', 'AD_Org_ID', p_org_id, null, null, null, null, null);
+	 AD_PINSTANCE_PARA_INSERT(v_AD_Pinstance_ID, '30', 'M_Product_ID', Cur_Product.M_Product_ID, null, null, null, null, null);
+	 AD_PINSTANCE_PARA_INSERT(v_AD_Pinstance_ID, '60', 'AuxID', p_Run, null, null, null, null, null);
+	 AD_PINSTANCE_PARA_INSERT(v_AD_Pinstance_ID, '70', 'TableId', '800219', null, null, null, null, null);
+	 IF (p_production = 'Y') THEN
+	 AD_PINSTANCE_PARA_INSERT(v_AD_Pinstance_ID, '80', 'ProcessID', '800162', null, null, null, null, null); 	 
+	 ELSE
+	 AD_PINSTANCE_PARA_INSERT(v_AD_Pinstance_ID, '90', 'ProcessID', '800164', null, null, null, null, null); 	
+	 END IF;
+
+	 M_GET_STOCK(v_AD_Pinstance_ID, 'N');
+		-- Check result
+		SELECT result, errormsg
+		INTO v_pinstance_result, v_pinstance_msg
+		FROM ad_pinstance
+		WHERE ad_pinstance_id = v_ad_pinstance_id;
+		IF (v_pinstance_result = 0) THEN
+			-- Error on m_get_stock
+			RAISE_APPLICATION_ERROR(-20000, v_pinstance_msg);
+		END IF;
+	END; -- End Call M_GET_STOCK
+
+	SELECT COALESCE(SUM(quantity),0) INTO v_QtyOnHand
+	FROM M_STOCK_PROPOSED
+	WHERE AD_PINSTANCE_ID = v_AD_Pinstance_ID;
+
         IF (v_Count = 0) THEN -- First time on this product
           v_ResultStr := 'Inserting stock lines product: ' || Cur_Product.M_Product_ID;
           Mrp_Run_Insertlines(p_Client_ID, p_Org_ID, p_User_ID, p_Run, Cur_Product.M_Product_ID, (-1 * Cur_Product.STOCKMIN), 0, NULL, 'MS', 'Y', NULL, NULL, NULL, NULL, NULL, p_PlanningDate, NULL, p_Production, 'N', NULL, v_Aux_ID);
-          Mrp_Run_Insertlines(p_Client_ID, p_Org_ID, p_User_ID, p_Run, Cur_Product.M_Product_ID, Cur_Product.QtyOnHand, 0, NULL, 'ST', 'Y', NULL, NULL, NULL, NULL, NULL, p_PlanningDate, NULL, p_Production, 'Y', NULL, v_Aux_ID);
+          Mrp_Run_Insertlines(p_Client_ID, p_Org_ID, p_User_ID, p_Run, Cur_Product.M_Product_ID, v_QtyOnHand, 0, NULL, 'ST', 'Y', NULL, NULL, NULL, NULL, NULL, p_PlanningDate, NULL, p_Production, 'Y', NULL, v_Aux_ID);
 
           v_ResultStr := 'Inserting Order lines product: ' || Cur_Product.M_Product_ID;
           FOR Cur_OrderLine IN (SELECT Mrp_Check_Planningmethod(Cur_Product.MRP_PlanningMethod_ID,
--- a/src-db/database/model/functions/M_GENERATE_AVERAGE_COSTS.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/src-db/database/model/functions/M_GENERATE_AVERAGE_COSTS.xml	Sun Apr 01 20:25:01 2012 +0200
@@ -164,7 +164,11 @@
         ELSE
           v_CheckResultStr := v_CheckResultStr || ', ';
         END IF;
-        v_CheckResultStr := v_CheckResultStr || Cur_Docs.DOCUMENTNO;
+	  IF (COALESCE(LENGTH(v_CheckResultStr),0) > 1900) THEN
+	    v_CheckResultStr:=SUBSTR(v_CheckResultStr,1,1900) || '(...)';
+	  ELSE
+	    v_CheckResultStr := v_CheckResultStr || Cur_Docs.DOCUMENTNO;
+	  END IF;
       END LOOP;
       v_CheckResultStr:=v_CheckResultStr || '.';
     END IF;
@@ -189,7 +193,11 @@
         ELSE
           v_CheckResultStr := v_CheckResultStr || ', ';
         END IF;
-        v_CheckResultStr := v_CheckResultStr || Cur_Docs.INVENTORY || '(@Warehouse@ ' || Cur_Docs.WAREHOUSE || ')';
+	  IF (COALESCE(LENGTH(v_CheckResultStr),0) > 1900) THEN
+	    v_CheckResultStr:=SUBSTR(v_CheckResultStr,1,1900) || '(...)';
+	  ELSE
+	    v_CheckResultStr := v_CheckResultStr || Cur_Docs.INVENTORY || '(@Warehouse@ ' || Cur_Docs.WAREHOUSE || ')';
+	  END IF;
       END LOOP;
       v_CheckResultStr:=v_CheckResultStr || '.';
     END IF;
@@ -213,7 +221,11 @@
         ELSE
           v_CheckResultStr := v_CheckResultStr || ', ';
         END IF;
-        v_CheckResultStr := v_CheckResultStr || Cur_Docs.DOCUMENTNO;
+	  IF (COALESCE(LENGTH(v_CheckResultStr),0) > 1900) THEN
+	    v_CheckResultStr:=SUBSTR(v_CheckResultStr,1,1900) || '(...)';
+	  ELSE
+	    v_CheckResultStr := v_CheckResultStr || Cur_Docs.DOCUMENTNO;
+	  END IF;
       END LOOP;
       v_CheckResultStr:=v_CheckResultStr || '.';
     END IF;
@@ -238,7 +250,11 @@
         ELSE
           v_CheckResultStr := v_CheckResultStr || ', ';
         END IF;
-        v_CheckResultStr := v_CheckResultStr || Cur_Docs.DOCUMENTNO;
+	  IF (COALESCE(LENGTH(v_CheckResultStr),0) > 1900) THEN
+	    v_CheckResultStr:=SUBSTR(v_CheckResultStr,1,1900) || '(...)';
+	  ELSE
+	    v_CheckResultStr := v_CheckResultStr || Cur_Docs.DOCUMENTNO;
+	  END IF;
       END LOOP;
       v_CheckResultStr:=v_CheckResultStr || '.';
     END IF;
@@ -267,7 +283,11 @@
         ELSE
           v_CheckResultStr := v_CheckResultStr || ', ';
         END IF;
-        v_CheckResultStr := v_CheckResultStr || Cur_Docs.DATEINVOICED || ' (' || '@Invoice@ @SOS_DOCUMENTNO@' || Cur_Docs.DOCUMENTNO || ')';
+	  IF (COALESCE(LENGTH(v_CheckResultStr),0) > 1900) THEN
+	    v_CheckResultStr:=SUBSTR(v_CheckResultStr,1,1900) || '(...)';
+	  ELSE
+	    v_CheckResultStr := v_CheckResultStr || Cur_Docs.DATEINVOICED || ' (' || '@Invoice@ @SOS_DOCUMENTNO@' || Cur_Docs.DOCUMENTNO || ')';
+	  END IF;
       END LOOP;
       v_CheckResultStr:=v_CheckResultStr || '.';
     END IF;
@@ -328,7 +348,12 @@
       ORDER BY M_PRODUCT.M_PRODUCT_ID, M_INOUT.MOVEMENTDATE, M_INOUTLINE.MOVEMENTQTY DESC
       )
     LOOP
-      v_ResultStr:='new albaran:   '||Cur_InOutLine.M_INOUTLINE_ID;
+	
+      IF (COALESCE(LENGTH(v_ResultStr),0) > 1900) THEN
+	v_ResultStr:=SUBSTR(v_ResultStr,1,1900) || '(...)';
+      ELSE
+        v_ResultStr:='new albaran:   '||Cur_InOutLine.M_INOUTLINE_ID;
+      END IF;
 
       SELECT SUM(QTY)
       INTO v_PermanentQty
@@ -395,7 +420,12 @@
       ELSE
         v_Qty:=0;
       END IF;
-      v_ResultStr:='invoice albaran:   '||Cur_InOutLine.M_INOUTLINE_ID;
+      IF (COALESCE(LENGTH(v_ResultStr),0) > 1900) THEN
+	v_ResultStr:=SUBSTR(v_ResultStr,1,1900) || '(...)';
+      ELSE
+        v_ResultStr:='invoice albaran:   '||Cur_InOutLine.M_INOUTLINE_ID;
+      END IF;
+      
       SELECT CASE WHEN SUM(QTYINVOICED) <=0 THEN 0 ELSE SUM(C_INVOICELINE.QTYINVOICED*C_CURRENCY_CONVERT_PRECISION(C_INVOICELINE.PRICEACTUAL, C_INVOICE.C_CURRENCY_ID, v_BaseCurrency, TO_DATE(COALESCE(C_INVOICE.DATEINVOICED, Cur_InOutLine.MOVEMENTDATE)), NULL, C_INVOICELINE.AD_CLIENT_ID, C_INVOICELINE.AD_ORG_ID, 'C')) /SUM(QTYINVOICED) END,
              CASE WHEN SUM(QTYINVOICED) <=0 THEN 0 ELSE COUNT(C_INVOICELINE.C_INVOICELINE_ID) END
       INTO v_Price, v_Count
@@ -405,7 +435,12 @@
         AND C_INVOICE.C_INVOICE_ID = C_INVOICELINE.C_INVOICE_ID
         AND QTYINVOICED<>0;
       IF(v_Count=0) THEN
-        v_ResultStr:='order albaran:   '||Cur_InOutLine.M_INOUTLINE_ID;
+        IF (COALESCE(LENGTH(v_ResultStr),0) > 1900) THEN
+	  v_ResultStr:=SUBSTR(v_ResultStr,1,1900) || '(...)';
+        ELSE
+          v_ResultStr:='order albaran:   '||Cur_InOutLine.M_INOUTLINE_ID;
+        END IF;
+        
         SELECT CASE WHEN SUM(C_ORDERLINE.QTYORDERED) <=0 THEN 0 ELSE SUM(C_ORDERLINE.QTYORDERED*C_CURRENCY_CONVERT_PRECISION(C_ORDERLINE.PRICEACTUAL, COALESCE(C_ORDERLINE.C_CURRENCY_ID, C_ORDER.C_CURRENCY_ID), v_BaseCurrency, TO_DATE(COALESCE(C_ORDER.DATEORDERED, Cur_InOutLine.MOVEMENTDATE)), NULL, C_ORDERLINE.AD_CLIENT_ID, C_ORDERLINE.AD_ORG_ID, 'C')) /SUM(C_ORDERLINE.QTYORDERED) END,
                CASE WHEN SUM(C_ORDERLINE.QTYORDERED) <=0 THEN 0 ELSE COUNT(C_ORDERLINE.C_ORDERLINE_ID) END
         INTO v_Price, v_Count
@@ -477,7 +512,12 @@
 	      v_Message := v_Message || '. @CannotCalcPrevCost@';
 	END IF;
       ELSE     
-	      v_ResultStr:='insert costing:   '||Cur_InOutLine.M_INOUTLINE_ID;
+              IF (COALESCE(LENGTH(v_ResultStr),0) > 1900) THEN
+	        v_ResultStr:=SUBSTR(v_ResultStr,1,1900) || '(...)';
+	      ELSE
+		v_ResultStr:='insert costing:   '||Cur_InOutLine.M_INOUTLINE_ID;
+	      END IF;
+	      
 	      INSERT
 	      INTO M_COSTING
 		(
--- a/src-db/database/model/functions/M_GET_STOCK.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/src-db/database/model/functions/M_GET_STOCK.xml	Sun Apr 01 20:25:01 2012 +0200
@@ -27,6 +27,7 @@
   v_ResultStr VARCHAR2(2000):='';
   v_Message VARCHAR2(2000):='';
   v_Record_ID VARCHAR2(32);
+  
   -- Parameter
   TYPE RECORD IS REF CURSOR;
   Cur_Parameter RECORD;
@@ -34,7 +35,7 @@
   Cur_MStock RECORD;
 
   -- Parameter Variables
-  v_Quantity NUMBER(10) ;
+  v_Quantity NUMBER(10);
   v_ProductID   VARCHAR2(32);
   v_LocatorID   VARCHAR2(32);
   v_WarehouseID VARCHAR2(32) ;
@@ -45,19 +46,21 @@
   v_UniqueAttribute CHAR(1);
   v_UomID VARCHAR2(32) ;
   v_ProductUomID VARCHAR2(32) ;
-  v_TableId  VARCHAR2(32):='-1';
+  v_TableID  VARCHAR2(32):='-1';
   v_AuxID VARCHAR2(32):='-1';
   v_LineNo NUMBER;
   v_SelectedAttSetInstanceID VARCHAR2(32) ;
   v_Count NUMBER:=1;
   v_ProductName M_Product.NAME%TYPE;
+  v_ProcessID VARCHAR2(32) ;
   
 BEGIN
   --  Update AD_PInstance
   DBMS_OUTPUT.PUT_LINE('Updating PInstance - Processing ' || PInstance_ID) ;
   v_ResultStr:='PInstanceNotFound';
-  AD_UPDATE_PINSTANCE(PInstance_ID, NULL, 'Y', NULL, NULL, p_calledfromapp) ;
+  AD_UPDATE_PINSTANCE(PInstance_ID, NULL, 'Y', NULL, NULL, p_calledfromapp);
 BEGIN --BODY
+
   -- Get Parameters
   v_ResultStr:='ReadingParameters';
   FOR Cur_Parameter IN
@@ -94,46 +97,51 @@
       DBMS_OUTPUT.PUT_LINE(' M_Locator_ID=' || v_LocatorID);    
     ELSIF(Cur_Parameter.ParameterName='M_Warehouse_ID') THEN
       v_WarehouseID:=Cur_Parameter.P_String;
-      DBMS_OUTPUT.PUT_LINE(' M_Warehouse_ID=' || v_WarehouseID);       
+      DBMS_OUTPUT.PUT_LINE(' M_Warehouse_ID=' || v_WarehouseID);
     ELSIF(Cur_Parameter.ParameterName='AD_Client_ID') THEN
       v_ClientID:=Cur_Parameter.P_String;
-      DBMS_OUTPUT.PUT_LINE(' AD_Client_ID=' || v_ClientID);  
+      DBMS_OUTPUT.PUT_LINE(' AD_Client_ID=' || v_ClientID);
     ELSIF(Cur_Parameter.ParameterName='AD_Org_ID') THEN
       v_OrgID:=Cur_Parameter.P_String;
-      DBMS_OUTPUT.PUT_LINE(' AD_Org_ID=' || v_OrgID);    
+      DBMS_OUTPUT.PUT_LINE(' AD_Org_ID=' || v_OrgID);
     ELSIF(Cur_Parameter.ParameterName='M_AttributesetInstance_ID') THEN
       v_AttributesetinstanceID:=Cur_Parameter.P_String;
-      DBMS_OUTPUT.PUT_LINE(' M_AttributesetInstance_ID=' || v_AttributesetinstanceID);    
+      DBMS_OUTPUT.PUT_LINE(' M_AttributesetInstance_ID=' || v_AttributesetinstanceID);
     ELSIF(Cur_Parameter.ParameterName='UniqueAttribute') THEN
       v_UniqueAttribute:=Cur_Parameter.P_String;
       DBMS_OUTPUT.PUT_LINE(' UniqueAttribute=' || v_UniqueAttribute);
     ELSIF(Cur_Parameter.ParameterName='TableId') THEN
-      v_TableId:=Cur_Parameter.P_String;
-      DBMS_OUTPUT.PUT_LINE(' TableId=' || v_TableId);
+      v_TableID:=Cur_Parameter.P_String;
+      DBMS_OUTPUT.PUT_LINE(' TableId=' || v_TableID);
     ELSIF(Cur_Parameter.ParameterName='AuxID') THEN
       v_AuxID:=Cur_Parameter.P_String;
       DBMS_OUTPUT.PUT_LINE(' AuxID=' || v_AuxID);    
     ELSIF(Cur_Parameter.ParameterName='LineNo') THEN
       v_LineNo:=Cur_Parameter.P_Number;
-      DBMS_OUTPUT.PUT_LINE(' LineNo=' || v_LineNo);          
+      DBMS_OUTPUT.PUT_LINE(' LineNo=' || v_LineNo);
+    ELSIF(Cur_Parameter.ParameterName='ProcessID') THEN
+      v_ProcessID:=Cur_Parameter.P_String;
+      DBMS_OUTPUT.PUT_LINE(' ProcessID=' || v_ProcessID);
     ELSE
       DBMS_OUTPUT.PUT_LINE('*** Unknown Parameter=' || Cur_Parameter.ParameterName) ;
     END IF;
   END LOOP; -- Get Parameter
   DBMS_OUTPUT.PUT_LINE('  Record_ID=' || v_Record_ID) ;
 
-  -- Insert Values from Auxiliar STOCK
-  FOR Cur_Stock IN (
+        -- Insert Values from Auxiliar STOCK
+
+    FOR Cur_Stock  IN
+    (
       SELECT MS.M_STORAGE_DETAIL_ID, COALESCE(MS.Quantity, 0) AS Qty, MS.QtyOrder AS QtyOrder, MS.UPDATED AS lastupdated
-      FROM M_STORAGE_DETAIL T
-            JOIN M_STOCK_AUX MS ON T.M_STORAGE_DETAIL_ID = MS.M_STORAGE_DETAIL_ID
-            JOIN M_LOCATOR L ON T.M_LOCATOR_ID=L.M_LOCATOR_ID
-            JOIN M_WAREHOUSE W ON L.M_WAREHOUSE_ID = W.M_WAREHOUSE_ID
-            LEFT JOIN M_PRODUCT_UOM PU ON T.M_PRODUCT_UOM_ID = PU.M_PRODUCT_UOM_ID
-            LEFT JOIN C_UOM U ON PU.C_UOM_ID = U.C_UOM_ID
-      WHERE T.M_PRODUCT_ID=v_ProductID
+      FROM M_STORAGE_DETAIL T        
+       JOIN M_STOCK_AUX MS ON T.M_STORAGE_DETAIL_ID = MS.M_STORAGE_DETAIL_ID
+       JOIN M_LOCATOR L ON T.M_LOCATOR_ID=L.M_LOCATOR_ID
+       JOIN M_WAREHOUSE W ON L.M_WAREHOUSE_ID = W.M_WAREHOUSE_ID
+                LEFT JOIN M_PRODUCT_UOM PU ON T.M_PRODUCT_UOM_ID = PU.M_PRODUCT_UOM_ID
+                LEFT JOIN C_UOM U ON PU.C_UOM_ID = U.C_UOM_ID
+        WHERE T.M_PRODUCT_ID=v_ProductID
         AND MS.AUX_ID = v_AuxID
-        AND MS.AD_TABLE_ID = v_TableId
+        AND MS.AD_TABLE_ID = v_TableID
         AND MS.LINE < v_LineNo
         AND COALESCE(T.C_UOM_ID, '-1') = COALESCE(v_UomID, T.C_UOM_ID, '-1')
         AND COALESCE(T.M_Product_UOM_id, '-1') = COALESCE(v_ProductUomID, T.M_Product_UOM_id, '-1')
@@ -143,27 +151,33 @@
         AND AD_ISORGINCLUDED(W.AD_ORG_ID,v_OrgID,W.AD_CLIENT_ID)<>-1
         AND COALESCE(MS.Quantity, 0)>0
         ORDER BY PRIORITYNO, LASTUPDATED
-  ) LOOP
-    INSERT INTO M_STOCK_PROPOSED (
+      )
+      LOOP
+        INSERT 
+        INTO M_STOCK_PROPOSED
+        (
         m_stock_proposed_id, ad_client_id, ad_org_id, isactive, 
         created , createdby, updated, updatedby,
         ad_pinstance_id, priority, m_storage_detail_id, quantity, qtyorder
-    ) VALUES (
+        )
+        VALUES
+        (
         get_uuid(), v_ClientID, v_OrgID, 'Y',
         now(), v_AD_User_ID, now(), v_AD_User_ID,
         pinstance_id, v_Count, Cur_Stock.M_STORAGE_DETAIL_ID, Cur_Stock.Qty, Cur_Stock.qtyorder
-    );
-    v_Count:=v_Count+1;
-  END LOOP;
+        );
+        v_Count:=v_Count+1;
+      END LOOP;
 
-  -- Insert Values from Storage Detail
-  FOR Cur_Stock IN (
+    -- Insert Values from Storage Detail
+    FOR Cur_Stock  IN
+    (
       SELECT T.M_STORAGE_DETAIL_ID, COALESCE(T.QtyOnHand, 0) AS Qty, T.QtyOrderOnHand AS QtyOrder, L.PRIORITYNO, T.UPDATED AS lastupdated
       FROM M_STORAGE_DETAIL T 
-            JOIN M_LOCATOR L ON T.M_LOCATOR_ID=L.M_LOCATOR_ID
-            JOIN M_WAREHOUSE W ON L.M_WAREHOUSE_ID = W.M_WAREHOUSE_ID
-            LEFT JOIN M_PRODUCT_UOM PU ON T.M_PRODUCT_UOM_ID = PU.M_PRODUCT_UOM_ID
-            LEFT JOIN C_UOM U ON PU.C_UOM_ID = U.C_UOM_ID
+       JOIN M_LOCATOR L ON T.M_LOCATOR_ID=L.M_LOCATOR_ID
+       JOIN M_WAREHOUSE W ON L.M_WAREHOUSE_ID = W.M_WAREHOUSE_ID
+       LEFT JOIN M_PRODUCT_UOM PU ON T.M_PRODUCT_UOM_ID = PU.M_PRODUCT_UOM_ID
+       LEFT JOIN C_UOM U ON PU.C_UOM_ID = U.C_UOM_ID
       WHERE T.M_PRODUCT_ID=v_ProductID
         AND COALESCE(T.C_UOM_ID, '-1') = COALESCE(v_UomID, T.C_UOM_ID, '-1')
         AND COALESCE(T.M_Product_UOM_id, '-1') = COALESCE(v_ProductUomID, T.M_Product_UOM_id, '-1')
@@ -173,27 +187,64 @@
         AND AD_ISORGINCLUDED(W.AD_ORG_ID,v_OrgID,W.AD_CLIENT_ID)<>-1
         AND COALESCE(T.QtyOnHand, 0)>0
         ORDER BY PRIORITYNO, LASTUPDATED
-  ) LOOP
-    INSERT INTO M_STOCK_PROPOSED (
+      )
+      LOOP
+        INSERT 
+        INTO M_STOCK_PROPOSED
+        (
         m_stock_proposed_id, ad_client_id, ad_org_id, isactive, 
         created , createdby, updated, updatedby,
         ad_pinstance_id, priority, m_storage_detail_id, quantity, qtyorder
-    ) VALUES (
+        )
+        VALUES
+        (
         get_uuid(), v_ClientID, v_OrgID, 'Y',
         now(), v_AD_User_ID, now(), v_AD_User_ID,
         pinstance_id, v_Count, Cur_Stock.M_STORAGE_DETAIL_ID, Cur_Stock.Qty, Cur_Stock.QtyOrder
-    );
-    v_Count:=v_Count+1;
-  END LOOP;
+        );
+        v_Count:=v_Count+1;
+      END LOOP;
 
-  IF (v_UniqueAttribute='Y') THEN 
+  --M_Get_Stock - Finish Process Extension Point
+  SELECT count(*) INTO v_count
+  FROM DUAL
+  WHERE EXISTS (SELECT 1 FROM ad_ep_procedures WHERE ad_extension_points_id = 'FF80818132FDD74F0132FDF278430029');
+  IF (v_count=1) THEN
+    DECLARE
+      v_ep_instance VARCHAR2(32);
+      v_extension_point_id VARCHAR2(32) := 'FF80818132FDD74F0132FDF278430029';
+    BEGIN
+      v_ep_instance := get_uuid();
+
+      AD_EP_INSTANCE_PARA_INSERT(v_ep_instance, v_extension_point_id, 'AD_Pinstance_Stock_ID',
+        pinstance_id, NULL, NULL, NULL, NULL, NULL, NULL);
+      AD_EP_INSTANCE_PARA_INSERT(v_ep_instance, v_extension_point_id, 'Record_ID',
+        v_Record_ID, NULL, NULL, NULL, NULL, NULL, NULL);
+      AD_EP_INSTANCE_PARA_INSERT(v_ep_instance, v_extension_point_id, 'User',
+        v_AD_User_ID, NULL, NULL, NULL, NULL, NULL, NULL);
+      AD_EP_INSTANCE_PARA_INSERT(v_ep_instance, v_extension_point_id, 'Message',
+        NULL, NULL, NULL, NULL, NULL, NULL, v_Message);
+      AD_EXTENSION_POINT_HANDLER(v_ep_instance, v_extension_point_id);
+      
+      SELECT p_text INTO v_Message
+      FROM ad_ep_instance_para
+      WHERE ad_ep_instance_id = v_ep_instance
+      AND parametername LIKE 'Message';
+
+      DELETE FROM ad_ep_instance_para
+      WHERE ad_ep_instance_id = v_ep_instance;
+    END;
+  END IF;
+
+
+  IF (v_UniqueAttribute='Y') THEN
     DELETE FROM M_STOCK_PROPOSED MS
     WHERE AD_PINSTANCE_ID = pinstance_id
       AND EXISTS (SELECT '1'
-                  FROM M_STORAGE_DETAIL T
-                  WHERE T.M_STORAGE_DETAIL_ID = MS.M_STORAGE_DETAIL_ID
-                  AND T.M_ATTRIBUTESETINSTANCE_ID = '0'
-                 ); 
+      FROM M_STORAGE_DETAIL T
+      WHERE T.M_STORAGE_DETAIL_ID = MS.M_STORAGE_DETAIL_ID
+      AND T.M_ATTRIBUTESETINSTANCE_ID = '0'
+      ); 
     v_SelectedAttSetInstanceID:=null;
 
     FOR Cur_MStock IN (
@@ -201,7 +252,7 @@
         FROM (
           SELECT SUM(MS.QUANTITY) AS QTY, T.M_ATTRIBUTESETINSTANCE_ID, MIN(PRIORITY) AS PRIORITY
           FROM M_STOCK_PROPOSED MS
-                JOIN M_STORAGE_DETAIL T ON MS.M_STORAGE_DETAIL_ID = T.M_STORAGE_DETAIL_ID
+               JOIN M_STORAGE_DETAIL T ON MS.M_STORAGE_DETAIL_ID = T.M_STORAGE_DETAIL_ID
           WHERE AD_PINSTANCE_ID = pinstance_id
           GROUP BY T.M_ATTRIBUTESETINSTANCE_ID
           HAVING SUM(MS.QUANTITY) >= v_Quantity
@@ -231,36 +282,6 @@
     END IF;
   END IF;
 
-  --M_Get_Stock - Finish Process Extension Point
-  SELECT count(*) INTO v_count
-  FROM DUAL
-  WHERE EXISTS (SELECT 1 FROM ad_ep_procedures WHERE ad_extension_points_id = 'FF80818132FDD74F0132FDF278430029');
-  IF (v_count=1) THEN
-    DECLARE
-      v_ep_instance VARCHAR2(32);
-      v_extension_point_id VARCHAR2(32) := 'FF80818132FDD74F0132FDF278430029';
-    BEGIN
-      v_ep_instance := get_uuid();
-
-      AD_EP_INSTANCE_PARA_INSERT(v_ep_instance, v_extension_point_id, 'AD_Pinstance_Stock_ID',
-          pinstance_id, NULL, NULL, NULL, NULL, NULL, NULL);
-      AD_EP_INSTANCE_PARA_INSERT(v_ep_instance, v_extension_point_id, 'Record_ID',
-          v_Record_ID, NULL, NULL, NULL, NULL, NULL, NULL);
-      AD_EP_INSTANCE_PARA_INSERT(v_ep_instance, v_extension_point_id, 'User',
-          v_AD_User_ID, NULL, NULL, NULL, NULL, NULL, NULL);
-      AD_EP_INSTANCE_PARA_INSERT(v_ep_instance, v_extension_point_id, 'Message',
-          NULL, NULL, NULL, NULL, NULL, NULL, v_Message);
-      AD_EXTENSION_POINT_HANDLER(v_ep_instance, v_extension_point_id);	    
-      SELECT p_text INTO v_Message
-      FROM ad_ep_instance_para
-      WHERE ad_ep_instance_id = v_ep_instance
-        AND parametername LIKE 'Message';
-
-      DELETE FROM ad_ep_instance_para
-      WHERE ad_ep_instance_id = v_ep_instance;
-    END;
-  END IF;
-    
   --  Update AD_PInstance
   DBMS_OUTPUT.PUT_LINE('Updating PInstance - Finished ' || v_Message) ;
   AD_UPDATE_PINSTANCE(PInstance_ID, NULL, 'N', 1, v_Message, p_calledfromapp) ;
--- a/src-db/database/model/postscript-Oracle.sql	Thu Mar 29 16:27:58 2012 +0000
+++ b/src-db/database/model/postscript-Oracle.sql	Sun Apr 01 20:25:01 2012 +0200
@@ -13,7 +13,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) 2001-2009 Openbravo SLU
+* All portions are Copyright (C) 2001-2012 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -875,7 +875,7 @@
                         and upper(c.columnname) not in ('CREATED','CREATEDBY','UPDATED', 'UPDATEDBY')
 			and c.isexcludeaudit='N'
                         order by c.position) loop
-      if (cur_cols.data_type in ('VARCHAR2', 'CHAR')) then
+      if (cur_cols.data_type in ('VARCHAR2', 'CHAR', 'CLOB')) then
         datatype := 'CHAR';
         code := code || 'IF (UPDATING AND ((COALESCE(:NEW.'||cur_cols.COLUMN_NAME||',''.'') != COALESCE(:OLD.'||cur_cols.COLUMN_NAME||',''.'')) OR ((:NEW.'||cur_cols.COLUMN_NAME||' IS NULL) AND :OLD.'||cur_cols.COLUMN_NAME||'=''.'') OR ((:OLD.'||cur_cols.COLUMN_NAME||' IS NULL) AND :NEW.'||cur_cols.COLUMN_NAME||'=''.'')))';
       elsif (cur_cols.data_type in ('NVARCHAR2', 'NCHAR')) then
--- a/src-db/database/model/prescript-PostgreSql.sql	Thu Mar 29 16:27:58 2012 +0000
+++ b/src-db/database/model/prescript-PostgreSql.sql	Sun Apr 01 20:25:01 2012 +0200
@@ -1258,15 +1258,19 @@
                     ELSE 10 
                 END
         END AS data_precision,
-        0 AS data_scale,
+        CASE 
+            WHEN upper(pg_type.typname) = 'NUMERIC' and cols.numeric_scale is not null THEN cols.numeric_scale
+            ELSE 0
+        END AS data_scale,
         CASE pg_attribute.atthasdef
             WHEN true THEN ( SELECT pg_attrdef.adsrc
                FROM pg_attrdef
               WHERE pg_attrdef.adrelid = pg_class.oid AND pg_attrdef.adnum = pg_attribute.attnum)
             ELSE NULL::text
         END AS data_default, not pg_attribute.attnotnull AS nullable, pg_attribute.attnum AS column_id
-   FROM pg_class, pg_namespace, pg_attribute, pg_type
-  WHERE pg_attribute.attrelid = pg_class.oid AND pg_attribute.atttypid = pg_type.oid AND pg_class.relnamespace = pg_namespace.oid AND pg_namespace.nspname = current_schema() AND pg_attribute.attnum > 0
+   FROM pg_class, pg_namespace, pg_attribute, pg_type, information_schema.columns cols
+  WHERE pg_attribute.attrelid = pg_class.oid AND pg_attribute.atttypid = pg_type.oid AND pg_class.relnamespace = pg_namespace.oid AND pg_namespace.nspname = current_schema() AND pg_attribute.attnum > 0 
+  AND upper(cols.table_name)=upper(pg_class.relname) AND upper(cols.column_name)=upper(pg_attribute.attname) AND cols.table_schema = current_schema()
 /-- END
 
 SELECT * FROM drop_view('v$version')
--- a/src-db/database/model/triggers/AD_TAB_TRG.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/src-db/database/model/triggers/AD_TAB_TRG.xml	Sun Apr 01 20:25:01 2012 +0200
@@ -17,7 +17,7 @@
     * parts created by ComPiere are Copyright (C) ComPiere, Inc.;
     * All Rights Reserved.
     * Contributor(s): Openbravo SLU
-    * Contributions are Copyright (C) 2001-2011 Openbravo, S.L.U.
+    * Contributions are Copyright (C) 2001-2012 Openbravo, S.L.U.
     *
     * Specifically, this derivative work is based upon the following Compiere
     * file and version.
@@ -30,7 +30,7 @@
 
 
    --Check tab name starts with a upper case letter
-   IF (not (substr(:new.Name,1,1) between 'A' and 'Z')) THEN
+   IF (not (ascii(substr(:new.Name,1,1)) between ascii('A') and ascii('Z'))) THEN
      RAISE_APPLICATION_ERROR(-20000, '@TabName1stCharUpper@') ;
    END IF;
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/model/triggers/FIN_FINANCIAL_ACCOUNT_TRG2.xml	Sun Apr 01 20:25:01 2012 +0200
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+  <database name="TRIGGER FIN_FINANCIAL_ACCOUNT_TRG2">
+    <trigger name="FIN_FINANCIAL_ACCOUNT_TRG2" table="FIN_FINANCIAL_ACCOUNT" fires="before" insert="true" update="true" delete="false" foreach="row">
+      <body><![CDATA[
+    /*************************************************************************
+    * The contents of this file are subject to the Openbravo  Public  License
+    * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
+    * Version 1.1  with a permitted attribution clause; you may not  use this
+    * file except in compliance with the License. You  may  obtain  a copy of
+    * the License at http://www.openbravo.com/legal/license.html
+    * Software distributed under the License  is  distributed  on  an "AS IS"
+    * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+    * License for the specific  language  governing  rights  and  limitations
+    * under the License.
+    * The Original Code is Openbravo ERP.
+    * The Initial Developer of the Original Code is Openbravo SLU
+    * All portions are Copyright (C) 2010 Openbravo SLU
+    * All Rights Reserved.
+    * Contributor(s):  ______________________________________.
+    ************************************************************************/
+    TYPE RECORD IS REF CURSOR;
+BEGIN
+
+    IF AD_isTriggerEnabled()='N' THEN RETURN;
+    END IF;
+
+  IF(INSERTING) THEN
+    :NEW.currentbalance := :NEW.initialbalance;
+    
+  END IF;
+END FIN_FINANCIAL_ACCOUNT_TRG2
+]]></body>
+    </trigger>
+  </database>
--- a/src-db/database/sourcedata/AD_AUXILIARINPUT.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/src-db/database/sourcedata/AD_AUXILIARINPUT.xml	Sun Apr 01 20:25:01 2012 +0200
@@ -1545,7 +1545,7 @@
 <!--A81DE6745CD547F088CCCA4A27E4B117-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A81DE6745CD547F088CCCA4A27E4B117-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A81DE6745CD547F088CCCA4A27E4B117-->  <AD_TAB_ID><![CDATA[5B6FF3B9E2B4423EB3EE4B2666D7E918]]></AD_TAB_ID>
-<!--A81DE6745CD547F088CCCA4A27E4B117-->  <NAME><![CDATA[ACTION]]></NAME>
+<!--A81DE6745CD547F088CCCA4A27E4B117-->  <NAME><![CDATA[AI_ACTION]]></NAME>
 <!--A81DE6745CD547F088CCCA4A27E4B117-->  <CODE><![CDATA[M]]></CODE>
 <!--A81DE6745CD547F088CCCA4A27E4B117-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--A81DE6745CD547F088CCCA4A27E4B117--></AD_AUXILIARINPUT>
--- a/src-db/database/sourcedata/AD_COLUMN.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Sun Apr 01 20:25:01 2012 +0200
@@ -122908,7 +122908,7 @@
 <!--800129-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--800129-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
 <!--800129-->  <AD_ELEMENT_ID><![CDATA[800021]]></AD_ELEMENT_ID>
-<!--800129-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--800129-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
 <!--800129-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--800129-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--800129-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
@@ -213152,8 +213152,8 @@
 <!--1002100109-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--1002100109-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--1002100109-->  <NAME><![CDATA[Deductable Rate]]></NAME>
-<!--1002100109-->  <DESCRIPTION><![CDATA[Deductable Rate]]></DESCRIPTION>
-<!--1002100109-->  <HELP><![CDATA[It is the deductable percentage]]></HELP>
+<!--1002100109-->  <DESCRIPTION><![CDATA[Deductible Rate]]></DESCRIPTION>
+<!--1002100109-->  <HELP><![CDATA[It is the deductible percentage]]></HELP>
 <!--1002100109-->  <COLUMNNAME><![CDATA[Deducpercent]]></COLUMNNAME>
 <!--1002100109-->  <AD_TABLE_ID><![CDATA[261]]></AD_TABLE_ID>
 <!--1002100109-->  <AD_REFERENCE_ID><![CDATA[22]]></AD_REFERENCE_ID>
@@ -224565,7 +224565,7 @@
 <!--31940C8567304B00A8AF8D7A61BE5F3A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--31940C8567304B00A8AF8D7A61BE5F3A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--31940C8567304B00A8AF8D7A61BE5F3A-->  <NAME><![CDATA[Days till due]]></NAME>
-<!--31940C8567304B00A8AF8D7A61BE5F3A-->  <DESCRIPTION><![CDATA[Days Till Next Due]]></DESCRIPTION>
+<!--31940C8567304B00A8AF8D7A61BE5F3A-->  <DESCRIPTION><![CDATA[Days till next due date]]></DESCRIPTION>
 <!--31940C8567304B00A8AF8D7A61BE5F3A-->  <HELP><![CDATA[Number of days left for the next due date]]></HELP>
 <!--31940C8567304B00A8AF8D7A61BE5F3A-->  <COLUMNNAME><![CDATA[DaysTillDue]]></COLUMNNAME>
 <!--31940C8567304B00A8AF8D7A61BE5F3A-->  <AD_TABLE_ID><![CDATA[318]]></AD_TABLE_ID>
--- a/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml	Sun Apr 01 20:25:01 2012 +0200
@@ -19627,10 +19627,10 @@
 <!--1002100024-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--1002100024-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--1002100024-->  <COLUMNNAME><![CDATA[Deducpercent]]></COLUMNNAME>
-<!--1002100024-->  <NAME><![CDATA[Deductable Rate]]></NAME>
-<!--1002100024-->  <PRINTNAME><![CDATA[Deductable Rate]]></PRINTNAME>
-<!--1002100024-->  <DESCRIPTION><![CDATA[Deductable Rate]]></DESCRIPTION>
-<!--1002100024-->  <HELP><![CDATA[It is the deductable percentage]]></HELP>
+<!--1002100024-->  <NAME><![CDATA[Deductible Rate]]></NAME>
+<!--1002100024-->  <PRINTNAME><![CDATA[Deductible Rate]]></PRINTNAME>
+<!--1002100024-->  <DESCRIPTION><![CDATA[Deductible Rate]]></DESCRIPTION>
+<!--1002100024-->  <HELP><![CDATA[It is the deductible percentage]]></HELP>
 <!--1002100024-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1002100024-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--1002100024--></AD_ELEMENT>
@@ -21547,13 +21547,13 @@
 <!--46C995886E534B6BA240599DACD8240B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--46C995886E534B6BA240599DACD8240B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--46C995886E534B6BA240599DACD8240B-->  <COLUMNNAME><![CDATA[DaysTillDue]]></COLUMNNAME>
-<!--46C995886E534B6BA240599DACD8240B-->  <NAME><![CDATA[Days Till Next Due]]></NAME>
-<!--46C995886E534B6BA240599DACD8240B-->  <PRINTNAME><![CDATA[Days Till Next Due]]></PRINTNAME>
-<!--46C995886E534B6BA240599DACD8240B-->  <DESCRIPTION><![CDATA[Days Till Next Due]]></DESCRIPTION>
+<!--46C995886E534B6BA240599DACD8240B-->  <NAME><![CDATA[Days till next due]]></NAME>
+<!--46C995886E534B6BA240599DACD8240B-->  <PRINTNAME><![CDATA[Days till next due]]></PRINTNAME>
+<!--46C995886E534B6BA240599DACD8240B-->  <DESCRIPTION><![CDATA[Days till next due date]]></DESCRIPTION>
 <!--46C995886E534B6BA240599DACD8240B-->  <HELP><![CDATA[Number of days left for the next due date]]></HELP>
-<!--46C995886E534B6BA240599DACD8240B-->  <PO_NAME><![CDATA[Days Till Next Due]]></PO_NAME>
-<!--46C995886E534B6BA240599DACD8240B-->  <PO_PRINTNAME><![CDATA[Days Till Next Due]]></PO_PRINTNAME>
-<!--46C995886E534B6BA240599DACD8240B-->  <PO_DESCRIPTION><![CDATA[Days Till Next Due]]></PO_DESCRIPTION>
+<!--46C995886E534B6BA240599DACD8240B-->  <PO_NAME><![CDATA[Days till next due]]></PO_NAME>
+<!--46C995886E534B6BA240599DACD8240B-->  <PO_PRINTNAME><![CDATA[Days till next due]]></PO_PRINTNAME>
+<!--46C995886E534B6BA240599DACD8240B-->  <PO_DESCRIPTION><![CDATA[Days till next due date]]></PO_DESCRIPTION>
 <!--46C995886E534B6BA240599DACD8240B-->  <PO_HELP><![CDATA[Number of days left for the next due date]]></PO_HELP>
 <!--46C995886E534B6BA240599DACD8240B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--46C995886E534B6BA240599DACD8240B-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
@@ -22688,8 +22688,8 @@
 <!--571984A6373C8AA9E040007F01011B27-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--571984A6373C8AA9E040007F01011B27-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--571984A6373C8AA9E040007F01011B27-->  <COLUMNNAME><![CDATA[Daily_Interval]]></COLUMNNAME>
-<!--571984A6373C8AA9E040007F01011B27-->  <NAME><![CDATA[Daily_Interval]]></NAME>
-<!--571984A6373C8AA9E040007F01011B27-->  <PRINTNAME><![CDATA[Daily_Interval]]></PRINTNAME>
+<!--571984A6373C8AA9E040007F01011B27-->  <NAME><![CDATA[Daily Interval]]></NAME>
+<!--571984A6373C8AA9E040007F01011B27-->  <PRINTNAME><![CDATA[Daily Interval]]></PRINTNAME>
 <!--571984A6373C8AA9E040007F01011B27-->  <DESCRIPTION><![CDATA[The daily interval between executions of a process.]]></DESCRIPTION>
 <!--571984A6373C8AA9E040007F01011B27-->  <HELP><![CDATA[The daily interval between executions of a process.]]></HELP>
 <!--571984A6373C8AA9E040007F01011B27-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -25617,7 +25617,7 @@
 <!--8111EDCA505211DEA4E0001CC0B8EF99-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--8111EDCA505211DEA4E0001CC0B8EF99-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8111EDCA505211DEA4E0001CC0B8EF99-->  <COLUMNNAME><![CDATA[AD_Sequence_Bp_ID]]></COLUMNNAME>
-<!--8111EDCA505211DEA4E0001CC0B8EF99-->  <NAME><![CDATA[Sequance for Business Partner]]></NAME>
+<!--8111EDCA505211DEA4E0001CC0B8EF99-->  <NAME><![CDATA[Sequence for Business Partner]]></NAME>
 <!--8111EDCA505211DEA4E0001CC0B8EF99-->  <PRINTNAME><![CDATA[Sequance for Business Partner]]></PRINTNAME>
 <!--8111EDCA505211DEA4E0001CC0B8EF99-->  <DESCRIPTION><![CDATA[The sequence will be used to generate number for creating the sub-account for Business Partner.]]></DESCRIPTION>
 <!--8111EDCA505211DEA4E0001CC0B8EF99-->  <HELP><![CDATA[The sequence will be used to generate number for creating the sub-account for Business Partner.]]></HELP>
@@ -25631,7 +25631,7 @@
 <!--8112CD30505211DE8286001CC0B8EF99-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--8112CD30505211DE8286001CC0B8EF99-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8112CD30505211DE8286001CC0B8EF99-->  <COLUMNNAME><![CDATA[IsBpNewAccount]]></COLUMNNAME>
-<!--8112CD30505211DE8286001CC0B8EF99-->  <NAME><![CDATA[Create New Account for Business Parnter]]></NAME>
+<!--8112CD30505211DE8286001CC0B8EF99-->  <NAME><![CDATA[Create New Account for Business Partner]]></NAME>
 <!--8112CD30505211DE8286001CC0B8EF99-->  <PRINTNAME><![CDATA[Create New Account for Business Parnter]]></PRINTNAME>
 <!--8112CD30505211DE8286001CC0B8EF99-->  <DESCRIPTION><![CDATA[Create the new account for Business Partner]]></DESCRIPTION>
 <!--8112CD30505211DE8286001CC0B8EF99-->  <HELP><![CDATA[This flag is used to intimating the system for create the new sub-account for Business Partner.]]></HELP>
--- a/src-db/database/sourcedata/AD_FIELD.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/src-db/database/sourcedata/AD_FIELD.xml	Sun Apr 01 20:25:01 2012 +0200
@@ -24539,7 +24539,7 @@
 <!--2164-->  <AD_TAB_ID><![CDATA[220]]></AD_TAB_ID>
 <!--2164-->  <AD_COLUMN_ID><![CDATA[3081]]></AD_COLUMN_ID>
 <!--2164-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--2164-->  <DISPLAYLENGTH><![CDATA[11]]></DISPLAYLENGTH>
+<!--2164-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
 <!--2164-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--2164-->  <SEQNO><![CDATA[80]]></SEQNO>
 <!--2164-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
@@ -33899,7 +33899,7 @@
 <!--2763-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--2763-->  <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH>
 <!--2763-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--2763-->  <SEQNO><![CDATA[510]]></SEQNO>
+<!--2763-->  <SEQNO><![CDATA[348]]></SEQNO>
 <!--2763-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--2763-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--2763-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -33928,7 +33928,7 @@
 <!--2764-->  <DISPLAYLOGIC><![CDATA[@$Element_AY@='Y']]></DISPLAYLOGIC>
 <!--2764-->  <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH>
 <!--2764-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--2764-->  <SEQNO><![CDATA[570]]></SEQNO>
+<!--2764-->  <SEQNO><![CDATA[360]]></SEQNO>
 <!--2764-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--2764-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--2764-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -34095,7 +34095,7 @@
 <!--2771-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--2771-->  <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH>
 <!--2771-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
-<!--2771-->  <SEQNO><![CDATA[610]]></SEQNO>
+<!--2771-->  <SEQNO><![CDATA[405]]></SEQNO>
 <!--2771-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--2771-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--2771-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -34204,7 +34204,7 @@
 <!--2776-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--2776-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--2776-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--2776-->  <SEQNO><![CDATA[540]]></SEQNO>
+<!--2776-->  <SEQNO><![CDATA[351]]></SEQNO>
 <!--2776-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--2776-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--2776-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -35953,7 +35953,7 @@
 <!--2953-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
 <!--2953-->  <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH>
 <!--2953-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--2953-->  <SEQNO><![CDATA[580]]></SEQNO>
+<!--2953-->  <SEQNO><![CDATA[380]]></SEQNO>
 <!--2953-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--2953-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--2953-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -36008,7 +36008,7 @@
 <!--2956-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
 <!--2956-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--2956-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--2956-->  <SEQNO><![CDATA[590]]></SEQNO>
+<!--2956-->  <SEQNO><![CDATA[390]]></SEQNO>
 <!--2956-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--2956-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--2956-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -36144,7 +36144,7 @@
 <!--2961-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--2961-->  <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH>
 <!--2961-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--2961-->  <SEQNO><![CDATA[500]]></SEQNO>
+<!--2961-->  <SEQNO><![CDATA[347]]></SEQNO>
 <!--2961-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--2961-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--2961-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -36172,7 +36172,7 @@
 <!--2962-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--2962-->  <DISPLAYLENGTH><![CDATA[20]]></DISPLAYLENGTH>
 <!--2962-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--2962-->  <SEQNO><![CDATA[530]]></SEQNO>
+<!--2962-->  <SEQNO><![CDATA[350]]></SEQNO>
 <!--2962-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--2962-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--2962-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -38945,7 +38945,7 @@
 <!--3224-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--3224-->  <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH>
 <!--3224-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
-<!--3224-->  <SEQNO><![CDATA[520]]></SEQNO>
+<!--3224-->  <SEQNO><![CDATA[349]]></SEQNO>
 <!--3224-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--3224-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--3224-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -38973,7 +38973,7 @@
 <!--3225-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--3225-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--3225-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
-<!--3225-->  <SEQNO><![CDATA[600]]></SEQNO>
+<!--3225-->  <SEQNO><![CDATA[400]]></SEQNO>
 <!--3225-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--3225-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--3225-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -40462,7 +40462,7 @@
 <!--3334-->  <DISPLAYLOGIC><![CDATA[@DocStatus@!'CL'&@DocStatus@!'VO'&@InvoiceProcessButton@='']]></DISPLAYLOGIC>
 <!--3334-->  <DISPLAYLENGTH><![CDATA[23]]></DISPLAYLENGTH>
 <!--3334-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--3334-->  <SEQNO><![CDATA[550]]></SEQNO>
+<!--3334-->  <SEQNO><![CDATA[305]]></SEQNO>
 <!--3334-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--3334-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--3334-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -46710,7 +46710,7 @@
 <!--3670-->  <DISPLAYLOGIC><![CDATA[@Processed@='Y' & @#ShowAcct@='Y']]></DISPLAYLOGIC>
 <!--3670-->  <DISPLAYLENGTH><![CDATA[23]]></DISPLAYLENGTH>
 <!--3670-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--3670-->  <SEQNO><![CDATA[530]]></SEQNO>
+<!--3670-->  <SEQNO><![CDATA[303]]></SEQNO>
 <!--3670-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--3670-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--3670-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -54189,7 +54189,7 @@
 <!--4246-->  <DISPLAYLOGIC><![CDATA[@Processed@='N']]></DISPLAYLOGIC>
 <!--4246-->  <DISPLAYLENGTH><![CDATA[23]]></DISPLAYLENGTH>
 <!--4246-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--4246-->  <SEQNO><![CDATA[560]]></SEQNO>
+<!--4246-->  <SEQNO><![CDATA[306]]></SEQNO>
 <!--4246-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--4246-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--4246-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -75443,7 +75443,7 @@
 <!--6532-->  <DISPLAYLOGIC><![CDATA[@Processed@='N']]></DISPLAYLOGIC>
 <!--6532-->  <DISPLAYLENGTH><![CDATA[23]]></DISPLAYLENGTH>
 <!--6532-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--6532-->  <SEQNO><![CDATA[570]]></SEQNO>
+<!--6532-->  <SEQNO><![CDATA[307]]></SEQNO>
 <!--6532-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--6532-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--6532-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -77593,7 +77593,7 @@
 <!--6654-->  <AD_TAB_ID><![CDATA[478]]></AD_TAB_ID>
 <!--6654-->  <AD_COLUMN_ID><![CDATA[8720]]></AD_COLUMN_ID>
 <!--6654-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--6654-->  <DISPLAYLOGIC><![CDATA[@C_Order_Id@=''|@OrderStatus@='VO']]></DISPLAYLOGIC>
+<!--6654-->  <DISPLAYLOGIC><![CDATA[(@C_Order_Id@=''|@OrderStatus@='VO') & @projectstatus@='OR']]></DISPLAYLOGIC>
 <!--6654-->  <DISPLAYLENGTH><![CDATA[23]]></DISPLAYLENGTH>
 <!--6654-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--6654-->  <SEQNO><![CDATA[150]]></SEQNO>
@@ -154593,6 +154593,7 @@
 <!--804060-->  <AD_TAB_ID><![CDATA[239]]></AD_TAB_ID>
 <!--804060-->  <AD_COLUMN_ID><![CDATA[803695]]></AD_COLUMN_ID>
 <!--804060-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--804060-->  <DISPLAYLOGIC><![CDATA[@qtytype@!'E']]></DISPLAYLOGIC>
 <!--804060-->  <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
 <!--804060-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--804060-->  <SEQNO><![CDATA[230]]></SEQNO>
@@ -162137,7 +162138,7 @@
 <!--1002100235-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--1002100235-->  <DISPLAYLENGTH><![CDATA[19]]></DISPLAYLENGTH>
 <!--1002100235-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--1002100235-->  <SEQNO><![CDATA[560]]></SEQNO>
+<!--1002100235-->  <SEQNO><![CDATA[359]]></SEQNO>
 <!--1002100235-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1002100235-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--1002100235-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -162181,9 +162182,9 @@
 <!--1002100237-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--1002100237-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--1002100237-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--1002100237-->  <NAME><![CDATA[Deductable Rate]]></NAME>
-<!--1002100237-->  <DESCRIPTION><![CDATA[Deductable Rate]]></DESCRIPTION>
-<!--1002100237-->  <HELP><![CDATA[It is the deductable percentage]]></HELP>
+<!--1002100237-->  <NAME><![CDATA[Deductible Rate]]></NAME>
+<!--1002100237-->  <DESCRIPTION><![CDATA[Deductible Rate]]></DESCRIPTION>
+<!--1002100237-->  <HELP><![CDATA[It is the deductible percentage]]></HELP>
 <!--1002100237-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--1002100237-->  <AD_TAB_ID><![CDATA[174]]></AD_TAB_ID>
 <!--1002100237-->  <AD_COLUMN_ID><![CDATA[1002100109]]></AD_COLUMN_ID>
@@ -168415,10 +168416,10 @@
 <!--001B5B2BFC064FA4AEDD5B20518B2DD1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--001B5B2BFC064FA4AEDD5B20518B2DD1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--001B5B2BFC064FA4AEDD5B20518B2DD1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--001B5B2BFC064FA4AEDD5B20518B2DD1-->  <NAME><![CDATA[Amount Currently Due]]></NAME>
+<!--001B5B2BFC064FA4AEDD5B20518B2DD1-->  <NAME><![CDATA[Due Amount]]></NAME>
 <!--001B5B2BFC064FA4AEDD5B20518B2DD1-->  <DESCRIPTION><![CDATA[Due Amount]]></DESCRIPTION>
 <!--001B5B2BFC064FA4AEDD5B20518B2DD1-->  <HELP><![CDATA[Total amount due]]></HELP>
-<!--001B5B2BFC064FA4AEDD5B20518B2DD1-->  <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED>
+<!--001B5B2BFC064FA4AEDD5B20518B2DD1-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--001B5B2BFC064FA4AEDD5B20518B2DD1-->  <AD_TAB_ID><![CDATA[263]]></AD_TAB_ID>
 <!--001B5B2BFC064FA4AEDD5B20518B2DD1-->  <AD_COLUMN_ID><![CDATA[D330031212524D2CAA0C5ECEE52C20B8]]></AD_COLUMN_ID>
 <!--001B5B2BFC064FA4AEDD5B20518B2DD1-->  <AD_FIELDGROUP_ID><![CDATA[5779017ADB22479BB143E49A8B3A9AE0]]></AD_FIELDGROUP_ID>
@@ -168426,14 +168427,14 @@
 <!--001B5B2BFC064FA4AEDD5B20518B2DD1-->  <DISPLAYLOGIC><![CDATA[@Processed@='Y' & @Ispaid@='N']]></DISPLAYLOGIC>
 <!--001B5B2BFC064FA4AEDD5B20518B2DD1-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--001B5B2BFC064FA4AEDD5B20518B2DD1-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
-<!--001B5B2BFC064FA4AEDD5B20518B2DD1-->  <SEQNO><![CDATA[370]]></SEQNO>
+<!--001B5B2BFC064FA4AEDD5B20518B2DD1-->  <SEQNO><![CDATA[345]]></SEQNO>
 <!--001B5B2BFC064FA4AEDD5B20518B2DD1-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--001B5B2BFC064FA4AEDD5B20518B2DD1-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--001B5B2BFC064FA4AEDD5B20518B2DD1-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--001B5B2BFC064FA4AEDD5B20518B2DD1-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--001B5B2BFC064FA4AEDD5B20518B2DD1-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--001B5B2BFC064FA4AEDD5B20518B2DD1-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--001B5B2BFC064FA4AEDD5B20518B2DD1-->  <GRID_SEQNO><![CDATA[100]]></GRID_SEQNO>
+<!--001B5B2BFC064FA4AEDD5B20518B2DD1-->  <GRID_SEQNO><![CDATA[110]]></GRID_SEQNO>
 <!--001B5B2BFC064FA4AEDD5B20518B2DD1-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--001B5B2BFC064FA4AEDD5B20518B2DD1-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--001B5B2BFC064FA4AEDD5B20518B2DD1-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -168445,7 +168446,7 @@
 <!--00A85624B62A4151B3B1F5087CD5DE8B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--00A85624B62A4151B3B1F5087CD5DE8B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--00A85624B62A4151B3B1F5087CD5DE8B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--00A85624B62A4151B3B1F5087CD5DE8B-->  <NAME><![CDATA[Create New Account for Business Parnter]]></NAME>
+<!--00A85624B62A4151B3B1F5087CD5DE8B-->  <NAME><![CDATA[Create New Account for Business Partner]]></NAME>
 <!--00A85624B62A4151B3B1F5087CD5DE8B-->  <DESCRIPTION><![CDATA[Create the new account for Business Partner]]></DESCRIPTION>
 <!--00A85624B62A4151B3B1F5087CD5DE8B-->  <HELP><![CDATA[This flag is used to intimating the system for create the new sub-account for Business Partner.]]></HELP>
 <!--00A85624B62A4151B3B1F5087CD5DE8B-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
@@ -169077,7 +169078,7 @@
 <!--075A8BF00D2744878F8424E87FD18E71-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--075A8BF00D2744878F8424E87FD18E71-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--075A8BF00D2744878F8424E87FD18E71-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--075A8BF00D2744878F8424E87FD18E71-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--075A8BF00D2744878F8424E87FD18E71-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--075A8BF00D2744878F8424E87FD18E71-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--075A8BF00D2744878F8424E87FD18E71-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--075A8BF00D2744878F8424E87FD18E71-->  <GRID_SEQNO><![CDATA[80]]></GRID_SEQNO>
@@ -169958,25 +169959,24 @@
 <!--0F5888C3B41142FFAAC11D68CD176C05-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--0F5888C3B41142FFAAC11D68CD176C05-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0F5888C3B41142FFAAC11D68CD176C05-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--0F5888C3B41142FFAAC11D68CD176C05-->  <NAME><![CDATA[Amount Currently Due]]></NAME>
+<!--0F5888C3B41142FFAAC11D68CD176C05-->  <NAME><![CDATA[Due Amount]]></NAME>
 <!--0F5888C3B41142FFAAC11D68CD176C05-->  <DESCRIPTION><![CDATA[Due Amount]]></DESCRIPTION>
 <!--0F5888C3B41142FFAAC11D68CD176C05-->  <HELP><![CDATA[Total amount due]]></HELP>
-<!--0F5888C3B41142FFAAC11D68CD176C05-->  <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED>
+<!--0F5888C3B41142FFAAC11D68CD176C05-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--0F5888C3B41142FFAAC11D68CD176C05-->  <AD_TAB_ID><![CDATA[290]]></AD_TAB_ID>
 <!--0F5888C3B41142FFAAC11D68CD176C05-->  <AD_COLUMN_ID><![CDATA[D330031212524D2CAA0C5ECEE52C20B8]]></AD_COLUMN_ID>
-<!--0F5888C3B41142FFAAC11D68CD176C05-->  <AD_FIELDGROUP_ID><![CDATA[5779017ADB22479BB143E49A8B3A9AE0]]></AD_FIELDGROUP_ID>
 <!--0F5888C3B41142FFAAC11D68CD176C05-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--0F5888C3B41142FFAAC11D68CD176C05-->  <DISPLAYLOGIC><![CDATA[@Processed@='Y' & @Ispaid@='N']]></DISPLAYLOGIC>
 <!--0F5888C3B41142FFAAC11D68CD176C05-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--0F5888C3B41142FFAAC11D68CD176C05-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
-<!--0F5888C3B41142FFAAC11D68CD176C05-->  <SEQNO><![CDATA[320]]></SEQNO>
+<!--0F5888C3B41142FFAAC11D68CD176C05-->  <SEQNO><![CDATA[300]]></SEQNO>
 <!--0F5888C3B41142FFAAC11D68CD176C05-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--0F5888C3B41142FFAAC11D68CD176C05-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--0F5888C3B41142FFAAC11D68CD176C05-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--0F5888C3B41142FFAAC11D68CD176C05-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--0F5888C3B41142FFAAC11D68CD176C05-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--0F5888C3B41142FFAAC11D68CD176C05-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--0F5888C3B41142FFAAC11D68CD176C05-->  <GRID_SEQNO><![CDATA[100]]></GRID_SEQNO>
+<!--0F5888C3B41142FFAAC11D68CD176C05-->  <GRID_SEQNO><![CDATA[110]]></GRID_SEQNO>
 <!--0F5888C3B41142FFAAC11D68CD176C05-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--0F5888C3B41142FFAAC11D68CD176C05-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--0F5888C3B41142FFAAC11D68CD176C05-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -170346,18 +170346,17 @@
 <!--12C428AA32294335A97B3AAFCF00A7AD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--12C428AA32294335A97B3AAFCF00A7AD-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--12C428AA32294335A97B3AAFCF00A7AD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--12C428AA32294335A97B3AAFCF00A7AD-->  <NAME><![CDATA[Total Outstanding]]></NAME>
+<!--12C428AA32294335A97B3AAFCF00A7AD-->  <NAME><![CDATA[Outstanding Amount]]></NAME>
 <!--12C428AA32294335A97B3AAFCF00A7AD-->  <DESCRIPTION><![CDATA[Outstanding Amount]]></DESCRIPTION>
-<!--12C428AA32294335A97B3AAFCF00A7AD-->  <HELP><![CDATA[Total Outstanding Amount. Amount pending to be paid]]></HELP>
-<!--12C428AA32294335A97B3AAFCF00A7AD-->  <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED>
+<!--12C428AA32294335A97B3AAFCF00A7AD-->  <HELP><![CDATA[Outstanding Amount. Amount pending to be paid]]></HELP>
+<!--12C428AA32294335A97B3AAFCF00A7AD-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--12C428AA32294335A97B3AAFCF00A7AD-->  <AD_TAB_ID><![CDATA[290]]></AD_TAB_ID>
 <!--12C428AA32294335A97B3AAFCF00A7AD-->  <AD_COLUMN_ID><![CDATA[CC754B47555D4F66974371B151632F41]]></AD_COLUMN_ID>
-<!--12C428AA32294335A97B3AAFCF00A7AD-->  <AD_FIELDGROUP_ID><![CDATA[5779017ADB22479BB143E49A8B3A9AE0]]></AD_FIELDGROUP_ID>
 <!--12C428AA32294335A97B3AAFCF00A7AD-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--12C428AA32294335A97B3AAFCF00A7AD-->  <DISPLAYLOGIC><![CDATA[@Processed@='Y' & @Ispaid@='N']]></DISPLAYLOGIC>
 <!--12C428AA32294335A97B3AAFCF00A7AD-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--12C428AA32294335A97B3AAFCF00A7AD-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
-<!--12C428AA32294335A97B3AAFCF00A7AD-->  <SEQNO><![CDATA[310]]></SEQNO>
+<!--12C428AA32294335A97B3AAFCF00A7AD-->  <SEQNO><![CDATA[298]]></SEQNO>
 <!--12C428AA32294335A97B3AAFCF00A7AD-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--12C428AA32294335A97B3AAFCF00A7AD-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--12C428AA32294335A97B3AAFCF00A7AD-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -173426,10 +173425,11 @@
 <!--2C54884FAC954FB3BB1D10D880DF95AA-->  <AD_TAB_ID><![CDATA[263]]></AD_TAB_ID>
 <!--2C54884FAC954FB3BB1D10D880DF95AA-->  <AD_COLUMN_ID><![CDATA[077BD0CB4F424D8A882FB287671BD4B4]]></AD_COLUMN_ID>
 <!--2C54884FAC954FB3BB1D10D880DF95AA-->  <AD_FIELDGROUP_ID><![CDATA[5779017ADB22479BB143E49A8B3A9AE0]]></AD_FIELDGROUP_ID>
-<!--2C54884FAC954FB3BB1D10D880DF95AA-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--2C54884FAC954FB3BB1D10D880DF95AA-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--2C54884FAC954FB3BB1D10D880DF95AA-->  <DISPLAYLOGIC><![CDATA[@Processed@='Y']]></DISPLAYLOGIC>
 <!--2C54884FAC954FB3BB1D10D880DF95AA-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--2C54884FAC954FB3BB1D10D880DF95AA-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--2C54884FAC954FB3BB1D10D880DF95AA-->  <SEQNO><![CDATA[346]]></SEQNO>
 <!--2C54884FAC954FB3BB1D10D880DF95AA-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--2C54884FAC954FB3BB1D10D880DF95AA-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--2C54884FAC954FB3BB1D10D880DF95AA-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -179056,7 +179056,7 @@
 <!--549FB043F3B24FB9B12519B4F09C19B6-->  <DISPLAYLOGIC><![CDATA[@Processed@='Y' & @Ispaid@='N']]></DISPLAYLOGIC>
 <!--549FB043F3B24FB9B12519B4F09C19B6-->  <DISPLAYLENGTH><![CDATA[2]]></DISPLAYLENGTH>
 <!--549FB043F3B24FB9B12519B4F09C19B6-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
-<!--549FB043F3B24FB9B12519B4F09C19B6-->  <SEQNO><![CDATA[350]]></SEQNO>
+<!--549FB043F3B24FB9B12519B4F09C19B6-->  <SEQNO><![CDATA[342]]></SEQNO>
 <!--549FB043F3B24FB9B12519B4F09C19B6-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--549FB043F3B24FB9B12519B4F09C19B6-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--549FB043F3B24FB9B12519B4F09C19B6-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -179065,7 +179065,7 @@
 <!--549FB043F3B24FB9B12519B4F09C19B6-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--549FB043F3B24FB9B12519B4F09C19B6-->  <GRID_SEQNO><![CDATA[80]]></GRID_SEQNO>
 <!--549FB043F3B24FB9B12519B4F09C19B6-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--549FB043F3B24FB9B12519B4F09C19B6-->  <STARTNEWLINE><![CDATA[Y]]></STARTNEWLINE>
+<!--549FB043F3B24FB9B12519B4F09C19B6-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--549FB043F3B24FB9B12519B4F09C19B6-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
 <!--549FB043F3B24FB9B12519B4F09C19B6-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--549FB043F3B24FB9B12519B4F09C19B6--></AD_FIELD>
@@ -181269,7 +181269,7 @@
 <!--573D4A317DCEFFC9E040007F01012790-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--573D4A317DCEFFC9E040007F01012790-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--573D4A317DCEFFC9E040007F01012790-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--573D4A317DCEFFC9E040007F01012790-->  <NAME><![CDATA[Daily_Interval]]></NAME>
+<!--573D4A317DCEFFC9E040007F01012790-->  <NAME><![CDATA[Daily Interval]]></NAME>
 <!--573D4A317DCEFFC9E040007F01012790-->  <DESCRIPTION><![CDATA[The daily interval between executions of a process.]]></DESCRIPTION>
 <!--573D4A317DCEFFC9E040007F01012790-->  <HELP><![CDATA[The daily interval between executions of a process.]]></HELP>
 <!--573D4A317DCEFFC9E040007F01012790-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
@@ -183222,7 +183222,7 @@
 <!--5814736D56B34AD3A6F89D5023FAF575-->  <DISPLAYLOGIC><![CDATA[@Processed@='Y' & @PaymentMonitor@='']]></DISPLAYLOGIC>
 <!--5814736D56B34AD3A6F89D5023FAF575-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
 <!--5814736D56B34AD3A6F89D5023FAF575-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--5814736D56B34AD3A6F89D5023FAF575-->  <SEQNO><![CDATA[500]]></SEQNO>
+<!--5814736D56B34AD3A6F89D5023FAF575-->  <SEQNO><![CDATA[301]]></SEQNO>
 <!--5814736D56B34AD3A6F89D5023FAF575-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--5814736D56B34AD3A6F89D5023FAF575-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--5814736D56B34AD3A6F89D5023FAF575-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -191983,7 +191983,7 @@
 <!--75D3E53684774A14B665838D7CCC33A7-->  <DISPLAYLOGIC><![CDATA[@Processed@='Y' & @Ispaid@='N']]></DISPLAYLOGIC>
 <!--75D3E53684774A14B665838D7CCC33A7-->  <DISPLAYLENGTH><![CDATA[2]]></DISPLAYLENGTH>
 <!--75D3E53684774A14B665838D7CCC33A7-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
-<!--75D3E53684774A14B665838D7CCC33A7-->  <SEQNO><![CDATA[300]]></SEQNO>
+<!--75D3E53684774A14B665838D7CCC33A7-->  <SEQNO><![CDATA[297]]></SEQNO>
 <!--75D3E53684774A14B665838D7CCC33A7-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--75D3E53684774A14B665838D7CCC33A7-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--75D3E53684774A14B665838D7CCC33A7-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -191992,7 +191992,7 @@
 <!--75D3E53684774A14B665838D7CCC33A7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--75D3E53684774A14B665838D7CCC33A7-->  <GRID_SEQNO><![CDATA[80]]></GRID_SEQNO>
 <!--75D3E53684774A14B665838D7CCC33A7-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--75D3E53684774A14B665838D7CCC33A7-->  <STARTNEWLINE><![CDATA[Y]]></STARTNEWLINE>
+<!--75D3E53684774A14B665838D7CCC33A7-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--75D3E53684774A14B665838D7CCC33A7-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
 <!--75D3E53684774A14B665838D7CCC33A7-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--75D3E53684774A14B665838D7CCC33A7--></AD_FIELD>
@@ -198757,7 +198757,7 @@
 <!--83424218E05542989EF92FD3E5B5181A-->  <DISPLAYLOGIC><![CDATA[@Processed@='Y' & @PaymentMonitor@='']]></DISPLAYLOGIC>
 <!--83424218E05542989EF92FD3E5B5181A-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
 <!--83424218E05542989EF92FD3E5B5181A-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--83424218E05542989EF92FD3E5B5181A-->  <SEQNO><![CDATA[550]]></SEQNO>
+<!--83424218E05542989EF92FD3E5B5181A-->  <SEQNO><![CDATA[352]]></SEQNO>
 <!--83424218E05542989EF92FD3E5B5181A-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--83424218E05542989EF92FD3E5B5181A-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--83424218E05542989EF92FD3E5B5181A-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -201238,25 +201238,24 @@
 <!--8ACBE3091A9E4CF3835A397D1ADC1E16-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--8ACBE3091A9E4CF3835A397D1ADC1E16-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--8ACBE3091A9E4CF3835A397D1ADC1E16-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8ACBE3091A9E4CF3835A397D1ADC1E16-->  <NAME><![CDATA[Days Till Next Due]]></NAME>
-<!--8ACBE3091A9E4CF3835A397D1ADC1E16-->  <DESCRIPTION><![CDATA[Days Till Next Due]]></DESCRIPTION>
+<!--8ACBE3091A9E4CF3835A397D1ADC1E16-->  <NAME><![CDATA[Days till next due]]></NAME>
+<!--8ACBE3091A9E4CF3835A397D1ADC1E16-->  <DESCRIPTION><![CDATA[Days till next due date]]></DESCRIPTION>
 <!--8ACBE3091A9E4CF3835A397D1ADC1E16-->  <HELP><![CDATA[Number of days left for the next due date]]></HELP>
 <!--8ACBE3091A9E4CF3835A397D1ADC1E16-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--8ACBE3091A9E4CF3835A397D1ADC1E16-->  <AD_TAB_ID><![CDATA[290]]></AD_TAB_ID>
 <!--8ACBE3091A9E4CF3835A397D1ADC1E16-->  <AD_COLUMN_ID><![CDATA[31940C8567304B00A8AF8D7A61BE5F3A]]></AD_COLUMN_ID>
-<!--8ACBE3091A9E4CF3835A397D1ADC1E16-->  <AD_FIELDGROUP_ID><![CDATA[5779017ADB22479BB143E49A8B3A9AE0]]></AD_FIELDGROUP_ID>
 <!--8ACBE3091A9E4CF3835A397D1ADC1E16-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--8ACBE3091A9E4CF3835A397D1ADC1E16-->  <DISPLAYLOGIC><![CDATA[@Processed@='Y' & @Ispaid@='N']]></DISPLAYLOGIC>
 <!--8ACBE3091A9E4CF3835A397D1ADC1E16-->  <DISPLAYLENGTH><![CDATA[4]]></DISPLAYLENGTH>
 <!--8ACBE3091A9E4CF3835A397D1ADC1E16-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
-<!--8ACBE3091A9E4CF3835A397D1ADC1E16-->  <SEQNO><![CDATA[330]]></SEQNO>
+<!--8ACBE3091A9E4CF3835A397D1ADC1E16-->  <SEQNO><![CDATA[299]]></SEQNO>
 <!--8ACBE3091A9E4CF3835A397D1ADC1E16-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--8ACBE3091A9E4CF3835A397D1ADC1E16-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--8ACBE3091A9E4CF3835A397D1ADC1E16-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--8ACBE3091A9E4CF3835A397D1ADC1E16-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--8ACBE3091A9E4CF3835A397D1ADC1E16-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--8ACBE3091A9E4CF3835A397D1ADC1E16-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8ACBE3091A9E4CF3835A397D1ADC1E16-->  <GRID_SEQNO><![CDATA[112]]></GRID_SEQNO>
+<!--8ACBE3091A9E4CF3835A397D1ADC1E16-->  <GRID_SEQNO><![CDATA[100]]></GRID_SEQNO>
 <!--8ACBE3091A9E4CF3835A397D1ADC1E16-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--8ACBE3091A9E4CF3835A397D1ADC1E16-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--8ACBE3091A9E4CF3835A397D1ADC1E16-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -204589,7 +204588,7 @@
 <!--96765FC7606648C6841BA794FC08F690-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--96765FC7606648C6841BA794FC08F690-->  <AD_TAB_ID><![CDATA[290]]></AD_TAB_ID>
 <!--96765FC7606648C6841BA794FC08F690-->  <AD_COLUMN_ID><![CDATA[077BD0CB4F424D8A882FB287671BD4B4]]></AD_COLUMN_ID>
-<!--96765FC7606648C6841BA794FC08F690-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--96765FC7606648C6841BA794FC08F690-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--96765FC7606648C6841BA794FC08F690-->  <DISPLAYLOGIC><![CDATA[@Processed@='Y']]></DISPLAYLOGIC>
 <!--96765FC7606648C6841BA794FC08F690-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--96765FC7606648C6841BA794FC08F690-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
@@ -207562,10 +207561,10 @@
 <!--ABA8AFDB0CDD49B9B20A24D2D8127B38-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--ABA8AFDB0CDD49B9B20A24D2D8127B38-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--ABA8AFDB0CDD49B9B20A24D2D8127B38-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--ABA8AFDB0CDD49B9B20A24D2D8127B38-->  <NAME><![CDATA[Total Outstanding]]></NAME>
+<!--ABA8AFDB0CDD49B9B20A24D2D8127B38-->  <NAME><![CDATA[Outstanding Amount]]></NAME>
 <!--ABA8AFDB0CDD49B9B20A24D2D8127B38-->  <DESCRIPTION><![CDATA[Outstanding Amount]]></DESCRIPTION>
 <!--ABA8AFDB0CDD49B9B20A24D2D8127B38-->  <HELP><![CDATA[Outstanding Amount. Amount pending to be paid]]></HELP>
-<!--ABA8AFDB0CDD49B9B20A24D2D8127B38-->  <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED>
+<!--ABA8AFDB0CDD49B9B20A24D2D8127B38-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--ABA8AFDB0CDD49B9B20A24D2D8127B38-->  <AD_TAB_ID><![CDATA[263]]></AD_TAB_ID>
 <!--ABA8AFDB0CDD49B9B20A24D2D8127B38-->  <AD_COLUMN_ID><![CDATA[CC754B47555D4F66974371B151632F41]]></AD_COLUMN_ID>
 <!--ABA8AFDB0CDD49B9B20A24D2D8127B38-->  <AD_FIELDGROUP_ID><![CDATA[5779017ADB22479BB143E49A8B3A9AE0]]></AD_FIELDGROUP_ID>
@@ -207573,7 +207572,7 @@
 <!--ABA8AFDB0CDD49B9B20A24D2D8127B38-->  <DISPLAYLOGIC><![CDATA[@Processed@='Y' & @Ispaid@='N']]></DISPLAYLOGIC>
 <!--ABA8AFDB0CDD49B9B20A24D2D8127B38-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--ABA8AFDB0CDD49B9B20A24D2D8127B38-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
-<!--ABA8AFDB0CDD49B9B20A24D2D8127B38-->  <SEQNO><![CDATA[360]]></SEQNO>
+<!--ABA8AFDB0CDD49B9B20A24D2D8127B38-->  <SEQNO><![CDATA[343]]></SEQNO>
 <!--ABA8AFDB0CDD49B9B20A24D2D8127B38-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--ABA8AFDB0CDD49B9B20A24D2D8127B38-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--ABA8AFDB0CDD49B9B20A24D2D8127B38-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -217218,8 +217217,8 @@
 <!--B1EBC90EB5EAC896E040A8C0280118CA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--B1EBC90EB5EAC896E040A8C0280118CA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--B1EBC90EB5EAC896E040A8C0280118CA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--B1EBC90EB5EAC896E040A8C0280118CA-->  <NAME><![CDATA[Paid in Full Date]]></NAME>
-<!--B1EBC90EB5EAC896E040A8C0280118CA-->  <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED>
+<!--B1EBC90EB5EAC896E040A8C0280118CA-->  <NAME><![CDATA[Final Settlement Date]]></NAME>
+<!--B1EBC90EB5EAC896E040A8C0280118CA-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--B1EBC90EB5EAC896E040A8C0280118CA-->  <AD_TAB_ID><![CDATA[263]]></AD_TAB_ID>
 <!--B1EBC90EB5EAC896E040A8C0280118CA-->  <AD_COLUMN_ID><![CDATA[B1EB46EDFF1CBCB4E040A8C028010EF8]]></AD_COLUMN_ID>
 <!--B1EBC90EB5EAC896E040A8C0280118CA-->  <AD_FIELDGROUP_ID><![CDATA[5779017ADB22479BB143E49A8B3A9AE0]]></AD_FIELDGROUP_ID>
@@ -217227,14 +217226,14 @@
 <!--B1EBC90EB5EAC896E040A8C0280118CA-->  <DISPLAYLOGIC><![CDATA[@Processed@='Y' & @Ispaid@='Y']]></DISPLAYLOGIC>
 <!--B1EBC90EB5EAC896E040A8C0280118CA-->  <DISPLAYLENGTH><![CDATA[19]]></DISPLAYLENGTH>
 <!--B1EBC90EB5EAC896E040A8C0280118CA-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
-<!--B1EBC90EB5EAC896E040A8C0280118CA-->  <SEQNO><![CDATA[410]]></SEQNO>
+<!--B1EBC90EB5EAC896E040A8C0280118CA-->  <SEQNO><![CDATA[346]]></SEQNO>
 <!--B1EBC90EB5EAC896E040A8C0280118CA-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--B1EBC90EB5EAC896E040A8C0280118CA-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--B1EBC90EB5EAC896E040A8C0280118CA-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--B1EBC90EB5EAC896E040A8C0280118CA-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--B1EBC90EB5EAC896E040A8C0280118CA-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--B1EBC90EB5EAC896E040A8C0280118CA-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--B1EBC90EB5EAC896E040A8C0280118CA-->  <GRID_SEQNO><![CDATA[114]]></GRID_SEQNO>
+<!--B1EBC90EB5EAC896E040A8C0280118CA-->  <GRID_SEQNO><![CDATA[112]]></GRID_SEQNO>
 <!--B1EBC90EB5EAC896E040A8C0280118CA-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--B1EBC90EB5EAC896E040A8C0280118CA-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--B1EBC90EB5EAC896E040A8C0280118CA-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -217246,8 +217245,8 @@
 <!--B1EBC90EB5EBC896E040A8C0280118CA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--B1EBC90EB5EBC896E040A8C0280118CA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--B1EBC90EB5EBC896E040A8C0280118CA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--B1EBC90EB5EBC896E040A8C0280118CA-->  <NAME><![CDATA[Days to Pay in Full]]></NAME>
-<!--B1EBC90EB5EBC896E040A8C0280118CA-->  <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED>
+<!--B1EBC90EB5EBC896E040A8C0280118CA-->  <NAME><![CDATA[Days Sales Outstanding]]></NAME>
+<!--B1EBC90EB5EBC896E040A8C0280118CA-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--B1EBC90EB5EBC896E040A8C0280118CA-->  <AD_TAB_ID><![CDATA[263]]></AD_TAB_ID>
 <!--B1EBC90EB5EBC896E040A8C0280118CA-->  <AD_COLUMN_ID><![CDATA[B1EB46EDFF1DBCB4E040A8C028010EF8]]></AD_COLUMN_ID>
 <!--B1EBC90EB5EBC896E040A8C0280118CA-->  <AD_FIELDGROUP_ID><![CDATA[5779017ADB22479BB143E49A8B3A9AE0]]></AD_FIELDGROUP_ID>
@@ -217255,14 +217254,14 @@
 <!--B1EBC90EB5EBC896E040A8C0280118CA-->  <DISPLAYLOGIC><![CDATA[@Processed@='Y' & @Ispaid@='Y']]></DISPLAYLOGIC>
 <!--B1EBC90EB5EBC896E040A8C0280118CA-->  <DISPLAYLENGTH><![CDATA[4]]></DISPLAYLENGTH>
 <!--B1EBC90EB5EBC896E040A8C0280118CA-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
-<!--B1EBC90EB5EBC896E040A8C0280118CA-->  <SEQNO><![CDATA[420]]></SEQNO>
+<!--B1EBC90EB5EBC896E040A8C0280118CA-->  <SEQNO><![CDATA[346]]></SEQNO>
 <!--B1EBC90EB5EBC896E040A8C0280118CA-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--B1EBC90EB5EBC896E040A8C0280118CA-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--B1EBC90EB5EBC896E040A8C0280118CA-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--B1EBC90EB5EBC896E040A8C0280118CA-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--B1EBC90EB5EBC896E040A8C0280118CA-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--B1EBC90EB5EBC896E040A8C0280118CA-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--B1EBC90EB5EBC896E040A8C0280118CA-->  <GRID_SEQNO><![CDATA[116]]></GRID_SEQNO>
+<!--B1EBC90EB5EBC896E040A8C0280118CA-->  <GRID_SEQNO><![CDATA[114]]></GRID_SEQNO>
 <!--B1EBC90EB5EBC896E040A8C0280118CA-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--B1EBC90EB5EBC896E040A8C0280118CA-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--B1EBC90EB5EBC896E040A8C0280118CA-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -217274,8 +217273,8 @@
 <!--B1EBC90EB5ECC896E040A8C0280118CA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--B1EBC90EB5ECC896E040A8C0280118CA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--B1EBC90EB5ECC896E040A8C0280118CA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--B1EBC90EB5ECC896E040A8C0280118CA-->  <NAME><![CDATA[Percentage Paid Late]]></NAME>
-<!--B1EBC90EB5ECC896E040A8C0280118CA-->  <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED>
+<!--B1EBC90EB5ECC896E040A8C0280118CA-->  <NAME><![CDATA[Percentage Overdue]]></NAME>
+<!--B1EBC90EB5ECC896E040A8C0280118CA-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--B1EBC90EB5ECC896E040A8C0280118CA-->  <AD_TAB_ID><![CDATA[263]]></AD_TAB_ID>
 <!--B1EBC90EB5ECC896E040A8C0280118CA-->  <AD_COLUMN_ID><![CDATA[B1EB46EDFF1EBCB4E040A8C028010EF8]]></AD_COLUMN_ID>
 <!--B1EBC90EB5ECC896E040A8C0280118CA-->  <AD_FIELDGROUP_ID><![CDATA[5779017ADB22479BB143E49A8B3A9AE0]]></AD_FIELDGROUP_ID>
@@ -217283,16 +217282,16 @@
 <!--B1EBC90EB5ECC896E040A8C0280118CA-->  <DISPLAYLOGIC><![CDATA[@Processed@='Y' & @Totalpaid@!0]]></DISPLAYLOGIC>
 <!--B1EBC90EB5ECC896E040A8C0280118CA-->  <DISPLAYLENGTH><![CDATA[4]]></DISPLAYLENGTH>
 <!--B1EBC90EB5ECC896E040A8C0280118CA-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
-<!--B1EBC90EB5ECC896E040A8C0280118CA-->  <SEQNO><![CDATA[400]]></SEQNO>
+<!--B1EBC90EB5ECC896E040A8C0280118CA-->  <SEQNO><![CDATA[345]]></SEQNO>
 <!--B1EBC90EB5ECC896E040A8C0280118CA-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--B1EBC90EB5ECC896E040A8C0280118CA-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--B1EBC90EB5ECC896E040A8C0280118CA-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--B1EBC90EB5ECC896E040A8C0280118CA-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--B1EBC90EB5ECC896E040A8C0280118CA-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--B1EBC90EB5ECC896E040A8C0280118CA-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--B1EBC90EB5ECC896E040A8C0280118CA-->  <GRID_SEQNO><![CDATA[112]]></GRID_SEQNO>
+<!--B1EBC90EB5ECC896E040A8C0280118CA-->  <GRID_SEQNO><![CDATA[116]]></GRID_SEQNO>
 <!--B1EBC90EB5ECC896E040A8C0280118CA-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--B1EBC90EB5ECC896E040A8C0280118CA-->  <STARTNEWLINE><![CDATA[Y]]></STARTNEWLINE>
+<!--B1EBC90EB5ECC896E040A8C0280118CA-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--B1EBC90EB5ECC896E040A8C0280118CA-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
 <!--B1EBC90EB5ECC896E040A8C0280118CA-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--B1EBC90EB5ECC896E040A8C0280118CA--></AD_FIELD>
@@ -217302,23 +217301,22 @@
 <!--B1EBCACD0EB2E3F4E040A8C028011B08-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--B1EBCACD0EB2E3F4E040A8C028011B08-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--B1EBCACD0EB2E3F4E040A8C028011B08-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--B1EBCACD0EB2E3F4E040A8C028011B08-->  <NAME><![CDATA[Paid In Full Date]]></NAME>
-<!--B1EBCACD0EB2E3F4E040A8C028011B08-->  <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED>
+<!--B1EBCACD0EB2E3F4E040A8C028011B08-->  <NAME><![CDATA[Final Settlement Date]]></NAME>
+<!--B1EBCACD0EB2E3F4E040A8C028011B08-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--B1EBCACD0EB2E3F4E040A8C028011B08-->  <AD_TAB_ID><![CDATA[290]]></AD_TAB_ID>
 <!--B1EBCACD0EB2E3F4E040A8C028011B08-->  <AD_COLUMN_ID><![CDATA[B1EB46EDFF1CBCB4E040A8C028010EF8]]></AD_COLUMN_ID>
-<!--B1EBCACD0EB2E3F4E040A8C028011B08-->  <AD_FIELDGROUP_ID><![CDATA[5779017ADB22479BB143E49A8B3A9AE0]]></AD_FIELDGROUP_ID>
 <!--B1EBCACD0EB2E3F4E040A8C028011B08-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--B1EBCACD0EB2E3F4E040A8C028011B08-->  <DISPLAYLOGIC><![CDATA[@Processed@='Y' & @Ispaid@='Y']]></DISPLAYLOGIC>
 <!--B1EBCACD0EB2E3F4E040A8C028011B08-->  <DISPLAYLENGTH><![CDATA[19]]></DISPLAYLENGTH>
 <!--B1EBCACD0EB2E3F4E040A8C028011B08-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
-<!--B1EBCACD0EB2E3F4E040A8C028011B08-->  <SEQNO><![CDATA[350]]></SEQNO>
+<!--B1EBCACD0EB2E3F4E040A8C028011B08-->  <SEQNO><![CDATA[301]]></SEQNO>
 <!--B1EBCACD0EB2E3F4E040A8C028011B08-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--B1EBCACD0EB2E3F4E040A8C028011B08-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--B1EBCACD0EB2E3F4E040A8C028011B08-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--B1EBCACD0EB2E3F4E040A8C028011B08-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--B1EBCACD0EB2E3F4E040A8C028011B08-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--B1EBCACD0EB2E3F4E040A8C028011B08-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--B1EBCACD0EB2E3F4E040A8C028011B08-->  <GRID_SEQNO><![CDATA[116]]></GRID_SEQNO>
+<!--B1EBCACD0EB2E3F4E040A8C028011B08-->  <GRID_SEQNO><![CDATA[112]]></GRID_SEQNO>
 <!--B1EBCACD0EB2E3F4E040A8C028011B08-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--B1EBCACD0EB2E3F4E040A8C028011B08-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--B1EBCACD0EB2E3F4E040A8C028011B08-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -217330,23 +217328,22 @@
 <!--B1EBCACD0EB3E3F4E040A8C028011B08-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--B1EBCACD0EB3E3F4E040A8C028011B08-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--B1EBCACD0EB3E3F4E040A8C028011B08-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--B1EBCACD0EB3E3F4E040A8C028011B08-->  <NAME><![CDATA[Days to Pay in Full]]></NAME>
-<!--B1EBCACD0EB3E3F4E040A8C028011B08-->  <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED>
+<!--B1EBCACD0EB3E3F4E040A8C028011B08-->  <NAME><![CDATA[Days Sales Outstanding]]></NAME>
+<!--B1EBCACD0EB3E3F4E040A8C028011B08-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--B1EBCACD0EB3E3F4E040A8C028011B08-->  <AD_TAB_ID><![CDATA[290]]></AD_TAB_ID>
 <!--B1EBCACD0EB3E3F4E040A8C028011B08-->  <AD_COLUMN_ID><![CDATA[B1EB46EDFF1DBCB4E040A8C028010EF8]]></AD_COLUMN_ID>
-<!--B1EBCACD0EB3E3F4E040A8C028011B08-->  <AD_FIELDGROUP_ID><![CDATA[5779017ADB22479BB143E49A8B3A9AE0]]></AD_FIELDGROUP_ID>
 <!--B1EBCACD0EB3E3F4E040A8C028011B08-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--B1EBCACD0EB3E3F4E040A8C028011B08-->  <DISPLAYLOGIC><![CDATA[@Processed@='Y' & @Ispaid@='Y']]></DISPLAYLOGIC>
 <!--B1EBCACD0EB3E3F4E040A8C028011B08-->  <DISPLAYLENGTH><![CDATA[4]]></DISPLAYLENGTH>
 <!--B1EBCACD0EB3E3F4E040A8C028011B08-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
-<!--B1EBCACD0EB3E3F4E040A8C028011B08-->  <SEQNO><![CDATA[360]]></SEQNO>
+<!--B1EBCACD0EB3E3F4E040A8C028011B08-->  <SEQNO><![CDATA[302]]></SEQNO>
 <!--B1EBCACD0EB3E3F4E040A8C028011B08-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--B1EBCACD0EB3E3F4E040A8C028011B08-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--B1EBCACD0EB3E3F4E040A8C028011B08-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--B1EBCACD0EB3E3F4E040A8C028011B08-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--B1EBCACD0EB3E3F4E040A8C028011B08-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--B1EBCACD0EB3E3F4E040A8C028011B08-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--B1EBCACD0EB3E3F4E040A8C028011B08-->  <GRID_SEQNO><![CDATA[118]]></GRID_SEQNO>
+<!--B1EBCACD0EB3E3F4E040A8C028011B08-->  <GRID_SEQNO><![CDATA[114]]></GRID_SEQNO>
 <!--B1EBCACD0EB3E3F4E040A8C028011B08-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--B1EBCACD0EB3E3F4E040A8C028011B08-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--B1EBCACD0EB3E3F4E040A8C028011B08-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -217358,25 +217355,24 @@
 <!--B1EBCACD0EB4E3F4E040A8C028011B08-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--B1EBCACD0EB4E3F4E040A8C028011B08-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--B1EBCACD0EB4E3F4E040A8C028011B08-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--B1EBCACD0EB4E3F4E040A8C028011B08-->  <NAME><![CDATA[Percentage Paid Late]]></NAME>
-<!--B1EBCACD0EB4E3F4E040A8C028011B08-->  <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED>
+<!--B1EBCACD0EB4E3F4E040A8C028011B08-->  <NAME><![CDATA[Percentage Overdue]]></NAME>
+<!--B1EBCACD0EB4E3F4E040A8C028011B08-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--B1EBCACD0EB4E3F4E040A8C028011B08-->  <AD_TAB_ID><![CDATA[290]]></AD_TAB_ID>
 <!--B1EBCACD0EB4E3F4E040A8C028011B08-->  <AD_COLUMN_ID><![CDATA[B1EB46EDFF1EBCB4E040A8C028010EF8]]></AD_COLUMN_ID>
-<!--B1EBCACD0EB4E3F4E040A8C028011B08-->  <AD_FIELDGROUP_ID><![CDATA[5779017ADB22479BB143E49A8B3A9AE0]]></AD_FIELDGROUP_ID>
 <!--B1EBCACD0EB4E3F4E040A8C028011B08-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--B1EBCACD0EB4E3F4E040A8C028011B08-->  <DISPLAYLOGIC><![CDATA[@Processed@='Y' & @Totalpaid@!0]]></DISPLAYLOGIC>
 <!--B1EBCACD0EB4E3F4E040A8C028011B08-->  <DISPLAYLENGTH><![CDATA[4]]></DISPLAYLENGTH>
 <!--B1EBCACD0EB4E3F4E040A8C028011B08-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
-<!--B1EBCACD0EB4E3F4E040A8C028011B08-->  <SEQNO><![CDATA[340]]></SEQNO>
+<!--B1EBCACD0EB4E3F4E040A8C028011B08-->  <SEQNO><![CDATA[300]]></SEQNO>
 <!--B1EBCACD0EB4E3F4E040A8C028011B08-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--B1EBCACD0EB4E3F4E040A8C028011B08-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--B1EBCACD0EB4E3F4E040A8C028011B08-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--B1EBCACD0EB4E3F4E040A8C028011B08-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--B1EBCACD0EB4E3F4E040A8C028011B08-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--B1EBCACD0EB4E3F4E040A8C028011B08-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--B1EBCACD0EB4E3F4E040A8C028011B08-->  <GRID_SEQNO><![CDATA[114]]></GRID_SEQNO>
+<!--B1EBCACD0EB4E3F4E040A8C028011B08-->  <GRID_SEQNO><![CDATA[116]]></GRID_SEQNO>
 <!--B1EBCACD0EB4E3F4E040A8C028011B08-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--B1EBCACD0EB4E3F4E040A8C028011B08-->  <STARTNEWLINE><![CDATA[Y]]></STARTNEWLINE>
+<!--B1EBCACD0EB4E3F4E040A8C028011B08-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--B1EBCACD0EB4E3F4E040A8C028011B08-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
 <!--B1EBCACD0EB4E3F4E040A8C028011B08-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--B1EBCACD0EB4E3F4E040A8C028011B08--></AD_FIELD>
@@ -219118,7 +219114,7 @@
 <!--BD54082ED2A740CDBD66AE26F52B860F-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--BD54082ED2A740CDBD66AE26F52B860F-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--BD54082ED2A740CDBD66AE26F52B860F-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--BD54082ED2A740CDBD66AE26F52B860F-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--BD54082ED2A740CDBD66AE26F52B860F-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--BD54082ED2A740CDBD66AE26F52B860F-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--BD54082ED2A740CDBD66AE26F52B860F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--BD54082ED2A740CDBD66AE26F52B860F-->  <GRID_SEQNO><![CDATA[90]]></GRID_SEQNO>
@@ -221954,8 +221950,8 @@
 <!--D74D967D0AFF45679516ACB4214FF361-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--D74D967D0AFF45679516ACB4214FF361-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--D74D967D0AFF45679516ACB4214FF361-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--D74D967D0AFF45679516ACB4214FF361-->  <NAME><![CDATA[Days Till Next Due]]></NAME>
-<!--D74D967D0AFF45679516ACB4214FF361-->  <DESCRIPTION><![CDATA[Days Till Next Due]]></DESCRIPTION>
+<!--D74D967D0AFF45679516ACB4214FF361-->  <NAME><![CDATA[Days till next due]]></NAME>
+<!--D74D967D0AFF45679516ACB4214FF361-->  <DESCRIPTION><![CDATA[Days till next due date]]></DESCRIPTION>
 <!--D74D967D0AFF45679516ACB4214FF361-->  <HELP><![CDATA[Number of days left for the next due date]]></HELP>
 <!--D74D967D0AFF45679516ACB4214FF361-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--D74D967D0AFF45679516ACB4214FF361-->  <AD_TAB_ID><![CDATA[263]]></AD_TAB_ID>
@@ -221965,14 +221961,14 @@
 <!--D74D967D0AFF45679516ACB4214FF361-->  <DISPLAYLOGIC><![CDATA[@Processed@='Y' & @Ispaid@='N']]></DISPLAYLOGIC>
 <!--D74D967D0AFF45679516ACB4214FF361-->  <DISPLAYLENGTH><![CDATA[4]]></DISPLAYLENGTH>
 <!--D74D967D0AFF45679516ACB4214FF361-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
-<!--D74D967D0AFF45679516ACB4214FF361-->  <SEQNO><![CDATA[380]]></SEQNO>
+<!--D74D967D0AFF45679516ACB4214FF361-->  <SEQNO><![CDATA[344]]></SEQNO>
 <!--D74D967D0AFF45679516ACB4214FF361-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--D74D967D0AFF45679516ACB4214FF361-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--D74D967D0AFF45679516ACB4214FF361-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--D74D967D0AFF45679516ACB4214FF361-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--D74D967D0AFF45679516ACB4214FF361-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--D74D967D0AFF45679516ACB4214FF361-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--D74D967D0AFF45679516ACB4214FF361-->  <GRID_SEQNO><![CDATA[110]]></GRID_SEQNO>
+<!--D74D967D0AFF45679516ACB4214FF361-->  <GRID_SEQNO><![CDATA[100]]></GRID_SEQNO>
 <!--D74D967D0AFF45679516ACB4214FF361-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--D74D967D0AFF45679516ACB4214FF361-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--D74D967D0AFF45679516ACB4214FF361-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -225448,7 +225444,7 @@
 <!--F9EFB543E0244AB090036F2EA6959122-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--F9EFB543E0244AB090036F2EA6959122-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--F9EFB543E0244AB090036F2EA6959122-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--F9EFB543E0244AB090036F2EA6959122-->  <NAME><![CDATA[Sequance for Business Partner]]></NAME>
+<!--F9EFB543E0244AB090036F2EA6959122-->  <NAME><![CDATA[Sequence for Business Partner]]></NAME>
 <!--F9EFB543E0244AB090036F2EA6959122-->  <DESCRIPTION><![CDATA[The sequence will be used to generate number for creating the sub-account for Business Partner.]]></DESCRIPTION>
 <!--F9EFB543E0244AB090036F2EA6959122-->  <HELP><![CDATA[The sequence will be used to generate number for creating the sub-account for Business Partner.]]></HELP>
 <!--F9EFB543E0244AB090036F2EA6959122-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
--- a/src-db/database/sourcedata/AD_MESSAGE.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml	Sun Apr 01 20:25:01 2012 +0200
@@ -15748,6 +15748,17 @@
 <!--368B60C0A224458D8A388F911BD26785-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--368B60C0A224458D8A388F911BD26785--></AD_MESSAGE>
 
+<!--36DE1B1B3A8643C38DA099FD57D00235--><AD_MESSAGE>
+<!--36DE1B1B3A8643C38DA099FD57D00235-->  <AD_MESSAGE_ID><![CDATA[36DE1B1B3A8643C38DA099FD57D00235]]></AD_MESSAGE_ID>
+<!--36DE1B1B3A8643C38DA099FD57D00235-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--36DE1B1B3A8643C38DA099FD57D00235-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--36DE1B1B3A8643C38DA099FD57D00235-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--36DE1B1B3A8643C38DA099FD57D00235-->  <VALUE><![CDATA[DefineLocatorProduct]]></VALUE>
+<!--36DE1B1B3A8643C38DA099FD57D00235-->  <MSGTEXT><![CDATA[It is needed to define a locator for:]]></MSGTEXT>
+<!--36DE1B1B3A8643C38DA099FD57D00235-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--36DE1B1B3A8643C38DA099FD57D00235-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--36DE1B1B3A8643C38DA099FD57D00235--></AD_MESSAGE>
+
 <!--37B25D3CE4344D7CA0E2452CEE985BAF--><AD_MESSAGE>
 <!--37B25D3CE4344D7CA0E2452CEE985BAF-->  <AD_MESSAGE_ID><![CDATA[37B25D3CE4344D7CA0E2452CEE985BAF]]></AD_MESSAGE_ID>
 <!--37B25D3CE4344D7CA0E2452CEE985BAF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -19715,6 +19726,17 @@
 <!--EA8C3BCA062B4BB687AE2A2AAE4E32EE-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--EA8C3BCA062B4BB687AE2A2AAE4E32EE--></AD_MESSAGE>
 
+<!--EABA2F32B26B4854A976381054CE06FF--><AD_MESSAGE>
+<!--EABA2F32B26B4854A976381054CE06FF-->  <AD_MESSAGE_ID><![CDATA[EABA2F32B26B4854A976381054CE06FF]]></AD_MESSAGE_ID>
+<!--EABA2F32B26B4854A976381054CE06FF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--EABA2F32B26B4854A976381054CE06FF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--EABA2F32B26B4854A976381054CE06FF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--EABA2F32B26B4854A976381054CE06FF-->  <VALUE><![CDATA[CompletedQuantityGreaterZero]]></VALUE>
+<!--EABA2F32B26B4854A976381054CE06FF-->  <MSGTEXT><![CDATA[Completed Quantity must be greater than zero]]></MSGTEXT>
+<!--EABA2F32B26B4854A976381054CE06FF-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--EABA2F32B26B4854A976381054CE06FF-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--EABA2F32B26B4854A976381054CE06FF--></AD_MESSAGE>
+
 <!--EB21629341AC4F7CB3F7EE16BCA24E4D--><AD_MESSAGE>
 <!--EB21629341AC4F7CB3F7EE16BCA24E4D-->  <AD_MESSAGE_ID><![CDATA[EB21629341AC4F7CB3F7EE16BCA24E4D]]></AD_MESSAGE_ID>
 <!--EB21629341AC4F7CB3F7EE16BCA24E4D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_MODULE.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/src-db/database/sourcedata/AD_MODULE.xml	Sun Apr 01 20:25:01 2012 +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.15716]]></VERSION>
+<!--0-->  <VERSION><![CDATA[3.0.15749]]></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>
@@ -22,7 +22,7 @@
 <!--0-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--0-->  <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
 <!--0-->  <REFERENCEDATAINFO><![CDATA[Standard document types for orders, invoices, etc. and settings]]></REFERENCEDATAINFO>
-<!--0-->  <VERSION_LABEL><![CDATA[MP9]]></VERSION_LABEL>
+<!--0-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--0-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--0--></AD_MODULE>
 
--- a/src-db/database/sourcedata/AD_PROCESS.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/src-db/database/sourcedata/AD_PROCESS.xml	Sun Apr 01 20:25:01 2012 +0200
@@ -2046,7 +2046,7 @@
 <!--800000-->  <VALUE><![CDATA[RV_GeneralLedgerJournal]]></VALUE>
 <!--800000-->  <NAME><![CDATA[General Ledger Journal]]></NAME>
 <!--800000-->  <DESCRIPTION><![CDATA[General ledger journal]]></DESCRIPTION>
-<!--800000-->  <HELP><![CDATA[The General Ledger Journal report lists every ledger entry of an accounting schema within a given period of time.]]></HELP>
+<!--800000-->  <HELP><![CDATA[The General Ledger Journal report lists every accounting entry of an accounting schema within a given period of time.]]></HELP>
 <!--800000-->  <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
 <!--800000-->  <ISUSERSTARTABLE><![CDATA[N]]></ISUSERSTARTABLE>
 <!--800000-->  <ISREPORT><![CDATA[Y]]></ISREPORT>
--- a/src-db/database/sourcedata/AD_PROCESS_PARA.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/src-db/database/sourcedata/AD_PROCESS_PARA.xml	Sun Apr 01 20:25:01 2012 +0200
@@ -5,16 +5,14 @@
 <!--123-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--123-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--123-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--123-->  <NAME><![CDATA[Search Key]]></NAME>
-<!--123-->  <DESCRIPTION><![CDATA[A fast method for finding a particular record.]]></DESCRIPTION>
-<!--123-->  <HELP><![CDATA[A search key allows for a fast method of finding a particular record. If you leave the search key empty, the system automatically creates a numeric number originating from a document sequence defined in the  "Document Sequence" window. The sequence naming convention follows a rule "DocumentNo_TableName", where TableName is the actual name of the database table (e.g. C_Order).
-
-Usually, company's internal identifiers for various records (products, customers, etc) are stored here.]]></HELP>
+<!--123-->  <NAME><![CDATA[Product Search Key]]></NAME>
+<!--123-->  <DESCRIPTION><![CDATA[A fast method for finding a particular product.]]></DESCRIPTION>
+<!--123-->  <HELP><![CDATA[A product search key allows for a fast method of finding a particular product. ]]></HELP>
 <!--123-->  <AD_PROCESS_ID><![CDATA[105]]></AD_PROCESS_ID>
 <!--123-->  <SEQNO><![CDATA[10]]></SEQNO>
 <!--123-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
 <!--123-->  <COLUMNNAME><![CDATA[ProductValue]]></COLUMNNAME>
-<!--123-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--123-->  <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED>
 <!--123-->  <FIELDLENGTH><![CDATA[15]]></FIELDLENGTH>
 <!--123-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--123-->  <ISRANGE><![CDATA[N]]></ISRANGE>
--- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Sun Apr 01 20:25:01 2012 +0200
@@ -2855,17 +2855,6 @@
 <!--804325-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--804325--></AD_TEXTINTERFACES>
 
-<!--804327--><AD_TEXTINTERFACES>
-<!--804327-->  <AD_TEXTINTERFACES_ID><![CDATA[804327]]></AD_TEXTINTERFACES_ID>
-<!--804327-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--804327-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--804327-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--804327-->  <TEXT><![CDATA[www.openbravo.com/legal/license.html]]></TEXT>
-<!--804327-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/About.html]]></FILENAME>
-<!--804327-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--804327-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--804327--></AD_TEXTINTERFACES>
-
 <!--804423--><AD_TEXTINTERFACES>
 <!--804423-->  <AD_TEXTINTERFACES_ID><![CDATA[804423]]></AD_TEXTINTERFACES_ID>
 <!--804423-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -20235,6 +20224,17 @@
 <!--DAF427C6019B462591CB2B2D3232ED60-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--DAF427C6019B462591CB2B2D3232ED60--></AD_TEXTINTERFACES>
 
+<!--DBAD2FD2624549FB94F0B9EDC8B7BE3D--><AD_TEXTINTERFACES>
+<!--DBAD2FD2624549FB94F0B9EDC8B7BE3D-->  <AD_TEXTINTERFACES_ID><![CDATA[DBAD2FD2624549FB94F0B9EDC8B7BE3D]]></AD_TEXTINTERFACES_ID>
+<!--DBAD2FD2624549FB94F0B9EDC8B7BE3D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--DBAD2FD2624549FB94F0B9EDC8B7BE3D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--DBAD2FD2624549FB94F0B9EDC8B7BE3D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--DBAD2FD2624549FB94F0B9EDC8B7BE3D-->  <TEXT><![CDATA[Business Partner Category]]></TEXT>
+<!--DBAD2FD2624549FB94F0B9EDC8B7BE3D-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJRFilter.html]]></FILENAME>
+<!--DBAD2FD2624549FB94F0B9EDC8B7BE3D-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--DBAD2FD2624549FB94F0B9EDC8B7BE3D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--DBAD2FD2624549FB94F0B9EDC8B7BE3D--></AD_TEXTINTERFACES>
+
 <!--DC56329107544464ADCEA111AA534C17--><AD_TEXTINTERFACES>
 <!--DC56329107544464ADCEA111AA534C17-->  <AD_TEXTINTERFACES_ID><![CDATA[DC56329107544464ADCEA111AA534C17]]></AD_TEXTINTERFACES_ID>
 <!--DC56329107544464ADCEA111AA534C17-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -20587,6 +20587,17 @@
 <!--F4B6387C83DB41B2B42EDDB0BFD2240E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--F4B6387C83DB41B2B42EDDB0BFD2240E--></AD_TEXTINTERFACES>
 
+<!--F5EAFA2F130549CDBAEE22407DFD97ED--><AD_TEXTINTERFACES>
+<!--F5EAFA2F130549CDBAEE22407DFD97ED-->  <AD_TEXTINTERFACES_ID><![CDATA[F5EAFA2F130549CDBAEE22407DFD97ED]]></AD_TEXTINTERFACES_ID>
+<!--F5EAFA2F130549CDBAEE22407DFD97ED-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F5EAFA2F130549CDBAEE22407DFD97ED-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F5EAFA2F130549CDBAEE22407DFD97ED-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F5EAFA2F130549CDBAEE22407DFD97ED-->  <TEXT><![CDATA[http://www.openbravo.com/legal/license.html]]></TEXT>
+<!--F5EAFA2F130549CDBAEE22407DFD97ED-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/About.html]]></FILENAME>
+<!--F5EAFA2F130549CDBAEE22407DFD97ED-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--F5EAFA2F130549CDBAEE22407DFD97ED-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--F5EAFA2F130549CDBAEE22407DFD97ED--></AD_TEXTINTERFACES>
+
 <!--F6978464C70E4A7DB4B28CD1CCCC25DA--><AD_TEXTINTERFACES>
 <!--F6978464C70E4A7DB4B28CD1CCCC25DA-->  <AD_TEXTINTERFACES_ID><![CDATA[F6978464C70E4A7DB4B28CD1CCCC25DA]]></AD_TEXTINTERFACES_ID>
 <!--F6978464C70E4A7DB4B28CD1CCCC25DA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_TREENODE.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/src-db/database/sourcedata/AD_TREENODE.xml	Sun Apr 01 20:25:01 2012 +0200
@@ -1579,8 +1579,8 @@
 <!--52118BF1A2A64D84E040007F01005FEC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--52118BF1A2A64D84E040007F01005FEC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--52118BF1A2A64D84E040007F01005FEC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--52118BF1A2A64D84E040007F01005FEC-->  <PARENT_ID><![CDATA[800238]]></PARENT_ID>
-<!--52118BF1A2A64D84E040007F01005FEC-->  <SEQNO><![CDATA[80]]></SEQNO>
+<!--52118BF1A2A64D84E040007F01005FEC-->  <PARENT_ID><![CDATA[800237]]></PARENT_ID>
+<!--52118BF1A2A64D84E040007F01005FEC-->  <SEQNO><![CDATA[10]]></SEQNO>
 <!--52118BF1A2A64D84E040007F01005FEC--></AD_TREENODE>
 
 <!--52118BF1A2A94D84E040007F01005FEC--><AD_TREENODE>
@@ -3098,7 +3098,7 @@
 <!--52118BF1A3504D84E040007F01005FEC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--52118BF1A3504D84E040007F01005FEC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--52118BF1A3504D84E040007F01005FEC-->  <PARENT_ID><![CDATA[800237]]></PARENT_ID>
-<!--52118BF1A3504D84E040007F01005FEC-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--52118BF1A3504D84E040007F01005FEC-->  <SEQNO><![CDATA[30]]></SEQNO>
 <!--52118BF1A3504D84E040007F01005FEC--></AD_TREENODE>
 
 <!--52118BF1A3514D84E040007F01005FEC--><AD_TREENODE>
@@ -3109,7 +3109,7 @@
 <!--52118BF1A3514D84E040007F01005FEC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--52118BF1A3514D84E040007F01005FEC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--52118BF1A3514D84E040007F01005FEC-->  <PARENT_ID><![CDATA[800237]]></PARENT_ID>
-<!--52118BF1A3514D84E040007F01005FEC-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--52118BF1A3514D84E040007F01005FEC-->  <SEQNO><![CDATA[40]]></SEQNO>
 <!--52118BF1A3514D84E040007F01005FEC--></AD_TREENODE>
 
 <!--52118BF1A3524D84E040007F01005FEC--><AD_TREENODE>
@@ -3120,7 +3120,7 @@
 <!--52118BF1A3524D84E040007F01005FEC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--52118BF1A3524D84E040007F01005FEC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--52118BF1A3524D84E040007F01005FEC-->  <PARENT_ID><![CDATA[800237]]></PARENT_ID>
-<!--52118BF1A3524D84E040007F01005FEC-->  <SEQNO><![CDATA[80]]></SEQNO>
+<!--52118BF1A3524D84E040007F01005FEC-->  <SEQNO><![CDATA[50]]></SEQNO>
 <!--52118BF1A3524D84E040007F01005FEC--></AD_TREENODE>
 
 <!--52118BF1A3534D84E040007F01005FEC--><AD_TREENODE>
--- a/src-db/database/sourcedata/AD_WINDOW.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/src-db/database/sourcedata/AD_WINDOW.xml	Sun Apr 01 20:25:01 2012 +0200
@@ -1713,7 +1713,7 @@
 <!--800017-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--800017-->  <NAME><![CDATA[Discount]]></NAME>
 <!--800017-->  <DESCRIPTION><![CDATA[Create and edit product price percentage discounts.]]></DESCRIPTION>
-<!--800017-->  <HELP><![CDATA[A discount is a deduction from the total amount of an invoice.]]></HELP>
+<!--800017-->  <HELP><![CDATA[A discount is a deduction from the total amount of an order or an invoice.]]></HELP>
 <!--800017-->  <WINDOWTYPE><![CDATA[M]]></WINDOWTYPE>
 <!--800017-->  <ISSOTRX><![CDATA[N]]></ISSOTRX>
 <!--800017-->  <PROCESSING><![CDATA[N]]></PROCESSING>
--- a/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml	Sun Apr 01 20:25:01 2012 +0200
@@ -967,6 +967,29 @@
 <!--D5CD42F686A14DFA949052B99900D679-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
 <!--D5CD42F686A14DFA949052B99900D679--></OBUISEL_SELECTOR_FIELD>
 
+<!--D9CDC979521D4334A3D2D9A5D038257B--><OBUISEL_SELECTOR_FIELD>
+<!--D9CDC979521D4334A3D2D9A5D038257B-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[D9CDC979521D4334A3D2D9A5D038257B]]></OBUISEL_SELECTOR_FIELD_ID>
+<!--D9CDC979521D4334A3D2D9A5D038257B-->  <OBUISEL_SELECTOR_ID><![CDATA[4C8BC3E8E56441F4B8C98C684A0C9212]]></OBUISEL_SELECTOR_ID>
+<!--D9CDC979521D4334A3D2D9A5D038257B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D9CDC979521D4334A3D2D9A5D038257B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D9CDC979521D4334A3D2D9A5D038257B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D9CDC979521D4334A3D2D9A5D038257B-->  <AD_COLUMN_ID><![CDATA[1398]]></AD_COLUMN_ID>
+<!--D9CDC979521D4334A3D2D9A5D038257B-->  <NAME><![CDATA[Warehouse]]></NAME>
+<!--D9CDC979521D4334A3D2D9A5D038257B-->  <DESCRIPTION><![CDATA[The location where products arrive to or are sent from.]]></DESCRIPTION>
+<!--D9CDC979521D4334A3D2D9A5D038257B-->  <HELP><![CDATA[The Warehouse identifies a unique Warehouse where products are stored or Services are provided.]]></HELP>
+<!--D9CDC979521D4334A3D2D9A5D038257B-->  <PROPERTY><![CDATA[storageBin.warehouse]]></PROPERTY>
+<!--D9CDC979521D4334A3D2D9A5D038257B-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--D9CDC979521D4334A3D2D9A5D038257B-->  <SORT><![CDATA[Y]]></SORT>
+<!--D9CDC979521D4334A3D2D9A5D038257B-->  <FILTER><![CDATA[Y]]></FILTER>
+<!--D9CDC979521D4334A3D2D9A5D038257B-->  <SEARCHINSUGGESTIONBOX><![CDATA[N]]></SEARCHINSUGGESTIONBOX>
+<!--D9CDC979521D4334A3D2D9A5D038257B-->  <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
+<!--D9CDC979521D4334A3D2D9A5D038257B-->  <SORTNO><![CDATA[25]]></SORTNO>
+<!--D9CDC979521D4334A3D2D9A5D038257B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D9CDC979521D4334A3D2D9A5D038257B-->  <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--D9CDC979521D4334A3D2D9A5D038257B-->  <DEFAULT_EXPRESSION><![CDATA[if (OB.getWindowId() && OB.getSession().getAttribute(OB.getWindowId() +"|M_WAREHOUSE_ID")) {  OB.getSession().getAttribute(OB.getWindowId() +"|M_WAREHOUSE_ID");} else {  OB.getContext().getWarehouse().id;}]]></DEFAULT_EXPRESSION>
+<!--D9CDC979521D4334A3D2D9A5D038257B-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
+<!--D9CDC979521D4334A3D2D9A5D038257B--></OBUISEL_SELECTOR_FIELD>
+
 <!--DCA048BA81224FFB95F8870E059DF69F--><OBUISEL_SELECTOR_FIELD>
 <!--DCA048BA81224FFB95F8870E059DF69F-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[DCA048BA81224FFB95F8870E059DF69F]]></OBUISEL_SELECTOR_FIELD_ID>
 <!--DCA048BA81224FFB95F8870E059DF69F-->  <OBUISEL_SELECTOR_ID><![CDATA[4C8BC3E8E56441F4B8C98C684A0C9212]]></OBUISEL_SELECTOR_ID>
--- a/src/build.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/src/build.xml	Sun Apr 01 20:25:01 2012 +0200
@@ -347,9 +347,19 @@
 		  <available file="${basedir}/config/instance.revision"/>
 	    </and>
 	  </condition>
+	  <condition property="revision.not.found">
+		<and>
+		  <not>
+		 	<isset property="hg.id"/>
+		  </not>
+		  <not>
+		  	<available file="${basedir}/config/instance.revision"/>
+		  </not>
+	    </and>
+	  </condition>
 	  <antcall inheritall="true" target="calculate.instance.version"/>
 	</target>
-	<target name="calculate.instance.version" depends="calculate.version.from.hg, calculate.version.from.file">
+	<target name="calculate.instance.version" depends="calculate.version.from.hg, calculate.version.from.file, cannot.find.version">
 	    <sql driver="${bbdd.driver}" url="${bbdd.owner.url}" userid="${bbdd.user}" password="${bbdd.password}" delimiter="/">
 	      <classpath>
 	        <fileset dir="${base.lib}">
@@ -368,7 +378,10 @@
 	  <property name="instance.version" value="${hg.id}"/>
 	</target>
 	<target name="calculate.version.from.file" if="revision.from.file">
-		<loadfile property="instance.version" srcfile="${basedir}/config/instance.revision"/>
+	  <loadfile property="instance.version" srcfile="${basedir}/config/instance.revision"/>
+	</target>
+	<target name="cannot.find.version" if="revision.not.found">
+	  <property name="instance.version" value=" - "/>
 	</target>
 
   <target name="compile.src.gen" depends="init">
--- a/src/org/openbravo/erpCommon/ad_actionButton/CopyFromPOOrder.html	Thu Mar 29 16:27:58 2012 +0000
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CopyFromPOOrder.html	Sun Apr 01 20:25:01 2012 +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) 2001-2011 Openbravo SLU 
+ * All portions are Copyright (C) 2001-2012 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -30,6 +30,7 @@
   <script language="JavaScript" src="../../../../../web/js/messages.js" type="text/javascript"></script>
   <script language="JavaScript" type="text/javascript" id="paramLanguage">defaultLang = "en_US";</script>
   <script language="JavaScript" src="../../../../../web/js/windowKeyboard.js" type="text/javascript"></script>
+  <script language="JavaScript" src="../../../../../web/js/appStatus.js" type="text/javascript"></script> 
   <script language="JavaScript" src="../../../../../web/js/searchs.js" type="text/javascript"></script>
   <script type="text/javascript">
 
@@ -46,6 +47,7 @@
   }
 
   function submitThisPage(strCommand) {
+    setProcessingMode('popup', true);
     submitCommandForm(strCommand, false, null, null);
     return true;
   }
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java	Thu Mar 29 16:27:58 2012 +0000
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java	Sun Apr 01 20:25:01 2012 +0200
@@ -472,7 +472,7 @@
                 Utility.getContext(this, vars, "#User_Client", strWindowId),
                 Utility.getContext(this, vars, "#User_Org", strWindowId), strPO);
           else
-            data = CreateFromInvoiceData.selectFromPO(this, vars.getLanguage(),
+            data = CreateFromInvoiceData.selectFromPO(this, vars.getLanguage(), strKey,
                 Utility.getContext(this, vars, "#User_Client", strWindowId),
                 Utility.getContext(this, vars, "#User_Org", strWindowId), strPO);
         } else {
@@ -481,7 +481,7 @@
                 Utility.getContext(this, vars, "#User_Client", strWindowId),
                 Utility.getContext(this, vars, "#User_Org", strWindowId), strPO);
           else
-            data = CreateFromInvoiceData.selectFromPOTrl(this, vars.getLanguage(),
+            data = CreateFromInvoiceData.selectFromPOTrl(this, vars.getLanguage(), strKey,
                 Utility.getContext(this, vars, "#User_Client", strWindowId),
                 Utility.getContext(this, vars, "#User_Org", strWindowId), strPO);
         }
@@ -1478,7 +1478,7 @@
           if (isSOTrx.equals("Y"))
             data = CreateFromInvoiceData.selectFromPOUpdateSOTrx(conn, this, ids[k]);
           else
-            data = CreateFromInvoiceData.selectFromPOUpdate(conn, this, ids[k]);
+            data = CreateFromInvoiceData.selectFromPOUpdate(conn, this, strKey, ids[k]);
         }
         if (data != null) {
           for (int i = 0; i < data.length; i++) {
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql	Thu Mar 29 16:27:58 2012 +0000
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql	Sun Apr 01 20:25:01 2012 +0200
@@ -29,7 +29,11 @@
       <![CDATA[
         SELECT o.C_ORDER_ID as ID, Ad_Column_Identifier(to_char('C_Order'), to_char(o.c_order_id), to_char(?)) AS NAME, o.DocumentNo AS NAMEORDER,
         '' AS NAMESHIPMENT,
-        l.QtyOrdered-SUM(COALESCE(m.Qty,0)) AS QTY, l.C_UOM_ID,uom.UOMSymbol, l.M_Product_ID,p.NAME AS RELATION_NAME, 
+        l.QtyOrdered-SUM(COALESCE(m.Qty,0))-COALESCE((SELECT SUM(COALESCE(CI.QtyINVOICED, 0))  
+       FROM C_ORDERLINE CO LEFT JOIN C_INVOICELINE CI ON CI.C_ORDERLINE_ID = CO.C_ORDERLINE_ID
+       WHERE  CI.C_INVOICE_ID=? AND CO.C_ORDERLINE_ID = l.c_orderline_id
+       GROUP BY CI.C_orderline_id , CO.QtyORDERED),0) AS QTY, 
+       l.C_UOM_ID,uom.UOMSymbol, l.M_Product_ID,p.NAME AS RELATION_NAME, 
         l.C_OrderLine_ID,l.Line, l.ad_org_id, '' as STDPRECISION, 
         '' as M_InOutLine_ID, '' AS PriceActual, '' AS PriceList, '' AS PriceLimit, '' AS Description, '' as PriceStd,
         '' AS QUANTITYORDER, '' AS M_Product_UOM_ID, '' AS M_ATTRIBUTESETINSTANCE_ID, '' AS M_Offer_ID, '' AS PricePrecision,
@@ -45,6 +49,12 @@
         AND l.C_UOM_ID=uom.C_UOM_ID
         AND l.M_Product_ID=p.M_Product_ID
         AND l.C_Order_ID = ? 
+        AND NOT EXISTS (SELECT 1
+                       FROM C_ORDERLINE CO LEFT JOIN C_INVOICELINE CI ON CI.C_ORDERLINE_ID = CO.C_ORDERLINE_ID left join M_MATCHPO m on  CO.C_OrderLine_ID=m.C_OrderLine_ID
+                                                 AND m.C_InvoiceLine_ID IS NOT NULL
+                       WHERE CO.C_ORDERLINE_ID = l.c_orderline_id AND CI.C_INVOICE_ID=? 
+                       GROUP BY CI.C_orderline_id , CO.QtyORDERED
+                       HAVING (SUM(COALESCE(CI.QtyINVOICED, 0))-(COALESCE(CO.QtyORDERED,0)-SUM(COALESCE(m.Qty,0)))) >= 0 )   
         GROUP BY o.C_ORDER_ID, o.DocumentNo, o.DateOrdered, o.GrandTotal, l.QtyOrdered,l.C_UOM_ID,
         uom.UOMSymbol,l.M_Product_ID,p.NAME,l.Line,l.C_OrderLine_ID, l.ad_org_id, l.taxbaseamt,l.CancelPriceAD
         HAVING (l.QtyOrdered-SUM(COALESCE(m.Qty,0))) <> 0
@@ -53,9 +63,11 @@
     </Sql>
     <Field name="rownum" value="count"/>
     <Parameter name="language"/>
+    <Parameter name="piId"/>
     <Parameter name="adUserClient" type="replace" optional="true" after="o.AD_Client_ID IN (" text="'1'"/>
     <Parameter name="adOrgClient" type="replace" optional="true" after="o.AD_Org_ID IN (" text="'1'"/>
     <Parameter name="poId"/>
+    <Parameter name="piId"/>
   </SqlMethod>
   <SqlMethod name="selectFromPOCombo" type="preparedStatement" return="multiple">
     <SqlMethodComment></SqlMethodComment>
@@ -135,7 +147,12 @@
     <Sql>
       <![CDATA[
         SELECT o.C_ORDER_ID as ID, Ad_Column_Identifier(to_char('C_Order'), to_char(o.c_order_id), to_char(?)) AS NAME, o.DocumentNo AS NAMEORDER,
-        l.QtyOrdered-SUM(COALESCE(m.Qty,0)) AS QTY, l.C_UOM_ID, COALESCE(uomt.UOMSYMBOL, uom.UOMSymbol) AS UOMSymbol, 
+        l.QtyOrdered-SUM(COALESCE(m.Qty,0))-
+        COALESCE((SELECT SUM(COALESCE(CI.QtyINVOICED, 0))  
+        FROM C_ORDERLINE CO LEFT JOIN C_INVOICELINE CI ON CI.C_ORDERLINE_ID = CO.C_ORDERLINE_ID
+        WHERE  CI.C_INVOICE_ID=? AND CO.C_ORDERLINE_ID = l.c_orderline_id
+        GROUP BY CI.C_orderline_id , CO.QtyORDERED),0) AS QTY, 
+        l.C_UOM_ID, COALESCE(uomt.UOMSYMBOL, uom.UOMSymbol) AS UOMSymbol, 
         l.M_Product_ID,p.NAME AS RELATION_NAME, l.C_OrderLine_ID,l.Line, l.taxbaseamt 
         FROM C_UOM uom left join  C_UOM_TRL uomt on uom.C_UOM_ID = uomt.C_UOM_ID
                                                 and uomt.AD_Language = ?,
@@ -150,6 +167,12 @@
         AND l.C_UOM_ID=uom.C_UOM_ID 
         AND l.M_Product_ID=p.M_Product_ID  
         AND l.C_Order_ID = ? 
+        AND NOT EXISTS (SELECT 1
+                       FROM C_ORDERLINE CO LEFT JOIN C_INVOICELINE CI ON CI.C_ORDERLINE_ID = CO.C_ORDERLINE_ID left join M_MATCHPO m on  CO.C_OrderLine_ID=m.C_OrderLine_ID
+                                                 AND m.C_InvoiceLine_ID IS NOT NULL
+                       WHERE CO.C_ORDERLINE_ID = l.c_orderline_id AND CI.C_INVOICE_ID=? 
+                       GROUP BY CI.C_orderline_id , CO.QtyORDERED
+                       HAVING (SUM(COALESCE(CI.QtyINVOICED, 0))-(COALESCE(CO.QtyORDERED,0)-SUM(COALESCE(m.Qty,0)))) >= 0 )  
         GROUP BY o.C_ORDER_ID, o.DocumentNo, o.DateOrdered, o.GrandTotal, l.QtyOrdered,l.C_UOM_ID,
         uom.UOMSymbol, uomt.UOMSYMBOL,l.M_Product_ID,p.NAME,l.Line,l.C_OrderLine_ID,
         l.taxbaseamt 
@@ -159,10 +182,12 @@
     </Sql>
     <Field name="rownum" value="count"/>
     <Parameter name="adLanguage"/>
+    <Parameter name="piId"/>
     <Parameter name="adUserClient" type="replace" optional="true" after="o.AD_Client_ID IN (" text="'1'"/>
     <Parameter name="adOrgClient" type="replace" optional="true" after="o.AD_Org_ID IN (" text="'1'"/>
     <Parameter name="adLanguage"/>
     <Parameter name="poId"/>
+    <Parameter name="piId"/>
   </SqlMethod>
   <SqlMethod name="selectFromPOTrlSOTrx" type="preparedStatement" return="multiple">
     <SqlMethodComment></SqlMethodComment>
@@ -205,9 +230,16 @@
       (CASE WHEN B.M_InOutLine_ID IS NULL THEN A.M_Product_UOM_ID ELSE B.M_Product_UOM_ID END) AS M_Product_UOM_ID, A.M_ATTRIBUTESETINSTANCE_ID, A.ad_org_id,
       A.taxbaseamt
       FROM c_currency cur,C_UOM uom, M_PRODUCT p, 
-      (SELECT l.ad_org_id,l.C_CURRENCY_ID,l.C_UOM_ID, l.M_Product_ID, l.Line, l.Description, l.C_OrderLine_ID, (l.QtyOrdered-SUM(COALESCE(mp.Qty,0))) AS QTY,
-      l.quantityOrder*C_DIVIDE((l.QtyOrdered-SUM(COALESCE(mp.Qty,0))),l.QtyOrdered) as quantityOrder, l.M_Product_UOM_ID, l.M_ATTRIBUTESETINSTANCE_ID,
-      l.taxbaseamt
+      (SELECT l.ad_org_id,l.C_CURRENCY_ID,l.C_UOM_ID, l.M_Product_ID, l.Line, l.Description, l.C_OrderLine_ID, (l.QtyOrdered-SUM(COALESCE(mp.Qty,0))-
+       COALESCE((SELECT SUM(COALESCE(CI.QtyINVOICED, 0))  
+       FROM C_ORDERLINE CO LEFT JOIN C_INVOICELINE CI ON CI.C_ORDERLINE_ID = CO.C_ORDERLINE_ID
+       WHERE  CI.C_INVOICE_ID=? AND CO.C_ORDERLINE_ID = l.c_orderline_id
+       GROUP BY CI.C_orderline_id , CO.QtyORDERED),0)) AS QTY,
+      l.quantityOrder*C_DIVIDE((l.QtyOrdered-SUM(COALESCE(mp.Qty,0))-COALESCE((SELECT SUM(COALESCE(CI.QtyINVOICED, 0))  
+       FROM C_ORDERLINE CO LEFT JOIN C_INVOICELINE CI ON CI.C_ORDERLINE_ID = CO.C_ORDERLINE_ID
+       WHERE  CI.C_INVOICE_ID=? AND CO.C_ORDERLINE_ID = l.c_orderline_id
+       GROUP BY CI.C_orderline_id , CO.QtyORDERED),0)),l.QtyOrdered) as quantityOrder, 
+       l.M_Product_UOM_ID, l.M_ATTRIBUTESETINSTANCE_ID, l.taxbaseamt
         FROM C_ORDERLINE l left join M_MATCHPO mp on l.C_OrderLine_ID=mp.C_OrderLine_ID
                                                   and mp.C_InvoiceLine_ID IS NOT NULL
         GROUP BY l.ad_org_id,l.C_CURRENCY_ID,l.C_UOM_ID, l.M_Product_ID, l.Line, l.Description, l.C_OrderLine_ID, l.QtyOrdered, l.quantityOrder, l.M_Product_UOM_ID,
@@ -227,6 +259,8 @@
       ORDER BY A.Line
       ]]>
     </Sql>
+    <Parameter name="piId"/>
+    <Parameter name="piId"/>
     <Parameter name="cOrderlineId" optional="true" type="argument" after="AND A.M_Product_ID=p.M_Product_ID" text=" AND A.C_OrderLine_ID IN "/>
   </SqlMethod>
   <SqlMethod name="selectFromPOUpdateSOTrx" type="preparedStatement" connection="true" return="multiple">
--- a/src/org/openbravo/erpCommon/ad_actionButton/ValidateWorkEffort_ProductionRun.java	Thu Mar 29 16:27:58 2012 +0000
+++ b/src/org/openbravo/erpCommon/ad_actionButton/ValidateWorkEffort_ProductionRun.java	Sun Apr 01 20:25:01 2012 +0200
@@ -32,6 +32,7 @@
 import org.openbravo.model.materialmgmt.transaction.ProductionTransaction;
 import org.openbravo.scheduling.ProcessBundle;
 import org.openbravo.service.db.CallProcess;
+import org.openbravo.service.db.DalConnectionProvider;
 
 public class ValidateWorkEffort_ProductionRun implements org.openbravo.scheduling.Process {
 
@@ -102,7 +103,7 @@
       if (pInstance.getResult() == 0) {
         // Error Processing
         OBError myMessage = Utility.getProcessInstanceMessage(conn, vars,
-            PInstanceProcessData.select(conn, pInstance.getId()));
+            PInstanceProcessData.select(new DalConnectionProvider(), pInstance.getId()));
         throw new OBException("ERROR: " + myMessage.getMessage());
       }
     } finally {
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_Order_Amt.java	Thu Mar 29 16:27:58 2012 +0000
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Order_Amt.java	Sun Apr 01 20:25:01 2012 +0200
@@ -222,9 +222,20 @@
         priceActual = priceStd;
         resultado.append("new Array(\"inppriceactual\", " + priceActual.toString() + "),");
       } else {
-        priceActual = new BigDecimal(SLOrderProductData.getOffersPrice(this,
+        BigDecimal previousOffer = BigDecimal.ZERO;
+        if (priceActual.signum() != 0) {
+          previousOffer = new BigDecimal(SLOrderProductData.getOffersPrice(this,
+              dataOrder[0].dateordered, dataOrder[0].cBpartnerId, strProduct, priceStd.toString(),
+              (LineNetAmt.divide(priceActual)).toString(), dataOrder[0].mPricelistId,
+              dataOrder[0].id));
+        }
+        final BigDecimal actualOffer = new BigDecimal(SLOrderProductData.getOffersPrice(this,
             dataOrder[0].dateordered, dataOrder[0].cBpartnerId, strProduct, priceStd.toString(),
             strQty, dataOrder[0].mPricelistId, dataOrder[0].id));
+
+        if (!previousOffer.equals(actualOffer)) {
+          priceActual = actualOffer;
+        }
         if (priceActual.scale() > PricePrecision)
           priceActual = priceActual.setScale(PricePrecision, BigDecimal.ROUND_HALF_UP);
         resultado.append("new Array(\"inppriceactual\", " + priceActual.toString() + "),");
--- a/src/org/openbravo/erpCommon/ad_forms/About.html	Thu Mar 29 16:27:58 2012 +0000
+++ b/src/org/openbravo/erpCommon/ad_forms/About.html	Sun Apr 01 20:25:01 2012 +0200
@@ -150,7 +150,7 @@
               <p class="Regular_Paragraph">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;-&nbsp;Dynarch</p>
               <p class="Regular_Paragraph">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;-&nbsp;DHTMLGoodies</p>
               <p class="Wide_Paragraph">Openbravo and the openbravo logo are trademarks of Openbravo S.L.U. Names and distinctive signs of other parties are trademarks of their respective owners.</p>
-              <p class="Wide_Paragraph">For more information on our licensing, please consult&nbsp;<span class="LabelText"><a class="LabelLink_noicon" href="http://www.openbravo.com/legal/license.html" target="_blank">www.openbravo.com/legal/license.html</a></span></p>
+              <p class="Wide_Paragraph">For more information on our licensing, please consult&nbsp;<span class="LabelText"><a class="LabelLink_noicon" href="http://www.openbravo.com/legal/license.html" target="_blank">http://www.openbravo.com/legal/license.html</a></span></p>
               <p class="Regular_Paragraph">Thank you to all contributors.</p>
             </td>
           </tr>
--- a/src/org/openbravo/erpCommon/ad_process/buildStructure/buildStructure.xml	Thu Mar 29 16:27:58 2012 +0000
+++ b/src/org/openbravo/erpCommon/ad_process/buildStructure/buildStructure.xml	Sun Apr 01 20:25:01 2012 +0200
@@ -12,8 +12,8 @@
       <mainStep code="RB20" successCode="RB60" warningCode="RB60" errorCode="RB59">
         <name>Build</name>
         <successMessage>The build was successful</successMessage>
-        <warningMessage><![CDATA[There were warnings on the build. The application will run, but you should check them to see if there were important. Go to <a href="http://wiki.openbravo.com/wiki/ERP/2.50/Update_Tips" target="_blank" class="MessageBox_TextLink"> this link</a> for more information. <b>You must now restart the application container</b> to see the changes.]]></warningMessage>
-        <errorMessage><![CDATA[An error has occurred in the build. For a list of actions to take, go to <a href="http://wiki.openbravo.com/wiki/ERP/2.50/Update_Tips" target="_blank" class="MessageBox_TextLink">this link</a>]]></errorMessage>
+        <warningMessage><![CDATA[There were warnings on the build. The application will run, but you should check them to see if there were important. Go to <a href="http://wiki.openbravo.com/wiki/Update_Tips" target="_blank" class="MessageBox_TextLink"> this link</a> for more information. <b>You must now restart the application container</b> to see the changes.]]></warningMessage>
+        <errorMessage><![CDATA[An error has occurred in the build. For a list of actions to take, go to <a href="http://wiki.openbravo.com/wiki/Update_Tips" target="_blank" class="MessageBox_TextLink">this link</a>]]></errorMessage>
         <stepList>
           <step code="RB12" name="Database update"/>
           <step code="RB31" name="Reference data"/>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java	Thu Mar 29 16:27:58 2012 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java	Sun Apr 01 20:25:01 2012 +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) 2001-2011 Openbravo SLU
+ * All portions are Copyright (C) 2001-2012 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -246,9 +246,11 @@
     String strFinancialOrgFamily = getFinancialFamily(strTreeOrg, strOrg, vars.getClient());
     String strExistsInitialDate = ReportGeneralLedgerData.yearInitialDate(this,
         vars.getSessionValue("#AD_SqlDateFormat"), strDateFrom,
-        Utility.getContext(this, vars, "#User_Client", "ReportGeneralLedger"), strFinancialOrgFamily);
+        Utility.getContext(this, vars, "#User_Client", "ReportGeneralLedger"),
+        strFinancialOrgFamily);
     String strYearInitialDate = strDateFrom;
-    if (strExistsInitialDate.equals("")) strYearInitialDate = strExistsInitialDate;
+    if (strExistsInitialDate.equals(""))
+      strYearInitialDate = strExistsInitialDate;
     String toDatePlusOne = DateTimeData.nDaysAfter(this, strDateTo, "1");
 
     String strGroupByText = (strGroupBy.equals("BPartner") ? Utility.messageBD(this, "BusPartner",
@@ -312,7 +314,7 @@
       // of previous screen, so same sql -but from the beginning of the fiscal year- is executed
 
       ReportGeneralLedgerData[] dataTotal = null;
-      if (data != null && data.length > 1) {
+      if (data != null && data.length >= 1) {
         dataTotal = ReportGeneralLedgerData.select(this, rowNum, strGroupByText, strGroupBy,
             vars.getLanguage(), strDateFrom, toDatePlusOne, strAllaccounts, strcelementvaluefrom,
             strcelementvalueto,
@@ -330,7 +332,6 @@
         previousCredit = previousCredit.add(new BigDecimal(dataTotal[i].amtacctcr));
       }
       String strOld = "";
-      int j = 0;
       ReportGeneralLedgerData[] subreportElement = new ReportGeneralLedgerData[1];
       for (int i = 0; data != null && i < data.length; i++) {
         if (!strOld.equals(data[i].groupbyid + data[i].id)) {
@@ -341,18 +342,30 @@
             subreportElement[0].totalacctdr = previousDebit.toPlainString();
             subreportElement[0].totalacctcr = previousCredit.toPlainString();
             subreportElement[0].total = previousDebit.subtract(previousCredit).toPlainString();
-          } else
-            subreportElement = ReportGeneralLedgerData.selectTotal(this, strDateFrom,
-                toDatePlusOne, (strGroupBy.equals("BPartner") ? "('" + data[i].groupbyid + "')"
-                    : strcBpartnerId), (strGroupBy.equals("Product") ? "('" + data[i].groupbyid
-                    + "')" : strmProductId), (strGroupBy.equals("Project") ? "('"
-                    + data[i].groupbyid + "')" : strcProjectId), strcAcctSchemaId, data[i].id,
-                strYearInitialDate, strDateFrom, strOrgFamily, strHide);
+          } else {
+            if ("".equals(data[i].groupbyid)) {
+              // The argument " " is used to simulate one value and put the optional parameter-->
+              // AND FACT_ACCT.C_PROJECT_ID IS NULL for example
+              subreportElement = ReportGeneralLedgerData.selectTotal(this, strDateFrom,
+                  toDatePlusOne, null, (strGroupBy.equals("BPartner") ? " " : null), null,
+                  (strGroupBy.equals("Product") ? " " : null), null,
+                  (strGroupBy.equals("Project") ? " " : null), strcAcctSchemaId, data[i].id,
+                  strYearInitialDate, strDateFrom, strOrgFamily, strHide);
+            } else {
+              subreportElement = ReportGeneralLedgerData.selectTotal(this, strDateFrom,
+                  toDatePlusOne, (strGroupBy.equals("BPartner") ? "('" + data[i].groupbyid + "')"
+                      : strcBpartnerId), null, (strGroupBy.equals("Product") ? "('"
+                      + data[i].groupbyid + "')" : strmProductId), null, (strGroupBy
+                      .equals("Project") ? "('" + data[i].groupbyid + "')" : strcProjectId), null,
+                  strcAcctSchemaId, data[i].id, strYearInitialDate, strDateFrom, strOrgFamily,
+                  strHide);
+            }
+          }
           data[i].totalacctdr = subreportElement[0].totalacctdr;
           data[i].totalacctcr = subreportElement[0].totalacctcr;
-          data[i].totalacctsub = subreportElement[0].total;
-          j++;
         }
+        data[i].totalacctsub = subreportElement[0].total;
+
         data[i].previousdebit = subreportElement[0].totalacctdr;
         data[i].previouscredit = subreportElement[0].totalacctcr;
         data[i].previoustotal = subreportElement[0].total;
@@ -364,12 +377,23 @@
       for (int i = 0; data != null && i < data.length; i++) {
         if (!strTotal.equals(data[i].groupbyid + data[i].id)) {
           subreportElement = new ReportGeneralLedgerData[1];
-          subreportElement = ReportGeneralLedgerData.selectTotal(this, strDateFrom, toDatePlusOne,
-              (strGroupBy.equals("BPartner") ? "('" + data[i].groupbyid + "')" : strcBpartnerId),
-              (strGroupBy.equals("Product") ? "('" + data[i].groupbyid + "')" : strmProductId),
-              (strGroupBy.equals("Project") ? "('" + data[i].groupbyid + "')" : strcProjectId),
-              strcAcctSchemaId, data[i].id, strYearInitialDate, toDatePlusOne, strOrgFamily,
-              strHide);
+          if ("".equals(data[i].groupbyid)) {
+            // The argument " " is used to simulate one value and put the optional parameter--> AND
+            // FACT_ACCT.C_PROJECT_ID IS NULL for example
+            subreportElement = ReportGeneralLedgerData.selectTotal(this, strDateFrom,
+                toDatePlusOne, null, (strGroupBy.equals("BPartner") ? " " : null), null,
+                (strGroupBy.equals("Product") ? " " : null), null,
+                (strGroupBy.equals("Project") ? " " : null), strcAcctSchemaId, data[i].id,
+                strYearInitialDate, toDatePlusOne, strOrgFamily, strHide);
+          } else {
+            subreportElement = ReportGeneralLedgerData.selectTotal(this, strDateFrom,
+                toDatePlusOne, (strGroupBy.equals("BPartner") ? "('" + data[i].groupbyid + "')"
+                    : strcBpartnerId), null, (strGroupBy.equals("Product") ? "('"
+                    + data[i].groupbyid + "')" : strmProductId), null, (strGroupBy
+                    .equals("Project") ? "('" + data[i].groupbyid + "')" : strcProjectId), null,
+                strcAcctSchemaId, data[i].id, strYearInitialDate, toDatePlusOne, strOrgFamily,
+                strHide);
+          }
           g++;
         }
         data[i].finaldebit = subreportElement[0].totalacctdr;
@@ -477,9 +501,9 @@
       if (strExistsInitialDate.equals("") && vars.commandIn("FIND")) {
         xmlDocument.setParameter("messageType", "WARNING");
         xmlDocument.setParameter("messageTitle",
-           Utility.messageBD(this, "ProcessStatus-W", vars.getLanguage()));
+            Utility.messageBD(this, "ProcessStatus-W", vars.getLanguage()));
         xmlDocument.setParameter("messageMessage",
-           Utility.messageBD(this, "InitialDateNotFoundCalendar", vars.getLanguage()));
+            Utility.messageBD(this, "InitialDateNotFoundCalendar", vars.getLanguage()));
       }
       if (strGroupBy.equals(""))
         xmlDocument.setData("structure1", data);
@@ -525,8 +549,10 @@
     String strFinancialOrgFamily = getFinancialFamily(strTreeOrg, strOrg, vars.getClient());
     String strYearInitialDate = ReportGeneralLedgerData.yearInitialDate(this,
         vars.getSessionValue("#AD_SqlDateFormat"), strDateFrom,
-        Utility.getContext(this, vars, "#User_Client", "ReportGeneralLedger"), strFinancialOrgFamily);
-    if (strYearInitialDate.equals("")) strYearInitialDate = strDateFrom;
+        Utility.getContext(this, vars, "#User_Client", "ReportGeneralLedger"),
+        strFinancialOrgFamily);
+    if (strYearInitialDate.equals(""))
+      strYearInitialDate = strDateFrom;
     String toDatePlusOne = DateTimeData.nDaysAfter(this, strDateTo, "1");
 
     String strGroupByText = (strGroupBy.equals("BPartner") ? Utility.messageBD(this, "BusPartner",
@@ -565,12 +591,23 @@
       subreport = new ReportGeneralLedgerData[data.length];
       for (int i = 0; data != null && i < data.length; i++) {
         if (!strOld.equals(data[i].groupbyid + data[i].id)) {
-          subreport = ReportGeneralLedgerData.selectTotal(this, strDateFrom, DateTimeData
-              .nDaysAfter(this, strDateTo, "1"), (strGroupBy.equals("BPartner") ? "('"
-              + data[i].groupbyid + "')" : strcBpartnerId), (strGroupBy.equals("Product") ? "('"
-              + data[i].groupbyid + "')" : strmProductId), (strGroupBy.equals("Project") ? "('"
-              + data[i].groupbyid + "')" : strcProjectId), strcAcctSchemaId, data[i].id,
-              strYearInitialDate, strDateFrom, strOrgFamily, strHide);
+          if ("".equals(data[i].groupbyid)) {
+            // The argument " " is used to simulate one value and put the optional parameter--> AND
+            // FACT_ACCT.C_PROJECT_ID IS NULL for example
+            subreport = ReportGeneralLedgerData.selectTotal(this, strDateFrom, DateTimeData
+                .nDaysAfter(this, strDateTo, "1"), null, (strGroupBy.equals("BPartner") ? " "
+                : null), null, (strGroupBy.equals("Product") ? " " : null), null, (strGroupBy
+                .equals("Project") ? " " : null), strcAcctSchemaId, data[i].id, strYearInitialDate,
+                strDateFrom, strOrgFamily, strHide);
+          } else {
+            subreport = ReportGeneralLedgerData.selectTotal(this, strDateFrom, DateTimeData
+                .nDaysAfter(this, strDateTo, "1"), (strGroupBy.equals("BPartner") ? "('"
+                + data[i].groupbyid + "')" : strcBpartnerId), null,
+                (strGroupBy.equals("Product") ? "('" + data[i].groupbyid + "')" : strmProductId),
+                null, (strGroupBy.equals("Project") ? "('" + data[i].groupbyid + "')"
+                    : strcProjectId), null, strcAcctSchemaId, data[i].id, strYearInitialDate,
+                strDateFrom, strOrgFamily, strHide);
+          }
           totalDebit = BigDecimal.ZERO;
           totalCredit = BigDecimal.ZERO;
           subTotal = BigDecimal.ZERO;
@@ -627,8 +664,10 @@
     String strFinancialOrgFamily = getFinancialFamily(strTreeOrg, strOrg, vars.getClient());
     String strYearInitialDate = ReportGeneralLedgerData.yearInitialDate(this,
         vars.getSessionValue("#AD_SqlDateFormat"), strDateFrom,
-        Utility.getContext(this, vars, "#User_Client", "ReportGeneralLedger"), strFinancialOrgFamily);
-    if (strYearInitialDate.equals("")) strYearInitialDate = strDateFrom;
+        Utility.getContext(this, vars, "#User_Client", "ReportGeneralLedger"),
+        strFinancialOrgFamily);
+    if (strYearInitialDate.equals(""))
+      strYearInitialDate = strDateFrom;
     String toDatePlusOne = DateTimeData.nDaysAfter(this, strDateTo, "1");
 
     String strAllaccounts = "Y";
@@ -681,8 +720,8 @@
   private String getFinancialFamily(String strTree, String strChild, String strClientId)
       throws IOException, ServletException {
     log4j.debug("Tree.getFinancialMembers");
-    ReportGeneralLedgerData[] data = ReportGeneralLedgerData
-        .getFinancialOrgs(this, strTree, strChild, strClientId);
+    ReportGeneralLedgerData[] data = ReportGeneralLedgerData.getFinancialOrgs(this, strTree,
+        strChild, strClientId);
 
     boolean bolFirstLine = true;
     String strText = "";
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger_data.xsql	Thu Mar 29 16:27:58 2012 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger_data.xsql	Sun Apr 01 20:25:01 2012 +0200
@@ -242,8 +242,11 @@
       <Parameter name="dateFrom" optional="true" after="where 5=5"><![CDATA[AND DATEACCT >= TO_DATE(?) ]]></Parameter>
       <Parameter name="dateTo" optional="true" after="where 5=5"><![CDATA[AND DATEACCT < TO_DATE(?) ]]></Parameter>
       <Parameter name="bpartner" optional="true" type="argument" after="1=1"><![CDATA[ AND FACT_ACCT.C_BPARTNER_ID IN]]></Parameter>
+      <Parameter name="bpartnerNULL" optional="true" type="argument" after="1=1"><![CDATA[ AND FACT_ACCT.C_BPARTNER_ID IS NULL]]></Parameter>
       <Parameter name="product" optional="true" type="argument" after="1=1"><![CDATA[ AND FACT_ACCT.M_PRODUCT_ID IN]]></Parameter>
+      <Parameter name="productNULL" optional="true" type="argument" after="1=1"><![CDATA[ AND FACT_ACCT.M_PRODUCT_ID IS NULL]]></Parameter>
       <Parameter name="project" optional="true" type="argument" after="1=1"><![CDATA[ AND FACT_ACCT.C_PROJECT_ID IN]]></Parameter>
+      <Parameter name="projectNULL" optional="true" type="argument" after="1=1"><![CDATA[ AND FACT_ACCT.C_PROJECT_ID IS NULL]]></Parameter>
       <Parameter name="acctschema" optional="true" after="1=1"><![CDATA[ AND FACT_ACCT.C_ACCTSCHEMA_ID = ? ]]></Parameter>
       <Parameter name="account"/>
       <Parameter name="initialYearBalance"/>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJRFilter.html	Thu Mar 29 16:27:58 2012 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJRFilter.html	Sun Apr 01 20:25:01 2012 +0200
@@ -401,11 +401,11 @@
                     </select></td>
                 </tr>
                 <tr>
-                  <td class="TitleCell"><span class="LabelText">Business Partner Group</span></td>
+                  <td class="TitleCell"><span class="LabelText">Business Partner Category</span></td>
                   <td class="Combo_ContentCell" colspan="2"><select name="inpPartnerGroup" id="inpPartnerGroup2" class="Combo Combo_TwoCells_width">
                       <option value=""> <div id="reportC_BP_GROUPID"></div></option>
                     </select></td>
-                  <td class="TitleCell"><span class="LabelText">Product Group</span></td>
+                  <td class="TitleCell"><span class="LabelText">Product Category</span></td>
                   <td class="Combo_ContentCell" colspan="2"> <select name="inpProductCategory" id="inpProductCategory2" class="Combo Combo_TwoCells_width">
                       <option value=""> <div id="reportM_PRODUCT_CATEGORYID"></div></option>
                     </select></td>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderJR.java	Thu Mar 29 16:27:58 2012 +0000
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderJR.java	Sun Apr 01 20:25:01 2012 +0200
@@ -142,7 +142,6 @@
     xmlDocument.setParameter("mWarehouseId", strmWarehouseId);
     xmlDocument.setParameter("cProjectId", strcProjectId);
     xmlDocument.setParameter("projectName", OrderEditionData.selectProject(this, strcProjectId));
-    xmlDocument.setParameter("cProjectKind", "");
     xmlDocument.setParameter("cRegionId", "");
     xmlDocument.setParameter("mProductCatId", "");
     try {
--- a/src/org/openbravo/erpCommon/security/Login.html	Thu Mar 29 16:27:58 2012 +0000
+++ b/src/org/openbravo/erpCommon/security/Login.html	Sun Apr 01 20:25:01 2012 +0200
@@ -391,7 +391,7 @@
     }
     catch (e) { }
 
-    if ((!revisionControl('14275')) || (isOpsInstance() != isOpsInstanceCached())) {
+    if ((!revisionControl('15747')) || (isOpsInstance() != isOpsInstanceCached())) {
       maskLoginWindow(cacheMsg);
       setLoginMessage('Warning', '', cacheMsg);
     }
--- a/src/org/openbravo/erpCommon/security/Login_F1.html	Thu Mar 29 16:27:58 2012 +0000
+++ b/src/org/openbravo/erpCommon/security/Login_F1.html	Sun Apr 01 20:25:01 2012 +0200
@@ -126,7 +126,7 @@
       clearForm();
     } catch (e) {}
     setWindowElementFocus('firstElement');
-    if ((!revisionControl('14275')) || (isOpsInstance() != isOpsInstanceCached())) {
+    if ((!revisionControl('15747')) || (isOpsInstance() != isOpsInstanceCached())) {
       alert(cacheMsg);
     }
 
--- a/src/org/openbravo/erpCommon/utility/CalculateCoreRevision.java	Thu Mar 29 16:27:58 2012 +0000
+++ b/src/org/openbravo/erpCommon/utility/CalculateCoreRevision.java	Sun Apr 01 20:25:01 2012 +0200
@@ -29,6 +29,7 @@
  * 
  * 
  */
+@Deprecated
 public class CalculateCoreRevision extends Task {
   private String revision;
   private String hgRevNo;
--- a/src/org/openbravo/erpCommon/utility/reporting/Template_data.xsql	Thu Mar 29 16:27:58 2012 +0000
+++ b/src/org/openbravo/erpCommon/utility/reporting/Template_data.xsql	Sun Apr 01 20:25:01 2012 +0200
@@ -69,7 +69,8 @@
 			C_poc_doctype_template documenttemplate
 		where
 			documenttemplate.c_doctype_id = ? and
-			documenttemplate.ad_org_id = ?
+			documenttemplate.ad_org_id = ? and
+			documenttemplate.isactive = 'Y'
 	    union 
 		select
 		    '2' as position,
@@ -87,7 +88,8 @@
 			C_poc_doctype_template documenttemplate
 		where
 			documenttemplate.c_doctype_id = ? and
-			documenttemplate.ad_org_id = '0' 	    
+			documenttemplate.ad_org_id = '0' and
+			documenttemplate.isactive = 'Y'
 		order by position asc, ad_org_id desc
         ]]>
         </Sql>
--- a/src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java	Thu Mar 29 16:27:58 2012 +0000
+++ b/src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java	Sun Apr 01 20:25:01 2012 +0200
@@ -156,271 +156,280 @@
   void post(HttpServletRequest request, HttpServletResponse response, VariablesSecureApp vars,
       DocumentType documentType, String sessionValuePrefix, String strDocumentId)
       throws IOException, ServletException {
+    try {
 
-    Map<String, Report> reports;
+      Map<String, Report> reports;
 
-    // Checks are maintained in this way for mulithread safety
-    HashMap<String, Boolean> checks = new HashMap<String, Boolean>();
-    checks.put("moreThanOneCustomer", Boolean.FALSE);
-    checks.put("moreThanOnesalesRep", Boolean.FALSE);
+      // Checks are maintained in this way for mulithread safety
+      HashMap<String, Boolean> checks = new HashMap<String, Boolean>();
+      checks.put("moreThanOneCustomer", Boolean.FALSE);
+      checks.put("moreThanOnesalesRep", Boolean.FALSE);
 
-    String documentIds[] = null;
-    if (log4j.isDebugEnabled())
-      log4j.debug("strDocumentId: " + strDocumentId);
-    // normalize the string of ids to a comma separated list
-    strDocumentId = strDocumentId.replaceAll("\\(|\\)|'", "");
-    if (strDocumentId.length() == 0)
-      throw new ServletException(Utility.messageBD(this, "NoDocument", vars.getLanguage()));
+      String documentIds[] = null;
+      if (log4j.isDebugEnabled())
+        log4j.debug("strDocumentId: " + strDocumentId);
+      // normalize the string of ids to a comma separated list
+      strDocumentId = strDocumentId.replaceAll("\\(|\\)|'", "");
+      if (strDocumentId.length() == 0)
+        throw new ServletException(Utility.messageBD(this, "NoDocument", vars.getLanguage()));
 
-    documentIds = strDocumentId.split(",");
+      documentIds = strDocumentId.split(",");
 
-    if (log4j.isDebugEnabled())
-      log4j.debug("Number of documents selected: " + documentIds.length);
+      if (log4j.isDebugEnabled())
+        log4j.debug("Number of documents selected: " + documentIds.length);
 
-    multiReports = (documentIds.length > 1);
+      multiReports = (documentIds.length > 1);
 
-    reports = (Map<String, Report>) vars.getSessionObject(sessionValuePrefix + ".Documents");
-    final ReportManager reportManager = new ReportManager(this, globalParameters.strFTPDirectory,
-        strReplaceWithFull, globalParameters.strBaseDesignPath,
-        globalParameters.strDefaultDesignPath, globalParameters.prefix, multiReports);
+      reports = (Map<String, Report>) vars.getSessionObject(sessionValuePrefix + ".Documents");
+      final ReportManager reportManager = new ReportManager(this, globalParameters.strFTPDirectory,
+          strReplaceWithFull, globalParameters.strBaseDesignPath,
+          globalParameters.strDefaultDesignPath, globalParameters.prefix, multiReports);
 
-    if (vars.commandIn("PRINT")) {
-      archivedReports = false;
-      // Order documents by Document No.
-      if (multiReports)
-        documentIds = orderByDocumentNo(documentType, documentIds);
+      if (vars.commandIn("PRINT")) {
+        archivedReports = false;
+        // Order documents by Document No.
+        if (multiReports)
+          documentIds = orderByDocumentNo(documentType, documentIds);
 
-      /*
-       * PRINT option will print directly to the UI for a single report. For multiple reports the
-       * documents will each be saved individually and the concatenated in the same manner as the
-       * saved reports. After concatenating the reports they will be deleted.
-       */
-      Report report = null;
-      JasperPrint jasperPrint = null;
-      Collection<JasperPrint> jrPrintReports = new ArrayList<JasperPrint>();
-      final Collection<Report> savedReports = new ArrayList<Report>();
-      for (int i = 0; i < documentIds.length; i++) {
-        String documentId = documentIds[i];
-        report = buildReport(response, vars, documentId, reportManager, documentType,
-            Report.OutputTypeEnum.PRINT);
-        try {
-          jasperPrint = reportManager.processReport(report, vars);
-          jrPrintReports.add(jasperPrint);
-        } catch (final ReportingException e) {
-          advisePopUp(request, response, "Report processing failed",
-              "Unable to process report selection");
-          log4j.error(e.getMessage());
-          e.getStackTrace();
+        /*
+         * PRINT option will print directly to the UI for a single report. For multiple reports the
+         * documents will each be saved individually and the concatenated in the same manner as the
+         * saved reports. After concatenating the reports they will be deleted.
+         */
+        Report report = null;
+        JasperPrint jasperPrint = null;
+        Collection<JasperPrint> jrPrintReports = new ArrayList<JasperPrint>();
+        final Collection<Report> savedReports = new ArrayList<Report>();
+        for (int i = 0; i < documentIds.length; i++) {
+          String documentId = documentIds[i];
+          report = buildReport(response, vars, documentId, reportManager, documentType,
+              Report.OutputTypeEnum.PRINT);
+          try {
+            jasperPrint = reportManager.processReport(report, vars);
+            jrPrintReports.add(jasperPrint);
+          } catch (final ReportingException e) {
+            advisePopUp(request, response, "Report processing failed",
+                "Unable to process report selection");
+            log4j.error(e.getMessage());
+            e.getStackTrace();
+          }
+          savedReports.add(report);
+          if (multiReports) {
+            reportManager.saveTempReport(report, vars);
+          }
         }
-        savedReports.add(report);
-        if (multiReports) {
+        printReports(response, jrPrintReports, savedReports);
+      } else if (vars.commandIn("ARCHIVE")) {
+        // Order documents by Document No.
+        if (multiReports)
+          documentIds = orderByDocumentNo(documentType, documentIds);
+
+        /*
+         * ARCHIVE will save each report individually and then print the reports in a single
+         * printable (concatenated) format.
+         */
+        archivedReports = true;
+        Report report = null;
+        final Collection<Report> savedReports = new ArrayList<Report>();
+        for (int index = 0; index < documentIds.length; index++) {
+          String documentId = documentIds[index];
+          report = buildReport(response, vars, documentId, reportManager, documentType,
+              OutputTypeEnum.ARCHIVE);
+          buildReport(response, vars, documentId, reports, reportManager);
+          try {
+            reportManager.processReport(report, vars);
+          } catch (final ReportingException e) {
+            log4j.error(e);
+          }
           reportManager.saveTempReport(report, vars);
+          savedReports.add(report);
         }
-      }
-      printReports(response, jrPrintReports, savedReports);
-    } else if (vars.commandIn("ARCHIVE")) {
-      // Order documents by Document No.
-      if (multiReports)
-        documentIds = orderByDocumentNo(documentType, documentIds);
+        printReports(response, null, savedReports);
+      } else {
+        if (vars.commandIn("DEFAULT")) {
 
-      /*
-       * ARCHIVE will save each report individually and then print the reports in a single printable
-       * (concatenated) format.
-       */
-      archivedReports = true;
-      Report report = null;
-      final Collection<Report> savedReports = new ArrayList<Report>();
-      for (int index = 0; index < documentIds.length; index++) {
-        String documentId = documentIds[index];
-        report = buildReport(response, vars, documentId, reportManager, documentType,
-            OutputTypeEnum.ARCHIVE);
-        buildReport(response, vars, documentId, reports, reportManager);
-        try {
-          reportManager.processReport(report, vars);
-        } catch (final ReportingException e) {
-          log4j.error(e);
-        }
-        reportManager.saveTempReport(report, vars);
-        savedReports.add(report);
-      }
-      printReports(response, null, savedReports);
-    } else {
-      if (vars.commandIn("DEFAULT")) {
+          reports = new HashMap<String, Report>();
+          for (int index = 0; index < documentIds.length; index++) {
+            final String documentId = documentIds[index];
+            if (log4j.isDebugEnabled())
+              log4j.debug("Processing document with id: " + documentId);
 
-        reports = new HashMap<String, Report>();
-        for (int index = 0; index < documentIds.length; index++) {
-          final String documentId = documentIds[index];
-          if (log4j.isDebugEnabled())
-            log4j.debug("Processing document with id: " + documentId);
+            try {
+              final Report report = new Report(this, documentType, documentId, vars.getLanguage(),
+                  "default", multiReports, OutputTypeEnum.DEFAULT);
+              reports.put(documentId, report);
 
-          try {
-            final Report report = new Report(this, documentType, documentId, vars.getLanguage(),
-                "default", multiReports, OutputTypeEnum.DEFAULT);
-            reports.put(documentId, report);
+              final String senderAddress = EmailData.getSenderAddress(this, vars.getClient(),
+                  report.getOrgId());
+              boolean moreThanOnesalesRep = checks.get("moreThanOnesalesRep").booleanValue();
 
-            final String senderAddress = EmailData.getSenderAddress(this, vars.getClient(),
-                report.getOrgId());
-            boolean moreThanOnesalesRep = checks.get("moreThanOnesalesRep").booleanValue();
+              if (request.getServletPath().toLowerCase().indexOf("print.html") == -1) {
+                if ("".equals(senderAddress) || senderAddress == null) {
+                  final OBError on = new OBError();
+                  on.setMessage(Utility.messageBD(this, "No sender defined: Please go to client "
+                      + "configuration to complete the email configuration", vars.getLanguage()));
+                  on.setTitle(Utility.messageBD(this, "Email Configuration Error",
+                      vars.getLanguage()));
+                  on.setType("Error");
+                  final String tabId = vars.getSessionValue("inpTabId");
+                  vars.getStringParameter("tab");
+                  vars.setMessage(tabId, on);
+                  vars.getRequestGlobalVariable("inpTabId", "AttributeSetInstance.tabId");
+                  printPageClosePopUpAndRefreshParent(response, vars);
+                  throw new ServletException("Configuration Error no sender defined");
+                }
+              }
 
-            if (request.getServletPath().toLowerCase().indexOf("print.html") == -1) {
-              if ("".equals(senderAddress) || senderAddress == null) {
-                final OBError on = new OBError();
-                on.setMessage(Utility.messageBD(this, "No sender defined: Please go to client "
-                    + "configuration to complete the email configuration", vars.getLanguage()));
-                on.setTitle(Utility.messageBD(this, "Email Configuration Error", vars.getLanguage()));
-                on.setType("Error");
-                final String tabId = vars.getSessionValue("inpTabId");
-                vars.getStringParameter("tab");
-                vars.setMessage(tabId, on);
-                vars.getRequestGlobalVariable("inpTabId", "AttributeSetInstance.tabId");
-                printPageClosePopUpAndRefreshParent(response, vars);
-                throw new ServletException("Configuration Error no sender defined");
+              // check the different doc typeId's if all the selected
+              // doc's
+              // has the same doc typeId the template selector should
+              // appear
+              if (!differentDocTypes.containsKey(report.getDocTypeId())) {
+                differentDocTypes.put(report.getDocTypeId(), report.getTemplate());
+              }
+            } catch (final ReportingException exception) {
+              throw new ServletException(exception);
+            }
+
+          }
+
+          vars.setSessionObject(sessionValuePrefix + ".Documents", reports);
+
+          if (request.getServletPath().toLowerCase().indexOf("print.html") != -1)
+            createPrintOptionsPage(request, response, vars, documentType,
+                getComaSeparatedString(documentIds), reports);
+          else
+            createEmailOptionsPage(request, response, vars, documentType,
+                getComaSeparatedString(documentIds), reports, checks);
+
+        } else if (vars.commandIn("ADD")) {
+          if (request.getServletPath().toLowerCase().indexOf("print.html") != -1)
+            createPrintOptionsPage(request, response, vars, documentType,
+                getComaSeparatedString(documentIds), reports);
+          else {
+            final boolean showList = true;
+            createEmailOptionsPage(request, response, vars, documentType,
+                getComaSeparatedString(documentIds), reports, checks);
+          }
+
+        } else if (vars.commandIn("DEL")) {
+          final String documentToDelete = vars.getStringParameter("idToDelete");
+          final Vector<Object> vector = (Vector<Object>) request.getSession().getAttribute("files");
+          request.getSession().setAttribute("files", vector);
+
+          seekAndDestroy(vector, documentToDelete);
+          createEmailOptionsPage(request, response, vars, documentType,
+              getComaSeparatedString(documentIds), reports, checks);
+
+        } else if (vars.commandIn("EMAIL")) {
+          int nrOfEmailsSend = 0;
+          for (final PocData documentData : pocData) {
+            getEnvironentInformation(pocData, checks);
+            final String documentId = documentData.documentId;
+            if (log4j.isDebugEnabled())
+              log4j.debug("Processing document with id: " + documentId);
+
+            String templateInUse = "default";
+            if (differentDocTypes.size() == 1) {
+              templateInUse = vars.getRequestGlobalVariable("templates", "templates");
+            }
+
+            final Report report = buildReport(response, vars, documentId, reportManager,
+                documentType, OutputTypeEnum.EMAIL, templateInUse);
+
+            // if there is only one document type id the user should be
+            // able to choose between different templates
+            if (differentDocTypes.size() == 1) {
+              final String templateId = vars.getRequestGlobalVariable("templates", "templates");
+              try {
+                final TemplateInfo usedTemplateInfo = new TemplateInfo(this, report.getDocTypeId(),
+                    report.getOrgId(), vars.getLanguage(), templateId);
+                report.setTemplateInfo(usedTemplateInfo);
+              } catch (final ReportingException e) {
+                throw new ServletException("Error trying to get template information", e);
               }
             }
 
-            // check the different doc typeId's if all the selected
-            // doc's
-            // has the same doc typeId the template selector should
-            // appear
-            if (!differentDocTypes.containsKey(report.getDocTypeId())) {
-              differentDocTypes.put(report.getDocTypeId(), report.getTemplate());
+            if (report == null)
+              throw new ServletException(
+                  Utility.messageBD(this, "NoDataReport", vars.getLanguage()) + documentId);
+            // Check if the document is not in status 'draft'
+            if (!report.isDraft()) {
+              // Check if the report is already attached
+              if (!report.isAttached()) {
+                // get the Id of the entities table, this is used to
+                // store the file as an OB attachment
+                final String tableId = ToolsData.getTableId(this, report.getDocumentType()
+                    .getTableName());
+
+                // If the user wants to archive the document
+                if (vars.getStringParameter("inpArchive").equals("Y")) {
+                  // Save the report as a attachment because it is
+                  // being transferred to the user
+                  try {
+                    reportManager.createAttachmentForReport(this, report, tableId, vars);
+                  } catch (final ReportingException exception) {
+                    throw new ServletException(exception);
+                  }
+                } else {
+                  reportManager.saveTempReport(report, vars);
+                }
+              } else {
+                if (log4j.isDebugEnabled())
+                  log4j.debug("Document is not attached.");
+              }
+              final String senderAddress = vars.getStringParameter("fromEmail");
+              sendDocumentEmail(report, vars,
+                  (Vector<Object>) request.getSession().getAttribute("files"), documentData,
+                  senderAddress, checks);
+              nrOfEmailsSend++;
             }
-          } catch (final ReportingException exception) {
-            throw new ServletException(exception);
           }
+          request.getSession().removeAttribute("files");
+          createPrintStatusPage(response, vars, nrOfEmailsSend);
+        } else if (vars.commandIn("UPDATE_TEMPLATE")) {
+          JSONObject o = new JSONObject();
+          try {
+            final String templateId = vars.getRequestGlobalVariable("templates", "templates");
+            final String documentId = pocData[0].documentId;
+            for (final PocData documentData : pocData) {
+              final Report report = new Report(this, documentType, documentId, vars.getLanguage(),
+                  templateId, multiReports, OutputTypeEnum.DEFAULT);
+              o.put("templateId", templateId);
+              o.put("subject", report.getEmailDefinition().getSubject());
+              o.put("body", report.getEmailDefinition().getBody());
+              if (!multiReports) {
+                o.put("filename", report.getFilename());
+              }
+              reports = new HashMap<String, Report>();
+              reports.put(documentId, report);
+            }
+            vars.setSessionObject(sessionValuePrefix + ".Documents", reports);
 
-        }
-
-        vars.setSessionObject(sessionValuePrefix + ".Documents", reports);
-
-        if (request.getServletPath().toLowerCase().indexOf("print.html") != -1)
-          createPrintOptionsPage(request, response, vars, documentType,
-              getComaSeparatedString(documentIds), reports);
-        else
-          createEmailOptionsPage(request, response, vars, documentType,
-              getComaSeparatedString(documentIds), reports, checks);
-
-      } else if (vars.commandIn("ADD")) {
-        if (request.getServletPath().toLowerCase().indexOf("print.html") != -1)
-          createPrintOptionsPage(request, response, vars, documentType,
-              getComaSeparatedString(documentIds), reports);
-        else {
-          final boolean showList = true;
-          createEmailOptionsPage(request, response, vars, documentType,
-              getComaSeparatedString(documentIds), reports, checks);
-        }
-
-      } else if (vars.commandIn("DEL")) {
-        final String documentToDelete = vars.getStringParameter("idToDelete");
-        final Vector<Object> vector = (Vector<Object>) request.getSession().getAttribute("files");
-        request.getSession().setAttribute("files", vector);
-
-        seekAndDestroy(vector, documentToDelete);
-        createEmailOptionsPage(request, response, vars, documentType,
-            getComaSeparatedString(documentIds), reports, checks);
-
-      } else if (vars.commandIn("EMAIL")) {
-        int nrOfEmailsSend = 0;
-        for (final PocData documentData : pocData) {
-          getEnvironentInformation(pocData, checks);
-          final String documentId = documentData.documentId;
-          if (log4j.isDebugEnabled())
-            log4j.debug("Processing document with id: " + documentId);
-
-          String templateInUse = "default";
-          if (differentDocTypes.size() == 1) {
-            templateInUse = vars.getRequestGlobalVariable("templates", "templates");
-          }
-
-          final Report report = buildReport(response, vars, documentId, reportManager,
-              documentType, OutputTypeEnum.EMAIL, templateInUse);
-
-          // if there is only one document type id the user should be
-          // able to choose between different templates
-          if (differentDocTypes.size() == 1) {
-            final String templateId = vars.getRequestGlobalVariable("templates", "templates");
+          } catch (Exception e) {
+            log4j.error("Error in change template ajax", e);
+            o = new JSONObject();
             try {
-              final TemplateInfo usedTemplateInfo = new TemplateInfo(this, report.getDocTypeId(),
-                  report.getOrgId(), vars.getLanguage(), templateId);
-              report.setTemplateInfo(usedTemplateInfo);
-            } catch (final ReportingException e) {
-              throw new ServletException("Error trying to get template information", e);
+              o.put("error", true);
+            } catch (JSONException e1) {
+              log4j.error("Error in change template ajax", e1);
             }
           }
 
-          if (report == null)
-            throw new ServletException(Utility.messageBD(this, "NoDataReport", vars.getLanguage())
-                + documentId);
-          // Check if the document is not in status 'draft'
-          if (!report.isDraft()) {
-            // Check if the report is already attached
-            if (!report.isAttached()) {
-              // get the Id of the entities table, this is used to
-              // store the file as an OB attachment
-              final String tableId = ToolsData.getTableId(this, report.getDocumentType()
-                  .getTableName());
-
-              // If the user wants to archive the document
-              if (vars.getStringParameter("inpArchive").equals("Y")) {
-                // Save the report as a attachment because it is
-                // being transferred to the user
-                try {
-                  reportManager.createAttachmentForReport(this, report, tableId, vars);
-                } catch (final ReportingException exception) {
-                  throw new ServletException(exception);
-                }
-              } else {
-                reportManager.saveTempReport(report, vars);
-              }
-            } else {
-              if (log4j.isDebugEnabled())
-                log4j.debug("Document is not attached.");
-            }
-            final String senderAddress = vars.getStringParameter("fromEmail");
-            sendDocumentEmail(report, vars,
-                (Vector<Object>) request.getSession().getAttribute("files"), documentData,
-                senderAddress, checks);
-            nrOfEmailsSend++;
-          }
-        }
-        request.getSession().removeAttribute("files");
-        createPrintStatusPage(response, vars, nrOfEmailsSend);
-      } else if (vars.commandIn("UPDATE_TEMPLATE")) {
-        JSONObject o = new JSONObject();
-        try {
-          final String templateId = vars.getRequestGlobalVariable("templates", "templates");
-          final String documentId = pocData[0].documentId;
-          for (final PocData documentData : pocData) {
-            final Report report = new Report(this, documentType, documentId, vars.getLanguage(),
-                templateId, multiReports, OutputTypeEnum.DEFAULT);
-            o.put("templateId", templateId);
-            o.put("subject", report.getEmailDefinition().getSubject());
-            o.put("body", report.getEmailDefinition().getBody());
-            if (!multiReports) {
-              o.put("filename", report.getFilename());
-            }
-            reports = new HashMap<String, Report>();
-            reports.put(documentId, report);
-          }
-          vars.setSessionObject(sessionValuePrefix + ".Documents", reports);
-
-        } catch (Exception e) {
-          log4j.error("Error in change template ajax", e);
-          o = new JSONObject();
-          try {
-            o.put("error", true);
-          } catch (JSONException e1) {
-            log4j.error("Error in change template ajax", e1);
-          }
+          response.setContentType("application/json");
+          final PrintWriter out = response.getWriter();
+          out.println(o.toString());
+          out.close();
         }
 
-        response.setContentType("application/json");
-        final PrintWriter out = response.getWriter();
-        out.println(o.toString());
-        out.close();
+        pageError(response);
       }
-
-      pageError(response);
+    } catch (Exception e) {
+      // Catching the exception here instead of throwing it to HSAS because this is used in multi
+      // part request making the mechanism to detect popup not to work.
+      log4j.error("Error captured: ", e);
+      bdErrorGeneralPopUp(request, response, "Error",
+          Utility.translateError(this, vars, vars.getLanguage(), e.getMessage()).getMessage());
     }
   }
 
--- a/src/org/openbravo/erpReports/RptC_Bpartner.html	Thu Mar 29 16:27:58 2012 +0000
+++ b/src/org/openbravo/erpReports/RptC_Bpartner.html	Sun Apr 01 20:25:01 2012 +0200
@@ -220,11 +220,11 @@
         <tr>
           <td >
           <span class="LabelText">Commercial</span></td>
-          <td id="fieldIsemployee" class="LabelText">&nbsp;</td></tr>
+          <td id="fieldIssalesrep" class="LabelText">&nbsp;</td></tr>
         <tr>
           <td >
           <span class="LabelText">Employee</span></td>
-          <td id="fieldIssalesrep" class="LabelText">&nbsp;</td></tr>
+          <td id="fieldIsemployee" class="LabelText">&nbsp;</td></tr>
         <tr>
           <td >
           <span class="LabelText">Asset</span></td>
--- a/src/org/openbravo/service/db/DbUtility.java	Thu Mar 29 16:27:58 2012 +0000
+++ b/src/org/openbravo/service/db/DbUtility.java	Sun Apr 01 20:25:01 2012 +0200
@@ -24,6 +24,7 @@
 import java.io.FileReader;
 import java.io.IOException;
 import java.sql.BatchUpdateException;
+import java.sql.SQLException;
 
 import org.openbravo.base.exception.OBException;
 import org.openbravo.base.provider.OBSingleton;
@@ -37,21 +38,36 @@
 public class DbUtility implements OBSingleton {
 
   /**
-   * This method will take care of finding the real underlying exception. When a jdbc
-   * {@link BatchUpdateException} occurs then not the whole stack trace is available in the log
-   * because the {@link BatchUpdateException} does not place the underlying exception in the
-   * {@link Throwable#getCause()} but in the {@link BatchUpdateException#getNextException()}.
+   * This method will take care of finding the real underlying exception. When a jdbc or hibernate
+   * exception occurs then the whole stack trace is not available in the log because the exception
+   * does not return the underlying exception using the {@link Throwable#getCause()} but using the
+   * {@link SQLException#getNextException()}.
    * 
    * @param throwable
    *          the throwable to analyze
    * @return the underlying sql exception or the original throwable if none found
    */
   public static Throwable getUnderlyingSQLException(Throwable throwable) {
+
     if (throwable.getCause() instanceof BatchUpdateException
         && ((BatchUpdateException) throwable.getCause()).getNextException() != null) {
       final BatchUpdateException bue = (BatchUpdateException) throwable.getCause();
       return bue.getNextException();
     }
+    if (throwable.getCause() instanceof org.hibernate.exception.GenericJDBCException
+        && ((org.hibernate.exception.GenericJDBCException) throwable.getCause()).getSQLException()
+            .getNextException() != null) {
+      final org.hibernate.exception.GenericJDBCException gjdbce = (org.hibernate.exception.GenericJDBCException) throwable
+          .getCause();
+      return gjdbce.getSQLException().getNextException();
+    }
+    if (throwable.getCause() instanceof org.hibernate.exception.ConstraintViolationException
+        && ((org.hibernate.exception.ConstraintViolationException) throwable.getCause())
+            .getSQLException().getNextException() != null) {
+      final org.hibernate.exception.ConstraintViolationException cve = (org.hibernate.exception.ConstraintViolationException) throwable
+          .getCause();
+      return cve.getSQLException().getNextException();
+    }
     return throwable;
   }
 
--- a/web/js/utils.js	Thu Mar 29 16:27:58 2012 +0000
+++ b/web/js/utils.js	Sun Apr 01 20:25:01 2012 +0200
@@ -95,7 +95,7 @@
 * Return a number that would be checked at the Login screen to know if the file is cached with the correct version
 */
 function getCurrentRevision() {
-  var number = '14275';
+  var number = '15747';
   return number;
 }
 
@@ -3758,6 +3758,8 @@
     obj.className = obj.className.replace("readonly","");
     setObjAttribute(obj, 'readOnly', "false");
     obj.readOnly = false;
+    obj.removeAttribute('readOnly'); // To avoid in Chrome the dropdown arrow be light-greyed although it is not readonly anymore
+                                     // The previous statements are already needed since lower IE versions has problems handling "removeAttribute" function
     if (obj.setReadOnly) {
       obj.setReadOnly(false);
     }
@@ -3773,7 +3775,7 @@
     }
 
     if (obj.className.indexOf("Combo")!=-1) {
-      obj.className = className.replace("NoUpdatable","");
+      obj.className = obj.className.replace("NoUpdatable","");
       enableAttributeWithFunction(obj, 'obj', 'onChange');
       if (obj.getAttribute("onChange")) {
         onchange_combo = getObjAttribute(obj, 'onChange');