Merge temporary head for 3.0MP9.3
authorRM packaging bot <staff.rm@openbravo.com>
Thu, 24 May 2012 08:59:54 +0000
changeset 16293 025570cd6094
parent 16288 2d159103bd80 (diff)
parent 16292 3c0a7c421f1a (current diff)
child 16636 4a4ad33e5e27
Merge temporary head for 3.0MP9.3
.hgsigs
.hgtags
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
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.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_MODULE.xml
src-db/database/sourcedata/AD_TAB.xml
--- a/.hgignore	Tue May 22 06:39:39 2012 +0000
+++ b/.hgignore	Thu May 24 08:59:54 2012 +0000
@@ -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/.hgsigs	Tue May 22 06:39:39 2012 +0000
+++ b/.hgsigs	Thu May 24 08:59:54 2012 +0000
@@ -50,14 +50,24 @@
 e3386a2cd54020855bb2b3efa1c0afcfdf30a2b4 0 iEYEABECAAYFAk67/uoACgkQCX/oGf+2qkPXfQCg3lQiuBbJnVsPfnL8LWukEVG5CsIAoKsRfoVp93C1SY2N0iMl1LqT7CmB
 9bb62accddbd9114aa4562816ab5b0234b01b1fa 0 iEYEABECAAYFAk7Gf8IACgkQCX/oGf+2qkMwUACfbNSWszDOxciN14aA09Oe8da52TIAn3xc3Kgek0jmetz0q+lzPVxdAjjk
 1421ed09d86c5034375386393db18b2dc8866f77 0 iEYEABECAAYFAk7c/wQACgkQCX/oGf+2qkPZnwCfdfdLV/fHXKEXL0S+g9ip2PZuc5gAoL89Tv+s7FGS6g9HCfZSAkm76AF3
-cb27736b6ddbcf70d5a9c8878bdb012134818585 0 iEYEABECAAYFAk8pORIACgkQCX/oGf+2qkNT1ACgt0zVkZRcUGvubOPpiwStjh2c41YAn2J6v2/Cop95IKkUtVaBclL4c+89
 29635597c9b7110b66a4cde8e0cb0ece277f7407 0 iEYEABECAAYFAk7l05YACgkQCX/oGf+2qkNbCACgoK+bQ83JFW2GQb4j+YBkkBkrMOYAoKDSHPagp61WCcrPkCS7IEtmVI0E
 bc63869ec25d6771e0b3d3b65ddd630873663fc2 0 iEYEABECAAYFAk7h3vAACgkQCX/oGf+2qkP/HwCgt39R5/w8cF35rRoORikICeXQuDYAn347sM4ST4OvagS5ke9c6whsBYud
 5bb9eb1d86194a2fcf8779d28ee7bb131c53f20d 0 iEYEABECAAYFAk8BnJcACgkQCX/oGf+2qkMN7wCg+wl5wJjx0Y60WgZq3PRlBi3T3OoAmQGlwF1vK52FNykjDiACN+7Xdzjh
-f7c288af065f5425b20bd8bbef645df237282d4c 0 iEYEABECAAYFAk87pWEACgkQCX/oGf+2qkM1cgCg5Cp8jLM2gcEh+e+4QiJSJanE6J4An1iZUE2/OlrA8jLt9SQCs6/efCNq
-4463903e11ac52337be6041dcfb593022f35427f 0 iEYEABECAAYFAk8qiYkACgkQCX/oGf+2qkP6cgCfcsvKoCUqTvEE9+9qeLRBrjKy64YAn1Eg4n1WZcu4dxxnIDgAsjEywG/C
+cb27736b6ddbcf70d5a9c8878bdb012134818585 0 iEYEABECAAYFAk8pORIACgkQCX/oGf+2qkNT1ACgt0zVkZRcUGvubOPpiwStjh2c41YAn2J6v2/Cop95IKkUtVaBclL4c+89
 d034d0b54ffb6c401b3741be99d4237f82aa9d76 0 iEYEABECAAYFAk8EN/IACgkQCX/oGf+2qkMPzgCg/gXTYW5Vv9s02aG3VAi3lSvNiMwAn29/22CruqkJ9sTWkyA8lCChqk/r
 aa474df671aa2c3d4a16419479cf8098d5fbca82 0 iEYEABECAAYFAk8N8JAACgkQCX/oGf+2qkMFLACbB+b+pdKa0rd7O+ig6so/ETi1x0YAnRKPM91wMwdONWZ5AOazDoSj6h/c
+5cba5141fb8bb820c066f55b3b04713e3ba77439 0 iEYEABECAAYFAk+aaVcACgkQCX/oGf+2qkNnpwCaA0r7amMCeZiKyHJJT4QErFDVolkAniQ1iPNuyS3BGCCO8RWe/m/UH1IW
+4463903e11ac52337be6041dcfb593022f35427f 0 iEYEABECAAYFAk8qiYkACgkQCX/oGf+2qkP6cgCfcsvKoCUqTvEE9+9qeLRBrjKy64YAn1Eg4n1WZcu4dxxnIDgAsjEywG/C
+f7c288af065f5425b20bd8bbef645df237282d4c 0 iEYEABECAAYFAk87pWEACgkQCX/oGf+2qkM1cgCg5Cp8jLM2gcEh+e+4QiJSJanE6J4An1iZUE2/OlrA8jLt9SQCs6/efCNq
 4f5fd4acb98e5fb7ef587debb5ffd20487e2bb32 0 iEYEABECAAYFAk9CRa4ACgkQCX/oGf+2qkPC4ACeJ5HQ20QAW0ULMU/+SUGJvz9YNEYAoJwLMrqwWkt3GuJFyp7TwpULPeKu
 cab708e2de98b574cc10f344845b7dff184080b6 0 iEYEABECAAYFAk9Pi+oACgkQCX/oGf+2qkP4kwCfT5nGx/E4gn7sZh+d7L5/9JpcplwAoJ5C4WwVNpNaO+tNEx8oMlqdu8mc
 d43b1a2305e3ff6f308b329faa5692002b02afa7 0 iEYEABECAAYFAk+7NKsACgkQCX/oGf+2qkNZcwCg+fFWPtrKJ5ioNyiFuo/ueyydZEYAoOXHGh6h3dVnLByWnDUQCTOUZp5b
+b7b91ddca1a3817cff372c077cf8445c54bcc96a 0 iEYEABECAAYFAk+j4O4ACgkQCX/oGf+2qkPfowCePjPiaz1QWjCS55j1cOfFBLoQ2fwAoPfE0pPbRpBt6osM4vUAmJn9AGVH
+f4d0cceea00d21e244c7d6e5ddf3aa78e8610660 0 iEYEABECAAYFAk952D8ACgkQCX/oGf+2qkPmMACgo6qZwLG5GJcVYFhZqD2ASYXiEcAAn3Sis7yogN+qwyb1BokA+KSnEmjZ
+3565692a3ec1a33a8cb71014aa7fa0e4488a47b3 0 iEYEABECAAYFAk+OsrsACgkQCX/oGf+2qkM/yQCfUNjwjTN32jfek9UBwpNfxq1IqigAnA2Aq5NLUsUtDCw9DmJ5kjx6U26t
+1856e02fc5e0e515a31c939ebc0372303e692a0f 0 iEYEABECAAYFAk90jY0ACgkQCX/oGf+2qkOxtwCg6Cng1h29qYq7oA8b4mj3KPVMKgkAoLZP6fhub1DNQGEn8zjCEXIRt1Mi
+7a9d4ff35b0f5a978d2dc47d387e974898340d9d 0 iEYEABECAAYFAk+Rm1EACgkQCX/oGf+2qkOHAQCdEPh9Z+3tNo6OybQXTGloAJkhDgAAn32RTPHXoVCSCHO/0hOTOazH/yRo
+ec66c54fad7f8821269266cd7de52b09a423cdae 0 iEYEABECAAYFAk99aVgACgkQCX/oGf+2qkOiDwCg+Ne5Dp5L0X34APNzA7rBeCmZVsQAoJ5AU9K9+Dhn7iuBHVyTisbUJ/oC
+17bc2224a41a30d10472bd14581378201c1ca44b 0 iEYEABECAAYFAk+IHlMACgkQCX/oGf+2qkM3MACgoR2lLVuhzaAg2v0PAHTOsvCgEIoAoP5uBTyNv/CqYuf+XIwD6F9nxa+y
+80da674a77f9339af5985c3ca3aa7fb7f817a114 0 iEYEABECAAYFAk+qnzoACgkQCX/oGf+2qkPyuQCfaHkf4c4QgZar7nuCzp84iUkxWPsAoOQyyXYJaWZwwbjUBzoPNbRIBLLE
+358b14e92651ccf4e020a1420bd0b25b662f35ba 0 iEYEABECAAYFAk+0CeUACgkQCX/oGf+2qkMSIQCg8m8XwFqk/oFw5Cq1odJNq3ZiHIEAn2MHDVw5hRV7eD+c/zNOnQnAnp1n
--- a/.hgtags	Tue May 22 06:39:39 2012 +0000
+++ b/.hgtags	Thu May 24 08:59:54 2012 +0000
@@ -71,4 +71,14 @@
 746b477b1018404f6781714b9db63e389e5dc828 3.0MP7.3
 b434a0f497ee8394ca6eb6952939bf26c20566ae 3.0MP8
 482fdc3919a19e72bfa675ddfbeb5aee83144698 3.0MP8.1
+b625648e103ef1d0ae41eff56c9a1e33877e53f9 3.0MP8.2
+2b3682085de417caee2ba0c2bb3f049e452cbc64 3.0MP8.3
+3cd18772018f9fdff29aa4f9a6980a5d834e8aad 3.0MP8.4
+952c381e3ada4a4e3511782945d3aa66e09a697e 3.0MP9
+fb8d27aba52ce894846d0561c08aced707d99069 3.0MP9.1
+5f9198ef9b16258149c3de30d5811e9c9d50cbf6 3.0MP9.2
 d9a8fbfa1c964ee8c1c951302f9be3d50966c656 3.0MP9.3
+00280ab1ed3ab01d41ed048ccd01694af1223341 3.0MP10
+4a4cc349c6babb0d72149613cc3e4988427ee0ff 3.0MP10.1
+35a1ec14c74d970e083b2d195ea2eed784d5ac1c 3.0MP10.2
+f96fd5be357082854f418944e69fb406ae0dcda6 3.0MP11
--- a/build.xml	Tue May 22 06:39:39 2012 +0000
+++ b/build.xml	Thu May 24 08:59:54 2012 +0000
@@ -12,7 +12,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2001-2011 Openbravo SLU
+* All portions are Copyright (C) 2001-2012 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************
@@ -674,7 +674,7 @@
     <ant dir="${base.src}" target="uninstallWebService" inheritAll="true" inheritRefs="true" />
   </target>
 
-  <target name="install.source" depends="init, create.database, wad.lib, trl.lib, compile.complete.deploy">
+  <target name="install.source" depends="init, cleanSubfolders, create.database, wad.lib, trl.lib, compile.complete.deploy">
     <echo message="applying modules" />    
     <antcall inheritall="true" inheritrefs="true" target="apply.module" />
 
@@ -689,7 +689,7 @@
 		-->
   </target>
 
-  <target name="eclipse.install.source" depends="init, create.database">
+  <target name="eclipse.install.source" depends="init, cleanSubfolders, create.database">
     <fail unless="eclipse.running" message="eclipse.* tasks must be executed inside Eclipse" />
     <echo message="Building OpenbravoCore project..." level="info" />
     <eclipse.incrementalBuild project="OpenbravoCore" kind="full"/>
@@ -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">
@@ -1129,4 +1136,11 @@
     </taskdef>
     <showclassicwindows userId="0" adminMode="true" propertiesFile="${base.config}/Openbravo.properties"/>
   </target>
+  
+  <target name="cleanSubfolders" depends="init">
+      <ant dir="${base.src.core}" target="clean" inheritAll="true" inheritRefs="true" />
+      <ant dir="${base.src.trl}" target="clean" inheritAll="true" inheritRefs="true" />
+      <ant dir="${base.src.wad}" target="clean" inheritAll="true" inheritRefs="true" />
+    </target>
+  
 </project>
Binary file modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/LinkCreditPaymentsData.class has changed
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml	Thu May 24 08:59:54 2012 +0000
@@ -19,7 +19,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2011 Openbravo SLU
+* All portions are Copyright (C) 2011-2012 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -62,7 +62,7 @@
       ORDER BY name)
     LOOP
       BEGIN
-        v_Sql := 'SELECT ' || Cur_Dbprefix.dbprefix || '_ispaymentconfirmed' || '(''' || status || ''', ''' || fin_payment_scheduledetail_id || ''') FROM DUAL';
+        v_Sql := 'SELECT ' || Cur_Dbprefix.dbprefix || '_ispaymentconfirmed' || '(''' || coalesce(status, '') || ''', ''' || coalesce(fin_payment_scheduledetail_id, '') || ''') FROM DUAL';
 
         EXECUTE IMMEDIATE v_Sql INTO v_isPaymentConfirmed;
         IF (v_ispaymentconfirmed = 'Y') THEN
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_TAX_PAYMENT.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_TAX_PAYMENT.xml	Thu May 24 08:59:54 2012 +0000
@@ -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_COLUMN.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml	Thu May 24 08:59:54 2012 +0000
@@ -1136,7 +1136,7 @@
 <!--406EE714C6B645909609BA820A112F2C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--406EE714C6B645909609BA820A112F2C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--406EE714C6B645909609BA820A112F2C-->  <NAME><![CDATA[Updated]]></NAME>
-<!--406EE714C6B645909609BA820A112F2C-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--406EE714C6B645909609BA820A112F2C-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
 <!--406EE714C6B645909609BA820A112F2C-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
 <!--406EE714C6B645909609BA820A112F2C-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
 <!--406EE714C6B645909609BA820A112F2C-->  <AD_TABLE_ID><![CDATA[FF808081331848750133184B38D20009]]></AD_TABLE_ID>
@@ -1348,7 +1348,7 @@
 <!--4AE64134057846AFB053090561EA31D2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--4AE64134057846AFB053090561EA31D2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--4AE64134057846AFB053090561EA31D2-->  <NAME><![CDATA[Updated]]></NAME>
-<!--4AE64134057846AFB053090561EA31D2-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--4AE64134057846AFB053090561EA31D2-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
 <!--4AE64134057846AFB053090561EA31D2-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
 <!--4AE64134057846AFB053090561EA31D2-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
 <!--4AE64134057846AFB053090561EA31D2-->  <AD_TABLE_ID><![CDATA[1BAA61D216CB4A62838AA785658EE092]]></AD_TABLE_ID>
@@ -2165,8 +2165,9 @@
 <!--76A20548884B489E88D731480658E2D1-->  <HELP><![CDATA[Type of entry (Normal, Closing, Opening, Regularization)]]></HELP>
 <!--76A20548884B489E88D731480658E2D1-->  <COLUMNNAME><![CDATA[Factaccttype]]></COLUMNNAME>
 <!--76A20548884B489E88D731480658E2D1-->  <AD_TABLE_ID><![CDATA[FF80808130BB89090130BB8E3D7E0012]]></AD_TABLE_ID>
-<!--76A20548884B489E88D731480658E2D1-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
-<!--76A20548884B489E88D731480658E2D1-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--76A20548884B489E88D731480658E2D1-->  <AD_REFERENCE_ID><![CDATA[17]]></AD_REFERENCE_ID>
+<!--76A20548884B489E88D731480658E2D1-->  <AD_REFERENCE_VALUE_ID><![CDATA[DBCF65339D0F4403822A8A7928533D6B]]></AD_REFERENCE_VALUE_ID>
+<!--76A20548884B489E88D731480658E2D1-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
 <!--76A20548884B489E88D731480658E2D1-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--76A20548884B489E88D731480658E2D1-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--76A20548884B489E88D731480658E2D1-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
@@ -2655,7 +2656,7 @@
 <!--82EFB8E4044119C9E040007F01003778-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--82EFB8E4044119C9E040007F01003778-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--82EFB8E4044119C9E040007F01003778-->  <NAME><![CDATA[Updated]]></NAME>
-<!--82EFB8E4044119C9E040007F01003778-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--82EFB8E4044119C9E040007F01003778-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
 <!--82EFB8E4044119C9E040007F01003778-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
 <!--82EFB8E4044119C9E040007F01003778-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
 <!--82EFB8E4044119C9E040007F01003778-->  <AD_TABLE_ID><![CDATA[0DFF5BACFB964FDABAA5042C8809C813]]></AD_TABLE_ID>
@@ -4017,7 +4018,7 @@
 <!--8BBA8047E18A2A2FE040007F010030DC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--8BBA8047E18A2A2FE040007F010030DC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8BBA8047E18A2A2FE040007F010030DC-->  <NAME><![CDATA[Updated]]></NAME>
-<!--8BBA8047E18A2A2FE040007F010030DC-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--8BBA8047E18A2A2FE040007F010030DC-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
 <!--8BBA8047E18A2A2FE040007F010030DC-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
 <!--8BBA8047E18A2A2FE040007F010030DC-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
 <!--8BBA8047E18A2A2FE040007F010030DC-->  <AD_TABLE_ID><![CDATA[5AAFAB80FB6740D2A6190CB3939D90EC]]></AD_TABLE_ID>
@@ -5108,7 +5109,7 @@
 <!--A37C6F84AA253F50E040007F01006E35-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A37C6F84AA253F50E040007F01006E35-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A37C6F84AA253F50E040007F01006E35-->  <NAME><![CDATA[Updated]]></NAME>
-<!--A37C6F84AA253F50E040007F01006E35-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--A37C6F84AA253F50E040007F01006E35-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
 <!--A37C6F84AA253F50E040007F01006E35-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
 <!--A37C6F84AA253F50E040007F01006E35-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
 <!--A37C6F84AA253F50E040007F01006E35-->  <AD_TABLE_ID><![CDATA[FF8080812FFEC82D012FFECCE3400030]]></AD_TABLE_ID>
@@ -7139,7 +7140,7 @@
 <!--D4C27D211DF9416DA498EEFB6C008B7B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--D4C27D211DF9416DA498EEFB6C008B7B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--D4C27D211DF9416DA498EEFB6C008B7B-->  <NAME><![CDATA[Updated]]></NAME>
-<!--D4C27D211DF9416DA498EEFB6C008B7B-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--D4C27D211DF9416DA498EEFB6C008B7B-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
 <!--D4C27D211DF9416DA498EEFB6C008B7B-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
 <!--D4C27D211DF9416DA498EEFB6C008B7B-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
 <!--D4C27D211DF9416DA498EEFB6C008B7B-->  <AD_TABLE_ID><![CDATA[FF80808130BB89090130BB8E3D7E0012]]></AD_TABLE_ID>
@@ -7528,8 +7529,9 @@
 <!--F79D0173541B42CD9F41A58D53929BFA-->  <HELP><![CDATA[Type of entry (Normal, Closing, Opening, Regularization)]]></HELP>
 <!--F79D0173541B42CD9F41A58D53929BFA-->  <COLUMNNAME><![CDATA[Factaccttype]]></COLUMNNAME>
 <!--F79D0173541B42CD9F41A58D53929BFA-->  <AD_TABLE_ID><![CDATA[1BAA61D216CB4A62838AA785658EE092]]></AD_TABLE_ID>
-<!--F79D0173541B42CD9F41A58D53929BFA-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
-<!--F79D0173541B42CD9F41A58D53929BFA-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--F79D0173541B42CD9F41A58D53929BFA-->  <AD_REFERENCE_ID><![CDATA[17]]></AD_REFERENCE_ID>
+<!--F79D0173541B42CD9F41A58D53929BFA-->  <AD_REFERENCE_VALUE_ID><![CDATA[DBCF65339D0F4403822A8A7928533D6B]]></AD_REFERENCE_VALUE_ID>
+<!--F79D0173541B42CD9F41A58D53929BFA-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
 <!--F79D0173541B42CD9F41A58D53929BFA-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--F79D0173541B42CD9F41A58D53929BFA-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--F79D0173541B42CD9F41A58D53929BFA-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml	Thu May 24 08:59:54 2012 +0000
@@ -7316,7 +7316,7 @@
 <!--9D54A8A2EF224C4EB9FA053023445422-->  <AD_TAB_ID><![CDATA[2A9BA5FDA0F8470D881F8EA9DEDCC598]]></AD_TAB_ID>
 <!--9D54A8A2EF224C4EB9FA053023445422-->  <AD_COLUMN_ID><![CDATA[F79D0173541B42CD9F41A58D53929BFA]]></AD_COLUMN_ID>
 <!--9D54A8A2EF224C4EB9FA053023445422-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
-<!--9D54A8A2EF224C4EB9FA053023445422-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--9D54A8A2EF224C4EB9FA053023445422-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
 <!--9D54A8A2EF224C4EB9FA053023445422-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--9D54A8A2EF224C4EB9FA053023445422-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--9D54A8A2EF224C4EB9FA053023445422-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
@@ -8858,7 +8858,7 @@
 <!--AEA5B3947F8B4BC0A566CAA6726712F4-->  <AD_TAB_ID><![CDATA[FF80808130BB89090130BB9A3A2B0043]]></AD_TAB_ID>
 <!--AEA5B3947F8B4BC0A566CAA6726712F4-->  <AD_COLUMN_ID><![CDATA[76A20548884B489E88D731480658E2D1]]></AD_COLUMN_ID>
 <!--AEA5B3947F8B4BC0A566CAA6726712F4-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
-<!--AEA5B3947F8B4BC0A566CAA6726712F4-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--AEA5B3947F8B4BC0A566CAA6726712F4-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
 <!--AEA5B3947F8B4BC0A566CAA6726712F4-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--AEA5B3947F8B4BC0A566CAA6726712F4-->  <SEQNO><![CDATA[390]]></SEQNO>
 <!--AEA5B3947F8B4BC0A566CAA6726712F4-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml	Thu May 24 08:59:54 2012 +0000
@@ -154,6 +154,17 @@
 <!--2FD618C9D5064C75BFF13B57B767C912-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--2FD618C9D5064C75BFF13B57B767C912--></AD_MESSAGE>
 
+<!--355244CE61E647E7822FF281159181E4--><AD_MESSAGE>
+<!--355244CE61E647E7822FF281159181E4-->  <AD_MESSAGE_ID><![CDATA[355244CE61E647E7822FF281159181E4]]></AD_MESSAGE_ID>
+<!--355244CE61E647E7822FF281159181E4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--355244CE61E647E7822FF281159181E4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--355244CE61E647E7822FF281159181E4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--355244CE61E647E7822FF281159181E4-->  <VALUE><![CDATA[APRM_Payments_Created]]></VALUE>
+<!--355244CE61E647E7822FF281159181E4-->  <MSGTEXT><![CDATA[The next payments have been created and executed: %s]]></MSGTEXT>
+<!--355244CE61E647E7822FF281159181E4-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--355244CE61E647E7822FF281159181E4-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--355244CE61E647E7822FF281159181E4--></AD_MESSAGE>
+
 <!--406CD43121E34BF2A6AA2EBDB9DC8CF5--><AD_MESSAGE>
 <!--406CD43121E34BF2A6AA2EBDB9DC8CF5-->  <AD_MESSAGE_ID><![CDATA[406CD43121E34BF2A6AA2EBDB9DC8CF5]]></AD_MESSAGE_ID>
 <!--406CD43121E34BF2A6AA2EBDB9DC8CF5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -540,6 +551,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 +738,28 @@
 <!--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>
+
+<!--D304C035EC724B6A874E574BE59BC7BF--><AD_MESSAGE>
+<!--D304C035EC724B6A874E574BE59BC7BF-->  <AD_MESSAGE_ID><![CDATA[D304C035EC724B6A874E574BE59BC7BF]]></AD_MESSAGE_ID>
+<!--D304C035EC724B6A874E574BE59BC7BF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D304C035EC724B6A874E574BE59BC7BF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D304C035EC724B6A874E574BE59BC7BF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D304C035EC724B6A874E574BE59BC7BF-->  <VALUE><![CDATA[APRM_PaymentMethod]]></VALUE>
+<!--D304C035EC724B6A874E574BE59BC7BF-->  <MSGTEXT><![CDATA[Selected payment method doesn't exist.]]></MSGTEXT>
+<!--D304C035EC724B6A874E574BE59BC7BF-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--D304C035EC724B6A874E574BE59BC7BF-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--D304C035EC724B6A874E574BE59BC7BF--></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 +859,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	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Thu May 24 08:59:54 2012 +0000
@@ -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.15736]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.16285]]></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.3]]></VERSION_LABEL>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION_LABEL><![CDATA[MP11]]></VERSION_LABEL>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--A918E3331C404B889D69AA9BFAFB23AC--></AD_MODULE>
 
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu May 24 08:59:54 2012 +0000
@@ -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.15736]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.16285]]></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.15736]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->  <STARTVERSION><![CDATA[3.0.16285]]></STARTVERSION>
 <!--B97FC854C6DD41E692161585645A900F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--B97FC854C6DD41E692161585645A900F-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--B97FC854C6DD41E692161585645A900F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS.xml	Thu May 24 08:59:54 2012 +0000
@@ -263,8 +263,9 @@
 <!--D5B90B539C254B959045EDCA1DC99BDF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--D5B90B539C254B959045EDCA1DC99BDF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--D5B90B539C254B959045EDCA1DC99BDF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--D5B90B539C254B959045EDCA1DC99BDF-->  <VALUE><![CDATA[FIN_PaymentMonitor]]></VALUE>
-<!--D5B90B539C254B959045EDCA1DC99BDF-->  <NAME><![CDATA[FIN_PaymentMonitor]]></NAME>
+<!--D5B90B539C254B959045EDCA1DC99BDF-->  <VALUE><![CDATA[Payment Monitor]]></VALUE>
+<!--D5B90B539C254B959045EDCA1DC99BDF-->  <NAME><![CDATA[Payment Monitor]]></NAME>
+<!--D5B90B539C254B959045EDCA1DC99BDF-->  <DESCRIPTION><![CDATA[Payment Monitor]]></DESCRIPTION>
 <!--D5B90B539C254B959045EDCA1DC99BDF-->  <ACCESSLEVEL><![CDATA[7]]></ACCESSLEVEL>
 <!--D5B90B539C254B959045EDCA1DC99BDF-->  <ISUSERSTARTABLE><![CDATA[N]]></ISUSERSTARTABLE>
 <!--D5B90B539C254B959045EDCA1DC99BDF-->  <ISREPORT><![CDATA[N]]></ISREPORT>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml	Thu May 24 08:59:54 2012 +0000
@@ -496,7 +496,7 @@
 <!--FF8080813320657F0133209DE21B0042-->  <IMPORTFIELDS><![CDATA[N]]></IMPORTFIELDS>
 <!--FF8080813320657F0133209DE21B0042-->  <ISSORTTAB><![CDATA[N]]></ISSORTTAB>
 <!--FF8080813320657F0133209DE21B0042-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--FF8080813320657F0133209DE21B0042-->  <UIPATTERN><![CDATA[SR]]></UIPATTERN>
+<!--FF8080813320657F0133209DE21B0042-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--FF8080813320657F0133209DE21B0042-->  <SHOWPARENTBUTTONS><![CDATA[N]]></SHOWPARENTBUTTONS>
 <!--FF8080813320657F0133209DE21B0042-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
 <!--FF8080813320657F0133209DE21B0042-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Thu May 24 08:59:54 2012 +0000
@@ -297,17 +297,6 @@
 <!--30E50BD12DB1498B817E07734F7A6D9C-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--30E50BD12DB1498B817E07734F7A6D9C--></AD_TEXTINTERFACES>
 
-<!--31A4C0C03B794C6281EC0B396C678D15--><AD_TEXTINTERFACES>
-<!--31A4C0C03B794C6281EC0B396C678D15-->  <AD_TEXTINTERFACES_ID><![CDATA[31A4C0C03B794C6281EC0B396C678D15]]></AD_TEXTINTERFACES_ID>
-<!--31A4C0C03B794C6281EC0B396C678D15-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--31A4C0C03B794C6281EC0B396C678D15-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--31A4C0C03B794C6281EC0B396C678D15-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--31A4C0C03B794C6281EC0B396C678D15-->  <TEXT><![CDATA[Receiving From]]></TEXT>
-<!--31A4C0C03B794C6281EC0B396C678D15-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html]]></FILENAME>
-<!--31A4C0C03B794C6281EC0B396C678D15-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--31A4C0C03B794C6281EC0B396C678D15-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--31A4C0C03B794C6281EC0B396C678D15--></AD_TEXTINTERFACES>
-
 <!--3276B307A1404A97A4F885E3B26A890C--><AD_TEXTINTERFACES>
 <!--3276B307A1404A97A4F885E3B26A890C-->  <AD_TEXTINTERFACES_ID><![CDATA[3276B307A1404A97A4F885E3B26A890C]]></AD_TEXTINTERFACES_ID>
 <!--3276B307A1404A97A4F885E3B26A890C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1782,28 +1771,6 @@
 <!--880F17892846E2DDE040007F0100404D-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--880F17892846E2DDE040007F0100404D--></AD_TEXTINTERFACES>
 
-<!--88AFE5C0A0A3CD7FE040007F01000DB7--><AD_TEXTINTERFACES>
-<!--88AFE5C0A0A3CD7FE040007F01000DB7-->  <AD_TEXTINTERFACES_ID><![CDATA[88AFE5C0A0A3CD7FE040007F01000DB7]]></AD_TEXTINTERFACES_ID>
-<!--88AFE5C0A0A3CD7FE040007F01000DB7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--88AFE5C0A0A3CD7FE040007F01000DB7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--88AFE5C0A0A3CD7FE040007F01000DB7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--88AFE5C0A0A3CD7FE040007F01000DB7-->  <TEXT><![CDATA[find]]></TEXT>
-<!--88AFE5C0A0A3CD7FE040007F01000DB7-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransactionGrid.srpt]]></FILENAME>
-<!--88AFE5C0A0A3CD7FE040007F01000DB7-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--88AFE5C0A0A3CD7FE040007F01000DB7-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--88AFE5C0A0A3CD7FE040007F01000DB7--></AD_TEXTINTERFACES>
-
-<!--88F9C050D1FBB8EAE040007F010021A2--><AD_TEXTINTERFACES>
-<!--88F9C050D1FBB8EAE040007F010021A2-->  <AD_TEXTINTERFACES_ID><![CDATA[88F9C050D1FBB8EAE040007F010021A2]]></AD_TEXTINTERFACES_ID>
-<!--88F9C050D1FBB8EAE040007F010021A2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--88F9C050D1FBB8EAE040007F010021A2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--88F9C050D1FBB8EAE040007F010021A2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--88F9C050D1FBB8EAE040007F010021A2-->  <TEXT><![CDATA[add]]></TEXT>
-<!--88F9C050D1FBB8EAE040007F010021A2-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransactionGrid.srpt]]></FILENAME>
-<!--88F9C050D1FBB8EAE040007F010021A2-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--88F9C050D1FBB8EAE040007F010021A2-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--88F9C050D1FBB8EAE040007F010021A2--></AD_TEXTINTERFACES>
-
 <!--89A928B6FF534D9C93E1FA20D744C009--><AD_TEXTINTERFACES>
 <!--89A928B6FF534D9C93E1FA20D744C009-->  <AD_TEXTINTERFACES_ID><![CDATA[89A928B6FF534D9C93E1FA20D744C009]]></AD_TEXTINTERFACES_ID>
 <!--89A928B6FF534D9C93E1FA20D744C009-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1837,6 +1804,17 @@
 <!--8A63AFFF170841A093E1D677F11A8F06-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--8A63AFFF170841A093E1D677F11A8F06--></AD_TEXTINTERFACES>
 
+<!--8F869C21DCF14031BC01CCD9D158190E--><AD_TEXTINTERFACES>
+<!--8F869C21DCF14031BC01CCD9D158190E-->  <AD_TEXTINTERFACES_ID><![CDATA[8F869C21DCF14031BC01CCD9D158190E]]></AD_TEXTINTERFACES_ID>
+<!--8F869C21DCF14031BC01CCD9D158190E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8F869C21DCF14031BC01CCD9D158190E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8F869C21DCF14031BC01CCD9D158190E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8F869C21DCF14031BC01CCD9D158190E-->  <TEXT><![CDATA[for]]></TEXT>
+<!--8F869C21DCF14031BC01CCD9D158190E-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_reports/ReportReconciliation.jrxml]]></FILENAME>
+<!--8F869C21DCF14031BC01CCD9D158190E-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--8F869C21DCF14031BC01CCD9D158190E-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--8F869C21DCF14031BC01CCD9D158190E--></AD_TEXTINTERFACES>
+
 <!--90800D9E80B1497EBB3AF0E38C14A98F--><AD_TEXTINTERFACES>
 <!--90800D9E80B1497EBB3AF0E38C14A98F-->  <AD_TEXTINTERFACES_ID><![CDATA[90800D9E80B1497EBB3AF0E38C14A98F]]></AD_TEXTINTERFACES_ID>
 <!--90800D9E80B1497EBB3AF0E38C14A98F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2024,28 +2002,6 @@
 <!--949AA49A4D8E6BEAE040007F0100565C-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--949AA49A4D8E6BEAE040007F0100565C--></AD_TEXTINTERFACES>
 
-<!--949AA49A4D916BEAE040007F0100565C--><AD_TEXTINTERFACES>
-<!--949AA49A4D916BEAE040007F0100565C-->  <AD_TEXTINTERFACES_ID><![CDATA[949AA49A4D916BEAE040007F0100565C]]></AD_TEXTINTERFACES_ID>
-<!--949AA49A4D916BEAE040007F0100565C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--949AA49A4D916BEAE040007F0100565C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--949AA49A4D916BEAE040007F0100565C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--949AA49A4D916BEAE040007F0100565C-->  <TEXT><![CDATA[per]]></TEXT>
-<!--949AA49A4D916BEAE040007F0100565C-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_reports/ReportReconciliation.jrxml]]></FILENAME>
-<!--949AA49A4D916BEAE040007F0100565C-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--949AA49A4D916BEAE040007F0100565C-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--949AA49A4D916BEAE040007F0100565C--></AD_TEXTINTERFACES>
-
-<!--949AA49A4D946BEAE040007F0100565C--><AD_TEXTINTERFACES>
-<!--949AA49A4D946BEAE040007F0100565C-->  <AD_TEXTINTERFACES_ID><![CDATA[949AA49A4D946BEAE040007F0100565C]]></AD_TEXTINTERFACES_ID>
-<!--949AA49A4D946BEAE040007F0100565C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--949AA49A4D946BEAE040007F0100565C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--949AA49A4D946BEAE040007F0100565C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--949AA49A4D946BEAE040007F0100565C-->  <TEXT><![CDATA[for]]></TEXT>
-<!--949AA49A4D946BEAE040007F0100565C-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_reports/ReportReconciliation.jrxml]]></FILENAME>
-<!--949AA49A4D946BEAE040007F0100565C-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--949AA49A4D946BEAE040007F0100565C-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--949AA49A4D946BEAE040007F0100565C--></AD_TEXTINTERFACES>
-
 <!--949AA49A4D976BEAE040007F0100565C--><AD_TEXTINTERFACES>
 <!--949AA49A4D976BEAE040007F0100565C-->  <AD_TEXTINTERFACES_ID><![CDATA[949AA49A4D976BEAE040007F0100565C]]></AD_TEXTINTERFACES_ID>
 <!--949AA49A4D976BEAE040007F0100565C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2530,6 +2486,50 @@
 <!--BE73A5F0775447398C2ECD4C30CE7155-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--BE73A5F0775447398C2ECD4C30CE7155--></AD_TEXTINTERFACES>
 
+<!--BE924775AF967C78E040007F010017BF--><AD_TEXTINTERFACES>
+<!--BE924775AF967C78E040007F010017BF-->  <AD_TEXTINTERFACES_ID><![CDATA[BE924775AF967C78E040007F010017BF]]></AD_TEXTINTERFACES_ID>
+<!--BE924775AF967C78E040007F010017BF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BE924775AF967C78E040007F010017BF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BE924775AF967C78E040007F010017BF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BE924775AF967C78E040007F010017BF-->  <TEXT><![CDATA[To Be Paid To]]></TEXT>
+<!--BE924775AF967C78E040007F010017BF-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html]]></FILENAME>
+<!--BE924775AF967C78E040007F010017BF-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--BE924775AF967C78E040007F010017BF-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--BE924775AF967C78E040007F010017BF--></AD_TEXTINTERFACES>
+
+<!--BE924775AF997C78E040007F010017BF--><AD_TEXTINTERFACES>
+<!--BE924775AF997C78E040007F010017BF-->  <AD_TEXTINTERFACES_ID><![CDATA[BE924775AF997C78E040007F010017BF]]></AD_TEXTINTERFACES_ID>
+<!--BE924775AF997C78E040007F010017BF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BE924775AF997C78E040007F010017BF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BE924775AF997C78E040007F010017BF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BE924775AF997C78E040007F010017BF-->  <TEXT><![CDATA[Received From]]></TEXT>
+<!--BE924775AF997C78E040007F010017BF-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html]]></FILENAME>
+<!--BE924775AF997C78E040007F010017BF-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--BE924775AF997C78E040007F010017BF-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--BE924775AF997C78E040007F010017BF--></AD_TEXTINTERFACES>
+
+<!--BE924775AF9C7C78E040007F010017BF--><AD_TEXTINTERFACES>
+<!--BE924775AF9C7C78E040007F010017BF-->  <AD_TEXTINTERFACES_ID><![CDATA[BE924775AF9C7C78E040007F010017BF]]></AD_TEXTINTERFACES_ID>
+<!--BE924775AF9C7C78E040007F010017BF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BE924775AF9C7C78E040007F010017BF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BE924775AF9C7C78E040007F010017BF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BE924775AF9C7C78E040007F010017BF-->  <TEXT><![CDATA[Actual Payment Out]]></TEXT>
+<!--BE924775AF9C7C78E040007F010017BF-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html]]></FILENAME>
+<!--BE924775AF9C7C78E040007F010017BF-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--BE924775AF9C7C78E040007F010017BF-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--BE924775AF9C7C78E040007F010017BF--></AD_TEXTINTERFACES>
+
+<!--BE924775AF9F7C78E040007F010017BF--><AD_TEXTINTERFACES>
+<!--BE924775AF9F7C78E040007F010017BF-->  <AD_TEXTINTERFACES_ID><![CDATA[BE924775AF9F7C78E040007F010017BF]]></AD_TEXTINTERFACES_ID>
+<!--BE924775AF9F7C78E040007F010017BF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BE924775AF9F7C78E040007F010017BF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BE924775AF9F7C78E040007F010017BF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BE924775AF9F7C78E040007F010017BF-->  <TEXT><![CDATA[Actual Payment In]]></TEXT>
+<!--BE924775AF9F7C78E040007F010017BF-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html]]></FILENAME>
+<!--BE924775AF9F7C78E040007F010017BF-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--BE924775AF9F7C78E040007F010017BF-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--BE924775AF9F7C78E040007F010017BF--></AD_TEXTINTERFACES>
+
 <!--BF1A576214F74016BB85037D201AB974--><AD_TEXTINTERFACES>
 <!--BF1A576214F74016BB85037D201AB974-->  <AD_TEXTINTERFACES_ID><![CDATA[BF1A576214F74016BB85037D201AB974]]></AD_TEXTINTERFACES_ID>
 <!--BF1A576214F74016BB85037D201AB974-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2662,6 +2662,17 @@
 <!--CE2DB3A92796496FB681075E787506CE-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--CE2DB3A92796496FB681075E787506CE--></AD_TEXTINTERFACES>
 
+<!--CEAC243124A8410485A1C7A3760C74B8--><AD_TEXTINTERFACES>
+<!--CEAC243124A8410485A1C7A3760C74B8-->  <AD_TEXTINTERFACES_ID><![CDATA[CEAC243124A8410485A1C7A3760C74B8]]></AD_TEXTINTERFACES_ID>
+<!--CEAC243124A8410485A1C7A3760C74B8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--CEAC243124A8410485A1C7A3760C74B8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--CEAC243124A8410485A1C7A3760C74B8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--CEAC243124A8410485A1C7A3760C74B8-->  <TEXT><![CDATA[per]]></TEXT>
+<!--CEAC243124A8410485A1C7A3760C74B8-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_reports/ReportReconciliation.jrxml]]></FILENAME>
+<!--CEAC243124A8410485A1C7A3760C74B8-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--CEAC243124A8410485A1C7A3760C74B8-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--CEAC243124A8410485A1C7A3760C74B8--></AD_TEXTINTERFACES>
+
 <!--CF8D743F746F49759CDF771C6E73A909--><AD_TEXTINTERFACES>
 <!--CF8D743F746F49759CDF771C6E73A909-->  <AD_TEXTINTERFACES_ID><![CDATA[CF8D743F746F49759CDF771C6E73A909]]></AD_TEXTINTERFACES_ID>
 <!--CF8D743F746F49759CDF771C6E73A909-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2794,17 +2805,6 @@
 <!--DB2B268442884A5F8673F04A433EBC11-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--DB2B268442884A5F8673F04A433EBC11--></AD_TEXTINTERFACES>
 
-<!--DB502BB7F55E41FC8BEAAB244DB25E5F--><AD_TEXTINTERFACES>
-<!--DB502BB7F55E41FC8BEAAB244DB25E5F-->  <AD_TEXTINTERFACES_ID><![CDATA[DB502BB7F55E41FC8BEAAB244DB25E5F]]></AD_TEXTINTERFACES_ID>
-<!--DB502BB7F55E41FC8BEAAB244DB25E5F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--DB502BB7F55E41FC8BEAAB244DB25E5F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--DB502BB7F55E41FC8BEAAB244DB25E5F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--DB502BB7F55E41FC8BEAAB244DB25E5F-->  <TEXT><![CDATA[Paying To]]></TEXT>
-<!--DB502BB7F55E41FC8BEAAB244DB25E5F-->  <FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html]]></FILENAME>
-<!--DB502BB7F55E41FC8BEAAB244DB25E5F-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--DB502BB7F55E41FC8BEAAB244DB25E5F-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--DB502BB7F55E41FC8BEAAB244DB25E5F--></AD_TEXTINTERFACES>
-
 <!--DB98F20D5C2B4F3F9D5A01B27F9E4946--><AD_TEXTINTERFACES>
 <!--DB98F20D5C2B4F3F9D5A01B27F9E4946-->  <AD_TEXTINTERFACES_ID><![CDATA[DB98F20D5C2B4F3F9D5A01B27F9E4946]]></AD_TEXTINTERFACES_ID>
 <!--DB98F20D5C2B4F3F9D5A01B27F9E4946-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml	Thu May 24 08:59:54 2012 +0000
@@ -45,6 +45,7 @@
 <!--A98899B1C75A4F4EBD3414F1B654EFAB-->  <NAME><![CDATA[Business Partner]]></NAME>
 <!--A98899B1C75A4F4EBD3414F1B654EFAB-->  <AD_REFERENCE_ID><![CDATA[56DEFF37A33F46D1AC918C97C4447EAF]]></AD_REFERENCE_ID>
 <!--A98899B1C75A4F4EBD3414F1B654EFAB-->  <AD_TABLE_ID><![CDATA[291]]></AD_TABLE_ID>
+<!--A98899B1C75A4F4EBD3414F1B654EFAB-->  <FILTER_EXPRESSION><![CDATA["e.active=true"]]></FILTER_EXPRESSION>
 <!--A98899B1C75A4F4EBD3414F1B654EFAB-->  <OBCLKER_TEMPLATE_ID><![CDATA[9314DE8599AD44E7BFC4CC50699042AB]]></OBCLKER_TEMPLATE_ID>
 <!--A98899B1C75A4F4EBD3414F1B654EFAB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A98899B1C75A4F4EBD3414F1B654EFAB-->  <SUGGESTIONTEXTMATCHSTYLE><![CDATA[startsWith]]></SUGGESTIONTEXTMATCHSTYLE>
@@ -125,6 +126,7 @@
 <!--FF808181312DA8D801312DDE869B000C-->  <AD_REFERENCE_ID><![CDATA[FF808181312DA8D801312DDDAA750008]]></AD_REFERENCE_ID>
 <!--FF808181312DA8D801312DDE869B000C-->  <AD_TABLE_ID><![CDATA[208]]></AD_TABLE_ID>
 <!--FF808181312DA8D801312DDE869B000C-->  <AD_COLUMN_ID><![CDATA[1402]]></AD_COLUMN_ID>
+<!--FF808181312DA8D801312DDE869B000C-->  <WHERECLAUSE><![CDATA[e.active='Y']]></WHERECLAUSE>
 <!--FF808181312DA8D801312DDE869B000C-->  <OBCLKER_TEMPLATE_ID><![CDATA[9314DE8599AD44E7BFC4CC50699042AB]]></OBCLKER_TEMPLATE_ID>
 <!--FF808181312DA8D801312DDE869B000C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF808181312DA8D801312DDE869B000C-->  <SUGGESTIONTEXTMATCHSTYLE><![CDATA[startsWith]]></SUGGESTIONTEXTMATCHSTYLE>
--- a/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/LinkCreditPayments_data.xsql	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/LinkCreditPayments_data.xsql	Thu May 24 08:59:54 2012 +0000
@@ -32,6 +32,8 @@
         AND P.GENERATED_CREDIT = 0 AND P.USED_CREDIT > 0
         AND P.ISRECEIPT = ?
         AND P.C_BPARTNER_ID = ?
+        AND P.PROCESSED = 'Y'
+        AND P.STATUS NOT IN ('RPAE','RPVOID')
         ORDER BY P.PAYMENTDATE, P.DOCUMENTNO
       ]]>
     </Sql>
@@ -47,6 +49,8 @@
         WHERE GENERATED_CREDIT > 0 AND USED_CREDIT > 0
         AND ISRECEIPT = ?
         AND C_BPARTNER_ID = ?
+        AND P.PROCESSED = 'Y'
+        AND P.STATUS NOT IN ('RPAE','RPVOID')
         ORDER BY PAYMENTDATE, DOCUMENTNO
       ]]>
     </Sql>
--- a/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/src/org/openbravo/advpaymentmngt/modulescript/LinkCreditPaymentsData.java	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/src/org/openbravo/advpaymentmngt/modulescript/LinkCreditPaymentsData.java	Thu May 24 08:59:54 2012 +0000
@@ -67,6 +67,8 @@
       "        AND P.GENERATED_CREDIT = 0 AND P.USED_CREDIT > 0" +
       "        AND P.ISRECEIPT = ?" +
       "        AND P.C_BPARTNER_ID = ?" +
+      "        AND P.PROCESSED = 'Y'" +
+      "        AND P.STATUS NOT IN ('RPAE','RPVOID')" +
       "        ORDER BY P.PAYMENTDATE, P.DOCUMENTNO";
 
     ResultSet result;
@@ -135,6 +137,8 @@
       "        WHERE GENERATED_CREDIT > 0 AND USED_CREDIT > 0" +
       "        AND ISRECEIPT = ?" +
       "        AND C_BPARTNER_ID = ?" +
+      "        AND P.PROCESSED = 'Y'" +
+      "        AND P.STATUS NOT IN ('RPAE','RPVOID')" +
       "        ORDER BY PAYMENTDATE, DOCUMENTNO";
 
     ResultSet result;
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html	Thu May 24 08:59:54 2012 +0000
@@ -127,14 +127,22 @@
 }
 </script>
 <script language="JavaScript" type="text/javascript">
+function setTextContent(element, text) {
+  while (element.firstChild!==null) {
+    element.removeChild(element.firstChild); // remove all existing content
+  }
+  var newdiv = document.createElement("div");
+  newdiv.innerHTML = text.substring(5, text.length-6);
+  element.appendChild(newdiv);
+}
 function loadGLItemList() {
   var table = document.getElementById('sectionGLItemGrid'),
       glitemCount = OB.APRM.APFT_GLItems.length,
       glitemAmount = 0,
       glitemDescLength = 20, glitemDescCont = "...",
-      cellCount, row, cellGLItemDesc, cellGLITemReceivedInAmt, cellGLITemPaidOutAmt, cellRemoveButton, i, textNode, glAcctDimsDesc, acctDim, cellGLItemDim;
+      cellCount, row, cellGLItemDesc, cellGLITemReceivedInAmt, cellGLITemPaidOutAmt, cellRemoveButton, i, textNode, glAcctDimsDesc, acctDim, cellGLItemDim, cellText;
 
-  table.innerHTML = '';
+  setTextContent(table,'');
   if (glitemCount === 0) {
     OB.APRM.HasGLItems = false;
     frm.inpGLSumAmount.value = '0';
@@ -194,7 +202,7 @@
       glitemAmount = subtract(applyFormatJSToOBMasked(OB.APRM.APFT_GLItems[i].glitemPaidOutAmt), applyFormatJSToOBMasked(OB.APRM.APFT_GLItems[i].glitemReceivedInAmt));
     }
     cellRemoveButton = row.insertCell(cellCount);
-    cellRemoveButton.innerHTML = '<div><button type="button" id="buttonRemoveGLItem"'
+    cellText = '<div><button type="button" id="buttonRemoveGLItem"'
         + ' class="ButtonLink_focus" onclick="removeGLItem(' + i + ', ' + applyFormatOBMaskedToJS(glitemAmount) + ');return false;"'
         + ' onfocus="buttonEvent(\'onfocus\', this); window.status=\'OK\'; return true;"'
         + ' onblur="buttonEvent(\'onblur\', this);"'
@@ -208,6 +216,7 @@
         + '  <table class="Button"><tr><td>'
         + '    <img alt="Remove" title="Remove" src="../web/org.openbravo.advpaymentmngt/images/GLItemGridCancel-xButt.png" id="imgButtonRemove" border="0"/></td>'
         + '  </tr></table></button></div>';
+    setTextContent(cellRemoveButton, cellText);
   }
   updateTotal();
 }
@@ -873,7 +882,7 @@
             
             <!-- Line 1 -->
             <tr>
-              <td class="TitleCell"><span name="lblP" id="lblPPayingTo" class="LabelText">Paying To</span><span name="lblR" id="lblRReceivingFrom" class="LabelText">Receiving From</span></td>
+              <td class="TitleCell"><span name="lblP" id="lblPPayingTo" class="LabelText">To Be Paid To</span><span name="lblR" id="lblRReceivingFrom" class="LabelText">Received From</span></td>
               <td class="TextBox_ContentCell" colspan="2"><input class="readonly dojoValidateValid TextBox_TwoCells_width" type="text" name="inpBusinessPartner" value="" id="paramBusinessPartner"></input>
               <input type="hidden" name="inpBusinessPartnerId" value="" id="paramBusinessPartnerId"></input></td>
               <td class="TitleCell"><span class="LabelText" name="lblR" id="lblRCustomerBalance">Customer Balance</span></td>
@@ -895,7 +904,7 @@
 
             <!-- Line 2 -->
             <tr>
-              <td class="TitleCell"><span class="LabelText">Amount</span></td>
+              <td class="TitleCell"><span name="lblP" id="lblPActualPaymentOut" class="LabelText">Actual Payment Out</span><span name="lblR" id="lblRActualPaymentIn" class="LabelText">Actual Payment In</span></td>
               <td class="TextBox_btn_ContentCell">
                   <table border="0" cellspacing="0" cellpadding="0" summary=""  style="padding-top: 0px;">
                     <tr>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.java	Thu May 24 08:59:54 2012 +0000
@@ -328,13 +328,18 @@
     xmlDocument.setParameter("generatedCredit", payment.getGeneratedCredit() != null ? payment
         .getGeneratedCredit().toString() : BigDecimal.ZERO.toString());
 
-    final Currency financialAccountCurrency = payment.getAccount().getCurrency();
-    if (financialAccountCurrency != null) {
-      xmlDocument.setParameter("financialAccountCurrencyId", financialAccountCurrency.getId());
-      xmlDocument.setParameter("financialAccountCurrencyName",
-          financialAccountCurrency.getISOCode());
-      xmlDocument.setParameter("financialAccountCurrencyPrecision", financialAccountCurrency
-          .getStandardPrecision().toString());
+    OBContext.setAdminMode(true);
+    try {
+      final Currency financialAccountCurrency = payment.getAccount().getCurrency();
+      if (financialAccountCurrency != null) {
+        xmlDocument.setParameter("financialAccountCurrencyId", financialAccountCurrency.getId());
+        xmlDocument.setParameter("financialAccountCurrencyName",
+            financialAccountCurrency.getISOCode());
+        xmlDocument.setParameter("financialAccountCurrencyPrecision", financialAccountCurrency
+            .getStandardPrecision().toString());
+      }
+    } finally {
+      OBContext.restorePreviousMode();
     }
     xmlDocument.setParameter("exchangeRate",
         payment.getFinancialTransactionConvertRate() == null ? "" : payment
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java	Thu May 24 08:59:54 2012 +0000
@@ -123,16 +123,16 @@
       String strCurrencyId = vars.getRequestGlobalVariable("inpCurrencyId", "");
       String strPaymentDate = vars.getRequestGlobalVariable("inpPaymentDate", "");
       boolean isReceipt = vars.getRequiredStringParameter("isReceipt").equals("Y");
-      refreshFinancialAccountCombo(response, strPaymentMethodId, strFinancialAccountId, strOrgId,
-          strCurrencyId, isReceipt, strPaymentDate, conversionRatePrecision);
+      refreshFinancialAccountCombo(response, vars, strPaymentMethodId, strFinancialAccountId,
+          strOrgId, strCurrencyId, isReceipt, strPaymentDate, conversionRatePrecision);
     } else if (vars.commandIn("FILLFINANCIALACCOUNT")) {
       String strFinancialAccountId = vars.getRequestGlobalVariable("inpFinancialAccount", "");
       String strOrgId = vars.getRequestGlobalVariable("inpadOrgId", "");
       String strCurrencyId = vars.getRequestGlobalVariable("inpCurrencyId", "");
       String strPaymentDate = vars.getRequestGlobalVariable("inpPaymentDate", "");
       boolean isReceipt = vars.getRequiredStringParameter("isReceipt").equals("Y");
-      refreshFinancialAccountCombo(response, "", strFinancialAccountId, strOrgId, strCurrencyId,
-          isReceipt, strPaymentDate, conversionRatePrecision);
+      refreshFinancialAccountCombo(response, vars, "", strFinancialAccountId, strOrgId,
+          strCurrencyId, isReceipt, strPaymentDate, conversionRatePrecision);
 
     } else if (vars.commandIn("FILLPAYMENTMETHOD")) {
       String strPaymentMethodId = vars.getRequiredStringParameter("inpPaymentMethod");
@@ -147,8 +147,8 @@
       final String strOrgId = vars.getRequestGlobalVariable("inpadOrgId", "");
       final String strPaymentDate = vars.getRequestGlobalVariable("inpPaymentDate", "");
       Organization org = OBDal.getInstance().get(Organization.class, strOrgId);
-      refreshExchangeRate(response, strCurrencyId, strFinancialAccountCurrencyId, strPaymentDate,
-          org, conversionRatePrecision);
+      refreshExchangeRate(response, vars, strCurrencyId, strFinancialAccountCurrencyId,
+          strPaymentDate, org, conversionRatePrecision);
 
     } else if (vars.commandIn("SAVE") || vars.commandIn("SAVEANDPROCESS")) {
       boolean isReceipt = vars.getRequiredStringParameter("isReceipt").equals("Y");
@@ -379,8 +379,9 @@
         xmlDocument.setParameter("financialAccountCurrencyPrecision", financialAccountCurrency
             .getStandardPrecision().toString());
       }
-      String exchangeRate = findExchangeRate(paymentCurrency, financialAccountCurrency, new Date(),
-          OBDal.getInstance().get(Organization.class, strOrgId), conversionRatePrecision);
+      String exchangeRate = findExchangeRate(vars, paymentCurrency, financialAccountCurrency,
+          new Date(), OBDal.getInstance().get(Organization.class, strOrgId),
+          conversionRatePrecision);
       xmlDocument.setParameter("exchangeRate", exchangeRate);
 
     } finally {
@@ -468,7 +469,7 @@
 
   }
 
-  private void refreshFinancialAccountCombo(HttpServletResponse response,
+  private void refreshFinancialAccountCombo(HttpServletResponse response, VariablesSecureApp vars,
       String strPaymentMethodId, String strFinancialAccountId, String strOrgId,
       String strCurrencyId, boolean isReceipt, String paymentDate, int conversionRatePrecision)
       throws IOException, ServletException {
@@ -483,7 +484,7 @@
         .getFinancialAccountCurrency(strFinancialAccountId);
     final Currency paymentCurrency = dao.getObject(Currency.class, strCurrencyId);
 
-    String exchangeRate = findExchangeRate(paymentCurrency, financialAccountCurrency,
+    String exchangeRate = findExchangeRate(vars, paymentCurrency, financialAccountCurrency,
         FIN_Utility.getDate(paymentDate), OBDal.getInstance().get(Organization.class, strOrgId),
         conversionRatePrecision);
 
@@ -504,9 +505,9 @@
 
   }
 
-  private void refreshExchangeRate(HttpServletResponse response, String strCurrencyId,
-      String strFinancialAccountCurrencyId, String strPaymentDate, Organization organization,
-      int conversionRatePrecision) throws IOException, ServletException {
+  private void refreshExchangeRate(HttpServletResponse response, VariablesSecureApp vars,
+      String strCurrencyId, String strFinancialAccountCurrencyId, String strPaymentDate,
+      Organization organization, int conversionRatePrecision) throws IOException, ServletException {
 
     dao = new AdvPaymentMngtDao();
 
@@ -514,7 +515,7 @@
         strFinancialAccountCurrencyId);
     final Currency paymentCurrency = dao.getObject(Currency.class, strCurrencyId);
 
-    String exchangeRate = findExchangeRate(paymentCurrency, financialAccountCurrency,
+    String exchangeRate = findExchangeRate(vars, paymentCurrency, financialAccountCurrency,
         FIN_Utility.getDate(strPaymentDate), organization, conversionRatePrecision);
 
     JSONObject msg = new JSONObject();
@@ -529,8 +530,9 @@
     out.close();
   }
 
-  private String findExchangeRate(Currency paymentCurrency, Currency financialAccountCurrency,
-      Date paymentDate, Organization organization, int conversionRatePrecision) {
+  private String findExchangeRate(VariablesSecureApp vars, Currency paymentCurrency,
+      Currency financialAccountCurrency, Date paymentDate, Organization organization,
+      int conversionRatePrecision) {
     String exchangeRate = "1";
     if (financialAccountCurrency != null && !financialAccountCurrency.equals(paymentCurrency)) {
       final ConversionRate conversionRate = FIN_Utility.getConversionRate(paymentCurrency,
@@ -540,6 +542,10 @@
       } else {
         exchangeRate = conversionRate.getMultipleRateBy()
             .setScale(conversionRatePrecision, RoundingMode.HALF_UP).toPlainString();
+        String decimal = vars.getSessionValue("#decimalSeparator|generalQtyEdition", ".");
+        if (",".equalsIgnoreCase(decimal)) {
+          exchangeRate = exchangeRate.replace(".", ",");
+        }
       }
     }
     return exchangeRate;
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromTransaction.html	Thu May 24 08:59:54 2012 +0000
@@ -724,6 +724,9 @@
   return true;
 }
 function submitThisPage(strCommand) {
+  if (document.getElementById('buttonOK')){
+    document.getElementById('buttonOK').disabled= true;
+  } 
   if (validate(strCommand)) {
     document.frmMain.inpGLItems.value = isc.JSON.encode(OB.APRM.APFT_GLItems);
     submitCommandForm(strCommand, false, null, null, '_self');
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.html	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.html	Thu May 24 08:59:54 2012 +0000
@@ -270,7 +270,14 @@
         
         //Coming from AddPaymentFromTransaction and Deposit option is selected
         if (closeAutomatically === "Y") {
+          //Coming from button Match Statement
+          if(document.frmMain.inpFinBankStatementLineId.value !== ""){
+            reloadParentGrid();
+          }
+          //Coming from button Add Transaction
+          else{
             reloadWindowGrid();
+          }
           closeThisPage();
         }
       } else {
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ExecutePayments.html	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ExecutePayments.html	Thu May 24 08:59:54 2012 +0000
@@ -52,7 +52,7 @@
     return true;
   }
   function closeThisPage() {
-    closePage();
+	submitCommandForm('CLOSE', true, frmMain, null);
     return true;
   }
 
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ExecutePayments.java	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ExecutePayments.java	Thu May 24 08:59:54 2012 +0000
@@ -22,6 +22,7 @@
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 
 import javax.servlet.ServletException;
@@ -96,6 +97,8 @@
           IsIDFilter.instance);
       processAndClose(response, vars, strWindowId, executionProcess, payments,
           dao.getObject(Organization.class, strOrganizationId));
+    } else if (vars.commandIn("CLOSE")) {
+      printPageClosePopUp(response, vars);
     }
   }
 
@@ -171,8 +174,22 @@
       executePayment.init(getSource(strWindowId), executionProcess, payments, parameters,
           organization);
       result = executePayment.execute();
-      result.setMessage(Utility.parseTranslation(this, vars, vars.getLanguage(),
-          result.getMessage()));
+      String paymentsDocNo = "";
+      if ("Success".equals(result.getType())) {
+        int i = 0;
+        Iterator<FIN_Payment> iterator = payments.iterator();
+        while (iterator.hasNext()) {
+          FIN_Payment payment = iterator.next();
+          if (i == 0) {
+            paymentsDocNo += payment.getDocumentNo();
+            i++;
+          } else {
+            paymentsDocNo += ", " + payment.getDocumentNo();
+          }
+        }
+        result.setMessage(String.format(
+            Utility.messageBD(this, "APRM_Payments_Created", vars.getLanguage()), paymentsDocNo));
+      }
     } catch (NoExecutionProcessFoundException e) {
       result.setType("Error");
       result.setMessage(Utility.parseTranslation(this, vars, vars.getLanguage(),
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java	Thu May 24 08:59:54 2012 +0000
@@ -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) 2010-2011 Openbravo SLU
+ * All portions are Copyright (C) 2010-2012 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  *************************************************************************
@@ -25,7 +25,9 @@
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -66,7 +68,9 @@
 import org.openbravo.model.financialmgmt.payment.FIN_FinaccTransaction;
 import org.openbravo.model.financialmgmt.payment.FIN_FinancialAccount;
 import org.openbravo.model.financialmgmt.payment.FIN_Payment;
+import org.openbravo.model.financialmgmt.payment.FIN_PaymentDetail;
 import org.openbravo.model.financialmgmt.payment.FIN_PaymentMethod;
+import org.openbravo.model.financialmgmt.payment.FIN_PaymentSchedule;
 import org.openbravo.model.financialmgmt.payment.FIN_PaymentScheduleDetail;
 import org.openbravo.model.financialmgmt.payment.FIN_Reconciliation;
 import org.openbravo.model.financialmgmt.payment.FIN_ReconciliationLineTemp;
@@ -568,10 +572,8 @@
               .getFINPaymentDetailList().get(0).getFINPaymentScheduleDetailList().get(0)
               .getInvoicePaymentSchedule() == null && transaction.getFinPayment()
               .getFINPaymentDetailList().get(0).getFINPaymentScheduleDetailList().get(0)
-              .getOrderPaymentSchedule() == null) ? MATCHED_AGAINST_CREDIT : (transaction
-              .getFinPayment().getFINPaymentDetailList().get(0).getFINPaymentScheduleDetailList()
-              .get(0).getInvoicePaymentSchedule() != null ? MATCHED_AGAINST_INVOICE
-              : MATCHED_AGAINST_ORDER)));
+              .getOrderPaymentSchedule() == null) ? MATCHED_AGAINST_CREDIT
+              : (isInvoiceMatch(transaction) ? MATCHED_AGAINST_INVOICE : MATCHED_AGAINST_ORDER)));
           String bpName = "";
           if (transaction.getFinPayment() != null) {
             if (transaction.getFinPayment().getBusinessPartner() != null) {
@@ -670,8 +672,12 @@
               && !reconciledLine.getFinancialAccountTransaction().getFinPayment()
                   .isCreatedByAlgorithm()) {
             lineTemp.setPayment(reconciledLine.getPayment());
-          } else if (reconciledLine.getFinancialAccountTransaction().getFinPayment()
-              .getFINPaymentDetailList().get(0).getFINPaymentScheduleDetailList() != null
+          } else if (reconciledLine.getFinancialAccountTransaction() != null
+              && reconciledLine.getFinancialAccountTransaction().getFinPayment() != null
+              && reconciledLine.getFinancialAccountTransaction().getFinPayment()
+                  .getFINPaymentDetailList().size() > 0
+              && reconciledLine.getFinancialAccountTransaction().getFinPayment()
+                  .getFINPaymentDetailList().get(0).getFINPaymentScheduleDetailList() != null
               && reconciledLine.getFinancialAccountTransaction().getFinPayment()
                   .getFINPaymentDetailList().get(0).getFINPaymentScheduleDetailList().size() > 0
               && (reconciledLine.getFinancialAccountTransaction().getFinPayment()
@@ -1184,6 +1190,31 @@
     return myMessage;
   }
 
+  private boolean isInvoiceMatch(FIN_FinaccTransaction transaction) {
+    if (transaction.getFinPayment() == null) {
+      return false;
+    } else {
+      OBCriteria<FIN_PaymentScheduleDetail> obc = OBDal.getInstance().createCriteria(
+          FIN_PaymentScheduleDetail.class);
+      obc.createAlias(FIN_PaymentScheduleDetail.PROPERTY_PAYMENTDETAILS, "pd");
+      obc.add(Restrictions.eq("pd." + FIN_PaymentDetail.PROPERTY_FINPAYMENT,
+          transaction.getFinPayment()));
+      Set<FIN_PaymentSchedule> invoiceplans = new HashSet<FIN_PaymentSchedule>();
+      for (FIN_PaymentScheduleDetail paymentScheduleDetail : obc.list()) {
+        if (!invoiceplans.contains(paymentScheduleDetail.getInvoicePaymentSchedule())) {
+          invoiceplans.add(paymentScheduleDetail.getInvoicePaymentSchedule());
+        }
+        if (invoiceplans.size() > 1) {
+          return false;
+        }
+      }
+      if (invoiceplans.size() == 1) {
+        return true;
+      }
+    }
+    return false;
+  }
+
   public String getServletInfo() {
     return "This servlet match imported bank statement lines for a financial account";
   }
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransactionGrid.srpt	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransactionGrid.srpt	Thu May 24 08:59:54 2012 +0000
@@ -27,13 +27,13 @@
     <td class="DataGrid_Body_Cell"><span id="fieldBLReferenceNo">xx11100011</span></td>
     <td class="DataGrid_Body_Cell_Amount"><span id="fieldAmount">xx12233</span></td>
     <td class="DataGrid_Body_LineNoCell" style="background-color: xx;" id="inpMatchStyle_xx" name="inpMatchStyle_xx">
-      <a href="#" onClick="openSelector('xx');" id="fieldFindLink">find</a>
+      <a href="#" onClick="openSelector('xx');" id="fieldFindLink"><img src="../../../../../web/org.openbravo.advpaymentmngt/images/view.png"/></a>
       <!--span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span-->
       <input id="inpCheckBox_xx" type="checkbox" name="inpBankStatementLineId" value="" onclick="unMatchLine('xx', this.checked);"/>
       <input type="hidden" name="inpFinancialTransactionId_xx" id="inpFinancialTransactionId_xx" value=""></input>
       <input type="hidden" name="inpMatchingType_xx" id="inpMatchingType_xx" value=""></input>
       <!--span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span-->
-      <a href="#" onclick="openAddTransaction('xx');" id="fieldAddLink">add</a>
+      <a href="#" onclick="openAddTransaction('xx');" id="fieldAddLink"><img src="../../../../../web/org.openbravo.advpaymentmngt/images/add.png"/></a>
     </td>
     <td class="DataGrid_Body_Cell" id="inpMatchedDocument_xx">xxTransaction</td>
     <td class="DataGrid_Body_Cell" id="inpTransactionDate_xx" title="">xx01-01-2010</td>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java	Thu May 24 08:59:54 2012 +0000
@@ -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) 2010-2011 Openbravo SLU
+ * All portions are Copyright (C) 2010-2012 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  *************************************************************************
@@ -450,12 +450,14 @@
     xmlDocument.setParameter("css", vars.getTheme());
     xmlDocument.setParameter("language", "defaultLang=\"" + vars.getLanguage() + "\";");
     xmlDocument.setParameter("directory", "var baseDirectory = \"" + strReplaceWith + "/\";\n");
-    xmlDocument.setParameter("cancel", Utility.messageBD(this, "Cancel", vars.getLanguage()));
-    xmlDocument.setParameter("ok", Utility.messageBD(this, "OK", vars.getLanguage()));
     xmlDocument.setParameter("window", strWindowId);
     xmlDocument.setParameter("tab", strTabId);
     xmlDocument.setParameter("adOrgId", strOrg);
 
+    xmlDocument.setParameter("messageType", "SUCCESS");
+    xmlDocument.setParameter("messageTitle",
+        Utility.messageBD(this, "InvoiceComplete", vars.getLanguage()));
+
     xmlDocument.setParameter("invoiceGrossAmt", dao.getObject(Invoice.class, strC_Invoice_ID)
         .getGrandTotalAmount().toString());
 
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_forms/BatchPaymentExecution.html	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_forms/BatchPaymentExecution.html	Thu May 24 08:59:54 2012 +0000
@@ -12,7 +12,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010-2011 Openbravo SLU
+ * All portions are Copyright (C) 2010-2012 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  * Licensed under the Openbravo Commercial License version 1.1
@@ -222,9 +222,6 @@
   dijit.byId('grid').gridMovePage(direction);
   return true;
 }
-function changeOrganization() {
-  loadPaymentMethodCombo();
-}
 </script>
 <script language="JavaScript" type="text/javascript">
 function loadFinancialAccountCombo() {
@@ -426,7 +423,7 @@
                       <tr id="filterRow1">
                         <td class="TitleCell"><span class="LabelText">Organization</span></td>
                         <td class="Combo_ContentCell">
-                        <select  name="inpOrgId" id="paramOrgId" class="ComboKey Combo_TwoCells_width" required="true" onchange="changeOrganization(); return true;">
+                        <select  name="inpOrgId" id="paramOrgId" class="ComboKey Combo_TwoCells_width" required="true" onchange="loadPaymentMethodCombo(); return true;">
                           <div id="reportAD_ORGID"></div>
                         </select></td>
                       </tr>
@@ -509,7 +506,7 @@
                         </td>
                         <td class="Radio_Check_ContentCell">
                           <SPAN class="Checkbox_container_NOT_Focused">
-                            <INPUT type="radio" name="inpIsReceipt" id="paramReceivedIn" value="Y" checked onchange="" onclick=""/>
+                            <INPUT type="radio" name="inpIsReceipt" id="paramReceivedIn" value="Y" checked onchange="loadPaymentMethodCombo(); return true;" onclick=""/>
                           </SPAN>
                         </td>
                         <td class="TableEdition_OneCell_width TitleCell">
@@ -517,7 +514,7 @@
                         </td>
                         <td class="Radio_Check_ContentCell">
                           <SPAN class="Checkbox_container_NOT_Focused">
-                            <INPUT type="radio" name="inpIsReceipt" id="paramPaidOut" value="N" onchange="" onclick=""/>
+                            <INPUT type="radio" name="inpIsReceipt" id="paramPaidOut" value="N" onchange="loadPaymentMethodCombo(); return true;" onclick=""/>
                           </SPAN>
                         </td>
                       </tr>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_forms/BatchPaymentExecution.java	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_forms/BatchPaymentExecution.java	Thu May 24 08:59:54 2012 +0000
@@ -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) 2010-2011 Openbravo SLU
+ * All portions are Copyright (C) 2010-2012 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  *************************************************************************
@@ -39,10 +39,9 @@
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBCriteria;
 import org.openbravo.dal.service.OBDal;
-import org.openbravo.data.FieldProvider;
-import org.openbravo.erpCommon.ad_combos.OrganizationComboData;
 import org.openbravo.erpCommon.businessUtility.WindowTabs;
 import org.openbravo.erpCommon.info.SelectorUtility;
+import org.openbravo.erpCommon.utility.ComboTableData;
 import org.openbravo.erpCommon.utility.DateTimeData;
 import org.openbravo.erpCommon.utility.LeftTabsBar;
 import org.openbravo.erpCommon.utility.NavigationBar;
@@ -116,7 +115,7 @@
 
     } else if (vars.commandIn("CALLOUTFINANCIALACCOUNT")) {
       String strFinancialAccountId = vars.getRequestGlobalVariable("inpFinancialAccount", "");
-      String strPaymentMethodId = vars.getRequiredStringParameter("inpPaymentMethod");
+      String strPaymentMethodId = vars.getRequestGlobalVariable("inpPaymentMethod", "");
       String strOrgId = vars.getRequestGlobalVariable("inpOrgId", "");
       String strCurrencyId = vars.getRequestGlobalVariable("inpCurrencyId", "");
       boolean isReceipt = "Y".equals(vars.getGlobalVariable("inpIsReceipt",
@@ -149,16 +148,22 @@
     xmlDocument.setParameter("inpChkIsReceipt", strIsReceipt);
 
     String newOrg = strOrganizationId;
-    if (!"0".equals(strOrganizationId)) {
+    if (null != strOrganizationId) {
       xmlDocument.setParameter("orgId", strOrganizationId);
-    } else {
-      FieldProvider[] fp = OrganizationComboData.selectCombo(this, vars.getRole());
-      if (fp != null && fp.length > 0) {
-        newOrg = fp[0].getField("id");
-      }
     }
-    xmlDocument.setData("reportAD_ORGID", "liststructure",
-        OrganizationComboData.selectCombo(this, vars.getRole()));
+    try {
+      ComboTableData comboTableData = new ComboTableData(vars, this, "TABLEDIR", "AD_Org_ID", "",
+          "49DC1D6F086945AB82F84C66F5F13F16", Utility.getContext(this, vars, "#User_Org",
+              "BatchPaymentExecution"), Utility.getContext(this, vars, "#User_Client",
+              "BatchPaymentExecution"), 0);
+      Utility.fillSQLParameters(this, vars, null, comboTableData, "PrintInvoices", "");
+      xmlDocument.setData("reportAD_ORGID", "liststructure", comboTableData.select(false));
+      comboTableData = null;
+
+    } catch (Exception ex) {
+      throw new ServletException(ex);
+    }
+
     xmlDocument.setParameter("dateFrom", strDateFrom);
     xmlDocument.setParameter("dateTo", strDateTo);
 
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/ReportReconciliation.jrxml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/ReportReconciliation.jrxml	Thu May 24 08:59:54 2012 +0000
@@ -1,655 +1,537 @@
-<?xml version="1.0" encoding="UTF-8"  ?>
-<!-- Created with iReport - A designer for JasperReports -->
-<!DOCTYPE jasperReport PUBLIC "//JasperReports//DTD Report Design//EN" "http://jasperreports.sourceforge.net/dtds/jasperreport.dtd">
-<jasperReport
-		 name="ReportReconciliation"
-		 columnCount="1"
-		 printOrder="Vertical"
-		 orientation="Portrait"
-		 pageWidth="595"
-		 pageHeight="842"
-		 columnWidth="495"
-		 columnSpacing="0"
-		 leftMargin="50"
-		 rightMargin="50"
-		 topMargin="50"
-		 bottomMargin="50"
-		 whenNoDataType="NoPages"
-		 isTitleNewPage="false"
-		 isSummaryNewPage="false">
-	<property name="ireport.scriptlethandling" value="0" />
-	<property name="ireport.encoding" value="UTF-8" />
-	<import value="java.util.*" />
-	<import value="net.sf.jasperreports.engine.*" />
-	<import value="net.sf.jasperreports.engine.data.*" />
-
-	<style 
-		name="Gray"
-		isDefault="false"
-		mode="Opaque"
-		forecolor="#000000"
-		backcolor="#CCCCCC"
-	/>
-	<style 
-		name="DarkGray"
-		isDefault="false"
-		mode="Opaque"
-		forecolor="#FFFFFF"
-		backcolor="#555555"
-		vAlign="Middle"
-		leftPadding="5"
-		fontName="Bitstream Vera Sans"
-		fontSize="18"
-		isBold="true"
-	/>
-
-	<parameter name="SUBREPORT_DIR" isForPrompting="true" class="java.lang.String">
-		<defaultValueExpression ><![CDATA["./"]]></defaultValueExpression>
+<?xml version="1.0" encoding="UTF-8"?>
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="ReportReconciliation" pageWidth="595" pageHeight="842" columnWidth="495" leftMargin="50" rightMargin="50" topMargin="50" bottomMargin="50">
+	<property name="ireport.scriptlethandling" value="0"/>
+	<property name="ireport.encoding" value="UTF-8"/>
+	<property name="ireport.zoom" value="1.652892561983471"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="0"/>
+	<import value="net.sf.jasperreports.engine.*"/>
+	<import value="java.util.*"/>
+	<import value="net.sf.jasperreports.engine.data.*"/>
+	<style name="Gray" mode="Opaque" forecolor="#000000" backcolor="#CCCCCC"/>
+	<style name="DarkGray" mode="Opaque" forecolor="#FFFFFF" backcolor="#555555" vAlign="Middle" fontName="Bitstream Vera Sans" fontSize="18" isBold="true">
+		<box leftPadding="5"/>
+	</style>
+	<parameter name="SUBREPORT_DIR" class="java.lang.String">
+		<defaultValueExpression><![CDATA["./"]]></defaultValueExpression>
 	</parameter>
-	<parameter name="SUBREP_OUTPAYMENT" isForPrompting="false" class="net.sf.jasperreports.engine.JasperReport"/>
-	<parameter name="SUBREP_OUTDEPOSIT" isForPrompting="false" class="net.sf.jasperreports.engine.JasperReport"/>
-	<parameter name="SUBREP_UNRECBS" isForPrompting="false" class="net.sf.jasperreports.engine.JasperReport"/>
-	<parameter name="DATE" isForPrompting="false" class="java.util.Date"/>
-	<parameter name="NUMBERFORMAT" isForPrompting="false" class="java.text.DecimalFormat"/>
-	<parameter name="ACC_BAL_OB" isForPrompting="false" class="java.math.BigDecimal"/>
-	<parameter name="ADJ_ACC_BAL_OB" isForPrompting="false" class="java.math.BigDecimal"/>
-	<parameter name="FINACCOUNT_INFO" isForPrompting="false" class="java.lang.String"/>
-	<parameter name="RECONCILIATION_ID" isForPrompting="false" class="java.lang.String"/>
-	<parameter name="DATEFORMAT" isForPrompting="false" class="java.text.SimpleDateFormat"/>
-	<parameter name="END_BALANCE" isForPrompting="false" class="java.math.BigDecimal"/>
-	<parameter name="REPORT_TYPE" isForPrompting="false" class="java.lang.String">
-		<defaultValueExpression ><![CDATA["DETAIL"]]></defaultValueExpression>
+	<parameter name="SUBREP_OUTPAYMENT" class="net.sf.jasperreports.engine.JasperReport" isForPrompting="false"/>
+	<parameter name="SUBREP_OUTDEPOSIT" class="net.sf.jasperreports.engine.JasperReport" isForPrompting="false"/>
+	<parameter name="SUBREP_UNRECBS" class="net.sf.jasperreports.engine.JasperReport" isForPrompting="false"/>
+	<parameter name="DATE" class="java.util.Date" isForPrompting="false"/>
+	<parameter name="NUMBERFORMAT" class="java.text.DecimalFormat" isForPrompting="false"/>
+	<parameter name="ACC_BAL_OB" class="java.math.BigDecimal" isForPrompting="false"/>
+	<parameter name="ADJ_ACC_BAL_OB" class="java.math.BigDecimal" isForPrompting="false"/>
+	<parameter name="FINACCOUNT_INFO" class="java.lang.String" isForPrompting="false"/>
+	<parameter name="RECONCILIATION_ID" class="java.lang.String" isForPrompting="false"/>
+	<parameter name="DATEFORMAT" class="java.text.SimpleDateFormat" isForPrompting="false"/>
+	<parameter name="END_BALANCE" class="java.math.BigDecimal" isForPrompting="false"/>
+	<parameter name="REPORT_TYPE" class="java.lang.String" isForPrompting="false">
+		<defaultValueExpression><![CDATA["DETAIL"]]></defaultValueExpression>
 	</parameter>
-	<parameter name="AMT_OUT_PAYMENT" isForPrompting="false" class="java.math.BigDecimal"/>
-	<parameter name="AMT_OUT_DEPOSIT" isForPrompting="false" class="java.math.BigDecimal"/>
-	<parameter name="AMT_UNREC_BSLINE" isForPrompting="false" class="java.math.BigDecimal"/>
-	<parameter name="SHOW_BAND_PAYMENT" isForPrompting="false" class="java.lang.Boolean"/>
-	<parameter name="SHOW_BAND_DEPOSIT" isForPrompting="false" class="java.lang.Boolean"/>
-	<parameter name="SHOW_BAND_BSLINE" isForPrompting="false" class="java.lang.Boolean"/>
-	<queryString><![CDATA[SELECT 1 as dummy FROM DUAL]]></queryString>
-
+	<parameter name="AMT_OUT_PAYMENT" class="java.math.BigDecimal" isForPrompting="false"/>
+	<parameter name="AMT_OUT_DEPOSIT" class="java.math.BigDecimal" isForPrompting="false"/>
+	<parameter name="AMT_UNREC_BSLINE" class="java.math.BigDecimal" isForPrompting="false"/>
+	<parameter name="SHOW_BAND_PAYMENT" class="java.lang.Boolean" isForPrompting="false"/>
+	<parameter name="SHOW_BAND_DEPOSIT" class="java.lang.Boolean" isForPrompting="false"/>
+	<parameter name="SHOW_BAND_BSLINE" class="java.lang.Boolean" isForPrompting="false"/>
+	<queryString>
+		<![CDATA[SELECT 1 as dummy FROM DUAL]]>
+	</queryString>
 	<field name="DUMMY" class="java.math.BigDecimal"/>
-
-
-		<group  name="Opening Balance" >
-			<groupExpression><![CDATA[]]></groupExpression>
-			<groupHeader>
-			<band height="30"  isSplitAllowed="true" >
+	<group name="Opening Balance">
+		<groupExpression><![CDATA[]]></groupExpression>
+		<groupHeader>
+			<band height="30" splitType="Stretch">
 				<rectangle>
-					<reportElement
-						style="Gray"
-						x="0"
-						y="7"
-						width="495"
-						height="15"
-						key="rectangle-1"/>
-					<graphicElement stretchType="NoStretch"/>
+					<reportElement key="rectangle-1" style="Gray" x="0" y="7" width="495" height="15"/>
 				</rectangle>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						x="1"
-						y="8"
-						width="70"
-						height="14"
-						key="textField-3"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement verticalAlignment="Middle">
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.util.Date"><![CDATA[$P{DATE}]]></textFieldExpression>
+				<textField isBlankWhenNull="false">
+					<reportElement key="textField-3" x="1" y="8" width="70" height="14"/>
+					<box leftPadding="5">
+						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					</box>
+					<textElement verticalAlignment="Middle"/>
+					<textFieldExpression class="java.util.Date"><![CDATA[$P{DATE}]]></textFieldExpression>
 				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						x="380"
-						y="8"
-						width="115"
-						height="14"
-						key="textField-6"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" rightPadding="5" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[($P{ACC_BAL_OB}!=null) ? $P{NUMBERFORMAT}.format($P{ACC_BAL_OB}).toString() : new String(" ")]]></textFieldExpression>
+				<textField isBlankWhenNull="false">
+					<reportElement key="textField-6" x="380" y="8" width="115" height="14"/>
+					<box rightPadding="5">
+						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle"/>
+					<textFieldExpression class="java.lang.String"><![CDATA[($P{ACC_BAL_OB}!=null) ? $P{NUMBERFORMAT}.format($P{ACC_BAL_OB}).toString() : new String(" ")]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement
-						x="70"
-						y="8"
-						width="310"
-						height="14"
-						key="staticText-23"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement verticalAlignment="Middle">
-						<font/>
-					</textElement>
-				<text><![CDATA[Account Balance In Openbravo]]></text>
+					<reportElement key="staticText-23" x="70" y="8" width="310" height="14"/>
+					<box leftPadding="5">
+						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					</box>
+					<textElement verticalAlignment="Middle"/>
+					<text><![CDATA[Account Balance In Openbravo]]></text>
 				</staticText>
 			</band>
-			</groupHeader>
-			<groupFooter>
-			<band height="40"  isSplitAllowed="true" >
+		</groupHeader>
+		<groupFooter>
+			<band height="40" splitType="Stretch">
 				<rectangle>
-					<reportElement
-						style="Gray"
-						x="0"
-						y="3"
-						width="495"
-						height="15"
-						key="rectangle-2"/>
-					<graphicElement stretchType="NoStretch"/>
+					<reportElement key="rectangle-2" style="Gray" x="0" y="3" width="495" height="15"/>
 				</rectangle>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						x="1"
-						y="4"
-						width="70"
-						height="14"
-						key="textField-7"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement verticalAlignment="Middle">
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.util.Date"><![CDATA[$P{DATE}]]></textFieldExpression>
+				<textField isBlankWhenNull="false">
+					<reportElement key="textField-7" x="1" y="4" width="70" height="14"/>
+					<box leftPadding="5">
+						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					</box>
+					<textElement verticalAlignment="Middle"/>
+					<textFieldExpression class="java.util.Date"><![CDATA[$P{DATE}]]></textFieldExpression>
 				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						x="380"
-						y="4"
-						width="115"
-						height="14"
-						key="textField-8"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" rightPadding="5" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[($P{ADJ_ACC_BAL_OB}!=null) ? "(" + $P{NUMBERFORMAT}.format($P{ADJ_ACC_BAL_OB}).toString() + ")" : new String(" ")]]></textFieldExpression>
+				<textField isBlankWhenNull="false">
+					<reportElement key="textField-8" x="380" y="4" width="115" height="14"/>
+					<box rightPadding="5">
+						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle"/>
+					<textFieldExpression class="java.lang.String"><![CDATA[($P{ADJ_ACC_BAL_OB}!=null) ? "(" + $P{NUMBERFORMAT}.format($P{ADJ_ACC_BAL_OB}).toString() + ")" : new String(" ")]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement
-						x="70"
-						y="4"
-						width="310"
-						height="14"
-						key="staticText-24"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement verticalAlignment="Middle">
-						<font/>
-					</textElement>
-				<text><![CDATA[Adjusted Account Balance in Openbravo]]></text>
+					<reportElement key="staticText-24" x="70" y="4" width="310" height="14"/>
+					<box leftPadding="5">
+						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					</box>
+					<textElement verticalAlignment="Middle"/>
+					<text><![CDATA[Adjusted Account Balance in Openbravo]]></text>
 				</staticText>
 				<rectangle>
-					<reportElement
-						style="Gray"
-						x="0"
-						y="18"
-						width="495"
-						height="15"
-						key="rectangle-3"/>
-					<graphicElement stretchType="NoStretch"/>
+					<reportElement key="rectangle-3" style="Gray" x="0" y="18" width="495" height="15"/>
 				</rectangle>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						x="1"
-						y="19"
-						width="70"
-						height="14"
-						key="textField-9"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement verticalAlignment="Middle">
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.util.Date"><![CDATA[$P{DATE}]]></textFieldExpression>
+				<textField isBlankWhenNull="false">
+					<reportElement key="textField-9" x="1" y="19" width="70" height="14"/>
+					<box leftPadding="5">
+						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					</box>
+					<textElement verticalAlignment="Middle"/>
+					<textFieldExpression class="java.util.Date"><![CDATA[$P{DATE}]]></textFieldExpression>
 				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						x="380"
-						y="19"
-						width="115"
-						height="14"
-						key="textField-10"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" rightPadding="5" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[($P{END_BALANCE}!=null) ? "(" + $P{NUMBERFORMAT}.format($P{END_BALANCE}).toString() + ")" : new String("")]]></textFieldExpression>
+				<textField isBlankWhenNull="false">
+					<reportElement key="textField-10" x="380" y="19" width="115" height="14"/>
+					<box rightPadding="5">
+						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle"/>
+					<textFieldExpression class="java.lang.String"><![CDATA[($P{END_BALANCE}!=null) ? "(" + $P{NUMBERFORMAT}.format($P{END_BALANCE}).toString() + ")" : new String("")]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement
-						x="70"
-						y="19"
-						width="310"
-						height="14"
-						key="staticText-25"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement verticalAlignment="Middle">
-						<font/>
-					</textElement>
-				<text><![CDATA[Balance per Bank Statement]]></text>
+					<reportElement key="staticText-25" x="70" y="19" width="310" height="14"/>
+					<box leftPadding="5">
+						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					</box>
+					<textElement verticalAlignment="Middle"/>
+					<text><![CDATA[Balance per Bank Statement]]></text>
 				</staticText>
 			</band>
-			</groupFooter>
-		</group>
-		<group  name="OutstandingPayment" >
-			<groupExpression><![CDATA[]]></groupExpression>
-			<groupHeader>
-			<band height="20"  isSplitAllowed="true" >
+		</groupFooter>
+	</group>
+	<group name="OutstandingPayment">
+		<groupExpression><![CDATA[]]></groupExpression>
+		<groupHeader>
+			<band height="20" splitType="Stretch">
 				<printWhenExpression><![CDATA[$P{SHOW_BAND_PAYMENT}]]></printWhenExpression>
-				<subreport  isUsingCache="true">
-					<reportElement
-						mode="Transparent"
-						x="1"
-						y="15"
-						width="494"
-						height="5"
-						key="subreport-1"
-						isRemoveLineWhenBlank="true">
-							<printWhenExpression><![CDATA[new Boolean($P{REPORT_TYPE}.equalsIgnoreCase("DETAIL"))]]></printWhenExpression>
-						</reportElement>
-					<subreportParameter  name="RECONCILIATION_ID">
+				<subreport isUsingCache="true">
+					<reportElement key="subreport-1" mode="Transparent" x="1" y="15" width="494" height="5" isRemoveLineWhenBlank="true">
+						<printWhenExpression><![CDATA[new Boolean($P{REPORT_TYPE}.equalsIgnoreCase("DETAIL"))]]></printWhenExpression>
+					</reportElement>
+					<subreportParameter name="RECONCILIATION_ID">
 						<subreportParameterExpression><![CDATA[$P{RECONCILIATION_ID}]]></subreportParameterExpression>
 					</subreportParameter>
-					<subreportParameter  name="NUMBERFORMAT">
+					<subreportParameter name="NUMBERFORMAT">
 						<subreportParameterExpression><![CDATA[$P{NUMBERFORMAT}]]></subreportParameterExpression>
 					</subreportParameter>
 					<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
-					<subreportExpression  class="net.sf.jasperreports.engine.JasperReport"><![CDATA[$P{SUBREP_OUTPAYMENT}]]></subreportExpression>
+					<subreportExpression class="net.sf.jasperreports.engine.JasperReport"><![CDATA[$P{SUBREP_OUTPAYMENT}]]></subreportExpression>
 				</subreport>
 				<staticText>
-					<reportElement
-						x="0"
-						y="0"
-						width="169"
-						height="14"
-						key="staticText-11"
-						isRemoveLineWhenBlank="true"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
+					<reportElement key="staticText-11" x="0" y="0" width="169" height="14" isRemoveLineWhenBlank="true"/>
+					<box leftPadding="5">
+						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					</box>
 					<textElement>
 						<font isBold="true"/>
 					</textElement>
-				<text><![CDATA[Plus Outstanding Payments]]></text>
+					<text><![CDATA[Plus Outstanding Payments]]></text>
 				</staticText>
-				<line direction="TopDown">
-					<reportElement
-						x="0"
-						y="13"
-						width="495"
-						height="0"
-						forecolor="#E4DFDF"
-						key="line-1"
-						isRemoveLineWhenBlank="true"/>
-					<graphicElement stretchType="NoStretch" pen="Thin"/>
+				<line>
+					<reportElement key="line-1" x="0" y="13" width="495" height="1" isRemoveLineWhenBlank="true" forecolor="#E4DFDF"/>
+					<graphicElement>
+						<pen lineWidth="0.5" lineStyle="Solid"/>
+					</graphicElement>
 				</line>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						x="380"
-						y="0"
-						width="115"
-						height="15"
-						key="textField-12"
-						isRemoveLineWhenBlank="true">
-							<printWhenExpression><![CDATA[new Boolean($P{REPORT_TYPE}.equalsIgnoreCase("SUMMARY"))]]></printWhenExpression>
-						</reportElement>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" rightPadding="5" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[($P{AMT_OUT_PAYMENT}!=null) ? $P{NUMBERFORMAT}.format($P{AMT_OUT_PAYMENT}).toString() : new String("")]]></textFieldExpression>
+				<textField isBlankWhenNull="false">
+					<reportElement key="textField-12" x="380" y="0" width="115" height="15" isRemoveLineWhenBlank="true">
+						<printWhenExpression><![CDATA[new Boolean($P{REPORT_TYPE}.equalsIgnoreCase("SUMMARY"))]]></printWhenExpression>
+					</reportElement>
+					<box rightPadding="5">
+						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle"/>
+					<textFieldExpression class="java.lang.String"><![CDATA[($P{AMT_OUT_PAYMENT}!=null) ? $P{NUMBERFORMAT}.format($P{AMT_OUT_PAYMENT}).toString() : new String("")]]></textFieldExpression>
 				</textField>
 			</band>
-			</groupHeader>
-			<groupFooter>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-			</groupFooter>
-		</group>
-		<group  name="OutstandingDeposits" >
-			<groupExpression><![CDATA[]]></groupExpression>
-			<groupHeader>
-			<band height="20"  isSplitAllowed="true" >
+		</groupHeader>
+		<groupFooter>
+			<band splitType="Stretch"/>
+		</groupFooter>
+	</group>
+	<group name="OutstandingDeposits">
+		<groupExpression><![CDATA[]]></groupExpression>
+		<groupHeader>
+			<band height="20" splitType="Stretch">
 				<printWhenExpression><![CDATA[$P{SHOW_BAND_DEPOSIT}]]></printWhenExpression>
-				<subreport  isUsingCache="true">
-					<reportElement
-						x="1"
-						y="15"
-						width="494"
-						height="5"
-						key="subreport-2"
-						isRemoveLineWhenBlank="true">
-							<printWhenExpression><![CDATA[new Boolean($P{REPORT_TYPE}.equalsIgnoreCase("DETAIL"))]]></printWhenExpression>
-						</reportElement>
-					<subreportParameter  name="RECONCILIATION_ID">
+				<subreport isUsingCache="true">
+					<reportElement key="subreport-2" x="1" y="15" width="494" height="5" isRemoveLineWhenBlank="true">
+						<printWhenExpression><![CDATA[new Boolean($P{REPORT_TYPE}.equalsIgnoreCase("DETAIL"))]]></printWhenExpression>
+					</reportElement>
+					<subreportParameter name="RECONCILIATION_ID">
 						<subreportParameterExpression><![CDATA[$P{RECONCILIATION_ID}]]></subreportParameterExpression>
 					</subreportParameter>
-					<subreportParameter  name="NUMBERFORMAT">
+					<subreportParameter name="NUMBERFORMAT">
 						<subreportParameterExpression><![CDATA[$P{NUMBERFORMAT}]]></subreportParameterExpression>
 					</subreportParameter>
 					<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
-					<subreportExpression  class="net.sf.jasperreports.engine.JasperReport"><![CDATA[$P{SUBREP_OUTDEPOSIT}]]></subreportExpression>
+					<subreportExpression class="net.sf.jasperreports.engine.JasperReport"><![CDATA[$P{SUBREP_OUTDEPOSIT}]]></subreportExpression>
 				</subreport>
 				<staticText>
-					<reportElement
-						x="0"
-						y="0"
-						width="169"
-						height="14"
-						key="staticText-12"
-						isRemoveLineWhenBlank="true"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
+					<reportElement key="staticText-12" x="0" y="0" width="169" height="14" isRemoveLineWhenBlank="true"/>
+					<box leftPadding="5">
+						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					</box>
 					<textElement>
 						<font isBold="true"/>
 					</textElement>
-				<text><![CDATA[Less Outstanding Deposits]]></text>
+					<text><![CDATA[Less Outstanding Deposits]]></text>
 				</staticText>
-				<line direction="TopDown">
-					<reportElement
-						x="0"
-						y="13"
-						width="495"
-						height="0"
-						forecolor="#E4DFDF"
-						key="line-2"
-						isRemoveLineWhenBlank="true"/>
-					<graphicElement stretchType="NoStretch" pen="Thin"/>
+				<line>
+					<reportElement key="line-2" x="0" y="13" width="495" height="1" isRemoveLineWhenBlank="true" forecolor="#E4DFDF"/>
+					<graphicElement>
+						<pen lineWidth="0.5" lineStyle="Solid"/>
+					</graphicElement>
 				</line>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						x="380"
-						y="0"
-						width="115"
-						height="15"
-						key="textField-13"
-						isRemoveLineWhenBlank="true">
-							<printWhenExpression><![CDATA[new Boolean($P{REPORT_TYPE}.equalsIgnoreCase("SUMMARY"))]]></printWhenExpression>
-						</reportElement>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" rightPadding="5" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[($P{AMT_OUT_DEPOSIT}!=null) ? $P{NUMBERFORMAT}.format($P{AMT_OUT_DEPOSIT}).toString() : new String("")]]></textFieldExpression>
+				<textField isBlankWhenNull="false">
+					<reportElement key="textField-13" x="380" y="0" width="115" height="15" isRemoveLineWhenBlank="true">
+						<printWhenExpression><![CDATA[new Boolean($P{REPORT_TYPE}.equalsIgnoreCase("SUMMARY"))]]></printWhenExpression>
+					</reportElement>
+					<box rightPadding="5">
+						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle"/>
+					<textFieldExpression class="java.lang.String"><![CDATA[($P{AMT_OUT_DEPOSIT}!=null) ? $P{NUMBERFORMAT}.format($P{AMT_OUT_DEPOSIT}).toString() : new String("")]]></textFieldExpression>
 				</textField>
 			</band>
-			</groupHeader>
-			<groupFooter>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-			</groupFooter>
-		</group>
-		<group  name="UnreconciledBankStmt" >
-			<groupExpression><![CDATA[]]></groupExpression>
-			<groupHeader>
-			<band height="20"  isSplitAllowed="true" >
+		</groupHeader>
+		<groupFooter>
+			<band splitType="Stretch"/>
+		</groupFooter>
+	</group>
+	<group name="UnreconciledBankStmt">
+		<groupExpression><![CDATA[]]></groupExpression>
+		<groupHeader>
+			<band height="20" splitType="Stretch">
 				<printWhenExpression><![CDATA[$P{SHOW_BAND_BSLINE}]]></printWhenExpression>
 				<staticText>
-					<reportElement
-						x="0"
-						y="0"
-						width="244"
-						height="14"
-						key="staticText-16"
-						isRemoveLineWhenBlank="true"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
+					<reportElement key="staticText-16" x="0" y="0" width="244" height="14" isRemoveLineWhenBlank="true"/>
+					<box leftPadding="5">
+						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					</box>
 					<textElement>
 						<font isBold="true"/>
 					</textElement>
-				<text><![CDATA[Plus Un-reconciled Bank Statement Lines]]></text>
+					<text><![CDATA[Plus Un-reconciled Bank Statement Lines]]></text>
 				</staticText>
-				<subreport  isUsingCache="true">
-					<reportElement
-						x="1"
-						y="15"
-						width="494"
-						height="5"
-						key="subreport-3"
-						isRemoveLineWhenBlank="true">
-							<printWhenExpression><![CDATA[new Boolean($P{REPORT_TYPE}.equalsIgnoreCase("DETAIL"))]]></printWhenExpression>
-						</reportElement>
-					<subreportParameter  name="RECONCILIATION_ID">
+				<subreport isUsingCache="true">
+					<reportElement key="subreport-3" x="1" y="15" width="494" height="5" isRemoveLineWhenBlank="true">
+						<printWhenExpression><![CDATA[new Boolean($P{REPORT_TYPE}.equalsIgnoreCase("DETAIL"))]]></printWhenExpression>
+					</reportElement>
+					<subreportParameter name="RECONCILIATION_ID">
 						<subreportParameterExpression><![CDATA[$P{RECONCILIATION_ID}]]></subreportParameterExpression>
 					</subreportParameter>
-					<subreportParameter  name="NUMBERFORMAT">
+					<subreportParameter name="NUMBERFORMAT">
 						<subreportParameterExpression><![CDATA[$P{NUMBERFORMAT}]]></subreportParameterExpression>
 					</subreportParameter>
 					<connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
-					<subreportExpression  class="net.sf.jasperreports.engine.JasperReport"><![CDATA[$P{SUBREP_UNRECBS}]]></subreportExpression>
+					<subreportExpression class="net.sf.jasperreports.engine.JasperReport"><![CDATA[$P{SUBREP_UNRECBS}]]></subreportExpression>
 				</subreport>
-				<line direction="TopDown">
-					<reportElement
-						x="0"
-						y="13"
-						width="495"
-						height="0"
-						forecolor="#E4DFDF"
-						key="line-3"/>
-					<graphicElement stretchType="NoStretch" pen="Thin"/>
+				<line>
+					<reportElement key="line-3" x="0" y="13" width="495" height="1" forecolor="#E4DFDF"/>
+					<graphicElement>
+						<pen lineWidth="0.5" lineStyle="Solid"/>
+					</graphicElement>
 				</line>
-				<line direction="TopDown">
-					<reportElement
-						x="0"
-						y="13"
-						width="495"
-						height="0"
-						forecolor="#E4DFDF"
-						key="line-4"
-						isRemoveLineWhenBlank="true"/>
-					<graphicElement stretchType="NoStretch" pen="Thin"/>
+				<line>
+					<reportElement key="line-4" x="0" y="13" width="495" height="1" isRemoveLineWhenBlank="true" forecolor="#E4DFDF"/>
+					<graphicElement>
+						<pen lineWidth="0.5" lineStyle="Solid"/>
+					</graphicElement>
 				</line>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						x="380"
-						y="0"
-						width="115"
-						height="15"
-						key="textField-14"
-						isRemoveLineWhenBlank="true">
-							<printWhenExpression><![CDATA[new Boolean($P{REPORT_TYPE}.equalsIgnoreCase("SUMMARY"))]]></printWhenExpression>
-						</reportElement>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" rightPadding="5" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[($P{AMT_UNREC_BSLINE}!=null) ? $P{NUMBERFORMAT}.format($P{AMT_UNREC_BSLINE}).toString() : new String("")]]></textFieldExpression>
+				<textField isBlankWhenNull="false">
+					<reportElement key="textField-14" x="380" y="0" width="115" height="15" isRemoveLineWhenBlank="true">
+						<printWhenExpression><![CDATA[new Boolean($P{REPORT_TYPE}.equalsIgnoreCase("SUMMARY"))]]></printWhenExpression>
+					</reportElement>
+					<box rightPadding="5">
+						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					</box>
+					<textElement textAlignment="Right" verticalAlignment="Middle"/>
+					<textFieldExpression class="java.lang.String"><![CDATA[($P{AMT_UNREC_BSLINE}!=null) ? $P{NUMBERFORMAT}.format($P{AMT_UNREC_BSLINE}).toString() : new String("")]]></textFieldExpression>
 				</textField>
 			</band>
-			</groupHeader>
-			<groupFooter>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-			</groupFooter>
-		</group>
-		<background>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-		</background>
-		<title>
-			<band height="25"  isSplitAllowed="true" >
-				<staticText>
-					<reportElement
-						x="0"
-						y="0"
-						width="495"
-						height="25"
-						key="staticText-26">
-							<printWhenExpression><![CDATA[new Boolean($P{REPORT_TYPE}.equalsIgnoreCase("DETAIL"))]]></printWhenExpression>
-						</reportElement>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font pdfFontName="Helvetica-Bold" size="18" isBold="true"/>
-					</textElement>
+		</groupHeader>
+		<groupFooter>
+			<band splitType="Stretch"/>
+		</groupFooter>
+	</group>
+	<background>
+		<band splitType="Stretch"/>
+	</background>
+	<title>
+		<band height="25" splitType="Stretch">
+			<staticText>
+				<reportElement key="staticText-26" x="0" y="0" width="495" height="25">
+					<printWhenExpression><![CDATA[new Boolean($P{REPORT_TYPE}.equalsIgnoreCase("DETAIL"))]]></printWhenExpression>
+				</reportElement>
+				<box>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="18" isBold="true" pdfFontName="Helvetica-Bold"/>
+				</textElement>
 				<text><![CDATA[Reconciliation Report]]></text>
-				</staticText>
-				<staticText>
-					<reportElement
-						x="0"
-						y="0"
-						width="495"
-						height="25"
-						key="staticText-27">
-							<printWhenExpression><![CDATA[new Boolean($P{REPORT_TYPE}.equalsIgnoreCase("SUMMARY"))]]></printWhenExpression>
-						</reportElement>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Center" verticalAlignment="Middle">
-						<font pdfFontName="Helvetica-Bold" size="18" isBold="true"/>
-					</textElement>
+			</staticText>
+			<staticText>
+				<reportElement key="staticText-27" x="0" y="0" width="495" height="25">
+					<printWhenExpression><![CDATA[new Boolean($P{REPORT_TYPE}.equalsIgnoreCase("SUMMARY"))]]></printWhenExpression>
+				</reportElement>
+				<box>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="18" isBold="true" pdfFontName="Helvetica-Bold"/>
+				</textElement>
 				<text><![CDATA[Reconciliation Report Summary]]></text>
-				</staticText>
-			</band>
-		</title>
-		<pageHeader>
-			<band height="36"  isSplitAllowed="true" >
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						x="0"
-						y="0"
-						width="495"
-						height="18"
-						key="textField"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Center">
-						<font size="12"/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA["per " + $P{DATEFORMAT}.format($P{DATE})]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						x="0"
-						y="18"
-						width="495"
-						height="18"
-						key="textField-11"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Center">
-						<font size="12"/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA["for " + $P{FINACCOUNT_INFO}]]></textFieldExpression>
-				</textField>
-			</band>
-		</pageHeader>
-		<columnHeader>
-			<band height="18"  isSplitAllowed="true" >
-				<staticText>
-					<reportElement
-						style="DarkGray"
-						x="0"
-						y="0"
-						width="70"
-						height="18"
-						key="staticText-19"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement>
-						<font size="12"/>
-					</textElement>
+			</staticText>
+		</band>
+	</title>
+	<pageHeader>
+		<band height="36" splitType="Stretch">
+			<textField isBlankWhenNull="false">
+				<reportElement key="textField" x="50" y="0" width="445" height="18"/>
+				<box>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement>
+					<font size="12"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$P{DATEFORMAT}.format($P{DATE})]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="false">
+				<reportElement key="textField-11" x="50" y="18" width="445" height="18"/>
+				<box>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement>
+					<font size="12"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[$P{FINACCOUNT_INFO}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement x="0" y="0" width="50" height="18"/>
+				<textElement>
+					<font size="12"/>
+				</textElement>
+				<text><![CDATA[per]]></text>
+			</staticText>
+			<staticText>
+				<reportElement x="0" y="18" width="50" height="18"/>
+				<textElement>
+					<font size="12"/>
+				</textElement>
+				<text><![CDATA[for]]></text>
+			</staticText>
+		</band>
+	</pageHeader>
+	<columnHeader>
+		<band height="18" splitType="Stretch">
+			<staticText>
+				<reportElement key="staticText-19" style="DarkGray" x="0" y="0" width="70" height="18"/>
+				<box leftPadding="5">
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement>
+					<font size="12"/>
+				</textElement>
 				<text><![CDATA[Date]]></text>
-				</staticText>
-				<staticText>
-					<reportElement
-						style="DarkGray"
-						x="70"
-						y="0"
-						width="188"
-						height="18"
-						key="staticText-20"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement>
-						<font size="12"/>
-					</textElement>
+			</staticText>
+			<staticText>
+				<reportElement key="staticText-20" style="DarkGray" x="70" y="0" width="188" height="18"/>
+				<box leftPadding="5">
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement>
+					<font size="12"/>
+				</textElement>
 				<text><![CDATA[Business Partner]]></text>
-				</staticText>
-				<staticText>
-					<reportElement
-						style="DarkGray"
-						x="258"
-						y="0"
-						width="122"
-						height="18"
-						key="staticText-21"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement>
-						<font size="12"/>
-					</textElement>
+			</staticText>
+			<staticText>
+				<reportElement key="staticText-21" style="DarkGray" x="258" y="0" width="122" height="18"/>
+				<box leftPadding="5">
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement>
+					<font size="12"/>
+				</textElement>
 				<text><![CDATA[Reference]]></text>
-				</staticText>
-				<staticText>
-					<reportElement
-						style="DarkGray"
-						x="380"
-						y="0"
-						width="115"
-						height="18"
-						key="staticText-22"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="5" rightBorder="None" rightBorderColor="#000000" rightPadding="5" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Right">
-						<font size="12"/>
-					</textElement>
+			</staticText>
+			<staticText>
+				<reportElement key="staticText-22" style="DarkGray" x="380" y="0" width="115" height="18"/>
+				<box leftPadding="5" rightPadding="5">
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Right">
+					<font size="12"/>
+				</textElement>
 				<text><![CDATA[Amount]]></text>
-				</staticText>
-			</band>
-		</columnHeader>
-		<detail>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-		</detail>
-		<columnFooter>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-		</columnFooter>
-		<pageFooter>
-			<band height="20"  isSplitAllowed="true" >
-				<staticText>
-					<reportElement
-						x="177"
-						y="5"
-						width="64"
-						height="10"
-						key="staticText-18"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
+			</staticText>
+		</band>
+	</columnHeader>
+	<detail>
+		<band splitType="Stretch"/>
+	</detail>
+	<columnFooter>
+		<band splitType="Stretch"/>
+	</columnFooter>
+	<pageFooter>
+		<band height="20" splitType="Stretch">
+			<staticText>
+				<reportElement key="staticText-18" x="177" y="5" width="64" height="10"/>
+				<box>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Right" verticalAlignment="Middle">
+					<font size="8"/>
+				</textElement>
 				<text><![CDATA[Printed on ]]></text>
-				</staticText>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						x="245"
-						y="5"
-						width="69"
-						height="10"
-						key="textField-1"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-				<textFieldExpression   class="java.util.Date"><![CDATA[new Date()]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						x="325"
-						y="5"
-						width="141"
-						height="10"
-						key="textField-2"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" rightBorder="None" rightBorderColor="#000000" rightPadding="2" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[" Page " + $V{PAGE_NUMBER} + " of "]]></textFieldExpression>
-				</textField>
-				<textField isStretchWithOverflow="false" isBlankWhenNull="false" evaluationTime="Report" hyperlinkType="None"  hyperlinkTarget="Self" >
-					<reportElement
-						x="467"
-						y="5"
-						width="28"
-						height="10"
-						key="textField-15"/>
-					<box topBorder="None" topBorderColor="#000000" leftBorder="None" leftBorderColor="#000000" leftPadding="2" rightBorder="None" rightBorderColor="#000000" bottomBorder="None" bottomBorderColor="#000000"/>
-					<textElement textAlignment="Left" verticalAlignment="Middle">
-						<font size="8"/>
-					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA["" + $V{PAGE_NUMBER}]]></textFieldExpression>
-				</textField>
-			</band>
-		</pageFooter>
-		<summary>
-			<band height="0"  isSplitAllowed="true" >
-			</band>
-		</summary>
+			</staticText>
+			<textField isBlankWhenNull="false">
+				<reportElement key="textField-1" x="245" y="5" width="69" height="10"/>
+				<box>
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement verticalAlignment="Middle">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression class="java.util.Date"><![CDATA[new Date()]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="false">
+				<reportElement key="textField-2" x="325" y="5" width="141" height="10"/>
+				<box rightPadding="2">
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Right" verticalAlignment="Middle">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA[" Page " + $V{PAGE_NUMBER} + " of "]]></textFieldExpression>
+			</textField>
+			<textField evaluationTime="Report" isBlankWhenNull="false">
+				<reportElement key="textField-15" x="467" y="5" width="28" height="10"/>
+				<box leftPadding="2">
+					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+				</box>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font size="8"/>
+				</textElement>
+				<textFieldExpression class="java.lang.String"><![CDATA["" + $V{PAGE_NUMBER}]]></textFieldExpression>
+			</textField>
+		</band>
+	</pageFooter>
+	<summary>
+		<band splitType="Stretch"/>
+	</summary>
 </jasperReport>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java	Thu May 24 08:59:54 2012 +0000
@@ -209,7 +209,7 @@
       whereClause.append(" and psd.");
       whereClause.append(FIN_PaymentSchedule.PROPERTY_ORGANIZATION);
       whereClause.append(".id in (");
-      whereClause.append(FIN_Utility.getInStrSet(OBContext.getOBContext()
+      whereClause.append(Utility.getInStrSet(OBContext.getOBContext()
           .getOrganizationStructureProvider().getNaturalTree(organization.getId())));
       whereClause.append(")");
 
@@ -1319,7 +1319,11 @@
     obc.add(Restrictions.eq(FinAccPaymentMethod.PROPERTY_ACTIVE, true));
     obc.setFilterOnReadableClients(false);
     obc.setFilterOnReadableOrganization(false);
-    return obc.list().get(0);
+    try {
+      return obc.list().get(0);
+    } catch (IndexOutOfBoundsException e) {
+      throw new OBException(FIN_Utility.messageBD("APRM_PaymentMethod"));
+    }
   }
 
   public boolean isAutomatedExecutionPayment(FIN_FinancialAccount account,
@@ -1573,14 +1577,15 @@
    */
   public List<FIN_Payment> getCustomerPaymentsWithCredit(Organization org, BusinessPartner bp,
       boolean isReceipt) {
+
+    List<String> confirmedStatus = FIN_Utility.getListPaymentConfirmed();
     try {
       OBContext.setAdminMode(true);
       OBCriteria<FIN_Payment> obcPayment = OBDal.getInstance().createCriteria(FIN_Payment.class);
       obcPayment.add(Restrictions.eq(FIN_Payment.PROPERTY_BUSINESSPARTNER, bp));
       obcPayment.add(Restrictions.eq(FIN_Payment.PROPERTY_RECEIPT, isReceipt));
       obcPayment.add(Restrictions.ne(FIN_Payment.PROPERTY_GENERATEDCREDIT, BigDecimal.ZERO));
-      obcPayment.add(Restrictions.ne(FIN_Payment.PROPERTY_STATUS, "RPAP"));
-      obcPayment.add(Restrictions.ne(FIN_Payment.PROPERTY_STATUS, "RPVOID"));
+      obcPayment.add(Restrictions.in(FIN_Payment.PROPERTY_STATUS, confirmedStatus));
       obcPayment.add(Restrictions.neProperty(FIN_Payment.PROPERTY_GENERATEDCREDIT,
           FIN_Payment.PROPERTY_USEDCREDIT));
       final Organization legalEntity = FIN_Utility.getLegalEntityOrg(org);
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentMonitorProcess.java	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentMonitorProcess.java	Thu May 24 08:59:54 2012 +0000
@@ -147,12 +147,20 @@
       invoice.setDaysTillDue(getDaysTillDue(invoice));
       if (invoice.getOutstandingAmount().compareTo(BigDecimal.ZERO) == 0) {
         Date finalSettlementDate = getFinalSettlementDate(invoice);
-        invoice.setFinalSettlementDate(finalSettlementDate);
-        invoice.setDaysSalesOutstanding(FIN_Utility.getDaysBetween(invoice.getInvoiceDate(),
-            finalSettlementDate));
+        // If date is null invoice amount = 0 then nothing to set
+        if (finalSettlementDate != null) {
+          invoice.setFinalSettlementDate(finalSettlementDate);
+          invoice.setDaysSalesOutstanding(FIN_Utility.getDaysBetween(invoice.getInvoiceDate(),
+              finalSettlementDate));
+        }
+      }
+      BigDecimal grandTotalAmount = invoice.getGrandTotalAmount();
+      // This prevents division by ZERO
+      if (grandTotalAmount.compareTo(BigDecimal.ZERO) == 0) {
+        grandTotalAmount = BigDecimal.ONE;
       }
       invoice.setPercentageOverdue(amounts.get("overdueOriginal").multiply(new BigDecimal(100))
-          .divide(invoice.getGrandTotalAmount(), BigDecimal.ROUND_HALF_UP).longValue());
+          .divide(grandTotalAmount, BigDecimal.ROUND_HALF_UP).longValue());
       invoice.setLastCalculatedOnDate(new Date());
 
       OBDal.getInstance().save(invoice);
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java	Thu May 24 08:59:54 2012 +0000
@@ -99,6 +99,7 @@
           msg.setMessage(Utility.parseTranslation(conProvider, vars, language,
               "@APRM_FinancialAccountNotInNaturalTree@"));
           bundle.setResult(msg);
+          OBDal.getInstance().rollbackAndClose();
           return;
         }
         Set<String> invoiceDocNos = new TreeSet<String>();
@@ -122,6 +123,7 @@
             msg.setMessage(Utility.parseTranslation(conProvider, vars, language,
                 "@APRM_PaymentNoLines@"));
             bundle.setResult(msg);
+            OBDal.getInstance().rollbackAndClose();
             return;
           }
           for (FIN_PaymentDetail paymentDetail : paymentDetails) {
@@ -260,6 +262,7 @@
               msg.setMessage(Utility.parseTranslation(conProvider, vars, language,
                   "@NoExecutionProcessFound@"));
               bundle.setResult(msg);
+              OBDal.getInstance().rollbackAndClose();
               return;
             } catch (final Exception e) {
               e.printStackTrace(System.err);
@@ -267,6 +270,7 @@
               msg.setMessage(Utility.parseTranslation(conProvider, vars, language,
                   "@IssueOnExecutionProcess@"));
               bundle.setResult(msg);
+              OBDal.getInstance().rollbackAndClose();
               return;
             }
           } else {
@@ -350,6 +354,7 @@
           msg.setMessage(Utility.parseTranslation(conProvider, vars, language, "@PostedDocument@"
               + ": " + payment.getDocumentNo()));
           bundle.setResult(msg);
+          OBDal.getInstance().rollbackAndClose();
           return;
         }
         // Transaction exists
@@ -359,6 +364,7 @@
           msg.setMessage(Utility.parseTranslation(conProvider, vars, language,
               "@APRM_TransactionExists@"));
           bundle.setResult(msg);
+          OBDal.getInstance().rollbackAndClose();
           return;
         }
         // Payment with generated credit already used on other payments.
@@ -369,6 +375,7 @@
           msg.setMessage(Utility.parseTranslation(conProvider, vars, language,
               "@APRM_PaymentGeneratedCreditIsUsed@"));
           bundle.setResult(msg);
+          OBDal.getInstance().rollbackAndClose();
           return;
         }
 
@@ -556,6 +563,7 @@
               msg.setMessage(Utility.parseTranslation(conProvider, vars, language,
                   "@PostedDocument@" + ": " + payment.getDocumentNo()));
               bundle.setResult(msg);
+              OBDal.getInstance().rollbackAndClose();
               return;
             }
             // Transaction exists
@@ -565,6 +573,7 @@
               msg.setMessage(Utility.parseTranslation(conProvider, vars, language,
                   "@APRM_TransactionExists@"));
               bundle.setResult(msg);
+              OBDal.getInstance().rollbackAndClose();
               return;
             }
             // Payment with generated credit already used on other payments.
@@ -575,6 +584,7 @@
               msg.setMessage(Utility.parseTranslation(conProvider, vars, language,
                   "@APRM_PaymentGeneratedCreditIsUsed@"));
               bundle.setResult(msg);
+              OBDal.getInstance().rollbackAndClose();
               return;
             }
             // Payment not in Awaiting Execution
@@ -584,6 +594,7 @@
               msg.setMessage(Utility.parseTranslation(conProvider, vars, language,
                   "@APRM_PaymentNotRPAE_NotVoid@"));
               bundle.setResult(msg);
+              OBDal.getInstance().rollbackAndClose();
               return;
             }
 
@@ -689,6 +700,7 @@
         msg.setMessage(Utility.parseTranslation(conProvider, vars, language,
             "@CouldNotUpdateOriginalPaymentPlan@"));
         bundle.setResult(msg);
+        OBDal.getInstance().rollbackAndClose();
         return;
       }
 
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java	Thu May 24 08:59:54 2012 +0000
@@ -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) 2010-2011 Openbravo SLU
+ * All portions are Copyright (C) 2010-2012 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  *************************************************************************
@@ -252,7 +252,7 @@
       whereClause.append(FIN_BankStatement.PROPERTY_ACCOUNT + ".id = ?");
       parameters.add(account.getId());
       whereClause.append(" and bsl." + FIN_BankStatementLine.PROPERTY_ORGANIZATION + ".id in (");
-      whereClause.append(FIN_Utility.getInStrSet(new OrganizationStructureProvider()
+      whereClause.append(Utility.getInStrSet(new OrganizationStructureProvider()
           .getNaturalTree(organization.getId())) + ") ");
       whereClause.append(" and bsl.bankStatement.processed = 'Y'");
       whereClause.append(" order by bsl." + FIN_BankStatementLine.PROPERTY_CREATIONDATE + " desc");
@@ -283,7 +283,7 @@
       whereClause.append(" where bp." + BusinessPartner.PROPERTY_NAME + " = ?");
       parameters.add(partnername);
       whereClause.append(" and bp." + BusinessPartner.PROPERTY_ORGANIZATION + ".id in (");
-      whereClause.append(FIN_Utility.getInStrSet(new OrganizationStructureProvider()
+      whereClause.append(Utility.getInStrSet(new OrganizationStructureProvider()
           .getNaturalTree(organization.getId())) + ") ");
       final OBQuery<BusinessPartner> bp = OBDal.getInstance().createQuery(BusinessPartner.class,
           whereClause.toString(), parameters);
@@ -330,7 +330,7 @@
       }
       whereClause.delete(whereClause.length() - 3, whereClause.length()).append(")");
       whereClause.append(" and b." + BusinessPartner.PROPERTY_ORGANIZATION + ".id in (");
-      whereClause.append(FIN_Utility.getInStrSet(new OrganizationStructureProvider()
+      whereClause.append(Utility.getInStrSet(new OrganizationStructureProvider()
           .getNaturalTree(organization.getId())) + ") ");
       final OBQuery<BusinessPartner> bl = OBDal.getInstance().createQuery(BusinessPartner.class,
           whereClause.toString(), parameters);
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_MatchedTransaction.java	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_MatchedTransaction.java	Thu May 24 08:59:54 2012 +0000
@@ -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) 2010-2011 Openbravo SLU
+ * All portions are Copyright (C) 2010-2012 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  *************************************************************************
@@ -27,7 +27,7 @@
   public static final String WEAK = "AP";
   public static final String NOMATCH = "NO";
   public static final String MANUALMATCH = "MA";
-  private String level = "NO";
+  private String level = NOMATCH;
 
   public FIN_MatchedTransaction(FIN_FinaccTransaction _transaction, String _level) {
     transaction = _transaction;
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java	Thu May 24 08:59:54 2012 +0000
@@ -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) 2010-2011 Openbravo SLU
+ * All portions are Copyright (C) 2010-2012 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  *************************************************************************
@@ -228,21 +228,16 @@
   }
 
   /**
-   * Creates a comma separated string with the Id's of the Set of Strings.
+   * Creates a comma separated string with the Id's of the Set of Strings. This method is deprecated
+   * as it has been added to Utility (core)
    * 
    * @param set
    *          Set of Strings
    * @return Comma separated string of Id's
    */
+  @Deprecated
   public static String getInStrSet(Set<String> set) {
-    StringBuilder strInList = new StringBuilder();
-    for (String string : set) {
-      if (strInList.length() == 0)
-        strInList.append("'" + string + "'");
-      else
-        strInList.append(", '" + string + "'");
-    }
-    return strInList.toString();
+    return Utility.getInStrSet(set);
   }
 
   /**
@@ -962,6 +957,51 @@
   }
 
   /**
+   * Returns a list of Payment Status. If isConfirmed equals true, then the status returned are
+   * confirmed payments. Else they are pending of execution
+   * 
+   */
+  private static List<String> getListPaymentConfirmedOrNot(Boolean isConfirmed) {
+
+    List<String> listPaymentConfirmedOrNot = new ArrayList<String>();
+    OBContext.setAdminMode(true);
+    try {
+      final OBCriteria<org.openbravo.model.ad.domain.List> obCriteria = OBDal.getInstance()
+          .createCriteria(org.openbravo.model.ad.domain.List.class);
+      obCriteria.add(Restrictions.eq(org.openbravo.model.ad.domain.List.PROPERTY_REFERENCE + ".id",
+          "575BCB88A4694C27BC013DE9C73E6FE7"));
+      List<org.openbravo.model.ad.domain.List> adRefList = obCriteria.list();
+      for (org.openbravo.model.ad.domain.List adRef : adRefList) {
+        if (isConfirmed.equals(isPaymentConfirmed(adRef.getSearchKey(), null))) {
+          listPaymentConfirmedOrNot.add(adRef.getSearchKey());
+        }
+      }
+      return listPaymentConfirmedOrNot;
+    } catch (Exception e) {
+      log4j.error(e);
+      return null;
+    } finally {
+      OBContext.restorePreviousMode();
+    }
+  }
+
+  /**
+   * Returns a list confirmed Payment Status
+   * 
+   */
+  public static List<String> getListPaymentConfirmed() {
+    return getListPaymentConfirmedOrNot(true);
+  }
+
+  /**
+   * Returns a list not confirmed Payment Status
+   * 
+   */
+  public static List<String> getListPaymentNotConfirmed() {
+    return getListPaymentConfirmedOrNot(false);
+  }
+
+  /**
    * Returns the legal entity of the given organization
    * 
    * @param org
Binary file modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/images/add.png has changed
Binary file modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/images/view.png has changed
--- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Thu May 24 08:59:54 2012 +0000
@@ -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.15736]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.16285]]></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.3]]></VERSION_LABEL>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION_LABEL><![CDATA[MP11]]></VERSION_LABEL>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--C70732EA90A14EC0916078B85CC33D2D--></AD_MODULE>
 
--- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu May 24 08:59:54 2012 +0000
@@ -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.15736]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.16285]]></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_COLUMN.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml	Thu May 24 08:59:54 2012 +0000
@@ -114,7 +114,7 @@
 <!--01F2D2DBBDA14758982AA7386FA8FF72-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--01F2D2DBBDA14758982AA7386FA8FF72-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--01F2D2DBBDA14758982AA7386FA8FF72-->  <NAME><![CDATA[Updated]]></NAME>
-<!--01F2D2DBBDA14758982AA7386FA8FF72-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--01F2D2DBBDA14758982AA7386FA8FF72-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
 <!--01F2D2DBBDA14758982AA7386FA8FF72-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
 <!--01F2D2DBBDA14758982AA7386FA8FF72-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
 <!--01F2D2DBBDA14758982AA7386FA8FF72-->  <AD_TABLE_ID><![CDATA[FF80818132D7FB620132D8129D1A0028]]></AD_TABLE_ID>
@@ -218,7 +218,7 @@
 <!--0933E14B5EC040F7AABAF84468E1BA92-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0933E14B5EC040F7AABAF84468E1BA92-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0933E14B5EC040F7AABAF84468E1BA92-->  <NAME><![CDATA[Updated]]></NAME>
-<!--0933E14B5EC040F7AABAF84468E1BA92-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--0933E14B5EC040F7AABAF84468E1BA92-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
 <!--0933E14B5EC040F7AABAF84468E1BA92-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
 <!--0933E14B5EC040F7AABAF84468E1BA92-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
 <!--0933E14B5EC040F7AABAF84468E1BA92-->  <AD_TABLE_ID><![CDATA[E6F29F8A30BC4603B1D1195051C4F3A6]]></AD_TABLE_ID>
@@ -326,7 +326,7 @@
 <!--0FF70EF0FE8142BFB6F980CF54DFF184-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0FF70EF0FE8142BFB6F980CF54DFF184-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0FF70EF0FE8142BFB6F980CF54DFF184-->  <NAME><![CDATA[Updated]]></NAME>
-<!--0FF70EF0FE8142BFB6F980CF54DFF184-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--0FF70EF0FE8142BFB6F980CF54DFF184-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
 <!--0FF70EF0FE8142BFB6F980CF54DFF184-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
 <!--0FF70EF0FE8142BFB6F980CF54DFF184-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
 <!--0FF70EF0FE8142BFB6F980CF54DFF184-->  <AD_TABLE_ID><![CDATA[FF8081813157AED2013157B1F75F0007]]></AD_TABLE_ID>
@@ -395,7 +395,7 @@
 <!--1330F77151CC4A9BBC1B0151F27952B9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--1330F77151CC4A9BBC1B0151F27952B9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--1330F77151CC4A9BBC1B0151F27952B9-->  <NAME><![CDATA[Updated]]></NAME>
-<!--1330F77151CC4A9BBC1B0151F27952B9-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--1330F77151CC4A9BBC1B0151F27952B9-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
 <!--1330F77151CC4A9BBC1B0151F27952B9-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
 <!--1330F77151CC4A9BBC1B0151F27952B9-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
 <!--1330F77151CC4A9BBC1B0151F27952B9-->  <AD_TABLE_ID><![CDATA[DEADAC2161894A56A041B81A74B02D9E]]></AD_TABLE_ID>
@@ -681,7 +681,7 @@
 <!--1B597CE339F946A49442957168C854F6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--1B597CE339F946A49442957168C854F6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--1B597CE339F946A49442957168C854F6-->  <NAME><![CDATA[Updated]]></NAME>
-<!--1B597CE339F946A49442957168C854F6-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--1B597CE339F946A49442957168C854F6-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
 <!--1B597CE339F946A49442957168C854F6-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
 <!--1B597CE339F946A49442957168C854F6-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
 <!--1B597CE339F946A49442957168C854F6-->  <AD_TABLE_ID><![CDATA[090A37D22E61FE94012E620CD15D0030]]></AD_TABLE_ID>
@@ -893,7 +893,7 @@
 <!--22315684B80F401482445474C41E774E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--22315684B80F401482445474C41E774E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--22315684B80F401482445474C41E774E-->  <NAME><![CDATA[Updated]]></NAME>
-<!--22315684B80F401482445474C41E774E-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--22315684B80F401482445474C41E774E-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
 <!--22315684B80F401482445474C41E774E-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
 <!--22315684B80F401482445474C41E774E-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
 <!--22315684B80F401482445474C41E774E-->  <AD_TABLE_ID><![CDATA[FF80818132D85DB50132D860924E0004]]></AD_TABLE_ID>
@@ -1249,7 +1249,7 @@
 <!--356B1CB907814B9DB9789C13A66A9A8B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--356B1CB907814B9DB9789C13A66A9A8B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--356B1CB907814B9DB9789C13A66A9A8B-->  <NAME><![CDATA[Updated]]></NAME>
-<!--356B1CB907814B9DB9789C13A66A9A8B-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--356B1CB907814B9DB9789C13A66A9A8B-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
 <!--356B1CB907814B9DB9789C13A66A9A8B-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
 <!--356B1CB907814B9DB9789C13A66A9A8B-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
 <!--356B1CB907814B9DB9789C13A66A9A8B-->  <AD_TABLE_ID><![CDATA[79127717F4514B459D9014C91E793CE9]]></AD_TABLE_ID>
@@ -1996,7 +1996,7 @@
 <!--5AF0A8305F134533810453A8D7A4B483-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--5AF0A8305F134533810453A8D7A4B483-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--5AF0A8305F134533810453A8D7A4B483-->  <NAME><![CDATA[Updated]]></NAME>
-<!--5AF0A8305F134533810453A8D7A4B483-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--5AF0A8305F134533810453A8D7A4B483-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
 <!--5AF0A8305F134533810453A8D7A4B483-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
 <!--5AF0A8305F134533810453A8D7A4B483-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
 <!--5AF0A8305F134533810453A8D7A4B483-->  <AD_TABLE_ID><![CDATA[FF80818132F263D40132F26C10790010]]></AD_TABLE_ID>
@@ -2816,7 +2816,7 @@
 <!--88C966AFBEB442C7B5D488DF0F6FAA96-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--88C966AFBEB442C7B5D488DF0F6FAA96-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--88C966AFBEB442C7B5D488DF0F6FAA96-->  <NAME><![CDATA[Updated]]></NAME>
-<!--88C966AFBEB442C7B5D488DF0F6FAA96-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--88C966AFBEB442C7B5D488DF0F6FAA96-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
 <!--88C966AFBEB442C7B5D488DF0F6FAA96-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
 <!--88C966AFBEB442C7B5D488DF0F6FAA96-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
 <!--88C966AFBEB442C7B5D488DF0F6FAA96-->  <AD_TABLE_ID><![CDATA[6EDC4A262444493BAE672E7E144A36F7]]></AD_TABLE_ID>
@@ -3280,7 +3280,7 @@
 <!--927DA01A83303AFAE040A8C0CF072B85-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--927DA01A83303AFAE040A8C0CF072B85-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--927DA01A83303AFAE040A8C0CF072B85-->  <NAME><![CDATA[Updated]]></NAME>
-<!--927DA01A83303AFAE040A8C0CF072B85-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--927DA01A83303AFAE040A8C0CF072B85-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
 <!--927DA01A83303AFAE040A8C0CF072B85-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
 <!--927DA01A83303AFAE040A8C0CF072B85-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
 <!--927DA01A83303AFAE040A8C0CF072B85-->  <AD_TABLE_ID><![CDATA[30123B1001FC4E82BB4CB9725E069B48]]></AD_TABLE_ID>
@@ -4101,7 +4101,7 @@
 <!--927DA01A83473AFAE040A8C0CF072B85-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--927DA01A83473AFAE040A8C0CF072B85-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--927DA01A83473AFAE040A8C0CF072B85-->  <NAME><![CDATA[Updated]]></NAME>
-<!--927DA01A83473AFAE040A8C0CF072B85-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--927DA01A83473AFAE040A8C0CF072B85-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
 <!--927DA01A83473AFAE040A8C0CF072B85-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
 <!--927DA01A83473AFAE040A8C0CF072B85-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
 <!--927DA01A83473AFAE040A8C0CF072B85-->  <AD_TABLE_ID><![CDATA[1A801FD9F44E4EFFA2EA928693A6BBCB]]></AD_TABLE_ID>
@@ -4562,7 +4562,7 @@
 <!--927FD1CA753E6901E040A8C0CF073D3E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--927FD1CA753E6901E040A8C0CF073D3E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--927FD1CA753E6901E040A8C0CF073D3E-->  <NAME><![CDATA[Updated]]></NAME>
-<!--927FD1CA753E6901E040A8C0CF073D3E-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--927FD1CA753E6901E040A8C0CF073D3E-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
 <!--927FD1CA753E6901E040A8C0CF073D3E-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
 <!--927FD1CA753E6901E040A8C0CF073D3E-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
 <!--927FD1CA753E6901E040A8C0CF073D3E-->  <AD_TABLE_ID><![CDATA[815D739C48414E01AF9F44EE3E8CCEBB]]></AD_TABLE_ID>
@@ -6559,7 +6559,7 @@
 <!--EFB04F185A9045FC98A38657EA8109AB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--EFB04F185A9045FC98A38657EA8109AB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--EFB04F185A9045FC98A38657EA8109AB-->  <NAME><![CDATA[Java Class Name]]></NAME>
-<!--EFB04F185A9045FC98A38657EA8109AB-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--EFB04F185A9045FC98A38657EA8109AB-->  <DESCRIPTION><![CDATA[The classname is used when generating a representation of the table in java (the entity or business object). The classname is the simplename of the class (so without the package name). Often the AD_Table.name can be used here.]]></DESCRIPTION>
 <!--EFB04F185A9045FC98A38657EA8109AB-->  <HELP><![CDATA[The classname is used when generating a representation of the table in java (the entity or business object). The classname is the simplename of the class (so without the package name). Often the AD_Table.name can be used here. The combination of classname and package needs to be unique.]]></HELP>
 <!--EFB04F185A9045FC98A38657EA8109AB-->  <COLUMNNAME><![CDATA[Classname]]></COLUMNNAME>
 <!--EFB04F185A9045FC98A38657EA8109AB-->  <AD_TABLE_ID><![CDATA[FF80818132D7FB620132D8129D1A0028]]></AD_TABLE_ID>
@@ -6629,7 +6629,7 @@
 <!--F412626823AA4EDBBAF40BC38F6CE440-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--F412626823AA4EDBBAF40BC38F6CE440-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F412626823AA4EDBBAF40BC38F6CE440-->  <NAME><![CDATA[Updated]]></NAME>
-<!--F412626823AA4EDBBAF40BC38F6CE440-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--F412626823AA4EDBBAF40BC38F6CE440-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
 <!--F412626823AA4EDBBAF40BC38F6CE440-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
 <!--F412626823AA4EDBBAF40BC38F6CE440-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
 <!--F412626823AA4EDBBAF40BC38F6CE440-->  <AD_TABLE_ID><![CDATA[B733B9E74A0D4FE1A3EC2A100E0ADD47]]></AD_TABLE_ID>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml	Thu May 24 08:59:54 2012 +0000
@@ -371,7 +371,7 @@
 <!--0D7D1CCBA5E54A66A433D37759D2C074-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0D7D1CCBA5E54A66A433D37759D2C074-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0D7D1CCBA5E54A66A433D37759D2C074-->  <NAME><![CDATA[Java Class Name]]></NAME>
-<!--0D7D1CCBA5E54A66A433D37759D2C074-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--0D7D1CCBA5E54A66A433D37759D2C074-->  <DESCRIPTION><![CDATA[The classname is used when generating a representation of the table in java (the entity or business object). The classname is the simplename of the class (so without the package name). Often the AD_Table.name can be used here.]]></DESCRIPTION>
 <!--0D7D1CCBA5E54A66A433D37759D2C074-->  <HELP><![CDATA[The classname is used when generating a representation of the table in java (the entity or business object). The classname is the simplename of the class (so without the package name). Often the AD_Table.name can be used here. The combination of classname and package needs to be unique.]]></HELP>
 <!--0D7D1CCBA5E54A66A433D37759D2C074-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--0D7D1CCBA5E54A66A433D37759D2C074-->  <AD_TAB_ID><![CDATA[FF80818132D7FB620132D819C1720046]]></AD_TAB_ID>
@@ -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	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Thu May 24 08:59:54 2012 +0000
@@ -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.15736]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.16285]]></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.3]]></VERSION_LABEL>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION_LABEL><![CDATA[MP11]]></VERSION_LABEL>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--9BA0836A3CD74EE4AB48753A47211BCC--></AD_MODULE>
 
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu May 24 08:59:54 2012 +0000
@@ -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.15736]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.16285]]></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.15736]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->  <STARTVERSION><![CDATA[2.1.16285]]></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.15736]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->  <STARTVERSION><![CDATA[3.0.16285]]></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.15736]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->  <STARTVERSION><![CDATA[8.1.16285]]></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-db/database/sourcedata/AD_WINDOW.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_WINDOW.xml	Thu May 24 08:59:54 2012 +0000
@@ -45,7 +45,7 @@
 <!--FF8081813157AED2013157BE93460020-->  <DESCRIPTION><![CDATA[Maintains ui personalization records]]></DESCRIPTION>
 <!--FF8081813157AED2013157BE93460020-->  <HELP><![CDATA[Openbravo allows the customization of grid and form views. Customize windows and form views are stored once saved in the Window Personalization window.]]></HELP>
 <!--FF8081813157AED2013157BE93460020-->  <WINDOWTYPE><![CDATA[M]]></WINDOWTYPE>
-<!--FF8081813157AED2013157BE93460020-->  <ISSOTRX><![CDATA[N]]></ISSOTRX>
+<!--FF8081813157AED2013157BE93460020-->  <ISSOTRX><![CDATA[Y]]></ISSOTRX>
 <!--FF8081813157AED2013157BE93460020-->  <PROCESSING><![CDATA[N]]></PROCESSING>
 <!--FF8081813157AED2013157BE93460020-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
 <!--FF8081813157AED2013157BE93460020-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/AlertActionHandler.java	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/AlertActionHandler.java	Thu May 24 08:59:54 2012 +0000
@@ -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,58 @@
       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();
+
+        PreparedStatement sqlQuery = null;
+        ResultSet rs = null;
         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));
+          sqlQuery = new DalConnectionProvider(false).getPreparedStatement(sql);
+          sqlQuery.setString(1, alertRule.getId());
+          sqlQuery.execute();
+          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);
+        } finally {
+          try {
+            if (sqlQuery != null) {
+              sqlQuery.close();
+            }
+            if (rs != null) {
+              rs.close();
+            }
+          } catch (Exception e) {
+            log4j.error(
+                "An error has ocurred when trying to close the statement: " + 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	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java	Thu May 24 08:59:54 2012 +0000
@@ -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) {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/UsageAuditHandler.java	Thu May 24 08:59:54 2012 +0000
@@ -0,0 +1,62 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html 
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License. 
+ * The Original Code is Openbravo ERP. 
+ * The Initial Developer of the Original Code is Openbravo SLU 
+ * All portions are Copyright (C) 2012 Openbravo SLU 
+ * All Rights Reserved. 
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+ */
+
+package org.openbravo.client.application.event;
+
+import javax.enterprise.event.Observes;
+
+import org.apache.log4j.Logger;
+import org.openbravo.base.model.Entity;
+import org.openbravo.base.model.ModelProvider;
+import org.openbravo.base.model.Property;
+import org.openbravo.client.kernel.event.EntityPersistenceEventObserver;
+import org.openbravo.client.kernel.event.EntityUpdateEvent;
+import org.openbravo.database.SessionInfo;
+import org.openbravo.model.ad.system.SystemInformation;
+
+/**
+ * Observes changes in SystemInformation to cache value of usage audit check.
+ * 
+ * @author alostale
+ * 
+ */
+public class UsageAuditHandler extends EntityPersistenceEventObserver {
+  private static final String SYSTEM_INFO_TABLE_ID = "1005400005";
+  private static final Entity[] entities = { ModelProvider.getInstance().getEntityByTableId(
+      SYSTEM_INFO_TABLE_ID) };
+  private static final Property usageAuditProperty = entities[0]
+      .getProperty(SystemInformation.PROPERTY_ISUSAGEAUDITENABLED);
+  private static final Logger log = Logger.getLogger(UsageAuditHandler.class);
+
+  public void onUpdate(@Observes EntityUpdateEvent event) {
+    if (!isValidEvent(event)) {
+      return;
+    }
+    try {
+      SessionInfo.setUsageAuditActive((Boolean) event.getCurrentState(usageAuditProperty));
+    } catch (Exception e) {
+      log.error("Error setting usage audit", e);
+    }
+  }
+
+  @Override
+  protected Entity[] getObservedEntities() {
+    return entities;
+  }
+}
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/QuickLaunchDataSource.java	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/QuickLaunchDataSource.java	Thu May 24 08:59:54 2012 +0000
@@ -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/navigationbarcomponents/UserInfoWidgetActionHandler.java	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/UserInfoWidgetActionHandler.java	Thu May 24 08:59:54 2012 +0000
@@ -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) 2009-2011 Openbravo SLU 
+ * All portions are Copyright (C) 2009-2012 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -43,7 +43,6 @@
 import org.openbravo.dal.core.DalUtil;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.security.OrganizationStructureProvider;
-import org.openbravo.dal.service.OBCriteria;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.dal.service.OBQuery;
 import org.openbravo.erpCommon.obps.ActivationKey;
@@ -58,6 +57,7 @@
 import org.openbravo.model.common.enterprise.Organization;
 import org.openbravo.model.common.enterprise.Warehouse;
 import org.openbravo.service.db.DalConnectionProvider;
+import org.openbravo.service.json.JsonConstants;
 import org.openbravo.utils.FormatUtilities;
 
 /**
@@ -160,9 +160,13 @@
     final List<Role> roles = getRoles(parameters);
     final List<Role> sortedRoles = new ArrayList<Role>(roles);
     DalUtil.sortByIdentifier(sortedRoles);
-    final JSONObject valueMap = new JSONObject();
+    final JSONArray valueMap = new JSONArray();
     for (Role role : sortedRoles) {
-      valueMap.put(role.getId(), role.getIdentifier() + " - " + role.getClient().getIdentifier());
+      final JSONObject valueMapItem = new JSONObject();
+      valueMapItem.put(JsonConstants.ID, role.getId());
+      valueMapItem.put(JsonConstants.IDENTIFIER, role.getIdentifier() + " - "
+          + role.getClient().getIdentifier());
+      valueMap.put(valueMapItem);
     }
     formItemInfo.put("valueMap", valueMap);
 
@@ -177,24 +181,26 @@
 
       // now set the organizations
       final List<Organization> orgs = getOrganizations(role.getId());
-      final JSONObject orgValueMap = new JSONObject();
+      final JSONArray orgValueMap = new JSONArray();
       for (Organization org : orgs) {
-        orgValueMap.put(org.getId(), org.getIdentifier());
+        final JSONObject orgValueMapItem = new JSONObject();
+        orgValueMapItem.put(JsonConstants.ID, org.getId());
+        orgValueMapItem.put(JsonConstants.IDENTIFIER, org.getIdentifier());
+        orgValueMap.put(orgValueMapItem);
       }
       jsonRole.put("organizationValueMap", orgValueMap);
-      jsonRole.put("warehouseOrgMap", getWarehouses(role.getClient().getId()));
+      jsonRole.put("warehouseOrgMap", getWarehouses(role.getClient().getId(), orgs));
       jsonRoles.put(jsonRole);
     }
     formItemInfo.put("roles", jsonRoles);
     return formItemInfo;
   }
 
-  private JSONArray getWarehouses(String clientId) throws JSONException {
+  private JSONArray getWarehouses(String clientId, List<Organization> orgs) throws JSONException {
     List<JSONObject> orgWarehouseArray = new ArrayList<JSONObject>();
     final OrganizationStructureProvider osp = OBContext.getOBContext()
         .getOrganizationStructureProvider(clientId);
-    OBCriteria<Organization> orgs = OBDal.getInstance().createCriteria(Organization.class);
-    for (Organization org : orgs.list()) {
+    for (Organization org : orgs) {
       JSONObject orgWarehouse = new JSONObject();
       orgWarehouse.put("orgId", org.getId());
       final OBQuery<Warehouse> warehouses = OBDal
@@ -254,15 +260,17 @@
     return initialValues;
   }
 
-  private JSONObject createValueMapObject(List<? extends BaseOBObject> objects)
-      throws JSONException {
+  private JSONArray createValueMapObject(List<? extends BaseOBObject> objects) throws JSONException {
     // sort the list by their identifier
     DalUtil.sortByIdentifier(objects);
-    final JSONObject jsonObject = new JSONObject();
+    final JSONArray jsonArray = new JSONArray();
     for (BaseOBObject bob : objects) {
-      jsonObject.append((String) bob.getId(), bob.getIdentifier());
+      final JSONObject jsonArrayItem = new JSONObject();
+      jsonArrayItem.put(JsonConstants.ID, (String) bob.getId());
+      jsonArrayItem.put(JsonConstants.IDENTIFIER, (String) bob.getIdentifier());
+      jsonArray.put(jsonArrayItem);
     }
-    return jsonObject;
+    return jsonArray;
   }
 
   protected List<Role> getRoles(Map<String, Object> parameters) {
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-tab.js.ftl	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-tab.js.ftl	Thu May 24 08:59:54 2012 +0000
@@ -12,7 +12,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010-2011 Openbravo SLU
+ * All portions are Copyright (C) 2010-2012 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -25,7 +25,7 @@
         
     tabTitle: '${tabComponent.tabTitle?js_string}',
     entity:  '${tabComponent.entityName}',
-    
+    isDeleteableTable: ${tabComponent.deleteableTable?string},
     <#if tabComponent.parentProperty != ''>
         parentProperty: '${tabComponent.parentProperty?js_string}',
     </#if>
@@ -138,7 +138,7 @@
     </#list>],
     
     <#if tabComponent.childTabs?has_content>
-        hasChildTabs: true,
+        hasChildTabs: ${tabComponent.hasChildTabsProperty},
         createViewStructure: function() {
             <#list tabComponent.childTabs as childTabComponent>
             this.addChildView(
@@ -156,4 +156,4 @@
         this.viewGrid = ${tabComponent.viewGrid};
         this.Super('initWidget', arguments);
     }
-</#macro>
+</#macro>
\ No newline at end of file
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ApplicationDictionaryCachedStructures.java	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ApplicationDictionaryCachedStructures.java	Thu May 24 08:59:54 2012 +0000
@@ -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	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java	Thu May 24 08:59:54 2012 +0000
@@ -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>();
@@ -256,6 +257,7 @@
       long t9 = System.currentTimeMillis();
       JSONObject finalObject = buildJSONObject(mode, tab, columnValues, row, changeEventCols,
           calloutMessages, attachments, jsExcuteCode, hiddenInputs, noteCount);
+      analyzeResponse(tab, columnValues);
       long t10 = System.currentTimeMillis();
       log.debug("Elapsed time: " + (System.currentTimeMillis() - iniTime) + "(" + (t2 - t1) + ","
           + (t3 - t2) + "," + (t4 - t3) + "," + (t5 - t4) + "," + (t6 - t5) + "," + (t7 - t6) + ","
@@ -276,11 +278,45 @@
     return null;
   }
 
+  private void analyzeResponse(Tab tab, Map<String, JSONObject> columnValues) {
+    int maxEntries = 1000;
+    int i = 0;
+    String heavyCols = "";
+    for (String col : columnValues.keySet()) {
+      if (columnValues.get(col).has("entries")) {
+        try {
+          JSONArray array = columnValues.get(col).getJSONArray("entries");
+          if (array.length() > maxEntries) {
+            if (i > 0) {
+              heavyCols += ",";
+            }
+            heavyCols += col;
+            i++;
+          }
+        } catch (JSONException e) {
+          log.error("There was an error while analyzing the response for field: " + col);
+        }
+      }
+    }
+    if (!"".equals(heavyCols)) {
+      log.warn("Warning: In the window "
+          + tab.getWindow().getName()
+          + ", in tab "
+          + tab.getName()
+          + " the combo fields "
+          + heavyCols
+          + " contain more than "
+          + maxEntries
+          + " entries, and this could cause bad performance in the application. Possible fixes include changing these columns from a combo into a Selector, or adding a validation to reduce the number of entries in the combo.");
+    }
+  }
+
   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 +334,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 +422,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 +430,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());
           }
@@ -1389,7 +1430,7 @@
     String initS = "id=\"paramArray\">";
     String resp = calloutResponse.substring(calloutResponse.indexOf(initS) + initS.length());
     resp = resp.substring(0, resp.indexOf("</")).trim();
-    if (!resp.contains("new Array(")) {
+    if (!resp.contains("new Array(") && !resp.contains("[[")) {
       return null;
     }
     try {
@@ -1547,6 +1588,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/src/org/openbravo/client/application/window/OBViewTab.java	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java	Thu May 24 08:59:54 2012 +0000
@@ -243,6 +243,10 @@
     return parentProperty;
   }
 
+  public boolean getDeleteableTable() {
+    return tab.getTable().isDeletableRecords();
+  }
+
   public String getViewForm() {
     // force a load all the columns of the table
     getTab().getTable().getADColumnList().size();
@@ -279,6 +283,57 @@
     return childTabs;
   }
 
+  private boolean hasAlwaysVisibleChildTab() {
+    boolean hasVisibleChildTab = false;
+    for (OBViewTab childTab : this.getChildTabs()) {
+      if (!childTab.getAcctTab() && !childTab.getTrlTab()) {
+        hasVisibleChildTab = true;
+        break;
+      }
+    }
+    return hasVisibleChildTab;
+  }
+
+  private boolean hasAccountingChildTab() {
+    boolean hasAccountingChildTab = false;
+    for (OBViewTab childTab : this.getChildTabs()) {
+      if (childTab.getAcctTab()) {
+        hasAccountingChildTab = true;
+        break;
+      }
+    }
+    return hasAccountingChildTab;
+  }
+
+  private boolean hasTranslationChildTab() {
+    boolean hasTranslationChildTab = false;
+    for (OBViewTab childTab : this.getChildTabs()) {
+      if (childTab.getTrlTab()) {
+        hasTranslationChildTab = true;
+        break;
+      }
+    }
+    return hasTranslationChildTab;
+  }
+
+  public String getHasChildTabsProperty() {
+    String hasChildTabs = null;
+    if (this.hasAlwaysVisibleChildTab()) {
+      hasChildTabs = "true";
+    } else {
+      boolean hasAcctChildTab = this.hasAccountingChildTab();
+      boolean hasTrlChildTab = this.hasTranslationChildTab();
+      if (hasAcctChildTab && hasTrlChildTab) {
+        hasChildTabs = "(OB.PropertyStore.get('ShowTrl', this.windowId) === 'Y') || (OB.PropertyStore.get('ShowAcct', this.windowId) === 'Y')";
+      } else if (hasAcctChildTab) {
+        hasChildTabs = "(OB.PropertyStore.get('ShowAcct', this.windowId) === 'Y')";
+      } else { // hasTrlChildTab == true
+        hasChildTabs = "(OB.PropertyStore.get('ShowTrl', this.windowId) === 'Y')";
+      }
+    }
+    return hasChildTabs;
+  }
+
   public Tab getTab() {
     return tab;
   }
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-encrypted.js	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-encrypted.js	Thu May 24 08:59:54 2012 +0000
@@ -24,6 +24,10 @@
 isc.OBEncryptedItem.addProperties({
   operator: 'iContains',
   changed: function (form, item, value) {
+    this.Super('changed', arguments);
     this.form.setValue(item.name + '_cleartext', value);
+    if (this.grid.getEditRow() !== null) {
+      this.grid.getEditValues(this.grid.getEditRow())[item.name + '_cleartext'] = value;
+    }
   }
 });
\ No newline at end of file
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js	Thu May 24 08:59:54 2012 +0000
@@ -316,6 +316,16 @@
       return;
     }
 
+    if (criterion.operator === 'isNull') {
+      this.setValue('#');
+      return;
+    }
+
+    if (criterion.operator === 'notNull') {
+      this.setValue('!#');
+      return;
+    }
+
     if (criterion.operator === 'equals') {
       this.setSingleDateValue(criterion.value);
       return;
@@ -331,6 +341,19 @@
   },
 
   getCriterion: function () {
+    var value = this.blurValue();
+    if (value === '#') {
+      return {
+        fieldName: this.name,
+        operator: 'isNull'
+      };
+    }
+    if (value === '!#') {
+      return {
+        fieldName: this.name,
+        operator: 'notNull'
+      };
+    }
     if (this.singleDateValue) {
       return {
         fieldName: this.name,
@@ -343,6 +366,10 @@
   },
 
   canEditCriterion: function (criterion) {
+
+    if (criterion.fieldName === this.name && (criterion.operator === 'isNull' || criterion.operator === 'notNull')) {
+      return true;
+    }
     if (this.singleDateMode && criterion.fieldName === this.name) {
       return true;
     }
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-search.js	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-search.js	Thu May 24 08:59:54 2012 +0000
@@ -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-linked-items.js	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-linked-items.js	Thu May 24 08:59:54 2012 +0000
@@ -308,7 +308,7 @@
       height: 300,
       dataSource: this.linkedItemCategoryDS,
       layout: this,
-      emptyDataMessage: this.emptyMessage,
+      emptyDataMessage: OB.I18N.getLabel('OBUISC_ListGrid.emptyMessage'),
       loadingDataMessage: OB.I18N.getLabel('OBUISC_ListGrid.loadingDataMessage'),
       recordClick: 'this.layout.loadLinkedItems(record)',
       showFilterEditor: true,
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js	Thu May 24 08:59:54 2012 +0000
@@ -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;
+        }
       }
     }
   },
@@ -1338,7 +1346,7 @@
   saveRow: function () {
     var savingNewRecord = this.isNew,
         i, length, flds, form = this,
-        ficCallDone, record, recordIndex, callback;
+        ficCallDone, record, recordIndex, callback, viewsNotToRefresh;
 
     // store the value of the current focus item
     if (this.getFocusItem() && this.saveFocusItemChanged !== this.getFocusItem()) {
@@ -1444,9 +1452,19 @@
         form.setNewState(false);
 
         view.refreshParentRecord();
-        // Refreshes the child views that belong to the same entity
+
+        // Refreshes the selected record of the views that belong to the same entity
         // as the view being saved
-        view.refreshChildViewsWithEntity(this.view.entity);
+        if (view.standardWindow) {
+          viewsNotToRefresh = [];
+          // there is no need to refresh the current view...
+          viewsNotToRefresh[0] = view.tabId;
+          if (view.parentView) {
+            //  ... nor the parent view, if any (it would have been refreshed just a few lines ago)
+            viewsNotToRefresh[1] = view.parentView.tabId;
+          }
+          view.standardWindow.refreshViewsWithEntity(this.view.entity, viewsNotToRefresh);
+        }
 
         // We fill attachments in case the record is new, so that components
         // of the attachments section are created
@@ -1667,7 +1685,9 @@
 
       return '<span class="OBFormFieldLinkButton">' + titleHTML + '</span>&nbsp;' + imgHTML;
     }
-
+    //is not a link therefore this property is not needed.
+    //if this property is null the click event won't open a new tab
+    item.linkButtonClick = null;
     return titleHTML;
   },
 
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js	Thu May 24 08:59:54 2012 +0000
@@ -502,7 +502,7 @@
       this.filterImage.hide();
     }
 
-    if (this.filterClause && !this.view.isShowingForm && !this.view.messageBar.isVisible()) {
+    if (this.filterClause && !this.view.isShowingForm && (this.view.messageBar && !this.view.messageBar.isVisible())) {
       var showMessageProperty = OB.PropertyStore.get('OBUIAPP_ShowImplicitFilterMsg'),
           showMessage = (showMessageProperty !== 'N' && showMessageProperty !== '"N"' && noParentOrParentSelected);
       if (showMessage) {
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js	Thu May 24 08:59:54 2012 +0000
@@ -50,8 +50,9 @@
   editLinkFieldProperties: {
     type: 'text',
     canSort: false,
+    canReorder: false,
     frozen: true,
-    canFreeze: true,
+    canFreeze: false,
     canEdit: false,
     canGroupBy: false,
     canHide: false,
@@ -355,6 +356,18 @@
     this.setFields(this.completeFields.duplicate());
   },
 
+  setReadOnlyMode: function () {
+    if (this.uiPattern !== 'RO') {
+      this.uiPattern = 'RO';
+      this.canEdit = false;
+      if (this.contextMenu) {
+        this.contextMenu.destroy();
+        this.contextMenu = null;
+      }
+      this.refreshContents();
+    }
+  },
+
   draw: function () {
     var drawnBefore = this.isDrawn(),
         i, form, item, items, length;
@@ -1405,7 +1418,7 @@
         }
       });
     }
-    if (recordsSelected && !this.view.readOnly && !this.view.singleRecord && this.allSelectedRecordsWritable()) {
+    if (this.view.isDeleteableTable && recordsSelected && !this.view.readOnly && !this.view.singleRecord && this.allSelectedRecordsWritable()) {
       menuItems.add({
         title: OB.I18N.getLabel('OBUIAPP_Delete'),
         keyTitle: OB.KeyboardManager.Shortcuts.getProperty('keyComb.text', 'ToolBar_Eliminate', 'id'),
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js	Thu May 24 08:59:54 2012 +0000
@@ -399,7 +399,8 @@
   // ** {{{ createMainParts }}} **
   // Creates the main layout components of this view.
   createMainParts: function () {
-    var me = this;
+    var me = this,
+        completeFieldsWithoutImages, fieldsWithoutImages;
     if (this.tabId && this.tabId.length > 0) {
       this.formGridLayout = isc.HLayout.create({
         canFocus: true,
@@ -428,7 +429,12 @@
         }
       });
 
-      this.viewGrid.setDataSource(this.dataSource, this.viewGrid.completeFields || this.viewGrid.fields);
+      // the grid should not show the image fields
+      // see issue 20049 (https://issues.openbravo.com/view.php?id=20049)
+      completeFieldsWithoutImages = this.removeImageFields(this.viewGrid.completeFields);
+      fieldsWithoutImages = this.removeImageFields(this.viewGrid.fields);
+
+      this.viewGrid.setDataSource(this.dataSource, completeFieldsWithoutImages || fieldsWithoutImages);
 
       if (this.viewGrid) {
         this.viewGrid.setWidth('100%');
@@ -506,6 +512,31 @@
     }
   },
 
+  // returns a copy of fields after deleting the image fields
+  // see issue 20049 (https://issues.openbravo.com/view.php?id=20049)
+  removeImageFields: function (fields) {
+    var indexesToDelete, i, length, fieldsWithoutImages;
+    indexesToDelete = [];
+    if (fields) {
+      fieldsWithoutImages = fields.duplicate();
+      length = fieldsWithoutImages.length;
+      // gets the index of the image fields
+      for (i = 0; i < length; i++) {
+        if (fieldsWithoutImages[i].targetEntity === 'ADImage') {
+          indexesToDelete.push(i);
+        }
+      }
+      // removes the image fields
+      length = indexesToDelete.length;
+      for (i = 0; i < length; i++) {
+        fieldsWithoutImages.splice(indexesToDelete[i] - i, 1);
+      }
+    } else {
+      fieldsWithoutImages = fields;
+    }
+    return fieldsWithoutImages;
+  },
+
   getDirectLinkUrl: function () {
     var url = window.location.href,
         crit;
@@ -616,6 +647,9 @@
   setReadOnly: function (readOnly) {
     this.readOnly = readOnly;
     this.viewForm.readOnly = readOnly;
+    if (this.viewGrid && readOnly) {
+      this.viewGrid.setReadOnlyMode();
+    }
   },
 
   setSingleRecord: function (singleRecord) {
@@ -837,19 +871,33 @@
     }
   },
 
-  refreshChildViewsWithEntity: function (entity) {
-    var i, length, tabViewPane;
-    if (entity && this.childTabSet) {
-      length = this.childTabSet.tabs.length;
-      for (i = 0; i < length; i++) {
-        tabViewPane = this.childTabSet.tabs[i].pane;
-        // if the view belong to the input entity, it is refreshed
-        // See https://issues.openbravo.com/view.php?id=18951
-        if (tabViewPane && tabViewPane.entity === entity) {
-          tabViewPane.doRefreshContents(true);
+  refreshMeAndMyChildViewsWithEntity: function (entity, excludedTabIds) {
+    var i, length, tabViewPane, excludeTab = false;
+    if (entity && excludedTabIds) {
+      //Check is the tab has to be refreshed
+      for (i = 0; i < excludedTabIds.length; i++) {
+        if (excludedTabIds[i].match(this.tabId)) {
+          excludeTab = true;
+          // removes the tabId from the list of excluded, so it does
+          // not have to be checked by the child tabs
+          excludedTabIds.splice(i, 1);
+          break;
         }
-        // Refresh the child views of these tab
-        tabViewPane.refreshChildViewsWithEntity(entity);
+      }
+      // If it the tab is not in the exclude list, refresh 
+      // it if it belongs to the entered entity
+      if (!excludeTab) {
+        if (this.entity === entity) {
+          this.doRefreshContents(true);
+        }
+      }
+      // Refresh the child views of this tab
+      if (this.childTabSet) {
+        length = this.childTabSet.tabs.length;
+        for (i = 0; i < length; i++) {
+          tabViewPane = this.childTabSet.tabs[i].pane;
+          tabViewPane.refreshMeAndMyChildViewsWithEntity(entity, excludedTabIds);
+        }
       }
     }
   },
@@ -1432,7 +1480,7 @@
     var msg, dialogTitle, view = this,
         deleteCount, callback;
 
-    if (!this.readOnly) {
+    if (!this.readOnly && this.isDeleteableTable) {
       // first save what we have edited
       if (!autoSaveDone) {
         var actionObject = {
@@ -1925,10 +1973,10 @@
     return result;
   },
 
-  setFieldFormProperties: function (fld) {
+  setFieldFormProperties: function (fld, isGridField) {
     var onChangeFunction;
 
-    if (fld.displayed === false) {
+    if (fld.displayed === false && !isGridField) {
       fld.visible = false;
       fld.alwaysTakeSpace = false;
     }
@@ -2053,8 +2101,8 @@
       fld.escapeHTML = (fld.escapeHTML === false ? false : true);
       fld.prompt = fld.title;
       fld.editorProperties = isc.addProperties({}, fld, isc.shallowClone(fld.editorProps));
-      this.setFieldFormProperties(fld.editorProperties);
-
+      //issue 20192: 2nd parameter is true because fld.editorProperties is a grid property.
+      this.setFieldFormProperties(fld.editorProperties, true);
       if (fld.disabled) {
         fld.editorProperties.disabled = true;
       }
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js	Thu May 24 08:59:54 2012 +0000
@@ -181,6 +181,15 @@
     }
   },
 
+  //  Refreshes the selected records of all the window views, provided:
+  //  - They belong to the entity specified in the 'entity' parameter
+  //  - They are not included in the 'excludedTabIds' list
+  refreshViewsWithEntity: function (entity, excludedTabIds) {
+    if (this.view) {
+      this.view.refreshMeAndMyChildViewsWithEntity(entity, excludedTabIds);
+    }
+  },
+
   readWindowSettings: function () {
     var standardWindow = this;
 
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-tab.js	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-tab.js	Thu May 24 08:59:54 2012 +0000
@@ -334,6 +334,9 @@
   // when a tab is drawn the first time it steals the focus 
   // from the active view, prevent this
   focus: function () {
+    if (this.parentElement.tabSet.tabPicker) {
+      this.pane.setAsActiveView();
+    }
     if (this.pane.isActiveView && this.pane.isActiveView()) {
       this.Super('focus', arguments);
     }
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-quick-launch.js	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-quick-launch.js	Thu May 24 08:59:54 2012 +0000
@@ -192,7 +192,7 @@
         getPickListFilterCriteria: function () {
           // only filter on identifier
           var criteria = {};
-          criteria[OB.Constants.IDENTIFIER] = this.getValue();
+          criteria[OB.Constants.IDENTIFIER] = this.getDisplayValue();
           return criteria;
         },
         pickListFields: [{
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-user-profile-widget.js	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-user-profile-widget.js	Thu May 24 08:59:54 2012 +0000
@@ -104,10 +104,6 @@
       pickListTallBaseStyle: OB.Styles.OBFormField.DefaultComboBox.pickListTallBaseStyle,
       pickerIconSrc: OB.Styles.OBFormField.DefaultComboBox.pickerIconSrc,
 
-      // without this in chrome the content is sorted according to the id/value
-      // not the displayfield
-      sortField: 0,
-
       height: OB.Styles.OBFormField.DefaultComboBox.height,
       pickerIconWidth: OB.Styles.OBFormField.DefaultComboBox.pickerIconWidth,
       pickListCellHeight: OB.Styles.OBFormField.DefaultComboBox.pickListCellHeight,
@@ -130,7 +126,34 @@
       selectOnFocus: true,
       addUnknownValues: false,
       allowEmptyValue: false,
-      defaultToFirstOption: true
+      defaultToFirstOption: true,
+
+      // to solve: https://issues.openbravo.com/view.php?id=20067
+      // in chrome the order of the valueMap object is not retained
+      // the solution is to keep a separate entries array with the
+      // records in the correct order, see also the setEntries
+      // method
+      getClientPickListData: function () {
+        if (this.entries) {
+          return this.entries;
+        }
+        return this.Super('getClientPickListData', arguments);
+      },
+
+      setEntries: function (entries) {
+        var length = entries.length,
+            i, id, identifier, valueField = this.getValueFieldName(),
+            valueMap = {};
+        this.entries = [];
+        for (i = 0; i < length; i++) {
+          id = entries[i][OB.Constants.ID] || '';
+          identifier = entries[i][OB.Constants.IDENTIFIER] || '';
+          valueMap[id] = identifier;
+          this.entries[i] = {};
+          this.entries[i][valueField] = id;
+        }
+        this.setValueMap(valueMap);
+      }
     };
 
     roleField = isc.addProperties({
@@ -224,7 +247,7 @@
         // this is needed because the select items will reject values
         // if the valuemap is not yet set
         this.setValue('role', this.localFormData.initialValues.role);
-        this.setValueMaps();
+        this.setOtherEntries();
         // note, need to make a copy of the initial values
         // otherwise they are updated when the form values change!
         this.setValues(isc.addProperties({}, this.localFormData.initialValues));
@@ -239,11 +262,11 @@
         // order of these statements is important see comments in reset
         // function
         this.localFormData = data;
-        this.setValueMap('language', data.language.valueMap);
-        this.setValueMap('role', data.role.valueMap);
+        this.getItem('language').setEntries(data.language.valueMap);
+        this.getItem('role').setEntries(data.role.valueMap);
         this.setValue('role', data.initialValues.role);
         this.setValue('client', data.initialValues.client);
-        this.setValueMaps();
+        this.setOtherEntries();
         //First we set initial values, but warehouse will not work
         //as its combo hasn't yet been filled
         this.setValues(isc.addProperties({}, data.initialValues));
@@ -253,7 +276,7 @@
       },
       // updates the dependent combos
       itemChanged: function (item, newValue) {
-        this.setValueMaps();
+        this.setOtherEntries();
         if (item.name === 'role') {
           if (this.getItem('organization').getClientPickListData().length > 0) {
             this.getItem('organization').moveToFirstValue();
@@ -266,13 +289,13 @@
           }
         }
       },
-      setValueMaps: function () {
+      setOtherEntries: function () {
         var i, role, roleId = this.getValue('role'),
             length = this.localFormData.role.roles.length;
         for (i = 0; i < length; i++) {
           role = this.localFormData.role.roles[i];
           if (role.id === roleId) {
-            this.setValueMap('organization', role.organizationValueMap);
+            this.getItem('organization').setEntries(role.organizationValueMap);
             this.setValue('client', role.client);
           }
         }
@@ -291,7 +314,7 @@
             for (j = 0; j < length; j++) {
               warehouseOrg = role.warehouseOrgMap[j];
               if (warehouseOrg.orgId === orgId) {
-                this.setValueMap('warehouse', warehouseOrg.warehouseMap);
+                this.getItem('warehouse').setEntries(warehouseOrg.warehouseMap);
               }
             }
           }
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js	Thu May 24 08:59:54 2012 +0000
@@ -101,6 +101,8 @@
       filterEditorType: 'StaticTextItem'
     });
 
+    OB.TestRegistry.register('org.openbravo.client.application.process.pickandexecute.Grid', this);
+
     this.Super('initWidget', arguments);
   },
 
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-view.js	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-view.js	Thu May 24 08:59:54 2012 +0000
@@ -49,7 +49,7 @@
   initWidget: function () {
 
     var view = this,
-        okButton, cancelButton, i, buttonLayout = [];
+        okButton, newButton, cancelButton, i, buttonLayout = [];
 
     function actionClick() {
       if (view.validate()) {
@@ -109,11 +109,14 @@
       for (i in this.buttons) {
         if (this.buttons.hasOwnProperty(i)) {
 
-          buttonLayout.push(isc.OBFormButton.create({
+          newButton = isc.OBFormButton.create({
             title: this.buttons[i],
             _buttonValue: i,
             click: actionClick
-          }));
+          });
+          buttonLayout.push(newButton);
+          OB.TestRegistry.register('org.openbravo.client.application.process.pickandexecute.button.' + i, newButton);
+
 
           // pushing a spacer
           buttonLayout.push(isc.LayoutSpacer.create({
@@ -123,6 +126,7 @@
       }
     } else {
       buttonLayout.push(okButton);
+      OB.TestRegistry.register('org.openbravo.client.application.process.pickandexecute.button.ok', okButton);
       buttonLayout.push(isc.LayoutSpacer.create({
         width: 32
       }));
@@ -130,6 +134,8 @@
 
     buttonLayout.push(cancelButton);
     buttonLayout.push(isc.LayoutSpacer.create({}));
+    OB.TestRegistry.register('org.openbravo.client.application.process.pickandexecute.button.cancel', cancelButton);
+
 
     if (this.viewProperties.allowAdd) {
       this.addNewButton = isc.OBLinkButtonItem.create({
@@ -144,7 +150,7 @@
         }
       });
     }
-    OB.TestRegistry.register('org.openbravo.client.application.navigationbarcomponents.pickandexecute.button.addnew', this.addNewButton);
+    OB.TestRegistry.register('org.openbravo.client.application.process.pickandexecute.button.addnew', this.addNewButton);
 
     this.items = [this.viewGrid, isc.HLayout.create({
       height: 1,
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-action-button.js	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-action-button.js	Thu May 24 08:59:54 2012 +0000
@@ -135,11 +135,11 @@
     theView.setContextInfo(sessionProperties, callbackFunction, true);
   },
 
-  closeProcessPopup: function (newWindow) {
+  closeProcessPopup: function (newWindow, params) {
     //Keep current view for the callback function. Refresh and look for tab message.
     var contextView = OB.ActionButton.executingProcess.contextView,
         currentView = this.view,
-        afterRefresh;
+        afterRefresh, parsePathPart, parts;
 
     afterRefresh = function (doRefresh) {
       var undef, refresh = (doRefresh === undef || doRefresh);
@@ -182,6 +182,13 @@
     OB.ActionButton.executingProcess = null;
 
     if (newWindow) {
+      // Split path into protocol, server, port part and the rest (pathname, query, etc)
+      parsePathPart = /^((?:[A-Za-z]+:)?\/\/[^\/]+)?(\/.*)$/;
+      parts = parsePathPart.exec(newWindow);
+      if (parts && parts[2]) {
+        newWindow = parts[2];
+      }
+
       if (OB.Application.contextUrl && newWindow.indexOf(OB.Application.contextUrl) !== -1) {
         newWindow = newWindow.substr(newWindow.indexOf(OB.Application.contextUrl) + OB.Application.contextUrl.length - 1);
       }
@@ -194,11 +201,20 @@
         // Refreshing current tab, do not open it again.
         return;
       }
+
       var windowParams = {
         viewId: this.title,
         tabTitle: this.title,
         obManualURL: newWindow
       };
+      if (params) {
+        if (params.tabTitle) {
+          windowParams.tabTitle = params.tabTitle;
+        }
+        if (params.addToRecents !== null && params.addToRecents !== undefined) {
+          windowParams.addToRecents = params.addToRecents;
+        }
+      }
       OB.Layout.ViewManager.openView('OBClassicWindow', windowParams);
     }
   },
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js	Thu May 24 08:59:54 2012 +0000
@@ -157,7 +157,10 @@
           selectedRecords = grid.getSelectedRecords(),
           length = selectedRecords.length,
           i;
-
+      if (!this.view.isDeleteableTable) {
+        this.setDisabled(true);
+        return;
+      }
       for (i = 0; i < length; i++) {
         if (!grid.isWritable(selectedRecords[i])) {
           this.setDisabled(true);
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-view-manager.js	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-view-manager.js	Thu May 24 08:59:54 2012 +0000
@@ -231,7 +231,7 @@
     // to initialize an instance.
     //
     openView: function (viewName, params, state) {
-
+      var recentObjProperties;
       params = params || {};
 
       // only add closable views to the recent items, this prevents the workspace
@@ -247,10 +247,15 @@
         if (!params.viewId) {
           params.viewId = viewName;
         }
-        // add and set a default icon
-        vmgr.recentManager.addRecent('OBUIAPP_RecentViewList', isc.addProperties({
-          icon: OB.Styles.OBApplicationMenu.Icons.window
-        }, params));
+        //If recents receives null in params the tab is not added to the recent list
+        recentObjProperties = null;
+        if (params.addToRecents === undefined || params.addToRecents === null || params.addToRecents === true) {
+          // add and set a default icon
+          recentObjProperties = isc.addProperties({
+            icon: OB.Styles.OBApplicationMenu.Icons.window
+          }, params);
+        }
+        vmgr.recentManager.addRecent('OBUIAPP_RecentViewList', recentObjProperties);
       }
 
       //
--- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Thu May 24 08:59:54 2012 +0000
@@ -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.15736]]></VERSION>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.16285]]></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.3]]></VERSION_LABEL>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION_LABEL><![CDATA[MP11]]></VERSION_LABEL>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--D393BE6F22BB44B7B728259B34FC795A--></AD_MODULE>
 
--- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu May 24 08:59:54 2012 +0000
@@ -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.15736]]></STARTVERSION>
+<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.16285]]></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.htmlwidget/web/org.openbravo.client.htmlwidget/js/ob-html-widget.js	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.htmlwidget/web/org.openbravo.client.htmlwidget/js/ob-html-widget.js	Thu May 24 08:59:54 2012 +0000
@@ -50,7 +50,7 @@
     if (this.parameters.htmlcode) {
       this.contentSource = this.evaluateContents(this.parameters.htmlcode);
     }
-    this.windowContents.contents = this.contentSource;
+    this.windowContents.setContents(this.contentSource);
   },
 
   setWidgetHeight: function () {
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_COLUMN.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_COLUMN.xml	Thu May 24 08:59:54 2012 +0000
@@ -43,7 +43,7 @@
 <!--06E9B50BBF2D4869B028F51D11D432F6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--06E9B50BBF2D4869B028F51D11D432F6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--06E9B50BBF2D4869B028F51D11D432F6-->  <NAME><![CDATA[Updated]]></NAME>
-<!--06E9B50BBF2D4869B028F51D11D432F6-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--06E9B50BBF2D4869B028F51D11D432F6-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
 <!--06E9B50BBF2D4869B028F51D11D432F6-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
 <!--06E9B50BBF2D4869B028F51D11D432F6-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
 <!--06E9B50BBF2D4869B028F51D11D432F6-->  <AD_TABLE_ID><![CDATA[457C2166008B451093B2DA54A0F7E2EC]]></AD_TABLE_ID>
@@ -690,7 +690,7 @@
 <!--83756C850F774F748ECEAD93A6955E3B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--83756C850F774F748ECEAD93A6955E3B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--83756C850F774F748ECEAD93A6955E3B-->  <NAME><![CDATA[Updated]]></NAME>
-<!--83756C850F774F748ECEAD93A6955E3B-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--83756C850F774F748ECEAD93A6955E3B-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
 <!--83756C850F774F748ECEAD93A6955E3B-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
 <!--83756C850F774F748ECEAD93A6955E3B-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
 <!--83756C850F774F748ECEAD93A6955E3B-->  <AD_TABLE_ID><![CDATA[AB51D583178F4F4EB6B8DB44C64654BE]]></AD_TABLE_ID>
@@ -975,7 +975,7 @@
 <!--AAEC3080B87242B2958AFDDEE6CCAF60-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--AAEC3080B87242B2958AFDDEE6CCAF60-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--AAEC3080B87242B2958AFDDEE6CCAF60-->  <NAME><![CDATA[Updated]]></NAME>
-<!--AAEC3080B87242B2958AFDDEE6CCAF60-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--AAEC3080B87242B2958AFDDEE6CCAF60-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
 <!--AAEC3080B87242B2958AFDDEE6CCAF60-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
 <!--AAEC3080B87242B2958AFDDEE6CCAF60-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
 <!--AAEC3080B87242B2958AFDDEE6CCAF60-->  <AD_TABLE_ID><![CDATA[0B4D8D299242448DA1EA797FAA617297]]></AD_TABLE_ID>
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_FIELD.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_FIELD.xml	Thu May 24 08:59:54 2012 +0000
@@ -5,7 +5,7 @@
 <!--0F2B0754DC9843D5B3D7EC7D2FF07C8F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--0F2B0754DC9843D5B3D7EC7D2FF07C8F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0F2B0754DC9843D5B3D7EC7D2FF07C8F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--0F2B0754DC9843D5B3D7EC7D2FF07C8F-->  <NAME><![CDATA[Depends on Template ]]></NAME>
+<!--0F2B0754DC9843D5B3D7EC7D2FF07C8F-->  <NAME><![CDATA[Depends On Template ]]></NAME>
 <!--0F2B0754DC9843D5B3D7EC7D2FF07C8F-->  <DESCRIPTION><![CDATA[The template on which the current template depends]]></DESCRIPTION>
 <!--0F2B0754DC9843D5B3D7EC7D2FF07C8F-->  <HELP><![CDATA[Defines the template on which the current template depends.]]></HELP>
 <!--0F2B0754DC9843D5B3D7EC7D2FF07C8F-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
@@ -33,7 +33,7 @@
 <!--1A23F87E116C443F837BC9C2A8BD7EC2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--1A23F87E116C443F837BC9C2A8BD7EC2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--1A23F87E116C443F837BC9C2A8BD7EC2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--1A23F87E116C443F837BC9C2A8BD7EC2-->  <NAME><![CDATA[ComponentType]]></NAME>
+<!--1A23F87E116C443F837BC9C2A8BD7EC2-->  <NAME><![CDATA[Component Type]]></NAME>
 <!--1A23F87E116C443F837BC9C2A8BD7EC2-->  <DESCRIPTION><![CDATA[A type of component for which the template operates.]]></DESCRIPTION>
 <!--1A23F87E116C443F837BC9C2A8BD7EC2-->  <HELP><![CDATA[A type of component for which the template operates.]]></HELP>
 <!--1A23F87E116C443F837BC9C2A8BD7EC2-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
@@ -259,7 +259,7 @@
 <!--5FCB19D79E454B9BB8053995417750EB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--5FCB19D79E454B9BB8053995417750EB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--5FCB19D79E454B9BB8053995417750EB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--5FCB19D79E454B9BB8053995417750EB-->  <NAME><![CDATA[TemplateClasspathLocation]]></NAME>
+<!--5FCB19D79E454B9BB8053995417750EB-->  <NAME><![CDATA[Template Classpath Location]]></NAME>
 <!--5FCB19D79E454B9BB8053995417750EB-->  <DESCRIPTION><![CDATA[Defines the location in the classpath of the template file]]></DESCRIPTION>
 <!--5FCB19D79E454B9BB8053995417750EB-->  <HELP><![CDATA[Defines the location in the classpath of the template file. The template is loaded using the classloader. The path must be an absolute path (so start with a /).]]></HELP>
 <!--5FCB19D79E454B9BB8053995417750EB-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
@@ -423,7 +423,7 @@
 <!--8CBD0C02476942F9AD2C9B69FFAEE0FB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--8CBD0C02476942F9AD2C9B69FFAEE0FB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--8CBD0C02476942F9AD2C9B69FFAEE0FB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8CBD0C02476942F9AD2C9B69FFAEE0FB-->  <NAME><![CDATA[Obclker_Template_ID]]></NAME>
+<!--8CBD0C02476942F9AD2C9B69FFAEE0FB-->  <NAME><![CDATA[Template]]></NAME>
 <!--8CBD0C02476942F9AD2C9B69FFAEE0FB-->  <DESCRIPTION><![CDATA[The template used to generate the visualization of the component.]]></DESCRIPTION>
 <!--8CBD0C02476942F9AD2C9B69FFAEE0FB-->  <HELP><![CDATA[Defines the template which is used to generate the (javascript) code to render the component.]]></HELP>
 <!--8CBD0C02476942F9AD2C9B69FFAEE0FB-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Thu May 24 08:59:54 2012 +0000
@@ -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.15736]]></VERSION>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.16285]]></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.3]]></VERSION_LABEL>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION_LABEL><![CDATA[MP11]]></VERSION_LABEL>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--4B828F4D03264080AA1D2057B13F613C--></AD_MODULE>
 
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu May 24 08:59:54 2012 +0000
@@ -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.15736]]></STARTVERSION>
+<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.16285]]></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.15736]]></STARTVERSION>
+<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <STARTVERSION><![CDATA[1.1.16285]]></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.15736]]></STARTVERSION>
+<!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <STARTVERSION><![CDATA[2.0.16285]]></STARTVERSION>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON REST Webservice]]></DEPENDANT_MODULE_NAME>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_WINDOW.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_WINDOW.xml	Thu May 24 08:59:54 2012 +0000
@@ -9,7 +9,7 @@
 <!--CB53174675F84DCEAA13D2BED48F820C-->  <DESCRIPTION><![CDATA[Maintain component templates]]></DESCRIPTION>
 <!--CB53174675F84DCEAA13D2BED48F820C-->  <HELP><![CDATA[Templates are used to convert server side components into client side representations, to javascript. Templates are called to process requests from the browser for user interface components. Templates can depend on eachother, a template can use functions/methods provided by another template. This is handled through template dependencies.]]></HELP>
 <!--CB53174675F84DCEAA13D2BED48F820C-->  <WINDOWTYPE><![CDATA[M]]></WINDOWTYPE>
-<!--CB53174675F84DCEAA13D2BED48F820C-->  <ISSOTRX><![CDATA[N]]></ISSOTRX>
+<!--CB53174675F84DCEAA13D2BED48F820C-->  <ISSOTRX><![CDATA[Y]]></ISSOTRX>
 <!--CB53174675F84DCEAA13D2BED48F820C-->  <PROCESSING><![CDATA[N]]></PROCESSING>
 <!--CB53174675F84DCEAA13D2BED48F820C-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
 <!--CB53174675F84DCEAA13D2BED48F820C-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/OBCLKER_UIDEFINITION.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/OBCLKER_UIDEFINITION.xml	Thu May 24 08:59:54 2012 +0000
@@ -6,7 +6,7 @@
 <!--013F9C27AE0944D8AD19F8E33EEAACEB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--013F9C27AE0944D8AD19F8E33EEAACEB-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
 <!--013F9C27AE0944D8AD19F8E33EEAACEB-->  <AD_REFERENCE_ID><![CDATA[800019]]></AD_REFERENCE_ID>
-<!--013F9C27AE0944D8AD19F8E33EEAACEB-->  <CLASSNAME><![CDATA[org.openbravo.client.kernel.reference.NumberUIDefinition$DecimalUIDefinition]]></CLASSNAME>
+<!--013F9C27AE0944D8AD19F8E33EEAACEB-->  <CLASSNAME><![CDATA[org.openbravo.client.kernel.reference.NumberUIDefinition$BigDecimalUIDefinition]]></CLASSNAME>
 <!--013F9C27AE0944D8AD19F8E33EEAACEB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--013F9C27AE0944D8AD19F8E33EEAACEB--></OBCLKER_UIDEFINITION>
 
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelUtils.java	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelUtils.java	Thu May 24 08:59:54 2012 +0000
@@ -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) 2010-2011 Openbravo SLU 
+ * All portions are Copyright (C) 2010-2012 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -169,6 +169,23 @@
   }
 
   /**
+   * Returns "true" if the module given its java package exists and "false" if it doesn't.
+   * 
+   * @param javaPackage
+   *          the java package used to read the module
+   * @return boolean
+   */
+  public boolean isModulePresent(String javaPackage) {
+    for (Module module : getModulesOrderedByDependency()) {
+      // do trim to handle small typing errors, consider to do lowercase also
+      if (javaPackage.trim().equals(module.getJavaPackage().trim())) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /**
    * Get a module using its java package, the module is read from the internal cache.
    * 
    * @param javaPackage
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/NumberUIDefinition.java	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/NumberUIDefinition.java	Thu May 24 08:59:54 2012 +0000
@@ -187,6 +187,16 @@
     }
   }
 
+  public static class BigDecimalUIDefinition extends NumberUIDefinition {
+    public String getParentType() {
+      return "float";
+    }
+
+    public String getFormat() {
+      return "generalQtyEdition";
+    }
+  }
+
   public static class IntegerUIDefinition extends NumberUIDefinition {
     public String getParentType() {
       return "integer";
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/application-js.ftl	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/application-js.ftl	Thu May 24 08:59:54 2012 +0000
@@ -58,6 +58,7 @@
     Constants : {
         IDENTIFIER : '_identifier',
         ID : 'id',
+        FIELDSEPARATOR : '.',
         WHERE_PARAMETER : '_where',
         ORG_PARAMETER : '_org',
         ORDERBY_PARAMETER : '_orderBy',
--- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_COLUMN.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_COLUMN.xml	Thu May 24 08:59:54 2012 +0000
@@ -293,7 +293,7 @@
 <!--47C643EA9AEC4186ADDC06863496BC5A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--47C643EA9AEC4186ADDC06863496BC5A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--47C643EA9AEC4186ADDC06863496BC5A-->  <NAME><![CDATA[Updated]]></NAME>
-<!--47C643EA9AEC4186ADDC06863496BC5A-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--47C643EA9AEC4186ADDC06863496BC5A-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
 <!--47C643EA9AEC4186ADDC06863496BC5A-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
 <!--47C643EA9AEC4186ADDC06863496BC5A-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
 <!--47C643EA9AEC4186ADDC06863496BC5A-->  <AD_TABLE_ID><![CDATA[3E14194316E64F89970960B9350907B3]]></AD_TABLE_ID>
@@ -510,7 +510,7 @@
 <!--715304FFA17641DF92F3038E78FAA03C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--715304FFA17641DF92F3038E78FAA03C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--715304FFA17641DF92F3038E78FAA03C-->  <NAME><![CDATA[Updated]]></NAME>
-<!--715304FFA17641DF92F3038E78FAA03C-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--715304FFA17641DF92F3038E78FAA03C-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
 <!--715304FFA17641DF92F3038E78FAA03C-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
 <!--715304FFA17641DF92F3038E78FAA03C-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
 <!--715304FFA17641DF92F3038E78FAA03C-->  <AD_TABLE_ID><![CDATA[09C543CF4D854CB4A706E8EF1591F042]]></AD_TABLE_ID>
@@ -976,7 +976,7 @@
 <!--927D0D118B88EF36E040A8C0CF071CF5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--927D0D118B88EF36E040A8C0CF071CF5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--927D0D118B88EF36E040A8C0CF071CF5-->  <NAME><![CDATA[Updated]]></NAME>
-<!--927D0D118B88EF36E040A8C0CF071CF5-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--927D0D118B88EF36E040A8C0CF071CF5-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
 <!--927D0D118B88EF36E040A8C0CF071CF5-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
 <!--927D0D118B88EF36E040A8C0CF071CF5-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
 <!--927D0D118B88EF36E040A8C0CF071CF5-->  <AD_TABLE_ID><![CDATA[5F20F3D554CA408891C1BA6545114D4D]]></AD_TABLE_ID>
@@ -1408,7 +1408,7 @@
 <!--927D156047A76E92E040A8C0CF071D3D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--927D156047A76E92E040A8C0CF071D3D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--927D156047A76E92E040A8C0CF071D3D-->  <NAME><![CDATA[Updated]]></NAME>
-<!--927D156047A76E92E040A8C0CF071D3D-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--927D156047A76E92E040A8C0CF071D3D-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
 <!--927D156047A76E92E040A8C0CF071D3D-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
 <!--927D156047A76E92E040A8C0CF071D3D-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
 <!--927D156047A76E92E040A8C0CF071D3D-->  <AD_TABLE_ID><![CDATA[CF1D8385DC364B97B6A1BA2EE76C8DA1]]></AD_TABLE_ID>
@@ -1944,7 +1944,7 @@
 <!--927D156047B96E92E040A8C0CF071D3D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--927D156047B96E92E040A8C0CF071D3D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--927D156047B96E92E040A8C0CF071D3D-->  <NAME><![CDATA[Updated]]></NAME>
-<!--927D156047B96E92E040A8C0CF071D3D-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--927D156047B96E92E040A8C0CF071D3D-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
 <!--927D156047B96E92E040A8C0CF071D3D-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
 <!--927D156047B96E92E040A8C0CF071D3D-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
 <!--927D156047B96E92E040A8C0CF071D3D-->  <AD_TABLE_ID><![CDATA[D1829E5F3A8441BF85DDBC06D49C1074]]></AD_TABLE_ID>
@@ -2373,7 +2373,7 @@
 <!--927D156047C56E92E040A8C0CF071D3D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--927D156047C56E92E040A8C0CF071D3D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--927D156047C56E92E040A8C0CF071D3D-->  <NAME><![CDATA[Updated]]></NAME>
-<!--927D156047C56E92E040A8C0CF071D3D-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--927D156047C56E92E040A8C0CF071D3D-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
 <!--927D156047C56E92E040A8C0CF071D3D-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
 <!--927D156047C56E92E040A8C0CF071D3D-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
 <!--927D156047C56E92E040A8C0CF071D3D-->  <AD_TABLE_ID><![CDATA[E1C20B5D1AEB45FEB3D0E4B6C3F8B1A8]]></AD_TABLE_ID>
@@ -2767,7 +2767,7 @@
 <!--927DA01A83543AFAE040A8C0CF072B85-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--927DA01A83543AFAE040A8C0CF072B85-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--927DA01A83543AFAE040A8C0CF072B85-->  <NAME><![CDATA[Updated]]></NAME>
-<!--927DA01A83543AFAE040A8C0CF072B85-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--927DA01A83543AFAE040A8C0CF072B85-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
 <!--927DA01A83543AFAE040A8C0CF072B85-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
 <!--927DA01A83543AFAE040A8C0CF072B85-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
 <!--927DA01A83543AFAE040A8C0CF072B85-->  <AD_TABLE_ID><![CDATA[74AEBEAB2C284163BCA76CF1E96DBC2C]]></AD_TABLE_ID>
@@ -3124,7 +3124,7 @@
 <!--927DA01A835E3AFAE040A8C0CF072B85-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--927DA01A835E3AFAE040A8C0CF072B85-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--927DA01A835E3AFAE040A8C0CF072B85-->  <NAME><![CDATA[Updated]]></NAME>
-<!--927DA01A835E3AFAE040A8C0CF072B85-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--927DA01A835E3AFAE040A8C0CF072B85-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
 <!--927DA01A835E3AFAE040A8C0CF072B85-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
 <!--927DA01A835E3AFAE040A8C0CF072B85-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
 <!--927DA01A835E3AFAE040A8C0CF072B85-->  <AD_TABLE_ID><![CDATA[568FD0BE075149A98601DE94E571AABD]]></AD_TABLE_ID>
@@ -3942,7 +3942,7 @@
 <!--E00BC48A99864E29BCFE255DB0ADA202-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--E00BC48A99864E29BCFE255DB0ADA202-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--E00BC48A99864E29BCFE255DB0ADA202-->  <NAME><![CDATA[Updated]]></NAME>
-<!--E00BC48A99864E29BCFE255DB0ADA202-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--E00BC48A99864E29BCFE255DB0ADA202-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
 <!--E00BC48A99864E29BCFE255DB0ADA202-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
 <!--E00BC48A99864E29BCFE255DB0ADA202-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
 <!--E00BC48A99864E29BCFE255DB0ADA202-->  <AD_TABLE_ID><![CDATA[FF808181314242630131424606130001]]></AD_TABLE_ID>
--- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_ELEMENT.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_ELEMENT.xml	Thu May 24 08:59:54 2012 +0000
@@ -341,8 +341,8 @@
 <!--D64281ABFB7C4D79BF8BE0F0735677D4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--D64281ABFB7C4D79BF8BE0F0735677D4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--D64281ABFB7C4D79BF8BE0F0735677D4-->  <COLUMNNAME><![CDATA[Author_Msg]]></COLUMNNAME>
-<!--D64281ABFB7C4D79BF8BE0F0735677D4-->  <NAME><![CDATA[Author Messge]]></NAME>
-<!--D64281ABFB7C4D79BF8BE0F0735677D4-->  <PRINTNAME><![CDATA[Author Messge]]></PRINTNAME>
+<!--D64281ABFB7C4D79BF8BE0F0735677D4-->  <NAME><![CDATA[Author Message]]></NAME>
+<!--D64281ABFB7C4D79BF8BE0F0735677D4-->  <PRINTNAME><![CDATA[Author Message]]></PRINTNAME>
 <!--D64281ABFB7C4D79BF8BE0F0735677D4-->  <DESCRIPTION><![CDATA[Widget Author Message]]></DESCRIPTION>
 <!--D64281ABFB7C4D79BF8BE0F0735677D4-->  <HELP><![CDATA[It is a message the widget author can define. It will be shown in the widget about information.]]></HELP>
 <!--D64281ABFB7C4D79BF8BE0F0735677D4-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
--- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_FIELD.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_FIELD.xml	Thu May 24 08:59:54 2012 +0000
@@ -89,7 +89,7 @@
 <!--1916FAF6FD7B4DE08D3408A533A76CC9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--1916FAF6FD7B4DE08D3408A533A76CC9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--1916FAF6FD7B4DE08D3408A533A76CC9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--1916FAF6FD7B4DE08D3408A533A76CC9-->  <NAME><![CDATA[Author Messge]]></NAME>
+<!--1916FAF6FD7B4DE08D3408A533A76CC9-->  <NAME><![CDATA[Author Message]]></NAME>
 <!--1916FAF6FD7B4DE08D3408A533A76CC9-->  <DESCRIPTION><![CDATA[Widget Author Message]]></DESCRIPTION>
 <!--1916FAF6FD7B4DE08D3408A533A76CC9-->  <HELP><![CDATA[It is a message the widget author can define. It will be shown in the widget about information.]]></HELP>
 <!--1916FAF6FD7B4DE08D3408A533A76CC9-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
--- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Thu May 24 08:59:54 2012 +0000
@@ -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.15736]]></VERSION>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.16285]]></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,8 @@
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <UPDATEINFO><![CDATA[Styling bugfixing]]></UPDATEINFO>
-<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION_LABEL><![CDATA[MP9.3]]></VERSION_LABEL>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <REFERENCEDATAINFO><![CDATA[Provides the infrastructure of workspace tab]]></REFERENCEDATAINFO>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION_LABEL><![CDATA[MP11]]></VERSION_LABEL>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--2758CD25B2704AF6BBAD10365FC82C06--></AD_MODULE>
 
--- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu May 24 08:59:54 2012 +0000
@@ -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.15736]]></STARTVERSION>
+<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.16285]]></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.15736]]></STARTVERSION>
+<!--E71B28FC949D481D9F59C17D01E46EF9-->  <STARTVERSION><![CDATA[3.0.16285]]></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_COLUMN.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_COLUMN.xml	Thu May 24 08:59:54 2012 +0000
@@ -222,7 +222,7 @@
 <!--95CC5757ECB8E5B8E040007F010076A5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--95CC5757ECB8E5B8E040007F010076A5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--95CC5757ECB8E5B8E040007F010076A5-->  <NAME><![CDATA[Updated]]></NAME>
-<!--95CC5757ECB8E5B8E040007F010076A5-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--95CC5757ECB8E5B8E040007F010076A5-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
 <!--95CC5757ECB8E5B8E040007F010076A5-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
 <!--95CC5757ECB8E5B8E040007F010076A5-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
 <!--95CC5757ECB8E5B8E040007F010076A5-->  <AD_TABLE_ID><![CDATA[87AB97C7EED3429BBEFE9EF28EFACC08]]></AD_TABLE_ID>
@@ -577,7 +577,7 @@
 <!--95CC63FD04C121F2E040007F010075C1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--95CC63FD04C121F2E040007F010075C1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--95CC63FD04C121F2E040007F010075C1-->  <NAME><![CDATA[Updated]]></NAME>
-<!--95CC63FD04C121F2E040007F010075C1-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--95CC63FD04C121F2E040007F010075C1-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
 <!--95CC63FD04C121F2E040007F010075C1-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
 <!--95CC63FD04C121F2E040007F010075C1-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
 <!--95CC63FD04C121F2E040007F010075C1-->  <AD_TABLE_ID><![CDATA[8EE7634FA71B40FDB9ADF85374264BF6]]></AD_TABLE_ID>
@@ -1290,7 +1290,7 @@
 <!--96FCF4C1EF9EAE63E040007F01002B87-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--96FCF4C1EF9EAE63E040007F01002B87-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--96FCF4C1EF9EAE63E040007F01002B87-->  <NAME><![CDATA[Updated]]></NAME>
-<!--96FCF4C1EF9EAE63E040007F01002B87-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--96FCF4C1EF9EAE63E040007F01002B87-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
 <!--96FCF4C1EF9EAE63E040007F01002B87-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
 <!--96FCF4C1EF9EAE63E040007F01002B87-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
 <!--96FCF4C1EF9EAE63E040007F01002B87-->  <AD_TABLE_ID><![CDATA[28B9A36691BA4D4EBCA68E39D5D4B1BE]]></AD_TABLE_ID>
--- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Thu May 24 08:59:54 2012 +0000
@@ -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.15736]]></VERSION>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.16285]]></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.3]]></VERSION_LABEL>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION_LABEL><![CDATA[MP11]]></VERSION_LABEL>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC--></AD_MODULE>
 
--- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu May 24 08:59:54 2012 +0000
@@ -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.15736]]></STARTVERSION>
+<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.16285]]></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.querylist/src/org/openbravo/client/querylist/QueryListDataSource.java	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListDataSource.java	Thu May 24 08:59:54 2012 +0000
@@ -179,8 +179,11 @@
               if (value instanceof Date) {
                 value = xmlDateFormat.format(value);
               }
-
-              data.put(queryAliases[i], value);
+              if (!isExport) {
+                data.put(queryAliases[i], value);
+              } else {
+                data.put(QueryListUtils.getColumnLabel(column), value);
+              }
             }
           }
         }
--- a/modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListUtils.java	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListUtils.java	Thu May 24 08:59:54 2012 +0000
@@ -150,7 +150,7 @@
     }
   }
 
-  private static String getColumnLabel(OBCQL_QueryColumn column) {
+  public static String getColumnLabel(OBCQL_QueryColumn column) {
 
     final String userLanguageId = OBContext.getOBContext().getLanguage().getId();
     for (QueryColumnTrl trl : column.getOBCQLQueryColumnTrlList()) {
--- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Thu May 24 08:59:54 2012 +0000
@@ -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.15736]]></VERSION>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.16285]]></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.3]]></VERSION_LABEL>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION_LABEL><![CDATA[MP11]]></VERSION_LABEL>
 <!--FF8080812D842086012D844F3CC0003E-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--FF8080812D842086012D844F3CC0003E--></AD_MODULE>
 
--- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu May 24 08:59:54 2012 +0000
@@ -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.15736]]></STARTVERSION>
+<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.16285]]></STARTVERSION>
 <!--FF8080812D842086012D845002070046-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080812D842086012D845002070046-->  <DEPENDANT_MODULE_NAME><![CDATA[Workspace & Widgets]]></DEPENDANT_MODULE_NAME>
 <!--FF8080812D842086012D845002070046-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBKMO_WIDGET_URL.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBKMO_WIDGET_URL.xml	Thu May 24 08:59:54 2012 +0000
@@ -60,7 +60,7 @@
 <!--8A6B99392E2D9088012E2DC642BA004C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--8A6B99392E2D9088012E2DC642BA004C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8A6B99392E2D9088012E2DC642BA004C-->  <OBKMO_WIDGET_CLASS_ID><![CDATA[8A6B99392E2B4192012E2B55D957004C]]></OBKMO_WIDGET_CLASS_ID>
-<!--8A6B99392E2D9088012E2DC642BA004C-->  <URL><![CDATA[http://www.ig.gmodules.com/gadgets/ifr?exp_rpc_js=1&exp_track_js=1&url=http%3A%2F%2Fwww.google.com%2Fig%2Fmodules%2Ffinance%2Ffinance_sectorsummary2.xml&container=ig&view=default&lang=en&country=US&v=e8c095bc03301f02&parent=http://www.google.com&libs=core:core.io:core.iglegacy:auth-refresh&is_signedin=1&synd=ig&view=default#st=c%3Dig%26e%3DAPu7icpVQE/%252BNCnUkHm5ubYIjF8omXA7dwyjf6rqLfdwFdq9lc/erJhU4KLE9GsMHy8MDHPmhbVb739LPXJjhLPqx2r%252B9PT%252BqH1K8RsdxjLV%252Bcpb3tVYExz4DVyEL1R2AMl26ZXI6pgq&gadgetId=111621084476111923813&gadgetOwner=105787549640705078752&gadgetViewer=105787549640705078752&rpctoken=2075508900&ifpctok=2075508900&up_contracted=,]]></URL>
+<!--8A6B99392E2D9088012E2DC642BA004C-->  <URL><![CDATA[http://www-ig-opensocial.googleusercontent.com/gadgets/ifr?exp_rpc_js=1&exp_track_js=1&url=http%3A%2F%2Fwww.google.com%2Fig%2Fmodules%2Ffinance%2Ffinance_sectorsummary2.xml&container=ig&view=home&lang=es&country=US&sanitize=0&v=627b474cf25a5fae&parent=http://www.google.com&libs=core:core.io:core.iglegacy:auth-refresh&is_signedin=1&synd=ig&mid=86#st=c%3Dig%26e%3DAPu7icoLC97JRqcWBBzKsUhx45Y9Kp%252BY46cYEnFBgoMOXuir0Cw2ioPK0ZGgTpoci7aqof7AlFjX2D9EDXL1UPkyM5Pyy1EcgeNLtf0t8AYSuwQVy3wOmU8QW9qEr41LL4A7s30v2qcM&gadgetId=111621084476111923813&gadgetOwner=117758133156934986740&gadgetViewer=117758133156934986740&rpctoken=-769480845&ifpctok=-769480845&up_contracted=,]]></URL>
 <!--8A6B99392E2D9088012E2DC642BA004C--></OBKMO_WIDGET_URL>
 
 <!--8A6B99392E2D9088012E2DFDAB8800C2--><OBKMO_WIDGET_URL>
--- a/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Thu May 24 08:59:54 2012 +0000
@@ -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.15736]]></VERSION>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.16285]]></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.3]]></VERSION_LABEL>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION_LABEL><![CDATA[MP11]]></VERSION_LABEL>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--2A5EE903D7974AC298C0504FBC4501A7--></AD_MODULE>
 
--- a/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu May 24 08:59:54 2012 +0000
@@ -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.15736]]></STARTVERSION>
+<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.16285]]></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.financial.paymentreport/src-db/database/sourcedata/AD_PROCESS.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_PROCESS.xml	Thu May 24 08:59:54 2012 +0000
@@ -8,7 +8,7 @@
 <!--6AD04479EC134BD4826077F36B709876-->  <VALUE><![CDATA[paymentreport]]></VALUE>
 <!--6AD04479EC134BD4826077F36B709876-->  <NAME><![CDATA[Payment Report]]></NAME>
 <!--6AD04479EC134BD4826077F36B709876-->  <DESCRIPTION><![CDATA[Payment Report]]></DESCRIPTION>
-<!--6AD04479EC134BD4826077F36B709876-->  <HELP><![CDATA[Payment Report]]></HELP>
+<!--6AD04479EC134BD4826077F36B709876-->  <HELP><![CDATA[The Payment Report facilitates the display of certain payments with the extensive filtering options. For more information refer to http://wiki.openbravo.com/wiki/Payment_Report]]></HELP>
 <!--6AD04479EC134BD4826077F36B709876-->  <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
 <!--6AD04479EC134BD4826077F36B709876-->  <ISUSERSTARTABLE><![CDATA[N]]></ISUSERSTARTABLE>
 <!--6AD04479EC134BD4826077F36B709876-->  <ISREPORT><![CDATA[Y]]></ISREPORT>
--- a/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Thu May 24 08:59:54 2012 +0000
@@ -11,6 +11,17 @@
 <!--02AAEE46AC52441E84CC3D86CDABEC7C-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
 <!--02AAEE46AC52441E84CC3D86CDABEC7C--></AD_TEXTINTERFACES>
 
+<!--02F7B62B809A4C7994C6661D4150A410--><AD_TEXTINTERFACES>
+<!--02F7B62B809A4C7994C6661D4150A410-->  <AD_TEXTINTERFACES_ID><![CDATA[02F7B62B809A4C7994C6661D4150A410]]></AD_TEXTINTERFACES_ID>
+<!--02F7B62B809A4C7994C6661D4150A410-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--02F7B62B809A4C7994C6661D4150A410-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--02F7B62B809A4C7994C6661D4150A410-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--02F7B62B809A4C7994C6661D4150A410-->  <TEXT><![CDATA[PlannedDSO]]></TEXT>
+<!--02F7B62B809A4C7994C6661D4150A410-->  <FILENAME><![CDATA[/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportPDF.jrxml]]></FILENAME>
+<!--02F7B62B809A4C7994C6661D4150A410-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--02F7B62B809A4C7994C6661D4150A410-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
+<!--02F7B62B809A4C7994C6661D4150A410--></AD_TEXTINTERFACES>
+
 <!--044881ABF38E44E1BFE3D28F6992587F--><AD_TEXTINTERFACES>
 <!--044881ABF38E44E1BFE3D28F6992587F-->  <AD_TEXTINTERFACES_ID><![CDATA[044881ABF38E44E1BFE3D28F6992587F]]></AD_TEXTINTERFACES_ID>
 <!--044881ABF38E44E1BFE3D28F6992587F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -264,17 +275,6 @@
 <!--393EFE8078AF4B3299DBACBF533128F8-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
 <!--393EFE8078AF4B3299DBACBF533128F8--></AD_TEXTINTERFACES>
 
-<!--3A59F70C2BE548398EEC5134095FA252--><AD_TEXTINTERFACES>
-<!--3A59F70C2BE548398EEC5134095FA252-->  <AD_TEXTINTERFACES_ID><![CDATA[3A59F70C2BE548398EEC5134095FA252]]></AD_TEXTINTERFACES_ID>
-<!--3A59F70C2BE548398EEC5134095FA252-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--3A59F70C2BE548398EEC5134095FA252-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--3A59F70C2BE548398EEC5134095FA252-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--3A59F70C2BE548398EEC5134095FA252-->  <TEXT><![CDATA[Current DSO]]></TEXT>
-<!--3A59F70C2BE548398EEC5134095FA252-->  <FILENAME><![CDATA[/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportPDF.jrxml]]></FILENAME>
-<!--3A59F70C2BE548398EEC5134095FA252-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--3A59F70C2BE548398EEC5134095FA252-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
-<!--3A59F70C2BE548398EEC5134095FA252--></AD_TEXTINTERFACES>
-
 <!--43C8186236514013ADE1E5C8DB7A043B--><AD_TEXTINTERFACES>
 <!--43C8186236514013ADE1E5C8DB7A043B-->  <AD_TEXTINTERFACES_ID><![CDATA[43C8186236514013ADE1E5C8DB7A043B]]></AD_TEXTINTERFACES_ID>
 <!--43C8186236514013ADE1E5C8DB7A043B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -528,6 +528,17 @@
 <!--956DE8D037514B20A7303E122AAD2713-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
 <!--956DE8D037514B20A7303E122AAD2713--></AD_TEXTINTERFACES>
 
+<!--977F3730B74146ADBB48FCD85218F034--><AD_TEXTINTERFACES>
+<!--977F3730B74146ADBB48FCD85218F034-->  <AD_TEXTINTERFACES_ID><![CDATA[977F3730B74146ADBB48FCD85218F034]]></AD_TEXTINTERFACES_ID>
+<!--977F3730B74146ADBB48FCD85218F034-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--977F3730B74146ADBB48FCD85218F034-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--977F3730B74146ADBB48FCD85218F034-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--977F3730B74146ADBB48FCD85218F034-->  <TEXT><![CDATA[CurrentDSO]]></TEXT>
+<!--977F3730B74146ADBB48FCD85218F034-->  <FILENAME><![CDATA[/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml]]></FILENAME>
+<!--977F3730B74146ADBB48FCD85218F034-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--977F3730B74146ADBB48FCD85218F034-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
+<!--977F3730B74146ADBB48FCD85218F034--></AD_TEXTINTERFACES>
+
 <!--9896DFF27CCF4AB2A278019CE671DCAC--><AD_TEXTINTERFACES>
 <!--9896DFF27CCF4AB2A278019CE671DCAC-->  <AD_TEXTINTERFACES_ID><![CDATA[9896DFF27CCF4AB2A278019CE671DCAC]]></AD_TEXTINTERFACES_ID>
 <!--9896DFF27CCF4AB2A278019CE671DCAC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -616,17 +627,6 @@
 <!--A1CC0391770548668172514B0F7D0DDD-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
 <!--A1CC0391770548668172514B0F7D0DDD--></AD_TEXTINTERFACES>
 
-<!--AC02964E5D854803852115613014DF6E--><AD_TEXTINTERFACES>
-<!--AC02964E5D854803852115613014DF6E-->  <AD_TEXTINTERFACES_ID><![CDATA[AC02964E5D854803852115613014DF6E]]></AD_TEXTINTERFACES_ID>
-<!--AC02964E5D854803852115613014DF6E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--AC02964E5D854803852115613014DF6E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--AC02964E5D854803852115613014DF6E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--AC02964E5D854803852115613014DF6E-->  <TEXT><![CDATA[Planned DSO]]></TEXT>
-<!--AC02964E5D854803852115613014DF6E-->  <FILENAME><![CDATA[/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml]]></FILENAME>
-<!--AC02964E5D854803852115613014DF6E-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--AC02964E5D854803852115613014DF6E-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
-<!--AC02964E5D854803852115613014DF6E--></AD_TEXTINTERFACES>
-
 <!--AC44B03FF40047059E663CEB9CF49A5A--><AD_TEXTINTERFACES>
 <!--AC44B03FF40047059E663CEB9CF49A5A-->  <AD_TEXTINTERFACES_ID><![CDATA[AC44B03FF40047059E663CEB9CF49A5A]]></AD_TEXTINTERFACES_ID>
 <!--AC44B03FF40047059E663CEB9CF49A5A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -748,6 +748,17 @@
 <!--B973837A2C334DC49973CEE4179F43B7-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
 <!--B973837A2C334DC49973CEE4179F43B7--></AD_TEXTINTERFACES>
 
+<!--BA44533ED06A4B73BCE144691D928626--><AD_TEXTINTERFACES>
+<!--BA44533ED06A4B73BCE144691D928626-->  <AD_TEXTINTERFACES_ID><![CDATA[BA44533ED06A4B73BCE144691D928626]]></AD_TEXTINTERFACES_ID>
+<!--BA44533ED06A4B73BCE144691D928626-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BA44533ED06A4B73BCE144691D928626-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BA44533ED06A4B73BCE144691D928626-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BA44533ED06A4B73BCE144691D928626-->  <TEXT><![CDATA[PlannedDSO]]></TEXT>
+<!--BA44533ED06A4B73BCE144691D928626-->  <FILENAME><![CDATA[/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml]]></FILENAME>
+<!--BA44533ED06A4B73BCE144691D928626-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--BA44533ED06A4B73BCE144691D928626-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
+<!--BA44533ED06A4B73BCE144691D928626--></AD_TEXTINTERFACES>
+
 <!--BA58631F88A74CB1859804387A7AE6B2--><AD_TEXTINTERFACES>
 <!--BA58631F88A74CB1859804387A7AE6B2-->  <AD_TEXTINTERFACES_ID><![CDATA[BA58631F88A74CB1859804387A7AE6B2]]></AD_TEXTINTERFACES_ID>
 <!--BA58631F88A74CB1859804387A7AE6B2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -792,16 +803,16 @@
 <!--C31FF83C82AB49C7AC446FD28B431B3C-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
 <!--C31FF83C82AB49C7AC446FD28B431B3C--></AD_TEXTINTERFACES>
 
-<!--C3A3DCA2DFE142108B0693934784A6F6--><AD_TEXTINTERFACES>
-<!--C3A3DCA2DFE142108B0693934784A6F6-->  <AD_TEXTINTERFACES_ID><![CDATA[C3A3DCA2DFE142108B0693934784A6F6]]></AD_TEXTINTERFACES_ID>
-<!--C3A3DCA2DFE142108B0693934784A6F6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--C3A3DCA2DFE142108B0693934784A6F6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--C3A3DCA2DFE142108B0693934784A6F6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--C3A3DCA2DFE142108B0693934784A6F6-->  <TEXT><![CDATA[Current DSO]]></TEXT>
-<!--C3A3DCA2DFE142108B0693934784A6F6-->  <FILENAME><![CDATA[/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml]]></FILENAME>
-<!--C3A3DCA2DFE142108B0693934784A6F6-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--C3A3DCA2DFE142108B0693934784A6F6-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
-<!--C3A3DCA2DFE142108B0693934784A6F6--></AD_TEXTINTERFACES>
+<!--C764993E67B846B4B72165EB26D04BC9--><AD_TEXTINTERFACES>
+<!--C764993E67B846B4B72165EB26D04BC9-->  <AD_TEXTINTERFACES_ID><![CDATA[C764993E67B846B4B72165EB26D04BC9]]></AD_TEXTINTERFACES_ID>
+<!--C764993E67B846B4B72165EB26D04BC9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C764993E67B846B4B72165EB26D04BC9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C764993E67B846B4B72165EB26D04BC9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C764993E67B846B4B72165EB26D04BC9-->  <TEXT><![CDATA[CurrentDSO]]></TEXT>
+<!--C764993E67B846B4B72165EB26D04BC9-->  <FILENAME><![CDATA[/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportPDF.jrxml]]></FILENAME>
+<!--C764993E67B846B4B72165EB26D04BC9-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--C764993E67B846B4B72165EB26D04BC9-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
+<!--C764993E67B846B4B72165EB26D04BC9--></AD_TEXTINTERFACES>
 
 <!--C851638940504AF69C111133B4FC53FF--><AD_TEXTINTERFACES>
 <!--C851638940504AF69C111133B4FC53FF-->  <AD_TEXTINTERFACES_ID><![CDATA[C851638940504AF69C111133B4FC53FF]]></AD_TEXTINTERFACES_ID>
@@ -880,17 +891,6 @@
 <!--D79B532849AC43F09FB38375FB9CBBA2-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
 <!--D79B532849AC43F09FB38375FB9CBBA2--></AD_TEXTINTERFACES>
 
-<!--D97008CA65654BE69AFCDEECC9D20210--><AD_TEXTINTERFACES>
-<!--D97008CA65654BE69AFCDEECC9D20210-->  <AD_TEXTINTERFACES_ID><![CDATA[D97008CA65654BE69AFCDEECC9D20210]]></AD_TEXTINTERFACES_ID>
-<!--D97008CA65654BE69AFCDEECC9D20210-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--D97008CA65654BE69AFCDEECC9D20210-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--D97008CA65654BE69AFCDEECC9D20210-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--D97008CA65654BE69AFCDEECC9D20210-->  <TEXT><![CDATA[Planned DSO]]></TEXT>
-<!--D97008CA65654BE69AFCDEECC9D20210-->  <FILENAME><![CDATA[/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportPDF.jrxml]]></FILENAME>
-<!--D97008CA65654BE69AFCDEECC9D20210-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--D97008CA65654BE69AFCDEECC9D20210-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
-<!--D97008CA65654BE69AFCDEECC9D20210--></AD_TEXTINTERFACES>
-
 <!--DAFB4AF969704E6A8587DD2F9ED525AD--><AD_TEXTINTERFACES>
 <!--DAFB4AF969704E6A8587DD2F9ED525AD-->  <AD_TEXTINTERFACES_ID><![CDATA[DAFB4AF969704E6A8587DD2F9ED525AD]]></AD_TEXTINTERFACES_ID>
 <!--DAFB4AF969704E6A8587DD2F9ED525AD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java	Thu May 24 08:59:54 2012 +0000
@@ -1465,9 +1465,6 @@
           isBefore = isBeforeOrder(transaction, data, strOrdCritList, i + 1, BPName, BPCategory,
               strProject);
         }
-      } else {
-        isBefore = isBeforeOrder(transaction, data, strOrdCritList, i + 1, BPName, BPCategory,
-            strProject);
       }
       return isBefore;
     }
--- a/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml	Thu May 24 08:59:54 2012 +0000
@@ -2,8 +2,8 @@
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="PaymentReportExcel" pageWidth="1800" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="1740" leftMargin="30" rightMargin="30" topMargin="20" bottomMargin="20">
 	<property name="ireport.scriptlethandling" value="0"/>
 	<property name="ireport.encoding" value="UTF-8"/>
-	<property name="ireport.zoom" value="1.5"/>
-	<property name="ireport.x" value="1591"/>
+	<property name="ireport.zoom" value="1.0"/>
+	<property name="ireport.x" value="734"/>
 	<property name="ireport.y" value="0"/>
 	<import value="net.sf.jasperreports.engine.*"/>
 	<import value="java.util.*"/>
@@ -134,8 +134,7 @@
 				<textElement verticalAlignment="Middle">
 					<font size="8" isBold="false"/>
 				</textElement>
-				<text><![CDATA[Invoice
-Number]]></text>
+				<text><![CDATA[Invoice Number]]></text>
 			</staticText>
 			<staticText>
 				<reportElement key="staticText-7" style="Detail_Header" x="468" y="25" width="55" height="25"/>
@@ -158,16 +157,14 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="8" isBold="false"/>
 				</textElement>
-				<text><![CDATA[Planned
-DSO]]></text>
+				<text><![CDATA[PlannedDSO]]></text>
 			</staticText>
 			<staticText>
 				<reportElement key="staticText-10" style="Detail_Header" x="1162" y="25" width="33" height="25"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="8" isBold="false"/>
 				</textElement>
-				<text><![CDATA[Current
-DSO]]></text>
+				<text><![CDATA[CurrentDSO]]></text>
 			</staticText>
 			<staticText>
 				<reportElement key="staticText-11" style="Detail_Header" x="1195" y="25" width="36" height="25"/>
@@ -182,8 +179,7 @@
 				<textElement textAlignment="Right">
 					<font size="8" isBold="false"/>
 				</textElement>
-				<text><![CDATA[Base
-Amount]]></text>
+				<text><![CDATA[Base Amount]]></text>
 			</staticText>
 			<staticText>
 				<reportElement key="staticText-14" style="Detail_Header" x="1451" y="25" width="46" height="25"/>
@@ -191,8 +187,7 @@
 				<textElement textAlignment="Center">
 					<font size="8" isBold="false"/>
 				</textElement>
-				<text><![CDATA[Base
-Currency]]></text>
+				<text><![CDATA[Base Currency]]></text>
 			</staticText>
 			<staticText>
 				<reportElement key="staticText-15" style="Detail_Header" x="1231" y="25" width="80" height="25"/>
@@ -200,8 +195,7 @@
 				<textElement textAlignment="Right">
 					<font size="8" isBold="false"/>
 				</textElement>
-				<text><![CDATA[Transactional
-Amount]]></text>
+				<text><![CDATA[Transactional Amount]]></text>
 			</staticText>
 			<staticText>
 				<reportElement key="staticText-16" style="Detail_Header" x="1311" y="25" width="60" height="25"/>
@@ -279,7 +273,7 @@
 	</columnHeader>
 	<detail>
 		<band height="25" splitType="Stretch">
-			<textField isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement key="textField-2" style="Report_Footer" x="0" y="0" width="99" height="25"/>
 				<box leftPadding="2"/>
 				<textElement>
@@ -287,7 +281,7 @@
 				</textElement>
 				<textFieldExpression class="java.lang.String"><![CDATA[$F{BPARTNER}]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement key="textField-4" style="Report_Footer" x="523" y="0" width="65" height="25"/>
 				<box leftPadding="2"/>
 				<textElement>
@@ -295,7 +289,7 @@
 				</textElement>
 				<textFieldExpression class="java.lang.String"><![CDATA[$F{PAYMENT_DOCNO}]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement key="textField-5" style="Report_Footer" x="335" y="0" width="78" height="25"/>
 				<box leftPadding="2"/>
 				<textElement>
@@ -303,7 +297,7 @@
 				</textElement>
 				<textFieldExpression class="java.lang.String"><![CDATA[($F{SALES_PERSON}==null ? " " : $F{SALES_PERSON})]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement key="textField-6" style="Report_Footer" x="413" y="0" width="55" height="25"/>
 				<box leftPadding="2"/>
 				<textElement>
@@ -311,7 +305,7 @@
 				</textElement>
 				<textFieldExpression class="java.lang.String"><![CDATA[($F{INVOICE_NUMBER}==null ? " " : $F{INVOICE_NUMBER}.toString())]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement key="textField-7" style="Report_Footer" x="468" y="0" width="55" height="25"/>
 				<box leftPadding="2"/>
 				<textElement>
@@ -319,7 +313,7 @@
 				</textElement>
 				<textFieldExpression class="java.lang.String"><![CDATA[($F{INVOICE_DATE}== null ? " " : $F{INVOICE_DATE})]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement key="textField-8" style="Report_Footer" x="1067" y="0" width="62" height="25"/>
 				<box leftPadding="2"/>
 				<textElement>
@@ -327,28 +321,28 @@
 				</textElement>
 				<textFieldExpression class="java.lang.String"><![CDATA[($F{DUE_DATE}== null ? " " : $F{DUE_DATE})]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement key="textField-9" style="Report_Footer" x="1129" y="0" width="33" height="25"/>
 				<textElement textAlignment="Center">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression class="java.lang.String"><![CDATA[($F{PLANNED_DSO}== null ? " " : $F{PLANNED_DSO}.toString())]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement key="textField-10" style="Report_Footer" x="1162" y="0" width="33" height="25"/>
 				<textElement textAlignment="Center">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression class="java.lang.String"><![CDATA[($F{CURRENT_DSO}== null ? " " : $F{CURRENT_DSO}.toString())]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement key="textField-11" style="Report_Footer" x="1195" y="0" width="36" height="25"/>
 				<textElement textAlignment="Center">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression class="java.lang.String"><![CDATA[($F{OVERDUE}== null ? " " : $F{OVERDUE}.toString())]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement key="textField-13" style="Report_Footer" x="1371" y="0" width="80" height="25"/>
 				<box rightPadding="2"/>
 				<textElement textAlignment="Right">
@@ -356,14 +350,14 @@
 				</textElement>
 				<textFieldExpression class="java.math.BigDecimal"><![CDATA[$F{BASE_AMOUNT}]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement key="textField-14" style="Report_Footer" x="1451" y="0" width="46" height="25"/>
 				<textElement textAlignment="Center">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression class="java.lang.String"><![CDATA[$F{BASE_CURRENCY}]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement key="textField-15" style="Report_Footer" x="1231" y="0" width="80" height="25"/>
 				<box rightPadding="2"/>
 				<textElement textAlignment="Right">
@@ -371,14 +365,14 @@
 				</textElement>
 				<textFieldExpression class="java.math.BigDecimal"><![CDATA[$F{TRANS_AMOUNT}]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement key="textField-16" style="Report_Footer" x="1311" y="0" width="60" height="25"/>
 				<textElement textAlignment="Center">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression class="java.lang.String"><![CDATA[$F{TRANS_CURRENCY}]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement key="textField-17" style="Report_Footer" x="99" y="0" width="76" height="25"/>
 				<box leftPadding="2"/>
 				<textElement>
@@ -386,7 +380,7 @@
 				</textElement>
 				<textFieldExpression class="java.lang.String"><![CDATA[$F{BP_GROUP}]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement key="textField-18" style="Report_Footer" x="175" y="0" width="76" height="25"/>
 				<box leftPadding="2"/>
 				<textElement>
@@ -394,7 +388,7 @@
 				</textElement>
 				<textFieldExpression class="java.lang.String"><![CDATA[$F{STATUS}]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement key="textField-19" style="Report_Footer" x="251" y="0" width="84" height="25"/>
 				<box leftPadding="2"/>
 				<textElement>
@@ -410,7 +404,7 @@
 				</textElement>
 				<textFieldExpression class="java.lang.String"><![CDATA[$F{PAYMENT_DESC}]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement key="textField-22" style="Report_Footer" x="987" y="0" width="80" height="25"/>
 				<box leftPadding="2"/>
 				<textElement>
@@ -418,14 +412,14 @@
 				</textElement>
 				<textFieldExpression class="java.util.Date"><![CDATA[$F{PAYMENT_DATE}]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement key="textField-14" style="Report_Footer" x="588" y="0" width="172" height="25"/>
 				<textElement textAlignment="Left">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression class="java.lang.String"><![CDATA[$F{PAYMENT_METHOD}]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
 				<reportElement key="textField-14" style="Report_Footer" x="1497" y="0" width="77" height="25"/>
 				<textElement textAlignment="Center">
 					<font size="8"/>
--- a/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportPDF.jrxml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportPDF.jrxml	Thu May 24 08:59:54 2012 +0000
@@ -2,9 +2,9 @@
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="PaymentReportPDF" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="782" leftMargin="30" rightMargin="30" topMargin="20" bottomMargin="20">
 	<property name="ireport.scriptlethandling" value="0"/>
 	<property name="ireport.encoding" value="UTF-8"/>
-	<property name="ireport.zoom" value="1.5"/>
-	<property name="ireport.x" value="233"/>
-	<property name="ireport.y" value="19"/>
+	<property name="ireport.zoom" value="1.0"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="48"/>
 	<import value="net.sf.jasperreports.engine.*"/>
 	<import value="java.util.*"/>
 	<import value="net.sf.jasperreports.engine.data.*"/>
@@ -371,8 +371,7 @@
 					<textElement verticalAlignment="Middle">
 						<font size="8" isBold="false"/>
 					</textElement>
-					<text><![CDATA[Invoice
-Number]]></text>
+					<text><![CDATA[Invoice Number]]></text>
 				</staticText>
 				<staticText>
 					<reportElement key="staticText-7" style="Detail_Header" x="229" y="35" width="55" height="25"/>
@@ -395,16 +394,14 @@
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="8" isBold="false"/>
 					</textElement>
-					<text><![CDATA[Planned
-DSO]]></text>
+					<text><![CDATA[PlannedDSO]]></text>
 				</staticText>
 				<staticText>
 					<reportElement key="staticText-10" style="Detail_Header" x="446" y="35" width="33" height="25"/>
 					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="8" isBold="false"/>
 					</textElement>
-					<text><![CDATA[Current
-DSO]]></text>
+					<text><![CDATA[CurrentDSO]]></text>
 				</staticText>
 				<staticText>
 					<reportElement key="staticText-11" style="Detail_Header" x="480" y="35" width="36" height="25"/>
@@ -414,34 +411,31 @@
 					<text><![CDATA[Overdue]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText-13" style="Detail_Header" x="659" y="35" width="80" height="25"/>
+					<reportElement key="staticText-13" style="Detail_Header" x="654" y="35" width="75" height="25"/>
 					<box rightPadding="2"/>
 					<textElement textAlignment="Right">
 						<font size="8" isBold="false"/>
 					</textElement>
-					<text><![CDATA[Base
-Amount]]></text>
+					<text><![CDATA[Base Amount]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText-14" style="Detail_Header" x="740" y="35" width="41" height="25"/>
+					<reportElement key="staticText-14" style="Detail_Header" x="730" y="35" width="51" height="25"/>
 					<box leftPadding="2"/>
 					<textElement textAlignment="Center">
 						<font size="8" isBold="false"/>
 					</textElement>
-					<text><![CDATA[Base
-Currency]]></text>
+					<text><![CDATA[Base Currency]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText-15" style="Detail_Header" x="517" y="35" width="80" height="25"/>
+					<reportElement key="staticText-15" style="Detail_Header" x="517" y="35" width="75" height="25"/>
 					<box rightPadding="2"/>
 					<textElement textAlignment="Right">
 						<font size="8" isBold="false"/>
 					</textElement>
-					<text><![CDATA[Transactional
-Amount]]></text>
+					<text><![CDATA[Transactional Amount]]></text>
 				</staticText>
 				<staticText>
-					<reportElement key="staticText-16" style="Detail_Header" x="598" y="35" width="60" height="25"/>
+					<reportElement key="staticText-16" style="Detail_Header" x="593" y="35" width="60" height="25"/>
 					<box leftPadding="2"/>
 					<textElement textAlignment="Center">
 						<font size="8" isBold="false"/>
@@ -489,13 +483,13 @@
 					<reportElement key="line-46" style="Report_Footer" stretchType="RelativeToBandHeight" x="516" y="35" width="1" height="25"/>
 				</line>
 				<line>
-					<reportElement key="line-47" style="Report_Footer" stretchType="RelativeToBandHeight" x="597" y="35" width="1" height="25"/>
+					<reportElement key="line-47" style="Report_Footer" stretchType="RelativeToBandHeight" x="592" y="35" width="1" height="25"/>
 				</line>
 				<line>
-					<reportElement key="line-48" style="Report_Footer" stretchType="RelativeToBandHeight" x="658" y="35" width="1" height="25"/>
+					<reportElement key="line-48" style="Report_Footer" stretchType="RelativeToBandHeight" x="653" y="35" width="1" height="25"/>
 				</line>
 				<line>
-					<reportElement key="line-49" style="Report_Footer" stretchType="RelativeToBandHeight" x="739" y="35" width="1" height="25"/>
+					<reportElement key="line-49" style="Report_Footer" stretchType="RelativeToBandHeight" x="729" y="35" width="1" height="25"/>
 				</line>
 				<line>
 					<reportElement key="line-50" style="Report_Footer" stretchType="RelativeToBandHeight" x="781" y="35" width="1" height="25"/>
@@ -740,7 +734,7 @@
 				<textFieldExpression class="java.lang.String"><![CDATA[($F{OVERDUE}== null ? " " : $F{OVERDUE}.toString())]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField-13" style="Report_Footer" x="659" y="0" width="79" height="25"/>
+				<reportElement key="textField-13" style="Report_Footer" x="654" y="0" width="74" height="25"/>
 				<box rightPadding="2"/>
 				<textElement textAlignment="Right">
 					<font size="8"/>
@@ -748,14 +742,14 @@
 				<textFieldExpression class="java.lang.String"><![CDATA[($F{BASE_AMOUNT}== null ? " " : $F{BASE_AMOUNT}.toString())]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField-14" style="Report_Footer" x="740" y="0" width="40" height="25"/>
+				<reportElement key="textField-14" style="Report_Footer" x="730" y="0" width="50" height="25"/>
 				<textElement textAlignment="Center">
 					<font size="8"/>
 				</textElement>
 				<textFieldExpression class="java.lang.String"><![CDATA[$F{BASE_CURRENCY}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField-15" style="Report_Footer" x="517" y="0" width="79" height="25"/>
+				<reportElement key="textField-15" style="Report_Footer" x="517" y="0" width="74" height="25"/>
 				<box rightPadding="2"/>
 				<textElement textAlignment="Right">
 					<font size="8"/>
@@ -763,7 +757,7 @@
 				<textFieldExpression class="java.lang.String"><![CDATA[$F{TRANS_AMOUNT}.toString() + " "]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="false">
-				<reportElement key="textField-16" style="Report_Footer" x="598" y="0" width="60" height="25"/>
+				<reportElement key="textField-16" style="Report_Footer" x="593" y="0" width="60" height="25"/>
 				<textElement textAlignment="Center">
 					<font size="8"/>
 				</textElement>
@@ -797,13 +791,13 @@
 				<reportElement key="line-15" style="Report_Footer" stretchType="RelativeToBandHeight" x="516" y="0" width="1" height="25"/>
 			</line>
 			<line>
-				<reportElement key="line-17" style="Report_Footer" stretchType="RelativeToBandHeight" x="597" y="0" width="1" height="25"/>
+				<reportElement key="line-17" style="Report_Footer" stretchType="RelativeToBandHeight" x="592" y="0" width="1" height="25"/>
 			</line>
 			<line>
-				<reportElement key="line-18" style="Report_Footer" stretchType="RelativeToBandHeight" x="658" y="0" width="1" height="25"/>
+				<reportElement key="line-18" style="Report_Footer" stretchType="RelativeToBandHeight" x="653" y="0" width="1" height="25"/>
 			</line>
 			<line>
-				<reportElement key="line-19" style="Report_Footer" stretchType="RelativeToBandHeight" x="739" y="0" width="1" height="25"/>
+				<reportElement key="line-19" style="Report_Footer" stretchType="RelativeToBandHeight" x="729" y="0" width="1" height="25"/>
 			</line>
 			<line>
 				<reportElement key="line-25" style="Report_Footer" stretchType="RelativeToBandHeight" x="781" y="0" width="1" height="25"/>
--- a/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Thu May 24 08:59:54 2012 +0000
@@ -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.15736]]></VERSION>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.16285]]></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.3]]></VERSION_LABEL>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION_LABEL><![CDATA[MP11]]></VERSION_LABEL>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--3A3A943684D64DEF9EC39F588A656848--></AD_MODULE>
 
--- a/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu May 24 08:59:54 2012 +0000
@@ -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.15736]]></STARTVERSION>
+<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.16285]]></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.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped.java	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src/org/openbravo/reports/ordersawaitingdelivery/erpCommon/ad_reports/ReportOrderNotShipped.java	Thu May 24 08:59:54 2012 +0000
@@ -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) 2009-2011 Openbravo SLU 
+ * All portions are Copyright (C) 2009-2012 Openbravo SLU 
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -28,7 +28,6 @@
 
 import org.openbravo.base.secureApp.HttpSecureAppServlet;
 import org.openbravo.base.secureApp.VariablesSecureApp;
-import org.openbravo.erpCommon.ad_combos.OrganizationComboData;
 import org.openbravo.erpCommon.businessUtility.WindowTabs;
 import org.openbravo.erpCommon.utility.ComboTableData;
 import org.openbravo.erpCommon.utility.DateTimeData;
@@ -153,8 +152,18 @@
     xmlDocument.setParameter("orderDocNo", strOrderDocNo);
     xmlDocument.setParameter("orderRef", strOrderRef);
     xmlDocument.setParameter("adOrgId", strCOrgId);
-    xmlDocument.setData("reportAD_ORGID", "liststructure",
-        OrganizationComboData.selectCombo(this, vars.getRole()));
+    try {
+      ComboTableData comboTableData = new ComboTableData(vars, this, "TABLEDIR", "AD_Org_ID", "",
+          "49DC1D6F086945AB82F84C66F5F13F16", Utility.getContext(this, vars, "#AccessibleOrgTree",
+              "ReportOrderNotShipped"), Utility.getContext(this, vars, "#User_Client",
+              "ReportOrderNotShipped"), 0);
+      Utility.fillSQLParameters(this, vars, null, comboTableData, "ReportOrderNotShipped", "");
+      xmlDocument.setData("reportAD_ORGID", "liststructure", comboTableData.select(false));
+      comboTableData = null;
+
+    } catch (Exception ex) {
+      throw new ServletException(ex);
+    }
     response.setContentType("text/html; charset=UTF-8");
     PrintWriter out = response.getWriter();
     out.println(xmlDocument.print());
--- a/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_COLUMN.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_COLUMN.xml	Thu May 24 08:59:54 2012 +0000
@@ -292,7 +292,7 @@
 <!--3F49178720D247C4AC8286D2C2208C44-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--3F49178720D247C4AC8286D2C2208C44-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3F49178720D247C4AC8286D2C2208C44-->  <NAME><![CDATA[Updated]]></NAME>
-<!--3F49178720D247C4AC8286D2C2208C44-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--3F49178720D247C4AC8286D2C2208C44-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
 <!--3F49178720D247C4AC8286D2C2208C44-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
 <!--3F49178720D247C4AC8286D2C2208C44-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
 <!--3F49178720D247C4AC8286D2C2208C44-->  <AD_TABLE_ID><![CDATA[FC969D8F4327475095917840EC155462]]></AD_TABLE_ID>
@@ -757,7 +757,7 @@
 <!--AB1623990B96457F969FBFAC6803AC0E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--AB1623990B96457F969FBFAC6803AC0E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--AB1623990B96457F969FBFAC6803AC0E-->  <NAME><![CDATA[Updated]]></NAME>
-<!--AB1623990B96457F969FBFAC6803AC0E-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--AB1623990B96457F969FBFAC6803AC0E-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
 <!--AB1623990B96457F969FBFAC6803AC0E-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
 <!--AB1623990B96457F969FBFAC6803AC0E-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
 <!--AB1623990B96457F969FBFAC6803AC0E-->  <AD_TABLE_ID><![CDATA[B3283A801AAC411582CAAF6B99640CD8]]></AD_TABLE_ID>
--- a/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_FIELD.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_FIELD.xml	Thu May 24 08:59:54 2012 +0000
@@ -87,7 +87,7 @@
 <!--23272B81BEF74DC3BA922D205C604DFD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--23272B81BEF74DC3BA922D205C604DFD-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--23272B81BEF74DC3BA922D205C604DFD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--23272B81BEF74DC3BA922D205C604DFD-->  <NAME><![CDATA[Obserds_Datasource_ID]]></NAME>
+<!--23272B81BEF74DC3BA922D205C604DFD-->  <NAME><![CDATA[Datasource]]></NAME>
 <!--23272B81BEF74DC3BA922D205C604DFD-->  <DESCRIPTION><![CDATA[The datasource ]]></DESCRIPTION>
 <!--23272B81BEF74DC3BA922D205C604DFD-->  <HELP><![CDATA[The datasource provides data from the database or from in-memory data.]]></HELP>
 <!--23272B81BEF74DC3BA922D205C604DFD-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
@@ -279,7 +279,7 @@
 <!--77780C7AD4BB45DEAE510AAF6CFDCED5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--77780C7AD4BB45DEAE510AAF6CFDCED5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--77780C7AD4BB45DEAE510AAF6CFDCED5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--77780C7AD4BB45DEAE510AAF6CFDCED5-->  <NAME><![CDATA[Obserds_Datasource_Field_ID]]></NAME>
+<!--77780C7AD4BB45DEAE510AAF6CFDCED5-->  <NAME><![CDATA[Datasource Field]]></NAME>
 <!--77780C7AD4BB45DEAE510AAF6CFDCED5-->  <DESCRIPTION><![CDATA[The datasource field is part of the datasource definition.]]></DESCRIPTION>
 <!--77780C7AD4BB45DEAE510AAF6CFDCED5-->  <HELP><![CDATA[The datasource field is part of the datasource definition.]]></HELP>
 <!--77780C7AD4BB45DEAE510AAF6CFDCED5-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
--- a/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Thu May 24 08:59:54 2012 +0000
@@ -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.15736]]></VERSION>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION><![CDATA[2.1.16285]]></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.3]]></VERSION_LABEL>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION_LABEL><![CDATA[MP11]]></VERSION_LABEL>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4--></AD_MODULE>
 
--- a/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu May 24 08:59:54 2012 +0000
@@ -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.15736]]></STARTVERSION>
+<!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <STARTVERSION><![CDATA[1.1.16285]]></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.15736]]></STARTVERSION>
+<!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <STARTVERSION><![CDATA[2.0.16285]]></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.15736]]></STARTVERSION>
+<!--4FCE95802A854F7E8623AFF7C33D13EE-->  <STARTVERSION><![CDATA[3.0.16285]]></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.15736]]></STARTVERSION>
+<!--54AF8B39C55E4E7496902893ECD82786-->  <STARTVERSION><![CDATA[2.1.16285]]></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.15736]]></STARTVERSION>
+<!--D03C56D8A4E14F45A5466350E05C631F-->  <STARTVERSION><![CDATA[8.1.16285]]></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-db/database/sourcedata/AD_WINDOW.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_WINDOW.xml	Thu May 24 08:59:54 2012 +0000
@@ -9,7 +9,7 @@
 <!--67AD3A287B7F4577A1534C8430E9DB2E-->  <DESCRIPTION><![CDATA[Maintain datasources which are used to provide data to the user interface]]></DESCRIPTION>
 <!--67AD3A287B7F4577A1534C8430E9DB2E-->  <HELP><![CDATA[A datasource is used to provide data to user interface components running on the client. The data can be read from the database or can be computed at runtime in memory. Data consists mostly of records with fields which are displayed on the client in forms and grids.]]></HELP>
 <!--67AD3A287B7F4577A1534C8430E9DB2E-->  <WINDOWTYPE><![CDATA[M]]></WINDOWTYPE>
-<!--67AD3A287B7F4577A1534C8430E9DB2E-->  <ISSOTRX><![CDATA[N]]></ISSOTRX>
+<!--67AD3A287B7F4577A1534C8430E9DB2E-->  <ISSOTRX><![CDATA[Y]]></ISSOTRX>
 <!--67AD3A287B7F4577A1534C8430E9DB2E-->  <PROCESSING><![CDATA[N]]></PROCESSING>
 <!--67AD3A287B7F4577A1534C8430E9DB2E-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
 <!--67AD3A287B7F4577A1534C8430E9DB2E-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
--- a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java	Thu May 24 08:59:54 2012 +0000
@@ -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) 2009-2011 Openbravo SLU 
+ * All portions are Copyright (C) 2009-2012 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -65,7 +65,6 @@
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.database.SessionInfo;
 import org.openbravo.erpCommon.businessUtility.Preferences;
-import org.openbravo.erpCommon.security.UsageAudit;
 import org.openbravo.erpCommon.utility.PropertyNotFoundException;
 import org.openbravo.erpCommon.utility.Utility;
 import org.openbravo.model.ad.datamodel.Column;
@@ -116,8 +115,12 @@
       throws ServletException, IOException {
 
     try {
+      SessionInfo.setModuleId(request.getParameter("moduleId"));
+      SessionInfo.setCommand(request.getParameter(DataSourceConstants.OPERATION_TYPE_PARAM));
+      SessionInfo.setProcessId(request.getParameter("tabId"));
+      SessionInfo.setProcessType("W");
+
       super.service(request, response);
-
     } catch (final InvalidRequestException e) {
       if (SessionHandler.isSessionHandlerPresent()) {
         SessionHandler.getInstance().setDoRollback(true);
@@ -161,7 +164,6 @@
   public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException,
       ServletException {
     final Map<String, String> parameters = getParameterMap(request);
-    UsageAudit.auditAction(request, parameters);
     doFetch(request, response, parameters);
   }
 
@@ -559,7 +561,8 @@
   public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException,
       ServletException {
     final Map<String, String> parameters = getParameterMap(request);
-    UsageAudit.auditAction(request, parameters);
+
+    setSessionInfo();
 
     try {
       if (!hasAccess(request, parameters.get("tabId"))) {
@@ -586,8 +589,7 @@
   public void doDelete(HttpServletRequest request, HttpServletResponse response)
       throws IOException, ServletException {
     final Map<String, String> parameters = getParameterMap(request);
-    UsageAudit.auditAction(request, parameters);
-    setSessionInfo(request, parameters);
+    setSessionInfo();
     try {
       // checks and set parameters, if not valid then go away
       if (!checkSetParameters(request, response, parameters)) {
@@ -629,8 +631,7 @@
   public void doPut(HttpServletRequest request, HttpServletResponse response) throws IOException,
       ServletException {
     final Map<String, String> parameters = getParameterMap(request);
-    setSessionInfo(request, parameters);
-    UsageAudit.auditAction(request, parameters);
+    setSessionInfo();
     try {
       if (!hasAccess(request, parameters.get("tabId"))) {
         throw new OBUserException("AccessTableNoView");
@@ -647,15 +648,7 @@
     }
   }
 
-  private void setSessionInfo(HttpServletRequest request, Map<String, String> parameters) {
-    SessionInfo.setModuleId(parameters.get("moduleId"));
-    SessionInfo.setProcessType("W");
-    SessionInfo.setProcessId(parameters.get("tabId"));
-    // Session ID and user needn't be set as they were done in the service method.
-
-    // SessionInfo.setUserId(OBContext.getOBContext().getUser().getId());
-    // SessionInfo.setSessionId((String) request.getAttribute("#AD_SESSION_ID"));
-
+  private void setSessionInfo() {
     // FIXME: Because of issue #15331 connection is initialized with temporary audit table before
     // setting session info
     // Reset Session Info in DB manually as it was set in the service but actual information is not
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_COLUMN.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_COLUMN.xml	Thu May 24 08:59:54 2012 +0000
@@ -181,7 +181,7 @@
 <!--5F5AFB7517AC466EBCFA13CBB2B2EEF0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--5F5AFB7517AC466EBCFA13CBB2B2EEF0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--5F5AFB7517AC466EBCFA13CBB2B2EEF0-->  <NAME><![CDATA[Updated]]></NAME>
-<!--5F5AFB7517AC466EBCFA13CBB2B2EEF0-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--5F5AFB7517AC466EBCFA13CBB2B2EEF0-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
 <!--5F5AFB7517AC466EBCFA13CBB2B2EEF0-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
 <!--5F5AFB7517AC466EBCFA13CBB2B2EEF0-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
 <!--5F5AFB7517AC466EBCFA13CBB2B2EEF0-->  <AD_TABLE_ID><![CDATA[FF8080813161A3D301316206A5840008]]></AD_TABLE_ID>
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Thu May 24 08:59:54 2012 +0000
@@ -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.15736]]></VERSION>
+<!--FF8080813129ADA401312CA1222A0005-->  <VERSION><![CDATA[0.1.16285]]></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.3]]></VERSION_LABEL>
+<!--FF8080813129ADA401312CA1222A0005-->  <VERSION_LABEL><![CDATA[MP11]]></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	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu May 24 08:59:54 2012 +0000
@@ -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.15736]]></STARTVERSION>
+<!--FF8080813141B198013141BA0F7D0012-->  <STARTVERSION><![CDATA[0.1.16285]]></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.15736]]></STARTVERSION>
+<!--FF8080813151AEE1013151C4ACE6001B-->  <STARTVERSION><![CDATA[2.1.16285]]></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_COLUMN.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_COLUMN.xml	Thu May 24 08:59:54 2012 +0000
@@ -250,7 +250,7 @@
 <!--890BE735A7E94DD78AE96CA8F55D59EF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--890BE735A7E94DD78AE96CA8F55D59EF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--890BE735A7E94DD78AE96CA8F55D59EF-->  <NAME><![CDATA[Updated]]></NAME>
-<!--890BE735A7E94DD78AE96CA8F55D59EF-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--890BE735A7E94DD78AE96CA8F55D59EF-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
 <!--890BE735A7E94DD78AE96CA8F55D59EF-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
 <!--890BE735A7E94DD78AE96CA8F55D59EF-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
 <!--890BE735A7E94DD78AE96CA8F55D59EF-->  <AD_TABLE_ID><![CDATA[FF808081314B80C001314B976A49000C]]></AD_TABLE_ID>
--- a/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Thu May 24 08:59:54 2012 +0000
@@ -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.15736]]></VERSION>
+<!--FF8080813141B198013141B86DD70003-->  <VERSION><![CDATA[0.1.16285]]></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.3]]></VERSION_LABEL>
+<!--FF8080813141B198013141B86DD70003-->  <VERSION_LABEL><![CDATA[MP11]]></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	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu May 24 08:59:54 2012 +0000
@@ -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.15736]]></STARTVERSION>
+<!--FF8080813141B198013141B8B21B0006-->  <STARTVERSION><![CDATA[3.0.16285]]></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_MESSAGE.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MESSAGE.xml	Thu May 24 08:59:54 2012 +0000
@@ -28,7 +28,7 @@
 <!--FF8081812D744D38012D745E4B22001F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FF8081812D744D38012D745E4B22001F-->  <ISACTIVE><![CDATA[N]]></ISACTIVE>
 <!--FF8081812D744D38012D745E4B22001F-->  <VALUE><![CDATA[OBJSON_StaleDate]]></VALUE>
-<!--FF8081812D744D38012D745E4B22001F-->  <MSGTEXT><![CDATA[The record you are saving has already been changed by another user or process. Refresh the data by clicking the refresh button, you will loose your current changes.]]></MSGTEXT>
+<!--FF8081812D744D38012D745E4B22001F-->  <MSGTEXT><![CDATA[The record you are saving has already been changed by another user or process. Cancel your changes and refresh the data by clicking the refresh button.]]></MSGTEXT>
 <!--FF8081812D744D38012D745E4B22001F-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
 <!--FF8081812D744D38012D745E4B22001F-->  <AD_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_MODULE_ID>
 <!--FF8081812D744D38012D745E4B22001F--></AD_MESSAGE>
--- a/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Thu May 24 08:59:54 2012 +0000
@@ -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.15736]]></VERSION>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION><![CDATA[2.0.16285]]></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.3]]></VERSION_LABEL>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION_LABEL><![CDATA[MP11]]></VERSION_LABEL>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1--></AD_MODULE>
 
--- a/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu May 24 08:59:54 2012 +0000
@@ -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.15736]]></STARTVERSION>
+<!--9E3E7B42DB16405FB794496D309D7044-->  <STARTVERSION><![CDATA[3.0.16285]]></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_COLUMN.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_COLUMN.xml	Thu May 24 08:59:54 2012 +0000
@@ -113,7 +113,7 @@
 <!--07EE0ED1C4F544E88F0AB78C8EF6173D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--07EE0ED1C4F544E88F0AB78C8EF6173D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--07EE0ED1C4F544E88F0AB78C8EF6173D-->  <NAME><![CDATA[Updated]]></NAME>
-<!--07EE0ED1C4F544E88F0AB78C8EF6173D-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--07EE0ED1C4F544E88F0AB78C8EF6173D-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
 <!--07EE0ED1C4F544E88F0AB78C8EF6173D-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
 <!--07EE0ED1C4F544E88F0AB78C8EF6173D-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
 <!--07EE0ED1C4F544E88F0AB78C8EF6173D-->  <AD_TABLE_ID><![CDATA[7E50FCF61A884C9D966D1348705EC17C]]></AD_TABLE_ID>
@@ -542,7 +542,7 @@
 <!--201FE34C125845358AE10A94953D9A44-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--201FE34C125845358AE10A94953D9A44-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--201FE34C125845358AE10A94953D9A44-->  <NAME><![CDATA[Updated]]></NAME>
-<!--201FE34C125845358AE10A94953D9A44-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--201FE34C125845358AE10A94953D9A44-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
 <!--201FE34C125845358AE10A94953D9A44-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
 <!--201FE34C125845358AE10A94953D9A44-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
 <!--201FE34C125845358AE10A94953D9A44-->  <AD_TABLE_ID><![CDATA[A2F880F9981349E2A6A57BD58267EBCE]]></AD_TABLE_ID>
@@ -1540,7 +1540,7 @@
 <!--89E9B7BCF29A42B3AA1DB33DCE06CE14-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--89E9B7BCF29A42B3AA1DB33DCE06CE14-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--89E9B7BCF29A42B3AA1DB33DCE06CE14-->  <NAME><![CDATA[Updated]]></NAME>
-<!--89E9B7BCF29A42B3AA1DB33DCE06CE14-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--89E9B7BCF29A42B3AA1DB33DCE06CE14-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
 <!--89E9B7BCF29A42B3AA1DB33DCE06CE14-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
 <!--89E9B7BCF29A42B3AA1DB33DCE06CE14-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
 <!--89E9B7BCF29A42B3AA1DB33DCE06CE14-->  <AD_TABLE_ID><![CDATA[956C43EAF12D44EBA06071EF0610FA15]]></AD_TABLE_ID>
@@ -1927,7 +1927,7 @@
 <!--9CFAD359FF0D433894E34EA05F6207FE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--9CFAD359FF0D433894E34EA05F6207FE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--9CFAD359FF0D433894E34EA05F6207FE-->  <NAME><![CDATA[Updated]]></NAME>
-<!--9CFAD359FF0D433894E34EA05F6207FE-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--9CFAD359FF0D433894E34EA05F6207FE-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
 <!--9CFAD359FF0D433894E34EA05F6207FE-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
 <!--9CFAD359FF0D433894E34EA05F6207FE-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
 <!--9CFAD359FF0D433894E34EA05F6207FE-->  <AD_TABLE_ID><![CDATA[2AB26D8C93234EDFA52778276242BBA2]]></AD_TABLE_ID>
--- a/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Thu May 24 08:59:54 2012 +0000
@@ -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.15736]]></VERSION>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION><![CDATA[2.1.16285]]></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.3]]></VERSION_LABEL>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION_LABEL><![CDATA[MP11]]></VERSION_LABEL>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--5EB4F15C80684ACA904756BDC12ADBE5--></AD_MODULE>
 
--- a/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu May 24 08:59:54 2012 +0000
@@ -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.15736]]></STARTVERSION>
+<!--38825CAED43941D38CA0C78DB04FCFA0-->  <STARTVERSION><![CDATA[8.1.16285]]></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.15736]]></STARTVERSION>
+<!--6DDE7B1A70174242AF82B5022FB89279-->  <STARTVERSION><![CDATA[2.1.16285]]></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.15736]]></STARTVERSION>
+<!--94F9CD2CB5EF4467A67475C786C984A7-->  <STARTVERSION><![CDATA[2.1.16285]]></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.15736]]></STARTVERSION>
+<!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <STARTVERSION><![CDATA[1.1.16285]]></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.15736]]></STARTVERSION>
+<!--C8DAC574B88649D08C9468521B343F12-->  <STARTVERSION><![CDATA[3.0.16285]]></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.15736]]></STARTVERSION>
+<!--F14EB17946BE4724A46F80CB1A47EC70-->  <STARTVERSION><![CDATA[2.1.16285]]></STARTVERSION>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-filter-select-item.js	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-filter-select-item.js	Thu May 24 08:59:54 2012 +0000
@@ -19,6 +19,7 @@
 isc.ClassFactory.defineClass('OBSelectorFilterSelectItem', isc.SelectItem);
 
 isc.OBSelectorFilterSelectItem.addProperties({
+  fetchMissingValues: true,
   operator: 'equals',
   valueField: OB.Constants.ID,
 
--- a/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js	Thu May 24 08:59:54 2012 +0000
@@ -361,6 +361,26 @@
     this.Super('updateValue', arguments);
   },
 
+  setValue: function (val) {
+    var i, displayedVal;
+
+    if (val && this.valueMap) {
+      displayedVal = this.valueMap[val];
+      for (i in this.valueMap) {
+        if (this.valueMap.hasOwnProperty(i)) {
+          if (this.valueMap[i] === displayedVal && i !== val) {
+            // cleaning up valueMap: there are 2 values that display the same info, keep just the one for
+            // the current value
+            delete this.valueMap[i];
+            break;
+          }
+        }
+      }
+    }
+
+    this.Super('setValue', arguments);
+  },
+
   // changed handles the case that the user removes the value using the keyboard
   // this should do the same things as setting the value through the pickvalue
   changed: function (form, item, newValue) {
@@ -440,7 +460,8 @@
 
   setValueFromRecord: function (record, fromPopup) {
     var currentValue = this.getValue(),
-        identifierFieldName = this.name + '.' + OB.Constants.IDENTIFIER;
+        identifierFieldName = this.name + '.' + OB.Constants.IDENTIFIER,
+        i;
     if (!record) {
       this.storeValue(null);
       this.form.setValue(this.name + '.' + this.displayField, null);
@@ -460,6 +481,7 @@
       if (!this.valueMap) {
         this.valueMap = {};
       }
+
       this.valueMap[record[this.valueField]] = record[this.displayField];
       this.updateValueMap();
     }
--- a/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Thu May 24 08:59:54 2012 +0000
@@ -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.15736]]></VERSION>
+<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION><![CDATA[2.0.16285]]></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.3]]></VERSION_LABEL>
+<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION_LABEL><![CDATA[MP11]]></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	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu May 24 08:59:54 2012 +0000
@@ -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.15736]]></STARTVERSION>
+<!--39BF75AD9AB3453698BF5DE29E727AA9-->  <STARTVERSION><![CDATA[3.0.16285]]></STARTVERSION>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Thu May 24 08:59:54 2012 +0000
@@ -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.15736]]></VERSION>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION><![CDATA[8.1.16285]]></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.3]]></VERSION_LABEL>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION_LABEL><![CDATA[MP11]]></VERSION_LABEL>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9--></AD_MODULE>
 
--- a/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu May 24 08:59:54 2012 +0000
@@ -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.15736]]></STARTVERSION>
+<!--086331E18477496B8AC74D2CFEBD1307-->  <STARTVERSION><![CDATA[3.0.16285]]></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.15736]]></STARTVERSION>
+<!--DC5D4EF450244482BD2B458DAA496333-->  <STARTVERSION><![CDATA[2.1.16285]]></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.15736]]></STARTVERSION>
+<!--F2AF15C0AF5540E393D96BE506E20648-->  <STARTVERSION><![CDATA[1.1.16285]]></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/js/ob-smartclient.js	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js	Thu May 24 08:59:54 2012 +0000
@@ -25,7 +25,6 @@
 // NOTE: causes issue https://issues.openbravo.com/view.php?id=16014
 // NOTE: disabled as now timezone is send from the client to the server
 // Time.setDefaultDisplayTimezone(0);
-
 // Call duplicated - we include SmartClient embedded in StaticResources for classic windows
 isc.setAutoDraw(false);
 isc.screenReader = false;
@@ -392,6 +391,11 @@
   // always take up space when an item is hidden in a form
   alwaysTakeSpace: true,
 
+  // If an item has an optiomDataSource, a fetch is made in the init() or setValue() ...
+  // "The fetch occurs if the item value is non null on initial draw of the form or whenever setValue() is called"
+  // http://www.smartclient.com/docs/8.1/a/b/c/go.html#attr..FormItem.fetchMissingValues
+  fetchMissingValues: false,
+
   // disable tab to icons
   canTabToIcons: false,
 
--- a/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/load_skin.js	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/smartclient/load_skin.js	Thu May 24 08:59:54 2012 +0000
@@ -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)
 
 
 
Binary file modules/org.openbravo.v3.datasets/build/classes/org/openbravo/v3/datasets/SetDefaultRole.class has changed
--- a/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Thu May 24 08:59:54 2012 +0000
@@ -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.15736]]></VERSION>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION><![CDATA[3.0.16285]]></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,8 @@
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
-<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION_LABEL><![CDATA[MP9.3]]></VERSION_LABEL>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <REFERENCEDATAINFO><![CDATA[Pre-configured collection of standard ERP roles]]></REFERENCEDATAINFO>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION_LABEL><![CDATA[MP11]]></VERSION_LABEL>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61--></AD_MODULE>
 
--- a/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu May 24 08:59:54 2012 +0000
@@ -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.15736]]></STARTVERSION>
+<!--148A000EE9A04A3CA653B1296A00B8E6-->  <STARTVERSION><![CDATA[3.0.16285]]></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.15736]]></STARTVERSION>
+<!--30F966407A6F4E15965821BAEE34D25B-->  <STARTVERSION><![CDATA[3.0.16285]]></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.15736]]></STARTVERSION>
+<!--F93CE30003B24F8F8886510B0065EECC-->  <STARTVERSION><![CDATA[1.1.16285]]></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.datasets/src-util/modulescript/src/org/openbravo/v3/datasets/SetDefaultRole.java	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.v3.datasets/src-util/modulescript/src/org/openbravo/v3/datasets/SetDefaultRole.java	Thu May 24 08:59:54 2012 +0000
@@ -36,7 +36,7 @@
     try {
       ConnectionProvider cp = getConnectionProvider();
       PreparedStatement ps = cp
-          .getPreparedStatement("update ad_user set default_ad_role_id='FF8080812AFBCB14012AFBD3E4340031' where ad_user_id='100' and default_ad_role_id is NULL and exists (select 1 from ad_role where ad_role_id='FF8080812AFBCB14012AFBD3E4340031')");
+          .getPreparedStatement("update ad_user set default_ad_role_id='42D0EEB1C66F497A90DD526DC597E6F0' where ad_user_id='100' and default_ad_role_id is NULL and exists (select 1 from ad_role where ad_role_id='42D0EEB1C66F497A90DD526DC597E6F0')");
       ps.executeUpdate();
     } catch (Exception e) {
       handleError(e);
--- a/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Thu May 24 08:59:54 2012 +0000
@@ -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.15736]]></VERSION>
+<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION><![CDATA[2.1.16285]]></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.3]]></VERSION_LABEL>
+<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION_LABEL><![CDATA[MP11]]></VERSION_LABEL>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--7E48CDD73B7E493A8BED4F7253E7C989--></AD_MODULE>
 
--- a/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu May 24 08:59:54 2012 +0000
@@ -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.15736]]></STARTVERSION>
+<!--01E1BCCEC9114DE0960538DF34E30E6F-->  <STARTVERSION><![CDATA[2.1.16285]]></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.15736]]></STARTVERSION>
+<!--025B181F63CA47B48A920F6983242390-->  <STARTVERSION><![CDATA[3.0.16285]]></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.15736]]></STARTVERSION>
+<!--054B4FEAF919478AA3FF27098A46D1D6-->  <STARTVERSION><![CDATA[2.1.16285]]></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.15736]]></STARTVERSION>
+<!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <STARTVERSION><![CDATA[1.0.16285]]></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.15736]]></STARTVERSION>
+<!--224754C3EF674C93B0D468F47BAAB824-->  <STARTVERSION><![CDATA[2.1.16285]]></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.15736]]></STARTVERSION>
+<!--5B72D24032DD4879A950194139D961B6-->  <STARTVERSION><![CDATA[2.1.16285]]></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.15736]]></STARTVERSION>
+<!--8730CA6A4224439D82E0DD31B3806E36-->  <STARTVERSION><![CDATA[1.0.16285]]></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.15736]]></STARTVERSION>
+<!--98C47FF058F8413B8A2B26036061446E-->  <STARTVERSION><![CDATA[8.1.16285]]></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.15736]]></STARTVERSION>
+<!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <STARTVERSION><![CDATA[2.0.16285]]></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.15736]]></STARTVERSION>
+<!--A9CB99330AF34944877F889DD8A0AB3C-->  <STARTVERSION><![CDATA[2.1.16285]]></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.15736]]></STARTVERSION>
+<!--E72A053A403C4A98A189C105B850ADB0-->  <STARTVERSION><![CDATA[1.1.16285]]></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.15736]]></STARTVERSION>
+<!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <STARTVERSION><![CDATA[2.0.16285]]></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	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.v3/src-db/database/configScript.xml	Thu May 24 08:59:54 2012 +0000
@@ -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,14 @@
       <oldValue><![CDATA[Y]]></oldValue>
       <newValue><![CDATA[N]]></newValue>
     </columnDataChange>
+    <columnDataChange tablename="AD_MENU" columnname="ISACTIVE" pkRow="800281">
+      <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>
@@ -29,10 +37,6 @@
       <oldValue><![CDATA[Y]]></oldValue>
       <newValue><![CDATA[N]]></newValue>
     </columnDataChange>
-    <columnDataChange tablename="AD_TAB" columnname="ISACTIVE" pkRow="317">
-      <oldValue><![CDATA[Y]]></oldValue>
-      <newValue><![CDATA[N]]></newValue>
-    </columnDataChange>
     <columnDataChange tablename="AD_TAB" columnname="ISACTIVE" pkRow="800000">
       <oldValue><![CDATA[Y]]></oldValue>
       <newValue><![CDATA[N]]></newValue>
@@ -93,10 +97,6 @@
       <oldValue><![CDATA[Y]]></oldValue>
       <newValue><![CDATA[N]]></newValue>
     </columnDataChange>
-    <columnDataChange tablename="AD_TAB" columnname="ISACTIVE" pkRow="1005100000">
-      <oldValue><![CDATA[Y]]></oldValue>
-      <newValue><![CDATA[N]]></newValue>
-    </columnDataChange>
     <columnDataChange tablename="AD_FIELD" columnname="ISDISPLAYED" pkRow="454">
       <oldValue><![CDATA[Y]]></oldValue>
       <newValue><![CDATA[N]]></newValue>
@@ -157,10 +157,6 @@
       <oldValue><![CDATA[Y]]></oldValue>
       <newValue><![CDATA[N]]></newValue>
     </columnDataChange>
-    <columnDataChange tablename="AD_FIELD" columnname="ISDISPLAYED" pkRow="1021">
-      <oldValue><![CDATA[Y]]></oldValue>
-      <newValue><![CDATA[N]]></newValue>
-    </columnDataChange>
     <columnDataChange tablename="AD_FIELD" columnname="ISSAMELINE" pkRow="1028">
       <oldValue><![CDATA[Y]]></oldValue>
       <newValue><![CDATA[N]]></newValue>
@@ -229,10 +225,6 @@
       <oldValue><![CDATA[Y]]></oldValue>
       <newValue><![CDATA[N]]></newValue>
     </columnDataChange>
-    <columnDataChange tablename="AD_FIELD" columnname="ISDISPLAYED" pkRow="1316">
-      <oldValue><![CDATA[Y]]></oldValue>
-      <newValue><![CDATA[N]]></newValue>
-    </columnDataChange>
     <columnDataChange tablename="AD_FIELD" columnname="ISDISPLAYED" pkRow="1319">
       <oldValue><![CDATA[Y]]></oldValue>
       <newValue><![CDATA[N]]></newValue>
@@ -605,14 +597,6 @@
       <oldValue><![CDATA[Y]]></oldValue>
       <newValue><![CDATA[N]]></newValue>
     </columnDataChange>
-    <columnDataChange tablename="AD_FIELD" columnname="ISDISPLAYED" pkRow="3404">
-      <oldValue><![CDATA[Y]]></oldValue>
-      <newValue><![CDATA[N]]></newValue>
-    </columnDataChange>
-    <columnDataChange tablename="AD_FIELD" columnname="ISDISPLAYED" pkRow="3405">
-      <oldValue><![CDATA[Y]]></oldValue>
-      <newValue><![CDATA[N]]></newValue>
-    </columnDataChange>
     <columnDataChange tablename="AD_FIELD" columnname="ISDISPLAYED" pkRow="3408">
       <oldValue><![CDATA[Y]]></oldValue>
       <newValue><![CDATA[N]]></newValue>
@@ -709,10 +693,6 @@
       <oldValue><![CDATA[Y]]></oldValue>
       <newValue><![CDATA[N]]></newValue>
     </columnDataChange>
-    <columnDataChange tablename="AD_FIELD" columnname="ISDISPLAYED" pkRow="3743">
-      <oldValue><![CDATA[Y]]></oldValue>
-      <newValue><![CDATA[N]]></newValue>
-    </columnDataChange>
     <columnDataChange tablename="AD_FIELD" columnname="ISDISPLAYED" pkRow="3744">
       <oldValue><![CDATA[Y]]></oldValue>
       <newValue><![CDATA[N]]></newValue>
@@ -725,10 +705,6 @@
       <oldValue><![CDATA[Y]]></oldValue>
       <newValue><![CDATA[N]]></newValue>
     </columnDataChange>
-    <columnDataChange tablename="AD_FIELD" columnname="ISDISPLAYED" pkRow="3747">
-      <oldValue><![CDATA[Y]]></oldValue>
-      <newValue><![CDATA[N]]></newValue>
-    </columnDataChange>
     <columnDataChange tablename="AD_FIELD" columnname="ISDISPLAYED" pkRow="3781">
       <oldValue><![CDATA[Y]]></oldValue>
       <newValue><![CDATA[N]]></newValue>
@@ -1573,9 +1549,13 @@
       <oldValue><![CDATA[Y]]></oldValue>
       <newValue><![CDATA[N]]></newValue>
     </columnDataChange>
-    <columnDataChange tablename="AD_FIELD" columnname="ISDISPLAYED" pkRow="803566">
-      <oldValue><![CDATA[Y]]></oldValue>
-      <newValue><![CDATA[N]]></newValue>
+    <columnDataChange tablename="AD_FIELD" columnname="SHOWINRELATION" pkRow="803566">
+      <oldValue><![CDATA[N]]></oldValue>
+      <newValue><![CDATA[Y]]></newValue>
+    </columnDataChange>
+    <columnDataChange tablename="AD_FIELD" columnname="GRID_SEQNO" pkRow="803566">
+      <oldValue/>
+      <newValue><![CDATA[70]]></newValue>
     </columnDataChange>
     <columnDataChange tablename="AD_FIELD" columnname="ISDISPLAYED" pkRow="803624">
       <oldValue><![CDATA[Y]]></oldValue>
@@ -1645,10 +1625,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>
@@ -1753,6 +1729,10 @@
       <oldValue><![CDATA[Y]]></oldValue>
       <newValue><![CDATA[N]]></newValue>
     </columnDataChange>
+    <columnDataChange tablename="AD_FIELD" columnname="SHOWINRELATION" pkRow="98C38D2E56AC11DE8275F3BADDEF3F7F">
+      <oldValue><![CDATA[Y]]></oldValue>
+      <newValue><![CDATA[N]]></newValue>
+    </columnDataChange>
     <columnDataChange tablename="AD_FIELD" columnname="ISDISPLAYED" pkRow="98C3C53256AC11DE9989D70F7DF0A574">
       <oldValue><![CDATA[Y]]></oldValue>
       <newValue><![CDATA[N]]></newValue>
@@ -1765,10 +1745,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	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Thu May 24 08:59:54 2012 +0000
@@ -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.15736]]></VERSION>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION><![CDATA[3.0.16285]]></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>
@@ -19,8 +19,8 @@
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <AD_LANGUAGE><![CDATA[en_US]]></AD_LANGUAGE>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
-<!--0138E7A89B5E4DC3932462252801FFBC-->  <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
-<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION_LABEL><![CDATA[MP9.3]]></VERSION_LABEL>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION_LABEL><![CDATA[MP11]]></VERSION_LABEL>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--0138E7A89B5E4DC3932462252801FFBC--></AD_MODULE>
 
--- a/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue May 22 06:39:39 2012 +0000
+++ b/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu May 24 08:59:54 2012 +0000
@@ -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.15736]]></STARTVERSION>
+<!--4D11E3A70650475381139522373CD191-->  <STARTVERSION><![CDATA[2.1.16285]]></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.15736]]></STARTVERSION>
+<!--52CE523C40634C47A99C6EBBD9C3125C-->  <STARTVERSION><![CDATA[3.0.16285]]></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.15736]]></STARTVERSION>
+<!--60834727BB114764ACEF019F40A34562-->  <STARTVERSION><![CDATA[1.1.16285]]></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.15736]]></STARTVERSION>
+<!--8418885E97D643138B6D907671351E3D-->  <STARTVERSION><![CDATA[3.0.16285]]></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.15736]]></STARTVERSION>
+<!--A32F3279B3374FC0A6CFEA2368BB7053-->  <STARTVERSION><![CDATA[3.0.16285]]></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.15736]]></STARTVERSION>
+<!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <STARTVERSION><![CDATA[3.0.16285]]></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.15736]]></STARTVERSION>
+<!--FF8080813189932B013189B45B59003A-->  <STARTVERSION><![CDATA[0.1.16285]]></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.15736]]></STARTVERSION>
+<!--FF8080813189932B013189B4C00F003D-->  <STARTVERSION><![CDATA[0.1.16285]]></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.15736]]></STARTVERSION>
+<!--FF8081812E2F6F3C012E2F750109001C-->  <STARTVERSION><![CDATA[0.0.16285]]></STARTVERSION>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <DEPENDANT_MODULE_NAME><![CDATA[Widgets Collection]]></DEPENDANT_MODULE_NAME>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/referencedata/sampledata/F_B_International_Group.xml	Tue May 22 06:39:39 2012 +0000
+++ b/referencedata/sampledata/F_B_International_Group.xml	Thu May 24 08:59:54 2012 +0000
@@ -1,416 +1,2585 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ob:Openbravo xmlns:ob="http://www.openbravo.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <FinancialMgmtMatchingAlgorithm id="F6B492F80B6C4733AA653D8B45679B6C">
-    <id>F6B492F80B6C4733AA653D8B45679B6C</id>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
+  <FinancialMgmtMatchingAlgorithm id="03266D6AD5B949F8B6231E158CE5D9A2">
+    <id>03266D6AD5B949F8B6231E158CE5D9A2</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="0"/>
+    <active>true</active>
+    <name>Advanced Matching Algorithm</name>
+    <description>The Advanced Matching Algorithm adds the possibility to match a bank statement line with a "payment" if the financial account transaction is not found; or with an "invoice payment plan line" if a payment is not found; or with an "order payment plan line" if an invoice payment plan lines is not found; and finally to generate a credit for a Business Partner in case there are no transaction to match found. "Advanced Matching Algorithm" also creates the corresponding financial accounts transactions while matching and finally it adds unmatching at any time. </description>
+    <javaClassName>org.openbravo.module.invoicematchingalgorithm.algorithm.InvoiceMatchingAlgorithm</javaClassName>
+  </FinancialMgmtMatchingAlgorithm>
+  <FinancialMgmtMatchingAlgorithm id="B98D193328B84DB89E50164A3ADD2B82">
+    <id>B98D193328B84DB89E50164A3ADD2B82</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
     <organization id="0"/>
     <active>true</active>
     <name>Standard</name>
     <description xsi:nil="true"/>
     <javaClassName>org.openbravo.advpaymentmngt.algorithm.StandardMatchingAlgorithm</javaClassName>
   </FinancialMgmtMatchingAlgorithm>
-  <FIN_Payment_Detail id="8A64B71A2B68AAA5012B7D0082C10019">
-    <id>8A64B71A2B68AAA5012B7D0082C10019</id>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="90A1F59849E84AFABD04814B3D15A691"/>
-    <finPayment id="3D048FCA18DF41A1B09D2FDD088B562B"/>
-    <amount>0.02</amount>
+  <FIN_Payment_Detail id="00A9F3805820483F9B32929836462D16">
+    <id>00A9F3805820483F9B32929836462D16</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="B843C30461EA4501935CB1D125C9C25A"/>
+    <finPayment id="C33F00F7C52A4CA0B82A9F419526EFFF"/>
+    <amount>2714.00</amount>
     <refund>false</refund>
     <active>true</active>
     <writeoffAmount>0.00</writeoffAmount>
     <gLItem xsi:nil="true"/>
     <isprepayment>false</isprepayment>
   </FIN_Payment_Detail>
-  <FIN_Payment_Detail id="8A64B71A2B68AAA5012B7D0082C8001A">
-    <id>8A64B71A2B68AAA5012B7D0082C8001A</id>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="90A1F59849E84AFABD04814B3D15A691"/>
-    <finPayment id="3D048FCA18DF41A1B09D2FDD088B562B"/>
-    <amount>85.79</amount>
+  <FIN_Payment_Detail id="051915B2B3D64FE0AD66C97B30C3B931">
+    <id>051915B2B3D64FE0AD66C97B30C3B931</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="B843C30461EA4501935CB1D125C9C25A"/>
+    <finPayment id="100730E380AA4B4EB5B8909806A600A5"/>
+    <amount>4720.00</amount>
     <refund>false</refund>
     <active>true</active>
     <writeoffAmount>0.00</writeoffAmount>
     <gLItem xsi:nil="true"/>
     <isprepayment>false</isprepayment>
   </FIN_Payment_Detail>
-  <FIN_Payment_Detail id="8A64B71A2B68AAA5012B7D0082CA001B">
-    <id>8A64B71A2B68AAA5012B7D0082CA001B</id>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="90A1F59849E84AFABD04814B3D15A691"/>
-    <finPayment id="3D048FCA18DF41A1B09D2FDD088B562B"/>
-    <amount>164.92</amount>
+  <FIN_Payment_Detail id="0597069904A546858D060BA4A4E5F951">
+    <id>0597069904A546858D060BA4A4E5F951</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="2E60544D37534C0B89E765FE29BC0B43"/>
+    <finPayment id="F523A75348C74EC49F4476E3BDD26233"/>
+    <amount>2392.00</amount>
     <refund>false</refund>
     <active>true</active>
     <writeoffAmount>0.00</writeoffAmount>
     <gLItem xsi:nil="true"/>
     <isprepayment>false</isprepayment>
   </FIN_Payment_Detail>
-  <FIN_Payment_Detail id="8A64B71A2B68AAA5012B7D0082CC001C">
-    <id>8A64B71A2B68AAA5012B7D0082CC001C</id>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="90A1F59849E84AFABD04814B3D15A691"/>
-    <finPayment id="3D048FCA18DF41A1B09D2FDD088B562B"/>
-    <amount>191.12</amount>
+  <FIN_Payment_Detail id="07CE794F98024DC9B46D8B725875F074">
+    <id>07CE794F98024DC9B46D8B725875F074</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="B843C30461EA4501935CB1D125C9C25A"/>
+    <finPayment id="7847898C64A24634A0211DF9F0F5623D"/>
+    <amount>4720.00</amount>
     <refund>false</refund>
     <active>true</active>
     <writeoffAmount>0.00</writeoffAmount>
     <gLItem xsi:nil="true"/>
     <isprepayment>false</isprepayment>
   </FIN_Payment_Detail>
-  <FIN_Payment_Detail id="8A64B71A2B68AAA5012B7D0082EF001D">
-    <id>8A64B71A2B68AAA5012B7D0082EF001D</id>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="90A1F59849E84AFABD04814B3D15A691"/>
-    <finPayment id="3D048FCA18DF41A1B09D2FDD088B562B"/>
-    <amount>168.22</amount>
+  <FIN_Payment_Detail id="0853EA8DB54641DB84F85726ECA5E17F">
+    <id>0853EA8DB54641DB84F85726ECA5E17F</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="2E60544D37534C0B89E765FE29BC0B43"/>
+    <finPayment id="9EE50FB51F7843C28E3E04F7E98D5CAD"/>
+    <amount>159654.70</amount>
     <refund>false</refund>
     <active>true</active>
     <writeoffAmount>0.00</writeoffAmount>
     <gLItem xsi:nil="true"/>
     <isprepayment>false</isprepayment>
   </FIN_Payment_Detail>
-  <FIN_Payment_Detail id="8A64B71A2B68AAA5012B7D0843720021">
-    <id>8A64B71A2B68AAA5012B7D0843720021</id>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="90A1F59849E84AFABD04814B3D15A691"/>
-    <finPayment id="16248F4ADAE448F482815CB91E1B6AE7"/>
-    <amount>3</amount>
-    <refund>false</refund>
-    <active>true</active>
-    <writeoffAmount>0</writeoffAmount>
-    <gLItem xsi:nil="true"/>
-    <isprepayment>false</isprepayment>
-  </FIN_Payment_Detail>
-  <FIN_Payment_Detail id="8A64B71A2B68AAA5012B7D08C3D90022">
-    <id>8A64B71A2B68AAA5012B7D08C3D90022</id>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="90A1F59849E84AFABD04814B3D15A691"/>
-    <finPayment id="C40A8A65B0FB4522A40830387B93E5CB"/>
-    <amount>3.31</amount>
+  <FIN_Payment_Detail id="096C56D3E38F4E9F92085EC8437D5E21">
+    <id>096C56D3E38F4E9F92085EC8437D5E21</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="2E60544D37534C0B89E765FE29BC0B43"/>
+    <finPayment id="9089C31F423C4E2D925F87C79EBD0EC0"/>
+    <amount>10400.00</amount>
     <refund>false</refund>
     <active>true</active>
     <writeoffAmount>0.00</writeoffAmount>
     <gLItem xsi:nil="true"/>
     <isprepayment>false</isprepayment>
   </FIN_Payment_Detail>
-  <FIN_Payment_Detail id="8A64B71A2B68AAA5012B7D1849160027">
-    <id>8A64B71A2B68AAA5012B7D1849160027</id>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="378AF0EAE1A2479EAAA33436645E9433"/>
-    <finPayment id="8A64B71A2B68AAA5012B7D1849130026"/>
-    <amount>1383.20</amount>
+  <FIN_Payment_Detail id="097A9819A20D4CE5A90A49AD66766030">
+    <id>097A9819A20D4CE5A90A49AD66766030</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="2E60544D37534C0B89E765FE29BC0B43"/>
+    <finPayment id="E96C3C5BE7BA4E1DAA7A84C971F7975A"/>
+    <amount>50513.56</amount>
     <refund>false</refund>
     <active>true</active>
     <writeoffAmount>0.00</writeoffAmount>
     <gLItem xsi:nil="true"/>
     <isprepayment>false</isprepayment>
   </FIN_Payment_Detail>
-  <FIN_Payment_Detail id="8A64B71A2B68AAA5012B80D4A863003A">
-    <id>8A64B71A2B68AAA5012B80D4A863003A</id>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="90A1F59849E84AFABD04814B3D15A691"/>
-    <finPayment id="FAE31E5467274E86BC7CDF5FBF1788C2"/>
-    <amount>75.03</amount>
-    <refund>false</refund>
-    <active>true</active>
-    <writeoffAmount>0</writeoffAmount>
-    <gLItem xsi:nil="true"/>
-    <isprepayment>false</isprepayment>
-  </FIN_Payment_Detail>
-  <FIN_Payment_Detail id="8A64B71A2B68AAA5012B80D530B5003B">
-    <id>8A64B71A2B68AAA5012B80D530B5003B</id>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="90A1F59849E84AFABD04814B3D15A691"/>
-    <finPayment id="4CBE98FC1EF44556B499DB99EDA26C1B"/>
-    <amount>50.00</amount>
+  <FIN_Payment_Detail id="09E8D8F2BE0A45E588EA77D204F70F69">
+    <id>09E8D8F2BE0A45E588EA77D204F70F69</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="DC206C91AA6A4897B44DA897936E0EC3"/>
+    <finPayment id="EADA9BE1B4E745F19D053D2EFAE1E03A"/>
+    <amount>300015.00</amount>
     <refund>false</refund>
     <active>true</active>
     <writeoffAmount>0.00</writeoffAmount>
     <gLItem xsi:nil="true"/>
     <isprepayment>false</isprepayment>
   </FIN_Payment_Detail>
-  <FIN_Payment_Detail id="8A64B71A2B68AAA5012B80DAE368003D">
-    <id>8A64B71A2B68AAA5012B80DAE368003D</id>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="378AF0EAE1A2479EAAA33436645E9433"/>
-    <finPayment id="A9310A008E744E50929ADE299B724D1E"/>
-    <amount>628.79</amount>
+  <FIN_Payment_Detail id="0A4194FC2F5A42B695276DBE3858A47B">
+    <id>0A4194FC2F5A42B695276DBE3858A47B</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="2E60544D37534C0B89E765FE29BC0B43"/>
+    <finPayment id="2A39322167534B47AEBB6482B46E4A86"/>
+    <amount>10400.00</amount>
     <refund>false</refund>
     <active>true</active>
     <writeoffAmount>0.00</writeoffAmount>
     <gLItem xsi:nil="true"/>
     <isprepayment>false</isprepayment>
   </FIN_Payment_Detail>
-  <FIN_Payment_Detail id="8A64B71A2B81497F012B81D5B48C0017">
-    <id>8A64B71A2B81497F012B81D5B48C0017</id>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="7A8E888A4B4C4E638CD5EB3A41A3289A"/>
-    <finPayment id="4A5808566ECC40DEAF4A5C05D225D81E"/>
-    <amount>202.68</amount>
-    <refund>false</refund>
-    <active>true</active>
-    <writeoffAmount>0</writeoffAmount>
-    <gLItem xsi:nil="true"/>
-    <isprepayment>false</isprepayment>
-  </FIN_Payment_Detail>
-  <FIN_Payment_Detail id="8A64B71A2B81497F012B81D64FDD0018">
-    <id>8A64B71A2B81497F012B81D64FDD0018</id>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="7A8E888A4B4C4E638CD5EB3A41A3289A"/>
-    <finPayment id="53CC001E6036491080266E38A54D73DF"/>
-    <amount>300.00</amount>
+  <FIN_Payment_Detail id="0B9987FFBD4747BD9E0827C1E904E475">
+    <id>0B9987FFBD4747BD9E0827C1E904E475</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="2E60544D37534C0B89E765FE29BC0B43"/>
+    <finPayment id="4895AE00B6644092858A8AD23C6BAA99"/>
+    <amount>100429.14</amount>
     <refund>false</refund>
     <active>true</active>
     <writeoffAmount>0.00</writeoffAmount>
     <gLItem xsi:nil="true"/>
     <isprepayment>false</isprepayment>
   </FIN_Payment_Detail>
-  <FIN_Payment_Detail id="8A64B71A2B81497F012B82367D37001D">
-    <id>8A64B71A2B81497F012B82367D37001D</id>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="0D8E225ADA6E425E98EAA0F34E5912D7"/>
-    <finPayment id="22F7D21FB4104C089194547F00D0626B"/>
-    <amount>262.55</amount>
+  <FIN_Payment_Detail id="0BF3E38AD0D84E44BF3EB5440E43B072">
+    <id>0BF3E38AD0D84E44BF3EB5440E43B072</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="E443A31992CB4635AFCAEABE7183CE85"/>
+    <finPayment id="27AE15BB409C45D9ABF10F0150D247EC"/>
+    <amount>308387.76</amount>
     <refund>false</refund>
     <active>true</active>
     <writeoffAmount>0.00</writeoffAmount>
     <gLItem xsi:nil="true"/>
     <isprepayment>false</isprepayment>
   </FIN_Payment_Detail>
-  <FIN_Payment_Detail id="8A64B71A2B81497F012B82367D47001E">
-    <id>8A64B71A2B81497F012B82367D47001E</id>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="0D8E225ADA6E425E98EAA0F34E5912D7"/>
-    <finPayment id="22F7D21FB4104C089194547F00D0626B"/>
-    <amount>177.00</amount>
+  <FIN_Payment_Detail id="0C2FD1C961C14D81A4608C8BF301E8EA">
+    <id>0C2FD1C961C14D81A4608C8BF301E8EA</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="E443A31992CB4635AFCAEABE7183CE85"/>
+    <finPayment id="A49FFF38CF704B61BD5A93C60EAFF4CF"/>
+    <amount>322789.00</amount>
     <refund>false</refund>
     <active>true</active>
     <writeoffAmount>0.00</writeoffAmount>
     <gLItem xsi:nil="true"/>
     <isprepayment>false</isprepayment>
   </FIN_Payment_Detail>
-  <FIN_Payment_Detail id="8A64B71A2B81497F012B82367D49001F">
-    <id>8A64B71A2B81497F012B82367D49001F</id>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="0D8E225ADA6E425E98EAA0F34E5912D7"/>
-    <finPayment id="22F7D21FB4104C089194547F00D0626B"/>
-    <amount>110.63</amount>
+  <FIN_Payment_Detail id="0C34CDAAB5A64253A3CCC4F7AB35E783">
+    <id>0C34CDAAB5A64253A3CCC4F7AB35E783</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="2E60544D37534C0B89E765FE29BC0B43"/>
+    <finPayment id="375F163EFECD407DB9F08A8F7647C136"/>
+    <amount>4587.00</amount>
     <refund>false</refund>
     <active>true</active>
     <writeoffAmount>0.00</writeoffAmount>
     <gLItem xsi:nil="true"/>
     <isprepayment>false</isprepayment>
   </FIN_Payment_Detail>
-  <FIN_Payment_Detail id="8A64B71A2C351129012C35C401FF0019">
-    <id>8A64B71A2C351129012C35C401FF0019</id>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="0D8E225ADA6E425E98EAA0F34E5912D7"/>
-    <finPayment id="BE8D60B5AFF8448CBD44DAF62260D2B5"/>
-    <amount>97.94</amount>
+  <FIN_Payment_Detail id="0DE25F34653346C182C1363F79889A27">
+    <id>0DE25F34653346C182C1363F79889A27</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="DC206C91AA6A4897B44DA897936E0EC3"/>
+    <finPayment id="D8B2BE5196A2478B98241E04CA1F4EE5"/>
+    <amount>1945418.80</amount>
     <refund>false</refund>
     <active>true</active>
     <writeoffAmount>0.00</writeoffAmount>
     <gLItem xsi:nil="true"/>
     <isprepayment>false</isprepayment>
   </FIN_Payment_Detail>
-  <FIN_Payment_Detail id="8A64B71A2C351129012C35C5DB5A0022">
-    <id>8A64B71A2C351129012C35C5DB5A0022</id>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="7A8E888A4B4C4E638CD5EB3A41A3289A"/>
-    <finPayment id="C3783FC1B5C2436C81247DDAEF9D1738"/>
-    <amount>500.00</amount>
+  <FIN_Payment_Detail id="0DE9526FEC6E493594D8358B8A98AFED">
+    <id>0DE9526FEC6E493594D8358B8A98AFED</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="B843C30461EA4501935CB1D125C9C25A"/>
+    <finPayment id="8ABC5D72828A4D1AB2DED8031D2107BE"/>
+    <amount>4720.00</amount>
     <refund>false</refund>
     <active>true</active>
     <writeoffAmount>0.00</writeoffAmount>
     <gLItem xsi:nil="true"/>
     <isprepayment>false</isprepayment>
   </FIN_Payment_Detail>
-  <FIN_Payment_Detail id="8A64B71A2C351129012C35C7CDA50026">
-    <id>8A64B71A2C351129012C35C7CDA50026</id>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="7A8E888A4B4C4E638CD5EB3A41A3289A"/>
-    <finPayment id="E80E742A75F94BB0AA623EA9BBD40758"/>
-    <amount>129.98</amount>
+  <FIN_Payment_Detail id="0DFB9C9F881748BFB24E455F0A700319">
+    <id>0DFB9C9F881748BFB24E455F0A700319</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="2E60544D37534C0B89E765FE29BC0B43"/>
+    <finPayment id="6EB51B9265514B63A191FC010CB6C296"/>
+    <amount>46112.50</amount>
     <refund>false</refund>
     <active>true</active>
     <writeoffAmount>0.00</writeoffAmount>
     <gLItem xsi:nil="true"/>
     <isprepayment>false</isprepayment>
   </FIN_Payment_Detail>
-  <FIN_Payment_Detail id="8A64B71A2C351129012C35C7CDA90027">
-    <id>8A64B71A2C351129012C35C7CDA90027</id>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="7A8E888A4B4C4E638CD5EB3A41A3289A"/>
-    <finPayment id="E80E742A75F94BB0AA623EA9BBD40758"/>
-    <amount>187.21</amount>
+  <FIN_Payment_Detail id="0E795A9CEF424564B73F74EDBD4ADF2A">
+    <id>0E795A9CEF424564B73F74EDBD4ADF2A</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="B843C30461EA4501935CB1D125C9C25A"/>
+    <finPayment id="7D6AA6CD37924347A93EB53B4453698B"/>
+    <amount>1416.00</amount>
     <refund>false</refund>
     <active>true</active>
     <writeoffAmount>0.00</writeoffAmount>
     <gLItem xsi:nil="true"/>
     <isprepayment>false</isprepayment>
   </FIN_Payment_Detail>
-  <FIN_Payment_Detail id="FF8080812E38E087012E38EA0AD4000D">
-    <id>FF8080812E38E087012E38EA0AD4000D</id>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="90A1F59849E84AFABD04814B3D15A691"/>
-    <finPayment id="FF8080812E38E087012E38EA0ACE000C"/>
-    <amount>0.01</amount>
+  <FIN_Payment_Detail id="0F48037A58054D5B9DDCF5143ECAF967">
+    <id>0F48037A58054D5B9DDCF5143ECAF967</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="2E60544D37534C0B89E765FE29BC0B43"/>
+    <finPayment id="A2D6875DF55E4FE3BE53B9258180B1EC"/>
+    <amount>11946.75</amount>
     <refund>false</refund>
     <active>true</active>
     <writeoffAmount>0.00</writeoffAmount>
     <gLItem xsi:nil="true"/>
     <isprepayment>false</isprepayment>
   </FIN_Payment_Detail>
-  <FIN_Payment_Detail id="FF8080812E38E087012E38EA0AD8000E">
-    <id>FF8080812E38E087012E38EA0AD8000E</id>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="90A1F59849E84AFABD04814B3D15A691"/>
-    <finPayment id="FF8080812E38E087012E38EA0ACE000C"/>
-    <amount>127.19</amount>
+  <FIN_Payment_Detail id="10448A6752C94C3CA1A65F593D22F5A9">
+    <id>10448A6752C94C3CA1A65F593D22F5A9</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="2E60544D37534C0B89E765FE29BC0B43"/>
+    <finPayment id="12A6FF6D543D44F6876DA2B32245AC8C"/>
+    <amount>41788.13</amount>
     <refund>false</refund>
     <active>true</active>
     <writeoffAmount>0.00</writeoffAmount>
     <gLItem xsi:nil="true"/>
     <isprepayment>false</isprepayment>
   </FIN_Payment_Detail>
-  <FIN_Payment_Detail id="FF8080812E38E087012E38EA0ADC000F">
-    <id>FF8080812E38E087012E38EA0ADC000F</id>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="90A1F59849E84AFABD04814B3D15A691"/>
-    <finPayment id="FF8080812E38E087012E38EA0ACE000C"/>
-    <amount>148.84</amount>
+  <FIN_Payment_Detail id="10B4F12858914F87BE8DF631C10D490B">
+    <id>10B4F12858914F87BE8DF631C10D490B</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="2E60544D37534C0B89E765FE29BC0B43"/>
+    <finPayment id="9797663A0993416C9FECF9C690F39DDF"/>
+    <amount>1190.75</amount>
     <refund>false</refund>
     <active>true</active>
     <writeoffAmount>0.00</writeoffAmount>
     <gLItem xsi:nil="true"/>
     <isprepayment>false</isprepayment>
   </FIN_Payment_Detail>
-  <FIN_Payment_Detail id="FF8080812E38E087012E38EA0AE00010">
-    <id>FF8080812E38E087012E38EA0AE00010</id>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="90A1F59849E84AFABD04814B3D15A691"/>
-    <finPayment id="FF8080812E38E087012E38EA0ACE000C"/>
-    <amount>703.08</amount>
+  <FIN_Payment_Detail id="128D6D1C3CD842C4BF8F04493E2194BF">
+    <id>128D6D1C3CD842C4BF8F04493E2194BF</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="E443A31992CB4635AFCAEABE7183CE85"/>
+    <finPayment id="454F7F62E0A74E63887C0E048EB491DD"/>
+    <amount>1048618.80</amount>
     <refund>false</refund>
     <active>true</active>
     <writeoffAmount>0.00</writeoffAmount>
     <gLItem xsi:nil="true"/>
     <isprepayment>false</isprepayment>
   </FIN_Payment_Detail>
-  <FIN_Payment_Detail id="FF8080812E38E087012E38EA0AE40011">
-    <id>FF8080812E38E087012E38EA0AE40011</id>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="90A1F59849E84AFABD04814B3D15A691"/>
-    <finPayment id="FF8080812E38E087012E38EA0ACE000C"/>
-    <amount>110.14</amount>
+  <FIN_Payment_Detail id="12B78A3D638749DBBF9A908DF2338792">
+    <id>12B78A3D638749DBBF9A908DF2338792</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="2E60544D37534C0B89E765FE29BC0B43"/>
+    <finPayment id="0D4FADE4D8994213B6F10D1BA5DA6933"/>
+    <amount>2631.20</amount>
     <refund>false</refund>
     <active>true</active>
     <writeoffAmount>0.00</writeoffAmount>
     <gLItem xsi:nil="true"/>
     <isprepayment>false</isprepayment>
   </FIN_Payment_Detail>
-  <FIN_Payment_Detail id="FF8080812E38E087012E38EF48040017">
-    <id>FF8080812E38E087012E38EF48040017</id>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="7A8E888A4B4C4E638CD5EB3A41A3289A"/>
-    <finPayment id="FF8080812E38E087012E38EF47FE0016"/>
-    <amount>224.20</amount>
+  <FIN_Payment_Detail id="12C90D07AB0F44728BA29ED2FEDC795B">
+    <id>12C90D07AB0F44728BA29ED2FEDC795B</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="B843C30461EA4501935CB1D125C9C25A"/>
+    <finPayment id="B841C8ADB7734DCD9D3739FE809E3637"/>
+    <amount>4720.00</amount>
     <refund>false</refund>
     <active>true</active>
     <writeoffAmount>0.00</writeoffAmount>
     <gLItem xsi:nil="true"/>
     <isprepayment>false</isprepayment>
   </FIN_Payment_Detail>
-  <FIN_Payment_Detail id="FF8080812E38E087012E38EF48090018">
-    <id>FF8080812E38E087012E38EF48090018</id>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="7A8E888A4B4C4E638CD5EB3A41A3289A"/>
-    <finPayment id="FF8080812E38E087012E38EF47FE0016"/>
-    <amount>1175.28</amount>
+  <FIN_Payment_Detail id="14795DB3237E470B8AD06C0AFA55BBDA">
+    <id>14795DB3237E470B8AD06C0AFA55BBDA</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="2E60544D37534C0B89E765FE29BC0B43"/>
+    <finPayment id="39763B39DD9F48B4B46944129A539476"/>
+    <amount>10400.00</amount>
     <refund>false</refund>
     <active>true</active>
     <writeoffAmount>0.00</writeoffAmount>
     <gLItem xsi:nil="true"/>
     <isprepayment>false</isprepayment>
   </FIN_Payment_Detail>
-  <FIN_Payment_Detail id="FF8080812E38E087012E38EF480D0019">
-    <id>FF8080812E38E087012E38EF480D0019</id>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="7A8E888A4B4C4E638CD5EB3A41A3289A"/>
-    <finPayment id="FF8080812E38E087012E38EF47FE0016"/>
-    <amount>1664.69</amount>
+  <FIN_Payment_Detail id="1519FE9C08F74AF9B16D12CDEE3AD88B">
+    <id>1519FE9C08F74AF9B16D12CDEE3AD88B</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="2E60544D37534C0B89E765FE29BC0B43"/>
+    <finPayment id="52F4A95DAD814975A9A1C6A0E149F896"/>
+    <amount>4800.00</amount>
     <refund>false</refund>
     <active>true</active>
     <writeoffAmount>0.00</writeoffAmount>
     <gLItem xsi:nil="true"/>
     <isprepayment>false</isprepayment>
   </FIN_Payment_Detail>
-  <FIN_Payment_Detail id="FF8080812E38E087012E38EF4811001A">
-    <id>FF8080812E38E087012E38EF4811001A</id>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="7A8E888A4B4C4E638CD5EB3A41A3289A"/>
-    <finPayment id="FF8080812E38E087012E38EF47FE0016"/>
-    <amount>846.06</amount>
+  <FIN_Payment_Detail id="153E35E6B2AB4BF0A3EF6E6CD082B8F3">
+    <id>153E35E6B2AB4BF0A3EF6E6CD082B8F3</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="DC206C91AA6A4897B44DA897936E0EC3"/>
+    <finPayment id="C386889E6FE94740BF2ABE5E77E79047"/>
+    <amount>116595.80</amount>
     <refund>false</refund>
     <active>true</active>
     <writeoffAmount>0.00</writeoffAmount>
     <gLItem xsi:nil="true"/>
     <isprepayment>false</isprepayment>
   </FIN_Payment_Detail>
-  <FIN_Payment_Detail id="FF8080812E39520D012E39650FCE000D">
-    <id>FF8080812E39520D012E39650FCE000D</id>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="7A8E888A4B4C4E638CD5EB3A41A3289A"/>
-    <finPayment id="B67C90A29C734646ABB52EE1F8F64974"/>
-    <amount>657.58</amount>
+  <FIN_Payment_Detail id="166BF5F2F9FA4282953CA620B9E23DF9">
+    <id>166BF5F2F9FA4282953CA620B9E23DF9</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="E443A31992CB4635AFCAEABE7183CE85"/>
+    <finPayment id="342C1EC6A577405BAD152220E27925E9"/>
+    <amount>13334.00</amount>
     <refund>false</refund>
     <active>true</active>
     <writeoffAmount>0.00</writeoffAmount>
     <gLItem xsi:nil="true"/>
     <isprepayment>false</isprepayment>
   </FIN_Payment_Detail>
-  <FIN_Payment_Detail id="FF8080812E39520D012E39650FDB000E">
-    <id>FF8080812E39520D012E39650FDB000E</id>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="7A8E888A4B4C4E638CD5EB3A41A3289A"/>
-    <finPayment id="B67C90A29C734646ABB52EE1F8F64974"/>
-    <amount>189.25</amount>
+  <FIN_Payment_Detail id="17EE01A21F594D0B96763E7DC1E4A2E5">
+    <id>17EE01A21F594D0B96763E7DC1E4A2E5</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="7BABA5FF80494CAFA54DEBD22EC46F01"/>
+    <finPayment id="7256C2FC65C944A895A032E86E4BB3A9"/>
+    <amount>542100.00</amount>
     <refund>false</refund>
     <active>true</active>
     <writeoffAmount>0.00</writeoffAmount>
     <gLItem xsi:nil="true"/>
     <isprepayment>false</isprepayment>
   </FIN_Payment_Detail>
-  <FIN_Payment_Detail id="FF8080812E39520D012E396BFE610015">
-    <id>FF8080812E39520D012E396BFE610015</id>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="378AF0EAE1A2479EAAA33436645E9433"/>
-    <finPayment id="FF8080812E39520D012E396BFE590014"/>
-    <amount>0.16</amount>
+  <FIN_Payment_Detail id="194EED5AE3BF4410AF169BEE597CB3D1">
+    <id>194EED5AE3BF4410AF169BEE597CB3D1</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="DC206C91AA6A4897B44DA897936E0EC3"/>
+    <finPayment id="B296FFBD24934539BE6C895A3650FD6B"/>
+    <amount>1168554.00</amount>
     <refund>false</refund>
     <active>true</active>
     <writeoffAmount>0.00</writeoffAmount>
     <gLItem xsi:nil="true"/>
     <isprepayment>false</isprepayment>
   </FIN_Payment_Detail>
-  <FIN_Payment_Detail id="FF8080812E39520D012E396BFE730017">
-    <id>FF8080812E39520D012E396BFE730017</id>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="378AF0EAE1A2479EAAA33436645E9433"/>
-    <finPayment id="FF8080812E39520D012E396BFE590014"/>
-    <amount>48.3</amount>
+  <FIN_Payment_Detail id="1AF593B829CB4B9BB5A51214D284EC4C">
+    <id>1AF593B829CB4B9BB5A51214D284EC4C</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="B843C30461EA4501935CB1D125C9C25A"/>
+    <finPayment id="5D05D272F2F24EBFBE119EC1A8CB5493"/>
+    <amount>2478.00</amount>
     <refund>false</refund>
     <active>true</active>
-    <writeoffAmount>0</writeoffAmount>
+    <writeoffAmount>0.00</writeoffAmount>
     <gLItem xsi:nil="true"/>
     <isprepayment>false</isprepayment>
   </FIN_Payment_Detail>
-  <FinancialMgmtPaymentExecutionProcessParameter id="F556E07CCF0D4BE7912154F191176416">
-    <id>F556E07CCF0D4BE7912154F191176416</id>
-    <client id="FF8080812AFBCB14012AFBD3E373001F"/>
-    <organization id="0"/>
-    <active>true</active>
-    <paymentExecutionProcess id="667B31AE82714CE180B12159FB6CEBAD"/>
+  <FIN_Payment_Detail id="1C30AE031C324C25B937F92AA99136FA">
+    <id>1C30AE031C324C25B937F92AA99136FA</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="B843C30461EA4501935CB1D125C9C25A"/>
+    <finPayment id="1231B3C5998A4DE88FA7A0443B1A40C1"/>
+    <amount>3037.32</amount>
+    <refund>false</refund>
+    <active>true</active>
+    <writeoffAmount>0.00</writeoffAmount>
+    <gLItem xsi:nil="true"/>
+    <isprepayment>false</isprepayment>
+  </FIN_Payment_Detail>
+  <FIN_Payment_Detail id="1C464C79FBA8446F8E4B32F01B586CAF">
+    <id>1C464C79FBA8446F8E4B32F01B586CAF</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="DC206C91AA6A4897B44DA897936E0EC3"/>
+    <finPayment id="9B5EC6DB33D14C24819B1A994B219F1B"/>
+    <amount>2177100.00</amount>
+    <refund>false</refund>
+    <active>true</active>
+    <writeoffAmount>0.00</writeoffAmount>
+    <gLItem xsi:nil="true"/>
+    <isprepayment>false</isprepayment>
+  </FIN_Payment_Detail>
+  <FIN_Payment_Detail id="1D13616E09D54D0F80BEF265EDC75BFE">
+    <id>1D13616E09D54D0F80BEF265EDC75BFE</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="2E60544D37534C0B89E765FE29BC0B43"/>
+    <finPayment id="E0A7250E2FDB4378A88D74130B196F49"/>
+    <amount>12000.00</amount>
+    <refund>false</refund>
+    <active>true</active>
+    <writeoffAmount>0.00</writeoffAmount>
+    <gLItem xsi:nil="true"/>
+    <isprepayment>false</isprepayment>
+  </FIN_Payment_Detail>
+  <FIN_Payment_Detail id="1D6226A69AB247CD9FAA2F377FC6DEA1">
+    <id>1D6226A69AB247CD9FAA2F377FC6DEA1</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="E443A31992CB4635AFCAEABE7183CE85"/>
+    <finPayment id="489DA8206B2444598241CD26935E59ED"/>
+    <amount>114346.72</amount>
+    <refund>false</refund>
+    <active>true</active>
+    <writeoffAmount>0.00</writeoffAmount>
+    <gLItem xsi:nil="true"/>
+    <isprepayment>false</isprepayment>
+  </FIN_Payment_Detail>
+  <FIN_Payment_Detail id="1E6853C00F304CA2A41B83CC3622D292">
+    <id>1E6853C00F304CA2A41B83CC3622D292</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="E443A31992CB4635AFCAEABE7183CE85"/>
+    <finPayment id="0C69884FA70E461F995844AAC483E255"/>
+    <amount>159696.48</amount>
+    <refund>false</refund>
+    <active>true</active>
+    <writeoffAmount>0.00</writeoffAmount>
+    <gLItem xsi:nil="true"/>
+    <isprepayment>false</isprepayment>
+  </FIN_Payment_Detail>
+  <FIN_Payment_Detail id="1E74E11072184B7D8D49DC47247A9327">
+    <id>1E74E11072184B7D8D49DC47247A9327</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="2E60544D37534C0B89E765FE29BC0B43"/>
+    <finPayment id="3C292FAA207048DA8C3D7F33E51DE62D"/>
+    <amount>4871.25</amount>
+    <refund>false</refund>
+    <active>true</active>
+    <writeoffAmount>0.00</writeoffAmount>
+    <gLItem xsi:nil="true"/>
+    <isprepayment>false</isprepayment>
+  </FIN_Payment_Detail>
+  <FIN_Payment_Detail id="239921172A1248838BA82C17D9C89282">
+    <id>239921172A1248838BA82C17D9C89282</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="2E60544D37534C0B89E765FE29BC0B43"/>
+    <finPayment id="15D6295C6C3147F084C8891151D172C2"/>
+    <amount>2247.00</amount>
+    <refund>false</refund>
+    <active>true</active>
+    <writeoffAmount>0.00</writeoffAmount>
+    <gLItem xsi:nil="true"/>
+    <isprepayment>false</isprepayment>
+  </FIN_Payment_Detail>
+  <FIN_Payment_Detail id="28296942AF904D869162FF435F41D220">
+    <id>28296942AF904D869162FF435F41D220</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="B843C30461EA4501935CB1D125C9C25A"/>
+    <finPayment id="AD35DBF84B8D466D88EA04A016787789"/>
+    <amount>1770.00</amount>
+    <refund>false</refund>
+    <active>true</active>
+    <writeoffAmount>0.00</writeoffAmount>
+    <gLItem xsi:nil="true"/>
+    <isprepayment>false</isprepayment>
+  </FIN_Payment_Detail>
+  <FIN_Payment_Detail id="2907CCCA4A974DD9BDC233BDB2794F65">
+    <id>2907CCCA4A974DD9BDC233BDB2794F65</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="2E60544D37534C0B89E765FE29BC0B43"/>
+    <finPayment id="9A4DFB294A544DDB81D48D1AFAAADD00"/>
+    <amount>520.00</amount>
+    <refund>false</refund>
+    <active>true</active>
+    <writeoffAmount>0.00</writeoffAmount>
+    <gLItem xsi:nil="true"/>
+    <isprepayment>false</isprepayment>
+  </FIN_Payment_Detail>
+  <FIN_Payment_Detail id="2B52B2108FCD4549A1D89F261A10FBCC">
+    <id>2B52B2108FCD4549A1D89F261A10FBCC</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="2E60544D37534C0B89E765FE29BC0B43"/>
+    <finPayment id="2033AA76DF324661AD6E3CE61E8C4BC5"/>
+    <amount>2814.50</amount>
+    <refund>false</refund>
+    <active>true</active>
+    <writeoffAmount>0.00</writeoffAmount>
+    <gLItem xsi:nil="true"/>
+    <isprepayment>false</isprepayment>
+  </FIN_Payment_Detail>
+  <FIN_Payment_Detail id="2D480F277A8046A28F2007B760E8F3DD">
+    <id>2D480F277A8046A28F2007B760E8F3DD</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="2E60544D37534C0B89E765FE29BC0B43"/>
+    <finPayment id="F8993C3DB234406E8D4DB459B5C12026"/>
+    <amount>1926.00</amount>
+    <refund>false</refund>
+    <active>true</active>
+    <writeoffAmount>0.00</writeoffAmount>
+    <gLItem xsi:nil="true"/>
+    <isprepayment>false</isprepayment>
+  </FIN_Payment_Detail>
+  <FIN_Payment_Detail id="2E116F77A9954ADDB06790858CB89454">
+    <id>2E116F77A9954ADDB06790858CB89454</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="B843C30461EA4501935CB1D125C9C25A"/>
+    <finPayment id="A6AE76A6190F46908BBB6F1DC012EEA3"/>
+    <amount>4838.00</amount>
+    <refund>false</refund>
+    <active>true</active>
+    <writeoffAmount>0.00</writeoffAmount>
+    <gLItem xsi:nil="true"/>
+    <isprepayment>false</isprepayment>
+  </FIN_Payment_Detail>
+  <FIN_Payment_Detail id="2F40773793A1482DA7C0EEE0040F6B0E">
+    <id>2F40773793A1482DA7C0EEE0040F6B0E</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="2E60544D37534C0B89E765FE29BC0B43"/>
+    <finPayment id="B2B4F8D5D1AE4134917CAD4743C11E1B"/>
+    <amount>12000.00</amount>
+    <refund>false</refund>
+    <active>true</active>
+    <writeoffAmount>0.00</writeoffAmount>
+    <gLItem xsi:nil="true"/>
+    <isprepayment>false</isprepayment>
+  </FIN_Payment_Detail>
+  <FIN_Payment_Detail id="30296E455A86403793A3F0F2520A8FC3">
+    <id>30296E455A86403793A3F0F2520A8FC3</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="7BABA5FF80494CAFA54DEBD22EC46F01"/>
+    <finPayment id="DC24869313334BE18BA50E9254F464E2"/>
+    <amount>28129.00</amount>
+    <refund>false</refund>
+    <active>true</active>
+    <writeoffAmount>0.00</writeoffAmount>
+    <gLItem xsi:nil="true"/>
+    <isprepayment>false</isprepayment>
+  </FIN_Payment_Detail>
+  <FIN_Payment_Detail id="30EE4A71C82A430BAEC770C0DBDF25F1">
+    <id>30EE4A71C82A430BAEC770C0DBDF25F1</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="B843C30461EA4501935CB1D125C9C25A"/>
+    <finPayment id="A3A5B842D5CC468EA639C42F3CB192B0"/>
+    <amount>3068.00</amount>
+    <refund>false</refund>
+    <active>true</active>
+    <writeoffAmount>0.00</writeoffAmount>
+    <gLItem xsi:nil="true"/>
+    <isprepayment>false</isprepayment>
+  </FIN_Payment_Detail>
+  <FIN_Payment_Detail id="32384B981A974B399413C76071F01703">
+    <id>32384B981A974B399413C76071F01703</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="DC206C91AA6A4897B44DA897936E0EC3"/>
+    <finPayment id="F6EFAD45044947AFAD193F16BBFB1CC5"/>
+    <amount>1171740.00</amount>
+    <refund>false</refund>
+    <active>true</active>
+    <writeoffAmount>0.00</writeoffAmount>
+    <gLItem xsi:nil="true"/>
+    <isprepayment>false</isprepayment>
+  </FIN_Payment_Detail>
+  <FIN_Payment_Detail id="341F2200DDF44983A87B4968083B864A">
+    <id>341F2200DDF44983A87B4968083B864A</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="2E60544D37534C0B89E765FE29BC0B43"/>
+    <finPayment id="398E7A5BD3374154BD213BAF3F35CBA0"/>
+    <amount>350000</amount>
+    <refund>false</refund>
+    <active>true</active>
+    <writeoffAmount>0</writeoffAmount>
+    <gLItem id="F37E42A338854490A764A714024300B6"/>
+    <isprepayment>false</isprepayment>
+  </FIN_Payment_Detail>
+  <FIN_Payment_Detail id="3567BB8B612F47BF9FE91640F8E34322">
+    <id>3567BB8B612F47BF9FE91640F8E34322</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="B843C30461EA4501935CB1D125C9C25A"/>
+    <finPayment id="13323FBCD140420D98B4B0DB946C390E"/>
+    <amount>1793.60</amount>
+    <refund>false</refund>
+    <active>true</active>
+    <writeoffAmount>0.00</writeoffAmount>
+    <gLItem xsi:nil="true"/>
+    <isprepayment>false</isprepayment>
+  </FIN_Payment_Detail>
+  <FIN_Payment_Detail id="382ABB71B6CE4C209FB4345E7D57598B">
+    <id>382ABB71B6CE4C209FB4345E7D57598B</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="B843C30461EA4501935CB1D125C9C25A"/>
+    <finPayment id="522B5FB120C54CC9A0CE509192D07B36"/>
+    <amount>2950.00</amount>
+    <refund>false</refund>
+    <active>true</active>
+    <writeoffAmount>0.00</writeoffAmount>
+    <gLItem xsi:nil="true"/>
+    <isprepayment>false</isprepayment>
+  </FIN_Payment_Detail>
+  <FIN_Payment_Detail id="3D8CE0D975C3441F8523BF83541A7707">
+    <id>3D8CE0D975C3441F8523BF83541A7707</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="B843C30461EA4501935CB1D125C9C25A"/>
+    <finPayment id="9A2A07CA955D48609D87AC64F94D31D6"/>
+    <amount>1416.00</amount>
+    <refund>false</refund>
+    <active>true</active>
+    <writeoffAmount>0.00</writeoffAmount>
+    <gLItem xsi:nil="true"/>
+    <isprepayment>false</isprepayment>
+  </FIN_Payment_Detail>
+  <FIN_Payment_Detail id="3EBFDA5C8F63458F8534DCB11D767B25">
+    <id>3EBFDA5C8F63458F8534DCB11D767B25</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="E443A31992CB4635AFCAEABE7183CE85"/>
+    <finPayment id="FEDEA6FC21A64D048782E76B522148E8"/>
+    <amount>189685.00</amount>
+    <refund>false</refund>
+    <active>true</active>
+    <writeoffAmount>0.00</writeoffAmount>
+    <gLItem xsi:nil="true"/>
+    <isprepayment>false</isprepayment>
+  </FIN_Payment_Detail>
+  <FIN_Payment_Detail id="3F17A50D17474BBC873F2B3293BA758E">
+    <id>3F17A50D17474BBC873F2B3293BA758E</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="E443A31992CB4635AFCAEABE7183CE85"/>
+    <finPayment id="6A370E5EE39D40D6A12233A8BA9F40AF"/>
+    <amount>618933.60</amount>
+    <refund>false</refund>
+    <active>true</active>
+    <writeoffAmount>0.00</writeoffAmount>
+    <gLItem xsi:nil="true"/>
+    <isprepayment>false</isprepayment>
+  </FIN_Payment_Detail>
+  <FIN_Payment_Detail id="3F50EA78EB4343A184C25B2F1BF7F627">
+    <id>3F50EA78EB4343A184C25B2F1BF7F627</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="2E60544D37534C0B89E765FE29BC0B43"/>
+    <finPayment id="8E71D7F473D74AE1839D4BD4D7361E2E"/>
+    <amount>60889.19</amount>
+    <refund>false</refund>
+    <active>true</active>
+    <writeoffAmount>0.00</writeoffAmount>
+    <gLItem xsi:nil="true"/>
+    <isprepayment>false</isprepayment>
+  </FIN_Payment_Detail>
+  <FIN_Payment_Detail id="42E1208FF0994B44BF91864E9ADD2219">
+    <id>42E1208FF0994B44BF91864E9ADD2219</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="2E60544D37534C0B89E765FE29BC0B43"/>
+    <finPayment id="5DA5A03C7A964778BE8C16B9425DFE66"/>
+    <amount>10400.00</amount>
+    <refund>false</refund>
+    <active>true</active>
+    <writeoffAmount>0.00</writeoffAmount>
+    <gLItem xsi:nil="true"/>
+    <isprepayment>false</isprepayment>
+  </FIN_Payment_Detail>
+  <FIN_Payment_Detail id="43F158D34E7149128EF3D70B151A38E6">
+    <id>43F158D34E7149128EF3D70B151A38E6</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="DC206C91AA6A4897B44DA897936E0EC3"/>
+    <finPayment id="A50DBD5D53FB46098FBB8A236AE4D1F2"/>
+    <amount>414770.00</amount>
+    <refund>false</refund>
+    <active>true</active>
+    <writeoffAmount>0.00</writeoffAmount>
+    <gLItem xsi:nil="true"/>
+    <isprepayment>false</isprepayment>
+  </FIN_Payment_Detail>
+  <FIN_Payment_Detail id="451F21D9BC894C6EA0E92917AD0B2478">
+    <id>451F21D9BC894C6EA0E92917AD0B2478</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="E443A31992CB4635AFCAEABE7183CE85"/>
+    <finPayment id="D7E79D1AB5664BB583828054475914AF"/>
+    <amount>441007.30</amount>
+    <refund>false</refund>
+    <active>true</active>
+    <writeoffAmount>0.00</writeoffAmount>
+    <gLItem xsi:nil="true"/>
+    <isprepayment>false</isprepayment>
+  </FIN_Payment_Detail>
+  <FIN_Payment_Detail id="4645049EBEF742249B65B54150527A82">
+    <id>4645049EBEF742249B65B54150527A82</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="B843C30461EA4501935CB1D125C9C25A"/>
+    <finPayment id="E95747BC57E243DB88A0BC6B5CF6A5B6"/>
+    <amount>3068.00</amount>
+    <refund>false</refund>
+    <active>true</active>
+    <writeoffAmount>0.00</writeoffAmount>
+    <gLItem xsi:nil="true"/>
+    <isprepayment>false</isprepayment>
+  </FIN_Payment_Detail>
+  <FIN_Payment_Detail id="4669B64BDFAD424E8F536E13E3AE07C0">
+    <id>4669B64BDFAD424E8F536E13E3AE07C0</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="B843C30461EA4501935CB1D125C9C25A"/>
+    <finPayment id="370BEA523D994FB7BC2AB00BAB5A27CC"/>
+    <amount>3186.00</amount>
+    <refund>false</refund>
+    <active>true</active>
+    <writeoffAmount>0.00</writeoffAmount>
+    <gLItem xsi:nil="true"/>
+    <isprepayment>false</isprepayment>
+  </FIN_Payment_Detail>
+  <FIN_Payment_Detail id="4706D232A7504C37B519D7A6BD24B2E4">
+    <id>4706D232A7504C37B519D7A6BD24B2E4</id>
+    <client id="23C59575B9CF467C9620760EB255B389"/>
+    <organization id="E443A31992CB4635AFCAEABE7183CE85"/>
+    <finPayment id="A13F6BCB93064F74A461306EB4A6CFBF"/>
+    <amount>1186490.00</amount>
+    <refund>false</refund>
+    <active>true</active>
+    <writeoffAmount>0.00</writeoffAmount>
+    <gLItem xsi:nil="true"/>
+    <isprepayment>false</isprepayment>
+  </FIN_Payment_Detail>
+  <FIN_Payment_Detail id="477B086607A44D5589FCC2A65148BC4A"></