Merge unit cost project.
authorGorka Ion Damián <gorkaion.damian@openbravo.com>
Mon, 05 Jan 2015 16:47:23 +0100
changeset 25727 33b8eec9e03f
parent 25726 401f1e9fc80d (current diff)
parent 25720 b614afc46817 (diff)
child 25728 5fd62eaa263a
Merge unit cost project.
modules/org.openbravo.advpaymentmngt/src-db/database/model/views/APRM_REC_DETAIL_V.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBCQL_QUERY_COLUMN.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBCQL_WIDGET_QUERY.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBKMO_WIDGET_REFERENCE.xml
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java
src-db/database/model/triggers/AD_TREENODE_MOD_TRG.xml
src-db/database/model/views/C_ORDER_LINETAX_VT.xml
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_DATASET_TABLE.xml
src-db/database/sourcedata/AD_ELEMENT.xml
src-db/database/sourcedata/AD_FIELD.xml
src-db/database/sourcedata/AD_MENU.xml
src-db/database/sourcedata/AD_REFERENCE.xml
src-db/database/sourcedata/AD_TAB.xml
src-db/database/sourcedata/AD_TABLE.xml
src-db/database/sourcedata/AD_TREENODE.xml
src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
src-db/database/sourcedata/OBUIAPP_PROCESS.xml
src-db/database/sourcedata/OBUISEL_SELECTOR.xml
src/org/openbravo/common/datasource/ReturnFromCustomerPickEditLineDatasource.java
src/org/openbravo/common/datasource/ReturnFromCustomerPickEditLineRow.java
src/org/openbravo/common/datasource/ReturnToVendorPickAndEditDataSource.java
src/org/openbravo/event/CostingRuleEventHandler.java
--- a/.hgsigs	Mon Jan 05 12:18:46 2015 +0100
+++ b/.hgsigs	Mon Jan 05 16:47:23 2015 +0100
@@ -157,3 +157,6 @@
 a9d6608b6cabe9e27fa31cbf2a49a69b2d583e0a 0 iEUEABECAAYFAlPfOfMACgkQCX/oGf+2qkP8GQCY8T/ZXMymIqGubZ6h2LbjE7Uc4gCg5A/numsq2gypnrNri+wMt1HLLWA=
 c63d4e4125e832602ed1da786f756c26c7fdcd2a 0 iEYEABECAAYFAlQISYIACgkQCX/oGf+2qkMciwCgo6ZYlA+XmT9DC0n2zO7P5okbQngAoITq7wESNiiLk56/3Rzw7gGtOgMe
 d8e24b51ba03c98d057048de5e86c1c8c977276f 0 iEYEABECAAYFAlRJO3UACgkQCX/oGf+2qkMMFQCeObdVCTDlec79H4alHs8t8SDMQ9YAoO4HfqRXTDGnDg5+LnLtuBxPsQDD
+924afa1490b09bc691895099f12204b2282b0ee9 0 iEYEABECAAYFAlRhoL8ACgkQCX/oGf+2qkNHkwCfeuBMGLqmtcdy8LxqPtcu8mRAlQIAnAjqdHUhM+pTFL5tdsaY1V9buvP9
+340ffd8d7a9d5f42c216d59bacb99a27253825b0 0 iEYEABECAAYFAlSAMJIACgkQCX/oGf+2qkPCvgCfUWYHrJ/CJAkuUbalTNWcKPdmipEAn0r9uP5bQjzfZG1qg1CqQPqyFeOk
+53cc6ea75bb1d2065e367fa065b540334d4d514d 0 iEYEABECAAYFAlSYSdYACgkQCX/oGf+2qkPl4wCggC4EzYsyVitSyhbL2kWJlTZ2XXcAmwU0F1jbBoVlgyENCdW93qsA/uUF
--- a/.hgtags	Mon Jan 05 12:18:46 2015 +0100
+++ b/.hgtags	Mon Jan 05 16:47:23 2015 +0100
@@ -168,3 +168,6 @@
 d7d2abe0f424775dcdf9139410ae161881be1fb8 3.0PR14Q3
 a5483762bc5de5e3e934785f3baffda3a2d96db2 3.0PR14Q3.1
 6af26661c789c5daa23e36e7367a05dfe291242e 3.0PR14Q3.2
+4ccbe7a7da1d0eed0677d7d0baf545607a192c87 3.0PR14Q3.3
+fc76bf00588598f913bd9a5bb1d45fdd692548fd 3.0PR14Q3.4
+ed3565630685be1107627816bfd88379e174d7a7 3.0PR14Q4
--- a/README	Mon Jan 05 12:18:46 2015 +0100
+++ b/README	Mon Jan 05 16:47:23 2015 +0100
@@ -2,18 +2,10 @@
 
 * Installation
 
-First, download the setup binary corresponding to your system:
+First, configure Openbravo properties run:
 
   ant setup
 
-Next run the downloaded file in the config directory. For example in
-x86 Linux:
-
-  ./setup-properties-linux.bin
-
-If there is no setup binary for your operating system and architecture,
-send a request to <staff.rm at openbravo dot com>.
-
 Then, to install it run:
 
   ant install.source
--- a/build.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/build.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -994,93 +994,22 @@
     <ant dir="src-util/diagnostic" antfile="build-create.xml" target="build" />
     <ant dir="src-util/diagnostic" target="check.all" />
   </target>
-
-  <target name="setup.check.os">
-    <condition property="osname" value="linux">
-      <equals arg1="${os.name}" arg2="Linux" />
-    </condition>
-    <condition property="osname" value="freebsd6">
-      <equals arg1="${os.name}" arg2="FreeBSD" />
-    </condition>
-    <condition property="osname" value="windows">
-      <contains string="${os.name}" substring="Windows" />
-    </condition>
-    <condition property="osname" value="osx">
-      <contains string="${os.name}" substring="OS X" />
-    </condition>
-    <condition property="osname" value="solaris">
-      <or>
-        <contains string="${os.name}" substring="Solaris" />
-        <contains string="${os.name}" substring="SunOS" />
-      </or>
-    </condition>
-    <condition property="osname" value="openbsd">
-      <equals arg1="${os.name}" arg2="OpenBSD" />
-    </condition>
-    <condition property="osname" value="aix">
-      <equals arg1="${os.name}" arg2="AIX" />
-    </condition>
-    <condition property="osname" value="hpux">
-      <equals arg1="${os.name}" arg2="HPUX" />
-    </condition>
+  
+  <target name="setup.compile">
+	<mkdir dir="build/classes" />
+    <javac srcdir="src/org/openbravo/configuration" destdir="build/classes" fork="true" deprecation="off" encoding="UTF-8" debug="true" debuglevel="lines,vars,source" includeantruntime="false">
+      <classpath refid="project.class.path"/>  
+    </javac>
   </target>
 
-  <target name="setup.check.arch">
-    <condition property="osarch" value="">
-      <or>
-        <equals arg1="${os.arch}" arg2="x86" />
-        <equals arg1="${os.arch}" arg2="i386" />
-        <contains string="${os.name}" substring="Windows" />
-        <contains string="${os.name}" substring="OS X" />
-      </or>
-    </condition>
-    <condition property="osarch" value="-x64">
-      <or>
-        <equals arg1="${os.arch}" arg2="amd64" />
-        <equals arg1="${os.arch}" arg2="x86_64" />
-        <not>
-          <contains string="${os.name}" substring="Windows" />
-        </not>
-        <not>
-          <contains string="${os.name}" substring="OS X" />
-        </not>
-      </or>
-    </condition>
-    <condition property="osarch" value="-ia64">
-      <equals arg1="${os.arch}" arg2="ia64" />
-    </condition>
-    <condition property="osarch" value="-sparc">
-      <equals arg1="${os.arch}" arg2="sparc" />
-    </condition>
-    <condition property="osarch" value="-ppc">
-      <equals arg1="${os.arch}" arg2="ppc" />
-    </condition>
-  </target>
-
-  <target name="setup.exists.test">
-    <condition property="bin.ext" value="exe">
-      <os family="windows" />
-    </condition>
-
-    <condition property="bin.ext" value="app.tar.gz">
-      <os family="mac" />
-    </condition>
-
-    <condition property="bin.ext" value="bin">
-      <not>
-        <isset property="${bin.ext}" />
-      </not>
-    </condition>
-
-    <available file="config/setup-properties-${osname}${osarch}.${bin.ext}" property="setup.exists" value="true" />
-  </target>
-
-  <target name="setup" depends="setup.check.os, setup.check.arch, setup.exists.test" unless="setup.exists">
-    <get src="https://code.openbravo.com/tools/rm/erp-setup-tool/raw-file/tip/setup/output/setup-properties-${osname}${osarch}.${bin.ext}" dest="config/setup-properties-${osname}${osarch}.${bin.ext}" verbose="true" />
-
-    <chmod file="config/setup-properties-${osname}${osarch}.${bin.ext}" perm="+x" />
-  </target>
-
+  <target name="setup" depends="init, setup.compile">
+    <echo message="Launching configuration application..."/>
+    <taskdef name="configurationApp" classname="org.openbravo.configuration.ConfigurationApp">
+      <classpath refid="project.class.path" />
+    </taskdef>
+    <configurationApp/>
+    </target>
+  
   <target name="package.core" depends="init, set.version.number">
 	<property name="tmpdir" value="${java.io.tmpdir}/ob.core${core.rev}" />
    
Binary file modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/AlertsForWrongInvoicesData.class has changed
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -463,7 +463,8 @@
                   fin_payment_schedule_order,
                   fin_payment_schedule_invoice,
                   fin_payment_detail_id,
-                  amount
+                  amount,
+                  c_bpartner_id
                 )
                 VALUES
                 (
@@ -472,7 +473,8 @@
                   order_schdet.fin_payment_schedule_order,
                   null,
                   order_schdet.fin_payment_detail_id,
-                  v_differenceamount
+                  v_differenceamount,
+                  v_BPartner_ID
                 );
                 -- update amount of the current payment schedule detail
                 UPDATE fin_payment_scheduledetail
@@ -563,7 +565,8 @@
               fin_payment_schedule_order,
               fin_payment_schedule_invoice,
               fin_payment_detail_id,
-              amount
+              amount,
+              c_bpartner_id
             )
             VALUES
             (
@@ -572,7 +575,8 @@
               null,
               v_payment_schedule_invoice,
               null,
-              v_scheduledamount
+              v_scheduledamount,
+              v_BPartner_ID
             );
           END IF;
         END LOOP;
@@ -607,7 +611,8 @@
           DUEAMT =  V_DueAmount,
           DAYSTILLDUE = V_DayStillDue,
           LASTCALCULATEDONDATE = now(),
-          ISPAID = CASE v_OutstandingAmount WHEN 0 THEN 'Y' ELSE 'N' END
+          ISPAID = CASE v_OutstandingAmount WHEN 0 THEN 'Y' ELSE 'N' END,
+          FINALSETTLEMENT = CASE v_OutstandingAmount WHEN 0 THEN now() ELSE NULL END
       WHERE C_INVOICE_ID = P_RECORD_ID;
 
       -- Updating SO_CREDITUSED when Invoices are being processed
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -167,7 +167,8 @@
           created, createdby, updated, updatedby,
           fin_payment_schedule_order,
           fin_payment_schedule_invoice, fin_payment_detail_id,
-          amount
+          amount,
+          c_bpartner_id
          )
         VALUES
         (
@@ -175,7 +176,8 @@
           now(), p_user, now(), p_user,
           v_payment_schedule_order,
           null, null,
-          v_pendingamount
+          v_pendingamount,
+          v_BPartner_ID
         );
       END IF;
     END;
@@ -285,12 +287,12 @@
               fin_payment_scheduledetail_id, ad_client_id, ad_org_id, isactive,
               created, createdby, updated, updatedby,
               fin_payment_detail_id, fin_payment_schedule_order, fin_payment_schedule_invoice,
-              amount, writeoffamt, iscanceled
+              amount, writeoffamt, iscanceled, c_bpartner_id
           ) VALUES (
               get_uuid(), v_Client_ID, v_Org_ID,'Y',
               now(), p_user, now(), p_user,
               null, v_FinPaymentScheduleId, null,
-              v_difference, 0 ,'N'
+              v_difference, 0 ,'N', v_BPartner_ID
           );
         END IF;
         UPDATE fin_payment_schedule 
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/views/APRM_REC_DETAIL_V.xml	Mon Jan 05 12:18:46 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-  <database name="VIEW APRM_REC_DETAIL_V">
-    <view name="APRM_REC_DETAIL_V"><![CDATA[((SELECT get_uuid() AS aprm_rec_detail_v_id, to_char('APRM_Reconciled') AS type, fin_finacc_transaction.fin_reconciliation_id, COALESCE(count(*), 0) AS item_no, COALESCE(sum(fin_finacc_transaction.depositamt - fin_finacc_transaction.paymentamt), 0) AS item_amt, fin_reconciliation.ad_client_id, fin_reconciliation.ad_org_id, fin_reconciliation.created, fin_reconciliation.createdby, fin_reconciliation.updated, fin_reconciliation.updatedby, fin_reconciliation.isactive FROM fin_finacc_transaction, fin_reconciliation WHERE fin_finacc_transaction.fin_reconciliation_id = fin_reconciliation.fin_reconciliation_id GROUP BY fin_finacc_transaction.fin_reconciliation_id, fin_reconciliation.ad_client_id, fin_reconciliation.ad_org_id, fin_reconciliation.created, fin_reconciliation.createdby, fin_reconciliation.updated, fin_reconciliation.updatedby, fin_reconciliation.isactive UNION ALL SELECT get_uuid() AS aprm_rec_detail_v_id, to_char('APRM_UnReconciled') AS type, fin_reconciliation.fin_reconciliation_id, COALESCE(count(*), 0) AS item_no, COALESCE(sum(fin_bankstatementline.cramount - fin_bankstatementline.dramount), 0) AS item_amt, fin_reconciliation.ad_client_id, fin_reconciliation.ad_org_id, fin_reconciliation.created, fin_reconciliation.createdby, fin_reconciliation.updated, fin_reconciliation.updatedby, fin_reconciliation.isactive FROM fin_bankstatementline, fin_bankstatement, fin_reconciliation WHERE (fin_bankstatementline.fin_finacc_transaction_id IS NULL OR (EXISTS (SELECT 1 FROM fin_finacc_transaction, fin_reconciliation rec WHERE fin_finacc_transaction.fin_reconciliation_id = rec.fin_reconciliation_id AND fin_bankstatementline.fin_finacc_transaction_id = fin_finacc_transaction.fin_finacc_transaction_id AND fin_finacc_transaction.fin_financial_account_id = fin_bankstatement.fin_financial_account_id AND rec.created > fin_reconciliation.created))) AND fin_bankstatementline.datetrx <= fin_reconciliation.dateto AND fin_bankstatement.fin_bankstatement_id = fin_bankstatementline.fin_bankstatement_id AND fin_bankstatement.fin_financial_account_id = fin_reconciliation.fin_financial_account_id GROUP BY fin_reconciliation.fin_reconciliation_id, fin_reconciliation.ad_client_id, fin_reconciliation.ad_org_id, fin_reconciliation.created, fin_reconciliation.createdby, fin_reconciliation.updated, fin_reconciliation.updatedby, fin_reconciliation.isactive) UNION ALL SELECT get_uuid() AS aprm_rec_detail_v_id, to_char('APRM_OutstandingPayments') AS type, fin_reconciliation.fin_reconciliation_id, COALESCE(sum(CASE COALESCE(fin_finacc_transaction.paymentamt, 0) WHEN 0 THEN 0 ELSE 1 END), 0) AS item_no, COALESCE(sum(fin_finacc_transaction.paymentamt), 0) AS item_amt, fin_reconciliation.ad_client_id, fin_reconciliation.ad_org_id, fin_reconciliation.created, fin_reconciliation.createdby, fin_reconciliation.updated, fin_reconciliation.updatedby, fin_reconciliation.isactive FROM fin_finacc_transaction, fin_reconciliation WHERE (fin_finacc_transaction.fin_reconciliation_id IS NULL OR (EXISTS (SELECT 1 FROM fin_reconciliation r WHERE r.dateto > fin_reconciliation.dateto AND fin_finacc_transaction.fin_reconciliation_id = r.fin_reconciliation_id))) AND fin_finacc_transaction.statementdate <= fin_reconciliation.dateto AND fin_finacc_transaction.fin_financial_account_id = fin_reconciliation.fin_financial_account_id GROUP BY fin_reconciliation.fin_reconciliation_id, fin_reconciliation.ad_client_id, fin_reconciliation.ad_org_id, fin_reconciliation.created, fin_reconciliation.createdby, fin_reconciliation.updated, fin_reconciliation.updatedby, fin_reconciliation.isactive) UNION ALL SELECT get_uuid() AS aprm_rec_detail_v_id, to_char('APRM_OutstandingDeposits') AS type, fin_reconciliation.fin_reconciliation_id, COALESCE(sum(CASE COALESCE(fin_finacc_transaction.depositamt, 0) WHEN 0 THEN 0 ELSE 1 END), 0) AS item_no, COALESCE(sum(fin_finacc_transaction.depositamt), 0) AS item_amt, fin_reconciliation.ad_client_id, fin_reconciliation.ad_org_id, fin_reconciliation.created, fin_reconciliation.createdby, fin_reconciliation.updated, fin_reconciliation.updatedby, fin_reconciliation.isactive FROM fin_finacc_transaction, fin_reconciliation WHERE (fin_finacc_transaction.fin_reconciliation_id IS NULL OR (EXISTS (SELECT 1 FROM fin_reconciliation r WHERE r.dateto > fin_reconciliation.dateto AND fin_finacc_transaction.fin_reconciliation_id = r.fin_reconciliation_id))) AND fin_finacc_transaction.statementdate <= fin_reconciliation.dateto AND fin_finacc_transaction.fin_financial_account_id = fin_reconciliation.fin_financial_account_id GROUP BY fin_reconciliation.fin_reconciliation_id, fin_reconciliation.ad_client_id, fin_reconciliation.ad_org_id, fin_reconciliation.created, fin_reconciliation.createdby, fin_reconciliation.updated, fin_reconciliation.updatedby, fin_reconciliation.isactive]]></view>
-  </database>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -242,6 +242,39 @@
 <!--0790053440214B14AF3610EE2739140E-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--0790053440214B14AF3610EE2739140E--></AD_COLUMN>
 
+<!--07DD87B8F3BE41C18546260D616E1404--><AD_COLUMN>
+<!--07DD87B8F3BE41C18546260D616E1404-->  <AD_COLUMN_ID><![CDATA[07DD87B8F3BE41C18546260D616E1404]]></AD_COLUMN_ID>
+<!--07DD87B8F3BE41C18546260D616E1404-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--07DD87B8F3BE41C18546260D616E1404-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--07DD87B8F3BE41C18546260D616E1404-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--07DD87B8F3BE41C18546260D616E1404-->  <NAME><![CDATA[EM_APRM_UnReconciledItemNo]]></NAME>
+<!--07DD87B8F3BE41C18546260D616E1404-->  <COLUMNNAME><![CDATA[EM_APRM_UnReconciledItemNo]]></COLUMNNAME>
+<!--07DD87B8F3BE41C18546260D616E1404-->  <AD_TABLE_ID><![CDATA[B1B7075C46934F0A9FD4C4D0F1457B42]]></AD_TABLE_ID>
+<!--07DD87B8F3BE41C18546260D616E1404-->  <AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID>
+<!--07DD87B8F3BE41C18546260D616E1404-->  <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--07DD87B8F3BE41C18546260D616E1404-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--07DD87B8F3BE41C18546260D616E1404-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--07DD87B8F3BE41C18546260D616E1404-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--07DD87B8F3BE41C18546260D616E1404-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--07DD87B8F3BE41C18546260D616E1404-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--07DD87B8F3BE41C18546260D616E1404-->  <SEQNO><![CDATA[310]]></SEQNO>
+<!--07DD87B8F3BE41C18546260D616E1404-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--07DD87B8F3BE41C18546260D616E1404-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--07DD87B8F3BE41C18546260D616E1404-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--07DD87B8F3BE41C18546260D616E1404-->  <AD_ELEMENT_ID><![CDATA[8F1BEEEE0B0847E59FD95EFE6658DF86]]></AD_ELEMENT_ID>
+<!--07DD87B8F3BE41C18546260D616E1404-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--07DD87B8F3BE41C18546260D616E1404-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--07DD87B8F3BE41C18546260D616E1404-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--07DD87B8F3BE41C18546260D616E1404-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--07DD87B8F3BE41C18546260D616E1404-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--07DD87B8F3BE41C18546260D616E1404-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--07DD87B8F3BE41C18546260D616E1404-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--07DD87B8F3BE41C18546260D616E1404-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--07DD87B8F3BE41C18546260D616E1404-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--07DD87B8F3BE41C18546260D616E1404-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--07DD87B8F3BE41C18546260D616E1404-->  <SQLLOGIC><![CDATA[(SELECT count(*) FROM fin_bankstatementline bl, fin_bankstatement b, fin_reconciliation r WHERE (bl.fin_finacc_transaction_id IS NULL OR (EXISTS ( SELECT 1 FROM fin_finacc_transaction t, fin_reconciliation rec WHERE t.fin_reconciliation_id  = rec.fin_reconciliation_id AND bl.fin_finacc_transaction_id  = t.fin_finacc_transaction_id  AND t.fin_financial_account_id  = b.fin_financial_account_id  AND rec.created > r.created))) AND bl.datetrx <= r.dateto AND b.fin_bankstatement_id  = bl.fin_bankstatement_id AND b.fin_financial_account_id  = r.fin_financial_account_id and r.fin_reconciliation_id = fin_reconciliation_id)]]></SQLLOGIC>
+<!--07DD87B8F3BE41C18546260D616E1404--></AD_COLUMN>
+
 <!--09A1C598D8134CAC92CB30E476A213B0--><AD_COLUMN>
 <!--09A1C598D8134CAC92CB30E476A213B0-->  <AD_COLUMN_ID><![CDATA[09A1C598D8134CAC92CB30E476A213B0]]></AD_COLUMN_ID>
 <!--09A1C598D8134CAC92CB30E476A213B0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -277,43 +310,6 @@
 <!--09A1C598D8134CAC92CB30E476A213B0-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--09A1C598D8134CAC92CB30E476A213B0--></AD_COLUMN>
 
-<!--09A973768AD449FCBDB2B78580BAE637--><AD_COLUMN>
-<!--09A973768AD449FCBDB2B78580BAE637-->  <AD_COLUMN_ID><![CDATA[09A973768AD449FCBDB2B78580BAE637]]></AD_COLUMN_ID>
-<!--09A973768AD449FCBDB2B78580BAE637-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--09A973768AD449FCBDB2B78580BAE637-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--09A973768AD449FCBDB2B78580BAE637-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--09A973768AD449FCBDB2B78580BAE637-->  <NAME><![CDATA[Active]]></NAME>
-<!--09A973768AD449FCBDB2B78580BAE637-->  <DESCRIPTION><![CDATA[A flag indicating whether this record is available for use or de-activated.]]></DESCRIPTION>
-<!--09A973768AD449FCBDB2B78580BAE637-->  <HELP><![CDATA[There are two methods of making records unavailable in the system: One is to delete the record, the other is to de-activate the record. A de-activated record is not available for selection, but available for reporting. There are two reasons for de-activating and not deleting records: 
-(1) The system requires the record for auditing purposes.
-(2) The record is referenced by other records. E.g., you cannot delete a Business Partner, if there are existing invoices for it. By de-activating the Business Partner you prevent it from being used in future transactions.]]></HELP>
-<!--09A973768AD449FCBDB2B78580BAE637-->  <COLUMNNAME><![CDATA[Isactive]]></COLUMNNAME>
-<!--09A973768AD449FCBDB2B78580BAE637-->  <AD_TABLE_ID><![CDATA[FF808081331848750133184B38D20009]]></AD_TABLE_ID>
-<!--09A973768AD449FCBDB2B78580BAE637-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
-<!--09A973768AD449FCBDB2B78580BAE637-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
-<!--09A973768AD449FCBDB2B78580BAE637-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--09A973768AD449FCBDB2B78580BAE637-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--09A973768AD449FCBDB2B78580BAE637-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--09A973768AD449FCBDB2B78580BAE637-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
-<!--09A973768AD449FCBDB2B78580BAE637-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--09A973768AD449FCBDB2B78580BAE637-->  <SEQNO><![CDATA[140]]></SEQNO>
-<!--09A973768AD449FCBDB2B78580BAE637-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--09A973768AD449FCBDB2B78580BAE637-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--09A973768AD449FCBDB2B78580BAE637-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--09A973768AD449FCBDB2B78580BAE637-->  <AD_ELEMENT_ID><![CDATA[348]]></AD_ELEMENT_ID>
-<!--09A973768AD449FCBDB2B78580BAE637-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--09A973768AD449FCBDB2B78580BAE637-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--09A973768AD449FCBDB2B78580BAE637-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--09A973768AD449FCBDB2B78580BAE637-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--09A973768AD449FCBDB2B78580BAE637-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--09A973768AD449FCBDB2B78580BAE637-->  <POSITION><![CDATA[12]]></POSITION>
-<!--09A973768AD449FCBDB2B78580BAE637-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--09A973768AD449FCBDB2B78580BAE637-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--09A973768AD449FCBDB2B78580BAE637-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--09A973768AD449FCBDB2B78580BAE637-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--09A973768AD449FCBDB2B78580BAE637-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--09A973768AD449FCBDB2B78580BAE637--></AD_COLUMN>
-
 <!--0CE41B7829C54AF3B7193B1FA52B3C62--><AD_COLUMN>
 <!--0CE41B7829C54AF3B7193B1FA52B3C62-->  <AD_COLUMN_ID><![CDATA[0CE41B7829C54AF3B7193B1FA52B3C62]]></AD_COLUMN_ID>
 <!--0CE41B7829C54AF3B7193B1FA52B3C62-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -598,41 +594,6 @@
 <!--137DEB7F4BAF46A783F86044A1817D66-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--137DEB7F4BAF46A783F86044A1817D66--></AD_COLUMN>
 
-<!--1485BE46BB7E48D78834C85C8E970D00--><AD_COLUMN>
-<!--1485BE46BB7E48D78834C85C8E970D00-->  <AD_COLUMN_ID><![CDATA[1485BE46BB7E48D78834C85C8E970D00]]></AD_COLUMN_ID>
-<!--1485BE46BB7E48D78834C85C8E970D00-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--1485BE46BB7E48D78834C85C8E970D00-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--1485BE46BB7E48D78834C85C8E970D00-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--1485BE46BB7E48D78834C85C8E970D00-->  <NAME><![CDATA[Type]]></NAME>
-<!--1485BE46BB7E48D78834C85C8E970D00-->  <DESCRIPTION><![CDATA[A distinct item characteristic used for processes and sometimes grouped within a category.]]></DESCRIPTION>
-<!--1485BE46BB7E48D78834C85C8E970D00-->  <HELP><![CDATA[The Type indicates the type of validation that will occur.  This can be SQL, Java Script or Java Language.]]></HELP>
-<!--1485BE46BB7E48D78834C85C8E970D00-->  <COLUMNNAME><![CDATA[Type]]></COLUMNNAME>
-<!--1485BE46BB7E48D78834C85C8E970D00-->  <AD_TABLE_ID><![CDATA[FF808081331848750133184B38D20009]]></AD_TABLE_ID>
-<!--1485BE46BB7E48D78834C85C8E970D00-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
-<!--1485BE46BB7E48D78834C85C8E970D00-->  <FIELDLENGTH><![CDATA[-5]]></FIELDLENGTH>
-<!--1485BE46BB7E48D78834C85C8E970D00-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--1485BE46BB7E48D78834C85C8E970D00-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--1485BE46BB7E48D78834C85C8E970D00-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--1485BE46BB7E48D78834C85C8E970D00-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
-<!--1485BE46BB7E48D78834C85C8E970D00-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
-<!--1485BE46BB7E48D78834C85C8E970D00-->  <SEQNO><![CDATA[170]]></SEQNO>
-<!--1485BE46BB7E48D78834C85C8E970D00-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--1485BE46BB7E48D78834C85C8E970D00-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1485BE46BB7E48D78834C85C8E970D00-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--1485BE46BB7E48D78834C85C8E970D00-->  <AD_ELEMENT_ID><![CDATA[600]]></AD_ELEMENT_ID>
-<!--1485BE46BB7E48D78834C85C8E970D00-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--1485BE46BB7E48D78834C85C8E970D00-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--1485BE46BB7E48D78834C85C8E970D00-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--1485BE46BB7E48D78834C85C8E970D00-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--1485BE46BB7E48D78834C85C8E970D00-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--1485BE46BB7E48D78834C85C8E970D00-->  <POSITION><![CDATA[2]]></POSITION>
-<!--1485BE46BB7E48D78834C85C8E970D00-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--1485BE46BB7E48D78834C85C8E970D00-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--1485BE46BB7E48D78834C85C8E970D00-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--1485BE46BB7E48D78834C85C8E970D00-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--1485BE46BB7E48D78834C85C8E970D00-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--1485BE46BB7E48D78834C85C8E970D00--></AD_COLUMN>
-
 <!--1678A44C2B7543DD8393C8E4E32D6F3E--><AD_COLUMN>
 <!--1678A44C2B7543DD8393C8E4E32D6F3E-->  <AD_COLUMN_ID><![CDATA[1678A44C2B7543DD8393C8E4E32D6F3E]]></AD_COLUMN_ID>
 <!--1678A44C2B7543DD8393C8E4E32D6F3E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2158,6 +2119,39 @@
 <!--3F41C500ECEB40D09089FEA4C3793F29-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--3F41C500ECEB40D09089FEA4C3793F29--></AD_COLUMN>
 
+<!--3FE18B378FA24031A2E24B058414729F--><AD_COLUMN>
+<!--3FE18B378FA24031A2E24B058414729F-->  <AD_COLUMN_ID><![CDATA[3FE18B378FA24031A2E24B058414729F]]></AD_COLUMN_ID>
+<!--3FE18B378FA24031A2E24B058414729F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3FE18B378FA24031A2E24B058414729F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3FE18B378FA24031A2E24B058414729F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3FE18B378FA24031A2E24B058414729F-->  <NAME><![CDATA[EM_APRM_OutstandingDepositItemsAmount]]></NAME>
+<!--3FE18B378FA24031A2E24B058414729F-->  <COLUMNNAME><![CDATA[EM_APRM_OutstandingDepositItemsAmount]]></COLUMNNAME>
+<!--3FE18B378FA24031A2E24B058414729F-->  <AD_TABLE_ID><![CDATA[B1B7075C46934F0A9FD4C4D0F1457B42]]></AD_TABLE_ID>
+<!--3FE18B378FA24031A2E24B058414729F-->  <AD_REFERENCE_ID><![CDATA[12]]></AD_REFERENCE_ID>
+<!--3FE18B378FA24031A2E24B058414729F-->  <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--3FE18B378FA24031A2E24B058414729F-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--3FE18B378FA24031A2E24B058414729F-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--3FE18B378FA24031A2E24B058414729F-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--3FE18B378FA24031A2E24B058414729F-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--3FE18B378FA24031A2E24B058414729F-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--3FE18B378FA24031A2E24B058414729F-->  <SEQNO><![CDATA[360]]></SEQNO>
+<!--3FE18B378FA24031A2E24B058414729F-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--3FE18B378FA24031A2E24B058414729F-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--3FE18B378FA24031A2E24B058414729F-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--3FE18B378FA24031A2E24B058414729F-->  <AD_ELEMENT_ID><![CDATA[D85187ABF8434C39A9A11EE8EFCF3DDE]]></AD_ELEMENT_ID>
+<!--3FE18B378FA24031A2E24B058414729F-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--3FE18B378FA24031A2E24B058414729F-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--3FE18B378FA24031A2E24B058414729F-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--3FE18B378FA24031A2E24B058414729F-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--3FE18B378FA24031A2E24B058414729F-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--3FE18B378FA24031A2E24B058414729F-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--3FE18B378FA24031A2E24B058414729F-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--3FE18B378FA24031A2E24B058414729F-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--3FE18B378FA24031A2E24B058414729F-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--3FE18B378FA24031A2E24B058414729F-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--3FE18B378FA24031A2E24B058414729F-->  <SQLLOGIC><![CDATA[(SELECT COALESCE(sum(t.depositamt), 0) FROM fin_finacc_transaction t,  fin_reconciliation rec WHERE (t.fin_reconciliation_id IS NULL OR (EXISTS ( SELECT 1 FROM fin_reconciliation r WHERE r.dateto > rec.dateto AND t.fin_reconciliation_id  = r.fin_reconciliation_id ))) AND t.statementdate <= rec.dateto AND t.depositamt <> 0 AND t.fin_financial_account_id  = rec.fin_financial_account_id AND rec.fin_reconciliation_id = fin_reconciliation_id)]]></SQLLOGIC>
+<!--3FE18B378FA24031A2E24B058414729F--></AD_COLUMN>
+
 <!--40405759C1E1456E99B537D36A06F987--><AD_COLUMN>
 <!--40405759C1E1456E99B537D36A06F987-->  <AD_COLUMN_ID><![CDATA[40405759C1E1456E99B537D36A06F987]]></AD_COLUMN_ID>
 <!--40405759C1E1456E99B537D36A06F987-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2193,41 +2187,6 @@
 <!--40405759C1E1456E99B537D36A06F987-->  <ENTITY_ALIAS><![CDATA[fp.documentNo]]></ENTITY_ALIAS>
 <!--40405759C1E1456E99B537D36A06F987--></AD_COLUMN>
 
-<!--406EE714C6B645909609BA820A112F2C--><AD_COLUMN>
-<!--406EE714C6B645909609BA820A112F2C-->  <AD_COLUMN_ID><![CDATA[406EE714C6B645909609BA820A112F2C]]></AD_COLUMN_ID>
-<!--406EE714C6B645909609BA820A112F2C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--406EE714C6B645909609BA820A112F2C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--406EE714C6B645909609BA820A112F2C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--406EE714C6B645909609BA820A112F2C-->  <NAME><![CDATA[Updated]]></NAME>
-<!--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>
-<!--406EE714C6B645909609BA820A112F2C-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
-<!--406EE714C6B645909609BA820A112F2C-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
-<!--406EE714C6B645909609BA820A112F2C-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--406EE714C6B645909609BA820A112F2C-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--406EE714C6B645909609BA820A112F2C-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--406EE714C6B645909609BA820A112F2C-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
-<!--406EE714C6B645909609BA820A112F2C-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--406EE714C6B645909609BA820A112F2C-->  <SEQNO><![CDATA[100]]></SEQNO>
-<!--406EE714C6B645909609BA820A112F2C-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--406EE714C6B645909609BA820A112F2C-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--406EE714C6B645909609BA820A112F2C-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--406EE714C6B645909609BA820A112F2C-->  <AD_ELEMENT_ID><![CDATA[607]]></AD_ELEMENT_ID>
-<!--406EE714C6B645909609BA820A112F2C-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--406EE714C6B645909609BA820A112F2C-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--406EE714C6B645909609BA820A112F2C-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--406EE714C6B645909609BA820A112F2C-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--406EE714C6B645909609BA820A112F2C-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--406EE714C6B645909609BA820A112F2C-->  <POSITION><![CDATA[10]]></POSITION>
-<!--406EE714C6B645909609BA820A112F2C-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--406EE714C6B645909609BA820A112F2C-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--406EE714C6B645909609BA820A112F2C-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--406EE714C6B645909609BA820A112F2C-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--406EE714C6B645909609BA820A112F2C-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--406EE714C6B645909609BA820A112F2C--></AD_COLUMN>
-
 <!--40E02E5A0DCA4C7EA2CADBFA06D8EA39--><AD_COLUMN>
 <!--40E02E5A0DCA4C7EA2CADBFA06D8EA39-->  <AD_COLUMN_ID><![CDATA[40E02E5A0DCA4C7EA2CADBFA06D8EA39]]></AD_COLUMN_ID>
 <!--40E02E5A0DCA4C7EA2CADBFA06D8EA39-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2440,41 +2399,6 @@
 <!--4690710630824E3AB4FE825F17D9EA9B-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--4690710630824E3AB4FE825F17D9EA9B--></AD_COLUMN>
 
-<!--46B2EF2686C849CF8ACAC56810041AEB--><AD_COLUMN>
-<!--46B2EF2686C849CF8ACAC56810041AEB-->  <AD_COLUMN_ID><![CDATA[46B2EF2686C849CF8ACAC56810041AEB]]></AD_COLUMN_ID>
-<!--46B2EF2686C849CF8ACAC56810041AEB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--46B2EF2686C849CF8ACAC56810041AEB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--46B2EF2686C849CF8ACAC56810041AEB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--46B2EF2686C849CF8ACAC56810041AEB-->  <NAME><![CDATA[Creation Date]]></NAME>
-<!--46B2EF2686C849CF8ACAC56810041AEB-->  <DESCRIPTION><![CDATA[The date that this record is completed.]]></DESCRIPTION>
-<!--46B2EF2686C849CF8ACAC56810041AEB-->  <HELP><![CDATA[The Created field indicates the date that this record was created.]]></HELP>
-<!--46B2EF2686C849CF8ACAC56810041AEB-->  <COLUMNNAME><![CDATA[Created]]></COLUMNNAME>
-<!--46B2EF2686C849CF8ACAC56810041AEB-->  <AD_TABLE_ID><![CDATA[FF808081331848750133184B38D20009]]></AD_TABLE_ID>
-<!--46B2EF2686C849CF8ACAC56810041AEB-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
-<!--46B2EF2686C849CF8ACAC56810041AEB-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
-<!--46B2EF2686C849CF8ACAC56810041AEB-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--46B2EF2686C849CF8ACAC56810041AEB-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--46B2EF2686C849CF8ACAC56810041AEB-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--46B2EF2686C849CF8ACAC56810041AEB-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
-<!--46B2EF2686C849CF8ACAC56810041AEB-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--46B2EF2686C849CF8ACAC56810041AEB-->  <SEQNO><![CDATA[80]]></SEQNO>
-<!--46B2EF2686C849CF8ACAC56810041AEB-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--46B2EF2686C849CF8ACAC56810041AEB-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--46B2EF2686C849CF8ACAC56810041AEB-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--46B2EF2686C849CF8ACAC56810041AEB-->  <AD_ELEMENT_ID><![CDATA[245]]></AD_ELEMENT_ID>
-<!--46B2EF2686C849CF8ACAC56810041AEB-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--46B2EF2686C849CF8ACAC56810041AEB-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--46B2EF2686C849CF8ACAC56810041AEB-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--46B2EF2686C849CF8ACAC56810041AEB-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--46B2EF2686C849CF8ACAC56810041AEB-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--46B2EF2686C849CF8ACAC56810041AEB-->  <POSITION><![CDATA[8]]></POSITION>
-<!--46B2EF2686C849CF8ACAC56810041AEB-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--46B2EF2686C849CF8ACAC56810041AEB-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--46B2EF2686C849CF8ACAC56810041AEB-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--46B2EF2686C849CF8ACAC56810041AEB-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--46B2EF2686C849CF8ACAC56810041AEB-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--46B2EF2686C849CF8ACAC56810041AEB--></AD_COLUMN>
-
 <!--46BDDEB8C59C4ADA9C4C9D837A10CD45--><AD_COLUMN>
 <!--46BDDEB8C59C4ADA9C4C9D837A10CD45-->  <AD_COLUMN_ID><![CDATA[46BDDEB8C59C4ADA9C4C9D837A10CD45]]></AD_COLUMN_ID>
 <!--46BDDEB8C59C4ADA9C4C9D837A10CD45-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2969,6 +2893,39 @@
 <!--57D5BC1D263243128DCD16E2836AE3E1-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--57D5BC1D263243128DCD16E2836AE3E1--></AD_COLUMN>
 
+<!--590088D9DDB34C1FB99E97CF50022B62--><AD_COLUMN>
+<!--590088D9DDB34C1FB99E97CF50022B62-->  <AD_COLUMN_ID><![CDATA[590088D9DDB34C1FB99E97CF50022B62]]></AD_COLUMN_ID>
+<!--590088D9DDB34C1FB99E97CF50022B62-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--590088D9DDB34C1FB99E97CF50022B62-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--590088D9DDB34C1FB99E97CF50022B62-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--590088D9DDB34C1FB99E97CF50022B62-->  <NAME><![CDATA[EM_APRM_ReconciledItemNo]]></NAME>
+<!--590088D9DDB34C1FB99E97CF50022B62-->  <COLUMNNAME><![CDATA[EM_APRM_ReconciledItemNo]]></COLUMNNAME>
+<!--590088D9DDB34C1FB99E97CF50022B62-->  <AD_TABLE_ID><![CDATA[B1B7075C46934F0A9FD4C4D0F1457B42]]></AD_TABLE_ID>
+<!--590088D9DDB34C1FB99E97CF50022B62-->  <AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID>
+<!--590088D9DDB34C1FB99E97CF50022B62-->  <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--590088D9DDB34C1FB99E97CF50022B62-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--590088D9DDB34C1FB99E97CF50022B62-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--590088D9DDB34C1FB99E97CF50022B62-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--590088D9DDB34C1FB99E97CF50022B62-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--590088D9DDB34C1FB99E97CF50022B62-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--590088D9DDB34C1FB99E97CF50022B62-->  <SEQNO><![CDATA[290]]></SEQNO>
+<!--590088D9DDB34C1FB99E97CF50022B62-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--590088D9DDB34C1FB99E97CF50022B62-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--590088D9DDB34C1FB99E97CF50022B62-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--590088D9DDB34C1FB99E97CF50022B62-->  <AD_ELEMENT_ID><![CDATA[F109FCAF8CC1462AB2A94F73F4E51EA7]]></AD_ELEMENT_ID>
+<!--590088D9DDB34C1FB99E97CF50022B62-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--590088D9DDB34C1FB99E97CF50022B62-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--590088D9DDB34C1FB99E97CF50022B62-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--590088D9DDB34C1FB99E97CF50022B62-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--590088D9DDB34C1FB99E97CF50022B62-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--590088D9DDB34C1FB99E97CF50022B62-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--590088D9DDB34C1FB99E97CF50022B62-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--590088D9DDB34C1FB99E97CF50022B62-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--590088D9DDB34C1FB99E97CF50022B62-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--590088D9DDB34C1FB99E97CF50022B62-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--590088D9DDB34C1FB99E97CF50022B62-->  <SQLLOGIC><![CDATA[( SELECT count(*) FROM fin_finacc_transaction WHERE fin_finacc_transaction.fin_reconciliation_id = fin_reconciliation_id)]]></SQLLOGIC>
+<!--590088D9DDB34C1FB99E97CF50022B62--></AD_COLUMN>
+
 <!--5961F18CC4934FCCA8AB18B2B3AFC960--><AD_COLUMN>
 <!--5961F18CC4934FCCA8AB18B2B3AFC960-->  <AD_COLUMN_ID><![CDATA[5961F18CC4934FCCA8AB18B2B3AFC960]]></AD_COLUMN_ID>
 <!--5961F18CC4934FCCA8AB18B2B3AFC960-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -3073,41 +3030,6 @@
 <!--5B278C5EA0AC4FDAB225F6A7A61FC094-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--5B278C5EA0AC4FDAB225F6A7A61FC094--></AD_COLUMN>
 
-<!--5B783EC445B04714B33004F9993EBB07--><AD_COLUMN>
-<!--5B783EC445B04714B33004F9993EBB07-->  <AD_COLUMN_ID><![CDATA[5B783EC445B04714B33004F9993EBB07]]></AD_COLUMN_ID>
-<!--5B783EC445B04714B33004F9993EBB07-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--5B783EC445B04714B33004F9993EBB07-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--5B783EC445B04714B33004F9993EBB07-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--5B783EC445B04714B33004F9993EBB07-->  <NAME><![CDATA[Reconciliation]]></NAME>
-<!--5B783EC445B04714B33004F9993EBB07-->  <DESCRIPTION><![CDATA[Reconciliation events related to the financial account]]></DESCRIPTION>
-<!--5B783EC445B04714B33004F9993EBB07-->  <HELP><![CDATA[Reconciliation events related to the financial account]]></HELP>
-<!--5B783EC445B04714B33004F9993EBB07-->  <COLUMNNAME><![CDATA[FIN_Reconciliation_ID]]></COLUMNNAME>
-<!--5B783EC445B04714B33004F9993EBB07-->  <AD_TABLE_ID><![CDATA[FF808081331848750133184B38D20009]]></AD_TABLE_ID>
-<!--5B783EC445B04714B33004F9993EBB07-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
-<!--5B783EC445B04714B33004F9993EBB07-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
-<!--5B783EC445B04714B33004F9993EBB07-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--5B783EC445B04714B33004F9993EBB07-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--5B783EC445B04714B33004F9993EBB07-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--5B783EC445B04714B33004F9993EBB07-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
-<!--5B783EC445B04714B33004F9993EBB07-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--5B783EC445B04714B33004F9993EBB07-->  <SEQNO><![CDATA[30]]></SEQNO>
-<!--5B783EC445B04714B33004F9993EBB07-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--5B783EC445B04714B33004F9993EBB07-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--5B783EC445B04714B33004F9993EBB07-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--5B783EC445B04714B33004F9993EBB07-->  <AD_ELEMENT_ID><![CDATA[8189F57B424789CBE040007F01003EE0]]></AD_ELEMENT_ID>
-<!--5B783EC445B04714B33004F9993EBB07-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--5B783EC445B04714B33004F9993EBB07-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--5B783EC445B04714B33004F9993EBB07-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--5B783EC445B04714B33004F9993EBB07-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--5B783EC445B04714B33004F9993EBB07-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--5B783EC445B04714B33004F9993EBB07-->  <POSITION><![CDATA[3]]></POSITION>
-<!--5B783EC445B04714B33004F9993EBB07-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--5B783EC445B04714B33004F9993EBB07-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--5B783EC445B04714B33004F9993EBB07-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--5B783EC445B04714B33004F9993EBB07-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--5B783EC445B04714B33004F9993EBB07-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--5B783EC445B04714B33004F9993EBB07--></AD_COLUMN>
-
 <!--5BABDB890D8B4C3C95C01331BFA898E5--><AD_COLUMN>
 <!--5BABDB890D8B4C3C95C01331BFA898E5-->  <AD_COLUMN_ID><![CDATA[5BABDB890D8B4C3C95C01331BFA898E5]]></AD_COLUMN_ID>
 <!--5BABDB890D8B4C3C95C01331BFA898E5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -4029,6 +3951,39 @@
 <!--76C4D6CDF96B4CB5B80967475AA3D2A9-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--76C4D6CDF96B4CB5B80967475AA3D2A9--></AD_COLUMN>
 
+<!--7791426B8C214F0EB68C13D99A577229--><AD_COLUMN>
+<!--7791426B8C214F0EB68C13D99A577229-->  <AD_COLUMN_ID><![CDATA[7791426B8C214F0EB68C13D99A577229]]></AD_COLUMN_ID>
+<!--7791426B8C214F0EB68C13D99A577229-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7791426B8C214F0EB68C13D99A577229-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7791426B8C214F0EB68C13D99A577229-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7791426B8C214F0EB68C13D99A577229-->  <NAME><![CDATA[EM_APRM_ReconciledItemAmount]]></NAME>
+<!--7791426B8C214F0EB68C13D99A577229-->  <COLUMNNAME><![CDATA[EM_APRM_ReconciledItemAmount]]></COLUMNNAME>
+<!--7791426B8C214F0EB68C13D99A577229-->  <AD_TABLE_ID><![CDATA[B1B7075C46934F0A9FD4C4D0F1457B42]]></AD_TABLE_ID>
+<!--7791426B8C214F0EB68C13D99A577229-->  <AD_REFERENCE_ID><![CDATA[12]]></AD_REFERENCE_ID>
+<!--7791426B8C214F0EB68C13D99A577229-->  <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--7791426B8C214F0EB68C13D99A577229-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7791426B8C214F0EB68C13D99A577229-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7791426B8C214F0EB68C13D99A577229-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--7791426B8C214F0EB68C13D99A577229-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--7791426B8C214F0EB68C13D99A577229-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7791426B8C214F0EB68C13D99A577229-->  <SEQNO><![CDATA[300]]></SEQNO>
+<!--7791426B8C214F0EB68C13D99A577229-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7791426B8C214F0EB68C13D99A577229-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7791426B8C214F0EB68C13D99A577229-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7791426B8C214F0EB68C13D99A577229-->  <AD_ELEMENT_ID><![CDATA[80132B0B521B4512AFC6CFA33BECF9CF]]></AD_ELEMENT_ID>
+<!--7791426B8C214F0EB68C13D99A577229-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7791426B8C214F0EB68C13D99A577229-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7791426B8C214F0EB68C13D99A577229-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7791426B8C214F0EB68C13D99A577229-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7791426B8C214F0EB68C13D99A577229-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--7791426B8C214F0EB68C13D99A577229-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7791426B8C214F0EB68C13D99A577229-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--7791426B8C214F0EB68C13D99A577229-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--7791426B8C214F0EB68C13D99A577229-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--7791426B8C214F0EB68C13D99A577229-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--7791426B8C214F0EB68C13D99A577229-->  <SQLLOGIC><![CDATA[(SELECT COALESCE(sum(fin_finacc_transaction.depositamt - fin_finacc_transaction.paymentamt), 0) FROM fin_finacc_transaction WHERE fin_finacc_transaction.fin_reconciliation_id = fin_reconciliation_id)]]></SQLLOGIC>
+<!--7791426B8C214F0EB68C13D99A577229--></AD_COLUMN>
+
 <!--78A3367822B35459E040007F01012510--><AD_COLUMN>
 <!--78A3367822B35459E040007F01012510-->  <AD_COLUMN_ID><![CDATA[78A3367822B35459E040007F01012510]]></AD_COLUMN_ID>
 <!--78A3367822B35459E040007F01012510-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -4377,6 +4332,39 @@
 <!--8071EA28ABEA4E1E919AD14F3EE5B033-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--8071EA28ABEA4E1E919AD14F3EE5B033--></AD_COLUMN>
 
+<!--81822D492C88480C8830E5059387A771--><AD_COLUMN>
+<!--81822D492C88480C8830E5059387A771-->  <AD_COLUMN_ID><![CDATA[81822D492C88480C8830E5059387A771]]></AD_COLUMN_ID>
+<!--81822D492C88480C8830E5059387A771-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--81822D492C88480C8830E5059387A771-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--81822D492C88480C8830E5059387A771-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--81822D492C88480C8830E5059387A771-->  <NAME><![CDATA[EM_APRM_OutstandingDepositsItemNo]]></NAME>
+<!--81822D492C88480C8830E5059387A771-->  <COLUMNNAME><![CDATA[EM_APRM_OutstandingDepositsItemNo]]></COLUMNNAME>
+<!--81822D492C88480C8830E5059387A771-->  <AD_TABLE_ID><![CDATA[B1B7075C46934F0A9FD4C4D0F1457B42]]></AD_TABLE_ID>
+<!--81822D492C88480C8830E5059387A771-->  <AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID>
+<!--81822D492C88480C8830E5059387A771-->  <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--81822D492C88480C8830E5059387A771-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--81822D492C88480C8830E5059387A771-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--81822D492C88480C8830E5059387A771-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--81822D492C88480C8830E5059387A771-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--81822D492C88480C8830E5059387A771-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--81822D492C88480C8830E5059387A771-->  <SEQNO><![CDATA[350]]></SEQNO>
+<!--81822D492C88480C8830E5059387A771-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--81822D492C88480C8830E5059387A771-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--81822D492C88480C8830E5059387A771-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--81822D492C88480C8830E5059387A771-->  <AD_ELEMENT_ID><![CDATA[B2836EAE81BC4FEEAD5DA597F575F033]]></AD_ELEMENT_ID>
+<!--81822D492C88480C8830E5059387A771-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--81822D492C88480C8830E5059387A771-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--81822D492C88480C8830E5059387A771-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--81822D492C88480C8830E5059387A771-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--81822D492C88480C8830E5059387A771-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--81822D492C88480C8830E5059387A771-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--81822D492C88480C8830E5059387A771-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--81822D492C88480C8830E5059387A771-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--81822D492C88480C8830E5059387A771-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--81822D492C88480C8830E5059387A771-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--81822D492C88480C8830E5059387A771-->  <SQLLOGIC><![CDATA[(SELECT count(*) FROM fin_finacc_transaction t,  fin_reconciliation rec WHERE (t.fin_reconciliation_id IS NULL OR (EXISTS ( SELECT 1 FROM fin_reconciliation r WHERE r.dateto > rec.dateto AND t.fin_reconciliation_id  = r.fin_reconciliation_id ))) AND t.statementdate <= rec.dateto AND t.depositamt <> 0 AND t.fin_financial_account_id  = rec.fin_financial_account_id AND rec.fin_reconciliation_id = fin_reconciliation_id) ]]></SQLLOGIC>
+<!--81822D492C88480C8830E5059387A771--></AD_COLUMN>
+
 <!--82EFB8E4043C19C9E040007F01003778--><AD_COLUMN>
 <!--82EFB8E4043C19C9E040007F01003778-->  <AD_COLUMN_ID><![CDATA[82EFB8E4043C19C9E040007F01003778]]></AD_COLUMN_ID>
 <!--82EFB8E4043C19C9E040007F01003778-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -6406,41 +6394,38 @@
 <!--90282A7E59A24C5AA3E030D91B622863-->  <ENTITY_ALIAS><![CDATA[@expectedAmount@]]></ENTITY_ALIAS>
 <!--90282A7E59A24C5AA3E030D91B622863--></AD_COLUMN>
 
-<!--9220C8010FFB4EAABB8B367633EA9454--><AD_COLUMN>
-<!--9220C8010FFB4EAABB8B367633EA9454-->  <AD_COLUMN_ID><![CDATA[9220C8010FFB4EAABB8B367633EA9454]]></AD_COLUMN_ID>
-<!--9220C8010FFB4EAABB8B367633EA9454-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--9220C8010FFB4EAABB8B367633EA9454-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--9220C8010FFB4EAABB8B367633EA9454-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--9220C8010FFB4EAABB8B367633EA9454-->  <NAME><![CDATA[Client]]></NAME>
-<!--9220C8010FFB4EAABB8B367633EA9454-->  <DESCRIPTION><![CDATA[Client for this installation.]]></DESCRIPTION>
-<!--9220C8010FFB4EAABB8B367633EA9454-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
-<!--9220C8010FFB4EAABB8B367633EA9454-->  <COLUMNNAME><![CDATA[AD_Client_ID]]></COLUMNNAME>
-<!--9220C8010FFB4EAABB8B367633EA9454-->  <AD_TABLE_ID><![CDATA[FF808081331848750133184B38D20009]]></AD_TABLE_ID>
-<!--9220C8010FFB4EAABB8B367633EA9454-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
-<!--9220C8010FFB4EAABB8B367633EA9454-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
-<!--9220C8010FFB4EAABB8B367633EA9454-->  <DEFAULTVALUE><![CDATA[@AD_CLIENT_ID@]]></DEFAULTVALUE>
-<!--9220C8010FFB4EAABB8B367633EA9454-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--9220C8010FFB4EAABB8B367633EA9454-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--9220C8010FFB4EAABB8B367633EA9454-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--9220C8010FFB4EAABB8B367633EA9454-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
-<!--9220C8010FFB4EAABB8B367633EA9454-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--9220C8010FFB4EAABB8B367633EA9454-->  <SEQNO><![CDATA[60]]></SEQNO>
-<!--9220C8010FFB4EAABB8B367633EA9454-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--9220C8010FFB4EAABB8B367633EA9454-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--9220C8010FFB4EAABB8B367633EA9454-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--9220C8010FFB4EAABB8B367633EA9454-->  <AD_ELEMENT_ID><![CDATA[102]]></AD_ELEMENT_ID>
-<!--9220C8010FFB4EAABB8B367633EA9454-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
-<!--9220C8010FFB4EAABB8B367633EA9454-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--9220C8010FFB4EAABB8B367633EA9454-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--9220C8010FFB4EAABB8B367633EA9454-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--9220C8010FFB4EAABB8B367633EA9454-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--9220C8010FFB4EAABB8B367633EA9454-->  <POSITION><![CDATA[6]]></POSITION>
-<!--9220C8010FFB4EAABB8B367633EA9454-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--9220C8010FFB4EAABB8B367633EA9454-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--9220C8010FFB4EAABB8B367633EA9454-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--9220C8010FFB4EAABB8B367633EA9454-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--9220C8010FFB4EAABB8B367633EA9454-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--9220C8010FFB4EAABB8B367633EA9454--></AD_COLUMN>
+<!--91BC2133F04647938F702192A5156C25--><AD_COLUMN>
+<!--91BC2133F04647938F702192A5156C25-->  <AD_COLUMN_ID><![CDATA[91BC2133F04647938F702192A5156C25]]></AD_COLUMN_ID>
+<!--91BC2133F04647938F702192A5156C25-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--91BC2133F04647938F702192A5156C25-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--91BC2133F04647938F702192A5156C25-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--91BC2133F04647938F702192A5156C25-->  <NAME><![CDATA[EM_APRM_OutstandingPaymentsItemNo]]></NAME>
+<!--91BC2133F04647938F702192A5156C25-->  <COLUMNNAME><![CDATA[EM_APRM_OutstandingPaymentsItemNo]]></COLUMNNAME>
+<!--91BC2133F04647938F702192A5156C25-->  <AD_TABLE_ID><![CDATA[B1B7075C46934F0A9FD4C4D0F1457B42]]></AD_TABLE_ID>
+<!--91BC2133F04647938F702192A5156C25-->  <AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID>
+<!--91BC2133F04647938F702192A5156C25-->  <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--91BC2133F04647938F702192A5156C25-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--91BC2133F04647938F702192A5156C25-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--91BC2133F04647938F702192A5156C25-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--91BC2133F04647938F702192A5156C25-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--91BC2133F04647938F702192A5156C25-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--91BC2133F04647938F702192A5156C25-->  <SEQNO><![CDATA[330]]></SEQNO>
+<!--91BC2133F04647938F702192A5156C25-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--91BC2133F04647938F702192A5156C25-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--91BC2133F04647938F702192A5156C25-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--91BC2133F04647938F702192A5156C25-->  <AD_ELEMENT_ID><![CDATA[88A3E3DE54C94427A1F5F7EA72EA46F4]]></AD_ELEMENT_ID>
+<!--91BC2133F04647938F702192A5156C25-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--91BC2133F04647938F702192A5156C25-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--91BC2133F04647938F702192A5156C25-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--91BC2133F04647938F702192A5156C25-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--91BC2133F04647938F702192A5156C25-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--91BC2133F04647938F702192A5156C25-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--91BC2133F04647938F702192A5156C25-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--91BC2133F04647938F702192A5156C25-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--91BC2133F04647938F702192A5156C25-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--91BC2133F04647938F702192A5156C25-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--91BC2133F04647938F702192A5156C25-->  <SQLLOGIC><![CDATA[(SELECT count(*) FROM fin_finacc_transaction t,  fin_reconciliation rec WHERE (t.fin_reconciliation_id IS NULL OR (EXISTS ( SELECT 1 FROM fin_reconciliation r WHERE r.dateto > rec.dateto AND t.fin_reconciliation_id  = r.fin_reconciliation_id ))) AND t.statementdate <= rec.dateto AND t.paymentamt <> 0 AND t.fin_financial_account_id  = rec.fin_financial_account_id AND rec.fin_reconciliation_id = fin_reconciliation_id) ]]></SQLLOGIC>
+<!--91BC2133F04647938F702192A5156C25--></AD_COLUMN>
 
 <!--923F5B228E5F4D2D96C00C206D47BC63--><AD_COLUMN>
 <!--923F5B228E5F4D2D96C00C206D47BC63-->  <AD_COLUMN_ID><![CDATA[923F5B228E5F4D2D96C00C206D47BC63]]></AD_COLUMN_ID>
@@ -6933,41 +6918,6 @@
 <!--9DC8500B414640E09BF61A3D14FE13D1-->  <EM_OBUIAPP_PROCESS_ID><![CDATA[86F0B1EBE2BC48E3ACF458768D14CC99]]></EM_OBUIAPP_PROCESS_ID>
 <!--9DC8500B414640E09BF61A3D14FE13D1--></AD_COLUMN>
 
-<!--9DE9E45A80994A969AC623FA97A3C0E8--><AD_COLUMN>
-<!--9DE9E45A80994A969AC623FA97A3C0E8-->  <AD_COLUMN_ID><![CDATA[9DE9E45A80994A969AC623FA97A3C0E8]]></AD_COLUMN_ID>
-<!--9DE9E45A80994A969AC623FA97A3C0E8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--9DE9E45A80994A969AC623FA97A3C0E8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--9DE9E45A80994A969AC623FA97A3C0E8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--9DE9E45A80994A969AC623FA97A3C0E8-->  <NAME><![CDATA[Created By]]></NAME>
-<!--9DE9E45A80994A969AC623FA97A3C0E8-->  <DESCRIPTION><![CDATA[User who created this records]]></DESCRIPTION>
-<!--9DE9E45A80994A969AC623FA97A3C0E8-->  <HELP><![CDATA[The Created By field indicates the user who created this record.]]></HELP>
-<!--9DE9E45A80994A969AC623FA97A3C0E8-->  <COLUMNNAME><![CDATA[Createdby]]></COLUMNNAME>
-<!--9DE9E45A80994A969AC623FA97A3C0E8-->  <AD_TABLE_ID><![CDATA[FF808081331848750133184B38D20009]]></AD_TABLE_ID>
-<!--9DE9E45A80994A969AC623FA97A3C0E8-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
-<!--9DE9E45A80994A969AC623FA97A3C0E8-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
-<!--9DE9E45A80994A969AC623FA97A3C0E8-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--9DE9E45A80994A969AC623FA97A3C0E8-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--9DE9E45A80994A969AC623FA97A3C0E8-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--9DE9E45A80994A969AC623FA97A3C0E8-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
-<!--9DE9E45A80994A969AC623FA97A3C0E8-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--9DE9E45A80994A969AC623FA97A3C0E8-->  <SEQNO><![CDATA[90]]></SEQNO>
-<!--9DE9E45A80994A969AC623FA97A3C0E8-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--9DE9E45A80994A969AC623FA97A3C0E8-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--9DE9E45A80994A969AC623FA97A3C0E8-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--9DE9E45A80994A969AC623FA97A3C0E8-->  <AD_ELEMENT_ID><![CDATA[246]]></AD_ELEMENT_ID>
-<!--9DE9E45A80994A969AC623FA97A3C0E8-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--9DE9E45A80994A969AC623FA97A3C0E8-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--9DE9E45A80994A969AC623FA97A3C0E8-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--9DE9E45A80994A969AC623FA97A3C0E8-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--9DE9E45A80994A969AC623FA97A3C0E8-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--9DE9E45A80994A969AC623FA97A3C0E8-->  <POSITION><![CDATA[9]]></POSITION>
-<!--9DE9E45A80994A969AC623FA97A3C0E8-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--9DE9E45A80994A969AC623FA97A3C0E8-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--9DE9E45A80994A969AC623FA97A3C0E8-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--9DE9E45A80994A969AC623FA97A3C0E8-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--9DE9E45A80994A969AC623FA97A3C0E8-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--9DE9E45A80994A969AC623FA97A3C0E8--></AD_COLUMN>
-
 <!--9E09394A2E0F402489D28053F5D3F111--><AD_COLUMN>
 <!--9E09394A2E0F402489D28053F5D3F111-->  <AD_COLUMN_ID><![CDATA[9E09394A2E0F402489D28053F5D3F111]]></AD_COLUMN_ID>
 <!--9E09394A2E0F402489D28053F5D3F111-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -9060,39 +9010,6 @@
 <!--AEF30836571D49FB96C42D7DD85FDDED-->  <ENTITY_ALIAS><![CDATA[@invoicedAmount@]]></ENTITY_ALIAS>
 <!--AEF30836571D49FB96C42D7DD85FDDED--></AD_COLUMN>
 
-<!--B0140FD7843840979CB847D51E858ABA--><AD_COLUMN>
-<!--B0140FD7843840979CB847D51E858ABA-->  <AD_COLUMN_ID><![CDATA[B0140FD7843840979CB847D51E858ABA]]></AD_COLUMN_ID>
-<!--B0140FD7843840979CB847D51E858ABA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--B0140FD7843840979CB847D51E858ABA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--B0140FD7843840979CB847D51E858ABA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--B0140FD7843840979CB847D51E858ABA-->  <NAME><![CDATA[Reconciled Items]]></NAME>
-<!--B0140FD7843840979CB847D51E858ABA-->  <COLUMNNAME><![CDATA[Item_No]]></COLUMNNAME>
-<!--B0140FD7843840979CB847D51E858ABA-->  <AD_TABLE_ID><![CDATA[FF808081331848750133184B38D20009]]></AD_TABLE_ID>
-<!--B0140FD7843840979CB847D51E858ABA-->  <AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID>
-<!--B0140FD7843840979CB847D51E858ABA-->  <FIELDLENGTH><![CDATA[2]]></FIELDLENGTH>
-<!--B0140FD7843840979CB847D51E858ABA-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--B0140FD7843840979CB847D51E858ABA-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--B0140FD7843840979CB847D51E858ABA-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--B0140FD7843840979CB847D51E858ABA-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
-<!--B0140FD7843840979CB847D51E858ABA-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--B0140FD7843840979CB847D51E858ABA-->  <SEQNO><![CDATA[160]]></SEQNO>
-<!--B0140FD7843840979CB847D51E858ABA-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--B0140FD7843840979CB847D51E858ABA-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--B0140FD7843840979CB847D51E858ABA-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--B0140FD7843840979CB847D51E858ABA-->  <AD_ELEMENT_ID><![CDATA[82EFB8E4045E19C9E040007F01003778]]></AD_ELEMENT_ID>
-<!--B0140FD7843840979CB847D51E858ABA-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--B0140FD7843840979CB847D51E858ABA-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--B0140FD7843840979CB847D51E858ABA-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--B0140FD7843840979CB847D51E858ABA-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--B0140FD7843840979CB847D51E858ABA-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--B0140FD7843840979CB847D51E858ABA-->  <POSITION><![CDATA[4]]></POSITION>
-<!--B0140FD7843840979CB847D51E858ABA-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--B0140FD7843840979CB847D51E858ABA-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--B0140FD7843840979CB847D51E858ABA-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--B0140FD7843840979CB847D51E858ABA-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--B0140FD7843840979CB847D51E858ABA-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--B0140FD7843840979CB847D51E858ABA--></AD_COLUMN>
-
 <!--B01D6A5AF6F14FD6947BDEEF22C35CF8--><AD_COLUMN>
 <!--B01D6A5AF6F14FD6947BDEEF22C35CF8-->  <AD_COLUMN_ID><![CDATA[B01D6A5AF6F14FD6947BDEEF22C35CF8]]></AD_COLUMN_ID>
 <!--B01D6A5AF6F14FD6947BDEEF22C35CF8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -9584,41 +9501,6 @@
 <!--B9DAC6015F8F4F94965030A72199BC55-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--B9DAC6015F8F4F94965030A72199BC55--></AD_COLUMN>
 
-<!--BB2A987CBD534A18B91D77B7D43AF879--><AD_COLUMN>
-<!--BB2A987CBD534A18B91D77B7D43AF879-->  <AD_COLUMN_ID><![CDATA[BB2A987CBD534A18B91D77B7D43AF879]]></AD_COLUMN_ID>
-<!--BB2A987CBD534A18B91D77B7D43AF879-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--BB2A987CBD534A18B91D77B7D43AF879-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--BB2A987CBD534A18B91D77B7D43AF879-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--BB2A987CBD534A18B91D77B7D43AF879-->  <NAME><![CDATA[Updated By]]></NAME>
-<!--BB2A987CBD534A18B91D77B7D43AF879-->  <DESCRIPTION><![CDATA[User who updated this records]]></DESCRIPTION>
-<!--BB2A987CBD534A18B91D77B7D43AF879-->  <HELP><![CDATA[The Updated By field indicates the user who updated this record.]]></HELP>
-<!--BB2A987CBD534A18B91D77B7D43AF879-->  <COLUMNNAME><![CDATA[Updatedby]]></COLUMNNAME>
-<!--BB2A987CBD534A18B91D77B7D43AF879-->  <AD_TABLE_ID><![CDATA[FF808081331848750133184B38D20009]]></AD_TABLE_ID>
-<!--BB2A987CBD534A18B91D77B7D43AF879-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
-<!--BB2A987CBD534A18B91D77B7D43AF879-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
-<!--BB2A987CBD534A18B91D77B7D43AF879-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--BB2A987CBD534A18B91D77B7D43AF879-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--BB2A987CBD534A18B91D77B7D43AF879-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--BB2A987CBD534A18B91D77B7D43AF879-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
-<!--BB2A987CBD534A18B91D77B7D43AF879-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--BB2A987CBD534A18B91D77B7D43AF879-->  <SEQNO><![CDATA[110]]></SEQNO>
-<!--BB2A987CBD534A18B91D77B7D43AF879-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--BB2A987CBD534A18B91D77B7D43AF879-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--BB2A987CBD534A18B91D77B7D43AF879-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--BB2A987CBD534A18B91D77B7D43AF879-->  <AD_ELEMENT_ID><![CDATA[608]]></AD_ELEMENT_ID>
-<!--BB2A987CBD534A18B91D77B7D43AF879-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--BB2A987CBD534A18B91D77B7D43AF879-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--BB2A987CBD534A18B91D77B7D43AF879-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--BB2A987CBD534A18B91D77B7D43AF879-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--BB2A987CBD534A18B91D77B7D43AF879-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--BB2A987CBD534A18B91D77B7D43AF879-->  <POSITION><![CDATA[11]]></POSITION>
-<!--BB2A987CBD534A18B91D77B7D43AF879-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--BB2A987CBD534A18B91D77B7D43AF879-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--BB2A987CBD534A18B91D77B7D43AF879-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--BB2A987CBD534A18B91D77B7D43AF879-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--BB2A987CBD534A18B91D77B7D43AF879-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--BB2A987CBD534A18B91D77B7D43AF879--></AD_COLUMN>
-
 <!--BBA3DB68DBD844B29F1EEC9A04F112E8--><AD_COLUMN>
 <!--BBA3DB68DBD844B29F1EEC9A04F112E8-->  <AD_COLUMN_ID><![CDATA[BBA3DB68DBD844B29F1EEC9A04F112E8]]></AD_COLUMN_ID>
 <!--BBA3DB68DBD844B29F1EEC9A04F112E8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -9727,6 +9609,39 @@
 <!--BBE36F9268AD4E4D9F8BD3E152E7D3BA-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--BBE36F9268AD4E4D9F8BD3E152E7D3BA--></AD_COLUMN>
 
+<!--BBE47252ECEF4B5BA7116E0E23CA5D8D--><AD_COLUMN>
+<!--BBE47252ECEF4B5BA7116E0E23CA5D8D-->  <AD_COLUMN_ID><![CDATA[BBE47252ECEF4B5BA7116E0E23CA5D8D]]></AD_COLUMN_ID>
+<!--BBE47252ECEF4B5BA7116E0E23CA5D8D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BBE47252ECEF4B5BA7116E0E23CA5D8D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BBE47252ECEF4B5BA7116E0E23CA5D8D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BBE47252ECEF4B5BA7116E0E23CA5D8D-->  <NAME><![CDATA[EM_APRM_OutstandingPaymentsItemsAmount]]></NAME>
+<!--BBE47252ECEF4B5BA7116E0E23CA5D8D-->  <COLUMNNAME><![CDATA[EM_APRM_OutstandingPaymentsItemsAmount]]></COLUMNNAME>
+<!--BBE47252ECEF4B5BA7116E0E23CA5D8D-->  <AD_TABLE_ID><![CDATA[B1B7075C46934F0A9FD4C4D0F1457B42]]></AD_TABLE_ID>
+<!--BBE47252ECEF4B5BA7116E0E23CA5D8D-->  <AD_REFERENCE_ID><![CDATA[12]]></AD_REFERENCE_ID>
+<!--BBE47252ECEF4B5BA7116E0E23CA5D8D-->  <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--BBE47252ECEF4B5BA7116E0E23CA5D8D-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--BBE47252ECEF4B5BA7116E0E23CA5D8D-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--BBE47252ECEF4B5BA7116E0E23CA5D8D-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--BBE47252ECEF4B5BA7116E0E23CA5D8D-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--BBE47252ECEF4B5BA7116E0E23CA5D8D-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--BBE47252ECEF4B5BA7116E0E23CA5D8D-->  <SEQNO><![CDATA[340]]></SEQNO>
+<!--BBE47252ECEF4B5BA7116E0E23CA5D8D-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--BBE47252ECEF4B5BA7116E0E23CA5D8D-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--BBE47252ECEF4B5BA7116E0E23CA5D8D-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--BBE47252ECEF4B5BA7116E0E23CA5D8D-->  <AD_ELEMENT_ID><![CDATA[D51BEAD64B9C4D5FBC097873933ACEB3]]></AD_ELEMENT_ID>
+<!--BBE47252ECEF4B5BA7116E0E23CA5D8D-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--BBE47252ECEF4B5BA7116E0E23CA5D8D-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--BBE47252ECEF4B5BA7116E0E23CA5D8D-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--BBE47252ECEF4B5BA7116E0E23CA5D8D-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--BBE47252ECEF4B5BA7116E0E23CA5D8D-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--BBE47252ECEF4B5BA7116E0E23CA5D8D-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--BBE47252ECEF4B5BA7116E0E23CA5D8D-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--BBE47252ECEF4B5BA7116E0E23CA5D8D-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--BBE47252ECEF4B5BA7116E0E23CA5D8D-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--BBE47252ECEF4B5BA7116E0E23CA5D8D-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--BBE47252ECEF4B5BA7116E0E23CA5D8D-->  <SQLLOGIC><![CDATA[(SELECT COALESCE(sum(t.paymentamt), 0) FROM fin_finacc_transaction t,  fin_reconciliation rec WHERE (t.fin_reconciliation_id IS NULL OR (EXISTS ( SELECT 1 FROM fin_reconciliation r WHERE r.dateto > rec.dateto AND t.fin_reconciliation_id  = r.fin_reconciliation_id ))) AND t.statementdate <= rec.dateto AND t.paymentamt <> 0 AND t.fin_financial_account_id  = rec.fin_financial_account_id AND rec.fin_reconciliation_id = fin_reconciliation_id)]]></SQLLOGIC>
+<!--BBE47252ECEF4B5BA7116E0E23CA5D8D--></AD_COLUMN>
+
 <!--BC78354AB2F7403FA9725CDF267C0A70--><AD_COLUMN>
 <!--BC78354AB2F7403FA9725CDF267C0A70-->  <AD_COLUMN_ID><![CDATA[BC78354AB2F7403FA9725CDF267C0A70]]></AD_COLUMN_ID>
 <!--BC78354AB2F7403FA9725CDF267C0A70-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -10113,6 +10028,39 @@
 <!--C5814D2F8ECC4DF798BEFA235A7352B9-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--C5814D2F8ECC4DF798BEFA235A7352B9--></AD_COLUMN>
 
+<!--C72EC790B2EF4BEEA2A843D30770B85D--><AD_COLUMN>
+<!--C72EC790B2EF4BEEA2A843D30770B85D-->  <AD_COLUMN_ID><![CDATA[C72EC790B2EF4BEEA2A843D30770B85D]]></AD_COLUMN_ID>
+<!--C72EC790B2EF4BEEA2A843D30770B85D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C72EC790B2EF4BEEA2A843D30770B85D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C72EC790B2EF4BEEA2A843D30770B85D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C72EC790B2EF4BEEA2A843D30770B85D-->  <NAME><![CDATA[EM_APRM_UnReconciledItemAmount]]></NAME>
+<!--C72EC790B2EF4BEEA2A843D30770B85D-->  <COLUMNNAME><![CDATA[EM_APRM_UnReconciledItemAmount]]></COLUMNNAME>
+<!--C72EC790B2EF4BEEA2A843D30770B85D-->  <AD_TABLE_ID><![CDATA[B1B7075C46934F0A9FD4C4D0F1457B42]]></AD_TABLE_ID>
+<!--C72EC790B2EF4BEEA2A843D30770B85D-->  <AD_REFERENCE_ID><![CDATA[12]]></AD_REFERENCE_ID>
+<!--C72EC790B2EF4BEEA2A843D30770B85D-->  <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--C72EC790B2EF4BEEA2A843D30770B85D-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--C72EC790B2EF4BEEA2A843D30770B85D-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--C72EC790B2EF4BEEA2A843D30770B85D-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--C72EC790B2EF4BEEA2A843D30770B85D-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--C72EC790B2EF4BEEA2A843D30770B85D-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--C72EC790B2EF4BEEA2A843D30770B85D-->  <SEQNO><![CDATA[320]]></SEQNO>
+<!--C72EC790B2EF4BEEA2A843D30770B85D-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--C72EC790B2EF4BEEA2A843D30770B85D-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--C72EC790B2EF4BEEA2A843D30770B85D-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--C72EC790B2EF4BEEA2A843D30770B85D-->  <AD_ELEMENT_ID><![CDATA[00019DBC917F47BB83C4509DEEC7CC66]]></AD_ELEMENT_ID>
+<!--C72EC790B2EF4BEEA2A843D30770B85D-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--C72EC790B2EF4BEEA2A843D30770B85D-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--C72EC790B2EF4BEEA2A843D30770B85D-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--C72EC790B2EF4BEEA2A843D30770B85D-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--C72EC790B2EF4BEEA2A843D30770B85D-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--C72EC790B2EF4BEEA2A843D30770B85D-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--C72EC790B2EF4BEEA2A843D30770B85D-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--C72EC790B2EF4BEEA2A843D30770B85D-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--C72EC790B2EF4BEEA2A843D30770B85D-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--C72EC790B2EF4BEEA2A843D30770B85D-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--C72EC790B2EF4BEEA2A843D30770B85D-->  <SQLLOGIC><![CDATA[(SELECT COALESCE(sum(bl.cramount - bl.dramount), 0) FROM fin_bankstatementline bl, fin_bankstatement b, fin_reconciliation r WHERE (bl.fin_finacc_transaction_id IS NULL OR (EXISTS ( SELECT 1 FROM fin_finacc_transaction t, fin_reconciliation rec WHERE t.fin_reconciliation_id  = rec.fin_reconciliation_id AND bl.fin_finacc_transaction_id  = t.fin_finacc_transaction_id  AND t.fin_financial_account_id  = b.fin_financial_account_id  AND rec.created > r.created))) AND bl.datetrx <= r.dateto AND b.fin_bankstatement_id  = bl.fin_bankstatement_id AND b.fin_financial_account_id  = r.fin_financial_account_id and r.fin_reconciliation_id = fin_reconciliation_id)]]></SQLLOGIC>
+<!--C72EC790B2EF4BEEA2A843D30770B85D--></AD_COLUMN>
+
 <!--C9FD369BECE545828033CC49CAB85D9D--><AD_COLUMN>
 <!--C9FD369BECE545828033CC49CAB85D9D-->  <AD_COLUMN_ID><![CDATA[C9FD369BECE545828033CC49CAB85D9D]]></AD_COLUMN_ID>
 <!--C9FD369BECE545828033CC49CAB85D9D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -10356,39 +10304,6 @@
 <!--D9CE146DA825427A9F0132F13599424B-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--D9CE146DA825427A9F0132F13599424B--></AD_COLUMN>
 
-<!--DD5C635F60EF4CA6BD8395F81E8466AD--><AD_COLUMN>
-<!--DD5C635F60EF4CA6BD8395F81E8466AD-->  <AD_COLUMN_ID><![CDATA[DD5C635F60EF4CA6BD8395F81E8466AD]]></AD_COLUMN_ID>
-<!--DD5C635F60EF4CA6BD8395F81E8466AD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--DD5C635F60EF4CA6BD8395F81E8466AD-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--DD5C635F60EF4CA6BD8395F81E8466AD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--DD5C635F60EF4CA6BD8395F81E8466AD-->  <NAME><![CDATA[APRM_Rec_Detail_V_ID]]></NAME>
-<!--DD5C635F60EF4CA6BD8395F81E8466AD-->  <COLUMNNAME><![CDATA[APRM_Rec_Detail_V_ID]]></COLUMNNAME>
-<!--DD5C635F60EF4CA6BD8395F81E8466AD-->  <AD_TABLE_ID><![CDATA[FF808081331848750133184B38D20009]]></AD_TABLE_ID>
-<!--DD5C635F60EF4CA6BD8395F81E8466AD-->  <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
-<!--DD5C635F60EF4CA6BD8395F81E8466AD-->  <FIELDLENGTH><![CDATA[-5]]></FIELDLENGTH>
-<!--DD5C635F60EF4CA6BD8395F81E8466AD-->  <ISKEY><![CDATA[Y]]></ISKEY>
-<!--DD5C635F60EF4CA6BD8395F81E8466AD-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--DD5C635F60EF4CA6BD8395F81E8466AD-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--DD5C635F60EF4CA6BD8395F81E8466AD-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
-<!--DD5C635F60EF4CA6BD8395F81E8466AD-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--DD5C635F60EF4CA6BD8395F81E8466AD-->  <SEQNO><![CDATA[10]]></SEQNO>
-<!--DD5C635F60EF4CA6BD8395F81E8466AD-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--DD5C635F60EF4CA6BD8395F81E8466AD-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--DD5C635F60EF4CA6BD8395F81E8466AD-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--DD5C635F60EF4CA6BD8395F81E8466AD-->  <AD_ELEMENT_ID><![CDATA[4AC57284C5C745EB9087C105222EDF02]]></AD_ELEMENT_ID>
-<!--DD5C635F60EF4CA6BD8395F81E8466AD-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--DD5C635F60EF4CA6BD8395F81E8466AD-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--DD5C635F60EF4CA6BD8395F81E8466AD-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--DD5C635F60EF4CA6BD8395F81E8466AD-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--DD5C635F60EF4CA6BD8395F81E8466AD-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--DD5C635F60EF4CA6BD8395F81E8466AD-->  <POSITION><![CDATA[1]]></POSITION>
-<!--DD5C635F60EF4CA6BD8395F81E8466AD-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--DD5C635F60EF4CA6BD8395F81E8466AD-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--DD5C635F60EF4CA6BD8395F81E8466AD-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--DD5C635F60EF4CA6BD8395F81E8466AD-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--DD5C635F60EF4CA6BD8395F81E8466AD-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--DD5C635F60EF4CA6BD8395F81E8466AD--></AD_COLUMN>
-
 <!--E156A67751484C5A9D367C235769BB24--><AD_COLUMN>
 <!--E156A67751484C5A9D367C235769BB24-->  <AD_COLUMN_ID><![CDATA[E156A67751484C5A9D367C235769BB24]]></AD_COLUMN_ID>
 <!--E156A67751484C5A9D367C235769BB24-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -10670,39 +10585,6 @@
 <!--E88F9871B4184489A5B188A589FB8543-->  <ENTITY_ALIAS><![CDATA[@invoiceNo@]]></ENTITY_ALIAS>
 <!--E88F9871B4184489A5B188A589FB8543--></AD_COLUMN>
 
-<!--EA4E28B26B6A4157830C4D2C09F93DCB--><AD_COLUMN>
-<!--EA4E28B26B6A4157830C4D2C09F93DCB-->  <AD_COLUMN_ID><![CDATA[EA4E28B26B6A4157830C4D2C09F93DCB]]></AD_COLUMN_ID>
-<!--EA4E28B26B6A4157830C4D2C09F93DCB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--EA4E28B26B6A4157830C4D2C09F93DCB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--EA4E28B26B6A4157830C4D2C09F93DCB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--EA4E28B26B6A4157830C4D2C09F93DCB-->  <NAME><![CDATA[Reconciled Items Amount]]></NAME>
-<!--EA4E28B26B6A4157830C4D2C09F93DCB-->  <COLUMNNAME><![CDATA[Item_Amt]]></COLUMNNAME>
-<!--EA4E28B26B6A4157830C4D2C09F93DCB-->  <AD_TABLE_ID><![CDATA[FF808081331848750133184B38D20009]]></AD_TABLE_ID>
-<!--EA4E28B26B6A4157830C4D2C09F93DCB-->  <AD_REFERENCE_ID><![CDATA[12]]></AD_REFERENCE_ID>
-<!--EA4E28B26B6A4157830C4D2C09F93DCB-->  <FIELDLENGTH><![CDATA[2]]></FIELDLENGTH>
-<!--EA4E28B26B6A4157830C4D2C09F93DCB-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--EA4E28B26B6A4157830C4D2C09F93DCB-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--EA4E28B26B6A4157830C4D2C09F93DCB-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--EA4E28B26B6A4157830C4D2C09F93DCB-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
-<!--EA4E28B26B6A4157830C4D2C09F93DCB-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--EA4E28B26B6A4157830C4D2C09F93DCB-->  <SEQNO><![CDATA[50]]></SEQNO>
-<!--EA4E28B26B6A4157830C4D2C09F93DCB-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--EA4E28B26B6A4157830C4D2C09F93DCB-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--EA4E28B26B6A4157830C4D2C09F93DCB-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--EA4E28B26B6A4157830C4D2C09F93DCB-->  <AD_ELEMENT_ID><![CDATA[82EFB8E4045F19C9E040007F01003778]]></AD_ELEMENT_ID>
-<!--EA4E28B26B6A4157830C4D2C09F93DCB-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--EA4E28B26B6A4157830C4D2C09F93DCB-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--EA4E28B26B6A4157830C4D2C09F93DCB-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--EA4E28B26B6A4157830C4D2C09F93DCB-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--EA4E28B26B6A4157830C4D2C09F93DCB-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--EA4E28B26B6A4157830C4D2C09F93DCB-->  <POSITION><![CDATA[5]]></POSITION>
-<!--EA4E28B26B6A4157830C4D2C09F93DCB-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--EA4E28B26B6A4157830C4D2C09F93DCB-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--EA4E28B26B6A4157830C4D2C09F93DCB-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--EA4E28B26B6A4157830C4D2C09F93DCB-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--EA4E28B26B6A4157830C4D2C09F93DCB-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--EA4E28B26B6A4157830C4D2C09F93DCB--></AD_COLUMN>
-
 <!--EB274794018B468497657840626CEA1E--><AD_COLUMN>
 <!--EB274794018B468497657840626CEA1E-->  <AD_COLUMN_ID><![CDATA[EB274794018B468497657840626CEA1E]]></AD_COLUMN_ID>
 <!--EB274794018B468497657840626CEA1E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -10988,42 +10870,6 @@
 <!--F79D0173541B42CD9F41A58D53929BFA-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--F79D0173541B42CD9F41A58D53929BFA--></AD_COLUMN>
 
-<!--F860918881E54495981462670E8882BF--><AD_COLUMN>
-<!--F860918881E54495981462670E8882BF-->  <AD_COLUMN_ID><![CDATA[F860918881E54495981462670E8882BF]]></AD_COLUMN_ID>
-<!--F860918881E54495981462670E8882BF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--F860918881E54495981462670E8882BF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--F860918881E54495981462670E8882BF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--F860918881E54495981462670E8882BF-->  <NAME><![CDATA[Organization]]></NAME>
-<!--F860918881E54495981462670E8882BF-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
-<!--F860918881E54495981462670E8882BF-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
-<!--F860918881E54495981462670E8882BF-->  <COLUMNNAME><![CDATA[AD_Org_ID]]></COLUMNNAME>
-<!--F860918881E54495981462670E8882BF-->  <AD_TABLE_ID><![CDATA[FF808081331848750133184B38D20009]]></AD_TABLE_ID>
-<!--F860918881E54495981462670E8882BF-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
-<!--F860918881E54495981462670E8882BF-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
-<!--F860918881E54495981462670E8882BF-->  <DEFAULTVALUE><![CDATA[@AD_ORG_ID@]]></DEFAULTVALUE>
-<!--F860918881E54495981462670E8882BF-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--F860918881E54495981462670E8882BF-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--F860918881E54495981462670E8882BF-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--F860918881E54495981462670E8882BF-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
-<!--F860918881E54495981462670E8882BF-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--F860918881E54495981462670E8882BF-->  <SEQNO><![CDATA[70]]></SEQNO>
-<!--F860918881E54495981462670E8882BF-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--F860918881E54495981462670E8882BF-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--F860918881E54495981462670E8882BF-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--F860918881E54495981462670E8882BF-->  <AD_ELEMENT_ID><![CDATA[113]]></AD_ELEMENT_ID>
-<!--F860918881E54495981462670E8882BF-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
-<!--F860918881E54495981462670E8882BF-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--F860918881E54495981462670E8882BF-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--F860918881E54495981462670E8882BF-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--F860918881E54495981462670E8882BF-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--F860918881E54495981462670E8882BF-->  <POSITION><![CDATA[7]]></POSITION>
-<!--F860918881E54495981462670E8882BF-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--F860918881E54495981462670E8882BF-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--F860918881E54495981462670E8882BF-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--F860918881E54495981462670E8882BF-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--F860918881E54495981462670E8882BF-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--F860918881E54495981462670E8882BF--></AD_COLUMN>
-
 <!--F8F6A13C5682DC4DE040007F01000363--><AD_COLUMN>
 <!--F8F6A13C5682DC4DE040007F01000363-->  <AD_COLUMN_ID><![CDATA[F8F6A13C5682DC4DE040007F01000363]]></AD_COLUMN_ID>
 <!--F8F6A13C5682DC4DE040007F01000363-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -1,5 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <data>
+<!--00019DBC917F47BB83C4509DEEC7CC66--><AD_ELEMENT>
+<!--00019DBC917F47BB83C4509DEEC7CC66-->  <AD_ELEMENT_ID><![CDATA[00019DBC917F47BB83C4509DEEC7CC66]]></AD_ELEMENT_ID>
+<!--00019DBC917F47BB83C4509DEEC7CC66-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--00019DBC917F47BB83C4509DEEC7CC66-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--00019DBC917F47BB83C4509DEEC7CC66-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--00019DBC917F47BB83C4509DEEC7CC66-->  <COLUMNNAME><![CDATA[EM_APRM_UnReconciledItemAmount]]></COLUMNNAME>
+<!--00019DBC917F47BB83C4509DEEC7CC66-->  <NAME><![CDATA[UnReconciled Items Amount]]></NAME>
+<!--00019DBC917F47BB83C4509DEEC7CC66-->  <PRINTNAME><![CDATA[UnReconciled Items Amount]]></PRINTNAME>
+<!--00019DBC917F47BB83C4509DEEC7CC66-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--00019DBC917F47BB83C4509DEEC7CC66-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--00019DBC917F47BB83C4509DEEC7CC66--></AD_ELEMENT>
+
 <!--093017D15DE649259C329641ADC41321--><AD_ELEMENT>
 <!--093017D15DE649259C329641ADC41321-->  <AD_ELEMENT_ID><![CDATA[093017D15DE649259C329641ADC41321]]></AD_ELEMENT_ID>
 <!--093017D15DE649259C329641ADC41321-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -210,18 +222,6 @@
 <!--4636FFBE88B64C9C990F76457F0D521E-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--4636FFBE88B64C9C990F76457F0D521E--></AD_ELEMENT>
 
-<!--4AC57284C5C745EB9087C105222EDF02--><AD_ELEMENT>
-<!--4AC57284C5C745EB9087C105222EDF02-->  <AD_ELEMENT_ID><![CDATA[4AC57284C5C745EB9087C105222EDF02]]></AD_ELEMENT_ID>
-<!--4AC57284C5C745EB9087C105222EDF02-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--4AC57284C5C745EB9087C105222EDF02-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--4AC57284C5C745EB9087C105222EDF02-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--4AC57284C5C745EB9087C105222EDF02-->  <COLUMNNAME><![CDATA[APRM_Rec_Detail_V_ID]]></COLUMNNAME>
-<!--4AC57284C5C745EB9087C105222EDF02-->  <NAME><![CDATA[APRM_Rec_Detail_V_ID]]></NAME>
-<!--4AC57284C5C745EB9087C105222EDF02-->  <PRINTNAME><![CDATA[APRM_Rec_Detail_V_ID]]></PRINTNAME>
-<!--4AC57284C5C745EB9087C105222EDF02-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--4AC57284C5C745EB9087C105222EDF02-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
-<!--4AC57284C5C745EB9087C105222EDF02--></AD_ELEMENT>
-
 <!--4BFB1532D2684F2B9997BF3B5555BFCB--><AD_ELEMENT>
 <!--4BFB1532D2684F2B9997BF3B5555BFCB-->  <AD_ELEMENT_ID><![CDATA[4BFB1532D2684F2B9997BF3B5555BFCB]]></AD_ELEMENT_ID>
 <!--4BFB1532D2684F2B9997BF3B5555BFCB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -508,18 +508,6 @@
 <!--6FE34C5D44364DA7B73F2925C1C4467B-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--6FE34C5D44364DA7B73F2925C1C4467B--></AD_ELEMENT>
 
-<!--720C4FC08FBD43419FF7EACABECA6AE3--><AD_ELEMENT>
-<!--720C4FC08FBD43419FF7EACABECA6AE3-->  <AD_ELEMENT_ID><![CDATA[720C4FC08FBD43419FF7EACABECA6AE3]]></AD_ELEMENT_ID>
-<!--720C4FC08FBD43419FF7EACABECA6AE3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--720C4FC08FBD43419FF7EACABECA6AE3-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--720C4FC08FBD43419FF7EACABECA6AE3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--720C4FC08FBD43419FF7EACABECA6AE3-->  <COLUMNNAME><![CDATA[reconciliationId]]></COLUMNNAME>
-<!--720C4FC08FBD43419FF7EACABECA6AE3-->  <NAME><![CDATA[reconciliationId]]></NAME>
-<!--720C4FC08FBD43419FF7EACABECA6AE3-->  <PRINTNAME><![CDATA[reconciliationId]]></PRINTNAME>
-<!--720C4FC08FBD43419FF7EACABECA6AE3-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--720C4FC08FBD43419FF7EACABECA6AE3-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
-<!--720C4FC08FBD43419FF7EACABECA6AE3--></AD_ELEMENT>
-
 <!--75E1BCB8DBF444199A4A03CDC44E8A25--><AD_ELEMENT>
 <!--75E1BCB8DBF444199A4A03CDC44E8A25-->  <AD_ELEMENT_ID><![CDATA[75E1BCB8DBF444199A4A03CDC44E8A25]]></AD_ELEMENT_ID>
 <!--75E1BCB8DBF444199A4A03CDC44E8A25-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -534,18 +522,6 @@
 <!--75E1BCB8DBF444199A4A03CDC44E8A25-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--75E1BCB8DBF444199A4A03CDC44E8A25--></AD_ELEMENT>
 
-<!--77E12B7AAB9F45BF9D3263E5967A696A--><AD_ELEMENT>
-<!--77E12B7AAB9F45BF9D3263E5967A696A-->  <AD_ELEMENT_ID><![CDATA[77E12B7AAB9F45BF9D3263E5967A696A]]></AD_ELEMENT_ID>
-<!--77E12B7AAB9F45BF9D3263E5967A696A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--77E12B7AAB9F45BF9D3263E5967A696A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--77E12B7AAB9F45BF9D3263E5967A696A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--77E12B7AAB9F45BF9D3263E5967A696A-->  <COLUMNNAME><![CDATA[language]]></COLUMNNAME>
-<!--77E12B7AAB9F45BF9D3263E5967A696A-->  <NAME><![CDATA[language]]></NAME>
-<!--77E12B7AAB9F45BF9D3263E5967A696A-->  <PRINTNAME><![CDATA[language]]></PRINTNAME>
-<!--77E12B7AAB9F45BF9D3263E5967A696A-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--77E12B7AAB9F45BF9D3263E5967A696A-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
-<!--77E12B7AAB9F45BF9D3263E5967A696A--></AD_ELEMENT>
-
 <!--78A3787B4823C096E040007F0101250E--><AD_ELEMENT>
 <!--78A3787B4823C096E040007F0101250E-->  <AD_ELEMENT_ID><![CDATA[78A3787B4823C096E040007F0101250E]]></AD_ELEMENT_ID>
 <!--78A3787B4823C096E040007F0101250E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -627,6 +603,18 @@
 <!--7FCAAFE989BEA375E040007F01007F0A-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--7FCAAFE989BEA375E040007F01007F0A--></AD_ELEMENT>
 
+<!--80132B0B521B4512AFC6CFA33BECF9CF--><AD_ELEMENT>
+<!--80132B0B521B4512AFC6CFA33BECF9CF-->  <AD_ELEMENT_ID><![CDATA[80132B0B521B4512AFC6CFA33BECF9CF]]></AD_ELEMENT_ID>
+<!--80132B0B521B4512AFC6CFA33BECF9CF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--80132B0B521B4512AFC6CFA33BECF9CF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--80132B0B521B4512AFC6CFA33BECF9CF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--80132B0B521B4512AFC6CFA33BECF9CF-->  <COLUMNNAME><![CDATA[EM_APRM_ReconciledItemAmount]]></COLUMNNAME>
+<!--80132B0B521B4512AFC6CFA33BECF9CF-->  <NAME><![CDATA[Reconciled Items Amount]]></NAME>
+<!--80132B0B521B4512AFC6CFA33BECF9CF-->  <PRINTNAME><![CDATA[Reconciled Items Amount]]></PRINTNAME>
+<!--80132B0B521B4512AFC6CFA33BECF9CF-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--80132B0B521B4512AFC6CFA33BECF9CF-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--80132B0B521B4512AFC6CFA33BECF9CF--></AD_ELEMENT>
+
 <!--80FC8B411CC1476693BBC697E5AA0913--><AD_ELEMENT>
 <!--80FC8B411CC1476693BBC697E5AA0913-->  <AD_ELEMENT_ID><![CDATA[80FC8B411CC1476693BBC697E5AA0913]]></AD_ELEMENT_ID>
 <!--80FC8B411CC1476693BBC697E5AA0913-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -814,6 +802,18 @@
 <!--87AA1068F10742CAE040007F010011D5-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--87AA1068F10742CAE040007F010011D5--></AD_ELEMENT>
 
+<!--88A3E3DE54C94427A1F5F7EA72EA46F4--><AD_ELEMENT>
+<!--88A3E3DE54C94427A1F5F7EA72EA46F4-->  <AD_ELEMENT_ID><![CDATA[88A3E3DE54C94427A1F5F7EA72EA46F4]]></AD_ELEMENT_ID>
+<!--88A3E3DE54C94427A1F5F7EA72EA46F4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--88A3E3DE54C94427A1F5F7EA72EA46F4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--88A3E3DE54C94427A1F5F7EA72EA46F4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--88A3E3DE54C94427A1F5F7EA72EA46F4-->  <COLUMNNAME><![CDATA[EM_APRM_OutstandingPaymentsItemNo]]></COLUMNNAME>
+<!--88A3E3DE54C94427A1F5F7EA72EA46F4-->  <NAME><![CDATA[Outstanding Payments Item No]]></NAME>
+<!--88A3E3DE54C94427A1F5F7EA72EA46F4-->  <PRINTNAME><![CDATA[Outstanding Payments Item No]]></PRINTNAME>
+<!--88A3E3DE54C94427A1F5F7EA72EA46F4-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--88A3E3DE54C94427A1F5F7EA72EA46F4-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--88A3E3DE54C94427A1F5F7EA72EA46F4--></AD_ELEMENT>
+
 <!--88E9727DAC364BA38FFE37BC8B9BF698--><AD_ELEMENT>
 <!--88E9727DAC364BA38FFE37BC8B9BF698-->  <AD_ELEMENT_ID><![CDATA[88E9727DAC364BA38FFE37BC8B9BF698]]></AD_ELEMENT_ID>
 <!--88E9727DAC364BA38FFE37BC8B9BF698-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -864,6 +864,18 @@
 <!--8BBA8342ED3C20FFE040007F01002E9B-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--8BBA8342ED3C20FFE040007F01002E9B--></AD_ELEMENT>
 
+<!--8F1BEEEE0B0847E59FD95EFE6658DF86--><AD_ELEMENT>
+<!--8F1BEEEE0B0847E59FD95EFE6658DF86-->  <AD_ELEMENT_ID><![CDATA[8F1BEEEE0B0847E59FD95EFE6658DF86]]></AD_ELEMENT_ID>
+<!--8F1BEEEE0B0847E59FD95EFE6658DF86-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8F1BEEEE0B0847E59FD95EFE6658DF86-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8F1BEEEE0B0847E59FD95EFE6658DF86-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8F1BEEEE0B0847E59FD95EFE6658DF86-->  <COLUMNNAME><![CDATA[EM_APRM_UnReconciledItemNo]]></COLUMNNAME>
+<!--8F1BEEEE0B0847E59FD95EFE6658DF86-->  <NAME><![CDATA[UnReconciled Item No]]></NAME>
+<!--8F1BEEEE0B0847E59FD95EFE6658DF86-->  <PRINTNAME><![CDATA[UnReconciled Item No]]></PRINTNAME>
+<!--8F1BEEEE0B0847E59FD95EFE6658DF86-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--8F1BEEEE0B0847E59FD95EFE6658DF86-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--8F1BEEEE0B0847E59FD95EFE6658DF86--></AD_ELEMENT>
+
 <!--904EC23F6DE3450F91EAD0C30862220D--><AD_ELEMENT>
 <!--904EC23F6DE3450F91EAD0C30862220D-->  <AD_ELEMENT_ID><![CDATA[904EC23F6DE3450F91EAD0C30862220D]]></AD_ELEMENT_ID>
 <!--904EC23F6DE3450F91EAD0C30862220D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1152,6 +1164,18 @@
 <!--B0FA9EF3D10E46FF9D402AB44056363B-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--B0FA9EF3D10E46FF9D402AB44056363B--></AD_ELEMENT>
 
+<!--B2836EAE81BC4FEEAD5DA597F575F033--><AD_ELEMENT>
+<!--B2836EAE81BC4FEEAD5DA597F575F033-->  <AD_ELEMENT_ID><![CDATA[B2836EAE81BC4FEEAD5DA597F575F033]]></AD_ELEMENT_ID>
+<!--B2836EAE81BC4FEEAD5DA597F575F033-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B2836EAE81BC4FEEAD5DA597F575F033-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B2836EAE81BC4FEEAD5DA597F575F033-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B2836EAE81BC4FEEAD5DA597F575F033-->  <COLUMNNAME><![CDATA[EM_APRM_OutstandingDepositsItemNo]]></COLUMNNAME>
+<!--B2836EAE81BC4FEEAD5DA597F575F033-->  <NAME><![CDATA[Outstanding Deposits Item No]]></NAME>
+<!--B2836EAE81BC4FEEAD5DA597F575F033-->  <PRINTNAME><![CDATA[Outstanding Deposits Item No]]></PRINTNAME>
+<!--B2836EAE81BC4FEEAD5DA597F575F033-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--B2836EAE81BC4FEEAD5DA597F575F033-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--B2836EAE81BC4FEEAD5DA597F575F033--></AD_ELEMENT>
+
 <!--B40C938A247779EFE040A8C0916618AE--><AD_ELEMENT>
 <!--B40C938A247779EFE040A8C0916618AE-->  <AD_ELEMENT_ID><![CDATA[B40C938A247779EFE040A8C0916618AE]]></AD_ELEMENT_ID>
 <!--B40C938A247779EFE040A8C0916618AE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1314,6 +1338,30 @@
 <!--D42C1F18622F4773989190BB8C2C8436-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--D42C1F18622F4773989190BB8C2C8436--></AD_ELEMENT>
 
+<!--D51BEAD64B9C4D5FBC097873933ACEB3--><AD_ELEMENT>
+<!--D51BEAD64B9C4D5FBC097873933ACEB3-->  <AD_ELEMENT_ID><![CDATA[D51BEAD64B9C4D5FBC097873933ACEB3]]></AD_ELEMENT_ID>
+<!--D51BEAD64B9C4D5FBC097873933ACEB3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D51BEAD64B9C4D5FBC097873933ACEB3-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D51BEAD64B9C4D5FBC097873933ACEB3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D51BEAD64B9C4D5FBC097873933ACEB3-->  <COLUMNNAME><![CDATA[EM_APRM_OutstandingPaymentsItemsAmount]]></COLUMNNAME>
+<!--D51BEAD64B9C4D5FBC097873933ACEB3-->  <NAME><![CDATA[Outstanding Payment Items Amount]]></NAME>
+<!--D51BEAD64B9C4D5FBC097873933ACEB3-->  <PRINTNAME><![CDATA[Outstanding Payment Items Amount]]></PRINTNAME>
+<!--D51BEAD64B9C4D5FBC097873933ACEB3-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--D51BEAD64B9C4D5FBC097873933ACEB3-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--D51BEAD64B9C4D5FBC097873933ACEB3--></AD_ELEMENT>
+
+<!--D85187ABF8434C39A9A11EE8EFCF3DDE--><AD_ELEMENT>
+<!--D85187ABF8434C39A9A11EE8EFCF3DDE-->  <AD_ELEMENT_ID><![CDATA[D85187ABF8434C39A9A11EE8EFCF3DDE]]></AD_ELEMENT_ID>
+<!--D85187ABF8434C39A9A11EE8EFCF3DDE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D85187ABF8434C39A9A11EE8EFCF3DDE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D85187ABF8434C39A9A11EE8EFCF3DDE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D85187ABF8434C39A9A11EE8EFCF3DDE-->  <COLUMNNAME><![CDATA[EM_APRM_OutstandingDepositItemsAmount]]></COLUMNNAME>
+<!--D85187ABF8434C39A9A11EE8EFCF3DDE-->  <NAME><![CDATA[Outstanding Deposit Items Amount]]></NAME>
+<!--D85187ABF8434C39A9A11EE8EFCF3DDE-->  <PRINTNAME><![CDATA[Outstanding Deposit Items Amount]]></PRINTNAME>
+<!--D85187ABF8434C39A9A11EE8EFCF3DDE-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--D85187ABF8434C39A9A11EE8EFCF3DDE-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--D85187ABF8434C39A9A11EE8EFCF3DDE--></AD_ELEMENT>
+
 <!--D9E7B70083344E86AF5A6272B2090755--><AD_ELEMENT>
 <!--D9E7B70083344E86AF5A6272B2090755-->  <AD_ELEMENT_ID><![CDATA[D9E7B70083344E86AF5A6272B2090755]]></AD_ELEMENT_ID>
 <!--D9E7B70083344E86AF5A6272B2090755-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1454,6 +1502,18 @@
 <!--EDB9CF491555465382F828F48291A0C0-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--EDB9CF491555465382F828F48291A0C0--></AD_ELEMENT>
 
+<!--F109FCAF8CC1462AB2A94F73F4E51EA7--><AD_ELEMENT>
+<!--F109FCAF8CC1462AB2A94F73F4E51EA7-->  <AD_ELEMENT_ID><![CDATA[F109FCAF8CC1462AB2A94F73F4E51EA7]]></AD_ELEMENT_ID>
+<!--F109FCAF8CC1462AB2A94F73F4E51EA7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F109FCAF8CC1462AB2A94F73F4E51EA7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F109FCAF8CC1462AB2A94F73F4E51EA7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F109FCAF8CC1462AB2A94F73F4E51EA7-->  <COLUMNNAME><![CDATA[EM_APRM_ReconciledItemNo]]></COLUMNNAME>
+<!--F109FCAF8CC1462AB2A94F73F4E51EA7-->  <NAME><![CDATA[Reconciled Item No.]]></NAME>
+<!--F109FCAF8CC1462AB2A94F73F4E51EA7-->  <PRINTNAME><![CDATA[Reconciled Item No.]]></PRINTNAME>
+<!--F109FCAF8CC1462AB2A94F73F4E51EA7-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--F109FCAF8CC1462AB2A94F73F4E51EA7-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--F109FCAF8CC1462AB2A94F73F4E51EA7--></AD_ELEMENT>
+
 <!--F1D81ADE47094291B577E6B10B2B95E4--><AD_ELEMENT>
 <!--F1D81ADE47094291B577E6B10B2B95E4-->  <AD_ELEMENT_ID><![CDATA[F1D81ADE47094291B577E6B10B2B95E4]]></AD_ELEMENT_ID>
 <!--F1D81ADE47094291B577E6B10B2B95E4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -445,6 +445,33 @@
 <!--0698EC1766D94DF4B783F058BEC76784-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--0698EC1766D94DF4B783F058BEC76784--></AD_FIELD>
 
+<!--0743D26ABDBD4FCBBC10DB87D66500F6--><AD_FIELD>
+<!--0743D26ABDBD4FCBBC10DB87D66500F6-->  <AD_FIELD_ID><![CDATA[0743D26ABDBD4FCBBC10DB87D66500F6]]></AD_FIELD_ID>
+<!--0743D26ABDBD4FCBBC10DB87D66500F6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0743D26ABDBD4FCBBC10DB87D66500F6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0743D26ABDBD4FCBBC10DB87D66500F6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0743D26ABDBD4FCBBC10DB87D66500F6-->  <NAME><![CDATA[Outstanding Payments Item No]]></NAME>
+<!--0743D26ABDBD4FCBBC10DB87D66500F6-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--0743D26ABDBD4FCBBC10DB87D66500F6-->  <AD_TAB_ID><![CDATA[FF8080813320657F0133209DE21B0042]]></AD_TAB_ID>
+<!--0743D26ABDBD4FCBBC10DB87D66500F6-->  <AD_COLUMN_ID><![CDATA[91BC2133F04647938F702192A5156C25]]></AD_COLUMN_ID>
+<!--0743D26ABDBD4FCBBC10DB87D66500F6-->  <IGNOREINWAD><![CDATA[Y]]></IGNOREINWAD>
+<!--0743D26ABDBD4FCBBC10DB87D66500F6-->  <AD_FIELDGROUP_ID><![CDATA[4E230C937ED04074ACFFC255B4DB93EC]]></AD_FIELDGROUP_ID>
+<!--0743D26ABDBD4FCBBC10DB87D66500F6-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--0743D26ABDBD4FCBBC10DB87D66500F6-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
+<!--0743D26ABDBD4FCBBC10DB87D66500F6-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--0743D26ABDBD4FCBBC10DB87D66500F6-->  <SEQNO><![CDATA[240]]></SEQNO>
+<!--0743D26ABDBD4FCBBC10DB87D66500F6-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--0743D26ABDBD4FCBBC10DB87D66500F6-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--0743D26ABDBD4FCBBC10DB87D66500F6-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--0743D26ABDBD4FCBBC10DB87D66500F6-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--0743D26ABDBD4FCBBC10DB87D66500F6-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--0743D26ABDBD4FCBBC10DB87D66500F6-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--0743D26ABDBD4FCBBC10DB87D66500F6-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--0743D26ABDBD4FCBBC10DB87D66500F6-->  <STARTNEWLINE><![CDATA[Y]]></STARTNEWLINE>
+<!--0743D26ABDBD4FCBBC10DB87D66500F6-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--0743D26ABDBD4FCBBC10DB87D66500F6-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--0743D26ABDBD4FCBBC10DB87D66500F6--></AD_FIELD>
+
 <!--0797D781255A4405A2E0C0CDE8ED23BE--><AD_FIELD>
 <!--0797D781255A4405A2E0C0CDE8ED23BE-->  <AD_FIELD_ID><![CDATA[0797D781255A4405A2E0C0CDE8ED23BE]]></AD_FIELD_ID>
 <!--0797D781255A4405A2E0C0CDE8ED23BE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -752,6 +779,33 @@
 <!--09C582CB650B44C7858C1EDC272F77AE-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--09C582CB650B44C7858C1EDC272F77AE--></AD_FIELD>
 
+<!--09F39FD0960340EF825D11AE728286B3--><AD_FIELD>
+<!--09F39FD0960340EF825D11AE728286B3-->  <AD_FIELD_ID><![CDATA[09F39FD0960340EF825D11AE728286B3]]></AD_FIELD_ID>
+<!--09F39FD0960340EF825D11AE728286B3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--09F39FD0960340EF825D11AE728286B3-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--09F39FD0960340EF825D11AE728286B3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--09F39FD0960340EF825D11AE728286B3-->  <NAME><![CDATA[UnReconciled Items Amount]]></NAME>
+<!--09F39FD0960340EF825D11AE728286B3-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--09F39FD0960340EF825D11AE728286B3-->  <AD_TAB_ID><![CDATA[FF8080813320657F0133209DE21B0042]]></AD_TAB_ID>
+<!--09F39FD0960340EF825D11AE728286B3-->  <AD_COLUMN_ID><![CDATA[C72EC790B2EF4BEEA2A843D30770B85D]]></AD_COLUMN_ID>
+<!--09F39FD0960340EF825D11AE728286B3-->  <IGNOREINWAD><![CDATA[Y]]></IGNOREINWAD>
+<!--09F39FD0960340EF825D11AE728286B3-->  <AD_FIELDGROUP_ID><![CDATA[4E230C937ED04074ACFFC255B4DB93EC]]></AD_FIELDGROUP_ID>
+<!--09F39FD0960340EF825D11AE728286B3-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--09F39FD0960340EF825D11AE728286B3-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
+<!--09F39FD0960340EF825D11AE728286B3-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--09F39FD0960340EF825D11AE728286B3-->  <SEQNO><![CDATA[230]]></SEQNO>
+<!--09F39FD0960340EF825D11AE728286B3-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--09F39FD0960340EF825D11AE728286B3-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--09F39FD0960340EF825D11AE728286B3-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--09F39FD0960340EF825D11AE728286B3-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--09F39FD0960340EF825D11AE728286B3-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--09F39FD0960340EF825D11AE728286B3-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--09F39FD0960340EF825D11AE728286B3-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--09F39FD0960340EF825D11AE728286B3-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--09F39FD0960340EF825D11AE728286B3-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--09F39FD0960340EF825D11AE728286B3-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--09F39FD0960340EF825D11AE728286B3--></AD_FIELD>
+
 <!--0A23152718D54E99B941D9AA1BF33734--><AD_FIELD>
 <!--0A23152718D54E99B941D9AA1BF33734-->  <AD_FIELD_ID><![CDATA[0A23152718D54E99B941D9AA1BF33734]]></AD_FIELD_ID>
 <!--0A23152718D54E99B941D9AA1BF33734-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1572,6 +1626,33 @@
 <!--173BFBB9D69E470E9BFA04921CF43A96-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--173BFBB9D69E470E9BFA04921CF43A96--></AD_FIELD>
 
+<!--17BBE4CB11E548DA8D38F7926FAA4C57--><AD_FIELD>
+<!--17BBE4CB11E548DA8D38F7926FAA4C57-->  <AD_FIELD_ID><![CDATA[17BBE4CB11E548DA8D38F7926FAA4C57]]></AD_FIELD_ID>
+<!--17BBE4CB11E548DA8D38F7926FAA4C57-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--17BBE4CB11E548DA8D38F7926FAA4C57-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--17BBE4CB11E548DA8D38F7926FAA4C57-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--17BBE4CB11E548DA8D38F7926FAA4C57-->  <NAME><![CDATA[Outstanding Payment Items Amount]]></NAME>
+<!--17BBE4CB11E548DA8D38F7926FAA4C57-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--17BBE4CB11E548DA8D38F7926FAA4C57-->  <AD_TAB_ID><![CDATA[FF8080813320657F0133209DE21B0042]]></AD_TAB_ID>
+<!--17BBE4CB11E548DA8D38F7926FAA4C57-->  <AD_COLUMN_ID><![CDATA[BBE47252ECEF4B5BA7116E0E23CA5D8D]]></AD_COLUMN_ID>
+<!--17BBE4CB11E548DA8D38F7926FAA4C57-->  <IGNOREINWAD><![CDATA[Y]]></IGNOREINWAD>
+<!--17BBE4CB11E548DA8D38F7926FAA4C57-->  <AD_FIELDGROUP_ID><![CDATA[4E230C937ED04074ACFFC255B4DB93EC]]></AD_FIELDGROUP_ID>
+<!--17BBE4CB11E548DA8D38F7926FAA4C57-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--17BBE4CB11E548DA8D38F7926FAA4C57-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
+<!--17BBE4CB11E548DA8D38F7926FAA4C57-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--17BBE4CB11E548DA8D38F7926FAA4C57-->  <SEQNO><![CDATA[250]]></SEQNO>
+<!--17BBE4CB11E548DA8D38F7926FAA4C57-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--17BBE4CB11E548DA8D38F7926FAA4C57-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--17BBE4CB11E548DA8D38F7926FAA4C57-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--17BBE4CB11E548DA8D38F7926FAA4C57-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--17BBE4CB11E548DA8D38F7926FAA4C57-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--17BBE4CB11E548DA8D38F7926FAA4C57-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--17BBE4CB11E548DA8D38F7926FAA4C57-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--17BBE4CB11E548DA8D38F7926FAA4C57-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--17BBE4CB11E548DA8D38F7926FAA4C57-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--17BBE4CB11E548DA8D38F7926FAA4C57-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--17BBE4CB11E548DA8D38F7926FAA4C57--></AD_FIELD>
+
 <!--18CBF8AE96B346D9966F40783008C6A2--><AD_FIELD>
 <!--18CBF8AE96B346D9966F40783008C6A2-->  <AD_FIELD_ID><![CDATA[18CBF8AE96B346D9966F40783008C6A2]]></AD_FIELD_ID>
 <!--18CBF8AE96B346D9966F40783008C6A2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -3358,6 +3439,33 @@
 <!--344DBD51F19444C3A50D67480A4925B7-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--344DBD51F19444C3A50D67480A4925B7--></AD_FIELD>
 
+<!--355910D59E0445FEAACD23F0CAF8DEA7--><AD_FIELD>
+<!--355910D59E0445FEAACD23F0CAF8DEA7-->  <AD_FIELD_ID><![CDATA[355910D59E0445FEAACD23F0CAF8DEA7]]></AD_FIELD_ID>
+<!--355910D59E0445FEAACD23F0CAF8DEA7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--355910D59E0445FEAACD23F0CAF8DEA7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--355910D59E0445FEAACD23F0CAF8DEA7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--355910D59E0445FEAACD23F0CAF8DEA7-->  <NAME><![CDATA[Outstanding Deposit Items Amount]]></NAME>
+<!--355910D59E0445FEAACD23F0CAF8DEA7-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--355910D59E0445FEAACD23F0CAF8DEA7-->  <AD_TAB_ID><![CDATA[FF8080813320657F0133209DE21B0042]]></AD_TAB_ID>
+<!--355910D59E0445FEAACD23F0CAF8DEA7-->  <AD_COLUMN_ID><![CDATA[3FE18B378FA24031A2E24B058414729F]]></AD_COLUMN_ID>
+<!--355910D59E0445FEAACD23F0CAF8DEA7-->  <IGNOREINWAD><![CDATA[Y]]></IGNOREINWAD>
+<!--355910D59E0445FEAACD23F0CAF8DEA7-->  <AD_FIELDGROUP_ID><![CDATA[4E230C937ED04074ACFFC255B4DB93EC]]></AD_FIELDGROUP_ID>
+<!--355910D59E0445FEAACD23F0CAF8DEA7-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--355910D59E0445FEAACD23F0CAF8DEA7-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
+<!--355910D59E0445FEAACD23F0CAF8DEA7-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--355910D59E0445FEAACD23F0CAF8DEA7-->  <SEQNO><![CDATA[270]]></SEQNO>
+<!--355910D59E0445FEAACD23F0CAF8DEA7-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--355910D59E0445FEAACD23F0CAF8DEA7-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--355910D59E0445FEAACD23F0CAF8DEA7-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--355910D59E0445FEAACD23F0CAF8DEA7-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--355910D59E0445FEAACD23F0CAF8DEA7-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--355910D59E0445FEAACD23F0CAF8DEA7-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--355910D59E0445FEAACD23F0CAF8DEA7-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--355910D59E0445FEAACD23F0CAF8DEA7-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--355910D59E0445FEAACD23F0CAF8DEA7-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--355910D59E0445FEAACD23F0CAF8DEA7-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--355910D59E0445FEAACD23F0CAF8DEA7--></AD_FIELD>
+
 <!--35D7F2568D814BACB67CD1334504315C--><AD_FIELD>
 <!--35D7F2568D814BACB67CD1334504315C-->  <AD_FIELD_ID><![CDATA[35D7F2568D814BACB67CD1334504315C]]></AD_FIELD_ID>
 <!--35D7F2568D814BACB67CD1334504315C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -4550,6 +4658,33 @@
 <!--40289C1D2E1298CF012E12F26EB1010A-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--40289C1D2E1298CF012E12F26EB1010A--></AD_FIELD>
 
+<!--40F7C113F57A42DDB1D915ADEFA1F1EA--><AD_FIELD>
+<!--40F7C113F57A42DDB1D915ADEFA1F1EA-->  <AD_FIELD_ID><![CDATA[40F7C113F57A42DDB1D915ADEFA1F1EA]]></AD_FIELD_ID>
+<!--40F7C113F57A42DDB1D915ADEFA1F1EA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--40F7C113F57A42DDB1D915ADEFA1F1EA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--40F7C113F57A42DDB1D915ADEFA1F1EA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--40F7C113F57A42DDB1D915ADEFA1F1EA-->  <NAME><![CDATA[UnReconciled Item No]]></NAME>
+<!--40F7C113F57A42DDB1D915ADEFA1F1EA-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--40F7C113F57A42DDB1D915ADEFA1F1EA-->  <AD_TAB_ID><![CDATA[FF8080813320657F0133209DE21B0042]]></AD_TAB_ID>
+<!--40F7C113F57A42DDB1D915ADEFA1F1EA-->  <AD_COLUMN_ID><![CDATA[07DD87B8F3BE41C18546260D616E1404]]></AD_COLUMN_ID>
+<!--40F7C113F57A42DDB1D915ADEFA1F1EA-->  <IGNOREINWAD><![CDATA[Y]]></IGNOREINWAD>
+<!--40F7C113F57A42DDB1D915ADEFA1F1EA-->  <AD_FIELDGROUP_ID><![CDATA[4E230C937ED04074ACFFC255B4DB93EC]]></AD_FIELDGROUP_ID>
+<!--40F7C113F57A42DDB1D915ADEFA1F1EA-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--40F7C113F57A42DDB1D915ADEFA1F1EA-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
+<!--40F7C113F57A42DDB1D915ADEFA1F1EA-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--40F7C113F57A42DDB1D915ADEFA1F1EA-->  <SEQNO><![CDATA[220]]></SEQNO>
+<!--40F7C113F57A42DDB1D915ADEFA1F1EA-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--40F7C113F57A42DDB1D915ADEFA1F1EA-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--40F7C113F57A42DDB1D915ADEFA1F1EA-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--40F7C113F57A42DDB1D915ADEFA1F1EA-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--40F7C113F57A42DDB1D915ADEFA1F1EA-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--40F7C113F57A42DDB1D915ADEFA1F1EA-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--40F7C113F57A42DDB1D915ADEFA1F1EA-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--40F7C113F57A42DDB1D915ADEFA1F1EA-->  <STARTNEWLINE><![CDATA[Y]]></STARTNEWLINE>
+<!--40F7C113F57A42DDB1D915ADEFA1F1EA-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--40F7C113F57A42DDB1D915ADEFA1F1EA-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--40F7C113F57A42DDB1D915ADEFA1F1EA--></AD_FIELD>
+
 <!--415EA1A7A7084D1485CC4413DAC73458--><AD_FIELD>
 <!--415EA1A7A7084D1485CC4413DAC73458-->  <AD_FIELD_ID><![CDATA[415EA1A7A7084D1485CC4413DAC73458]]></AD_FIELD_ID>
 <!--415EA1A7A7084D1485CC4413DAC73458-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -7654,6 +7789,33 @@
 <!--6CF8A431D2F84F4BB1428D0595EA9C74-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--6CF8A431D2F84F4BB1428D0595EA9C74--></AD_FIELD>
 
+<!--6D239AC40B7D48EDB2B96CF7CD5DA3AE--><AD_FIELD>
+<!--6D239AC40B7D48EDB2B96CF7CD5DA3AE-->  <AD_FIELD_ID><![CDATA[6D239AC40B7D48EDB2B96CF7CD5DA3AE]]></AD_FIELD_ID>
+<!--6D239AC40B7D48EDB2B96CF7CD5DA3AE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6D239AC40B7D48EDB2B96CF7CD5DA3AE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6D239AC40B7D48EDB2B96CF7CD5DA3AE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6D239AC40B7D48EDB2B96CF7CD5DA3AE-->  <NAME><![CDATA[Outstanding Deposits Item No]]></NAME>
+<!--6D239AC40B7D48EDB2B96CF7CD5DA3AE-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--6D239AC40B7D48EDB2B96CF7CD5DA3AE-->  <AD_TAB_ID><![CDATA[FF8080813320657F0133209DE21B0042]]></AD_TAB_ID>
+<!--6D239AC40B7D48EDB2B96CF7CD5DA3AE-->  <AD_COLUMN_ID><![CDATA[81822D492C88480C8830E5059387A771]]></AD_COLUMN_ID>
+<!--6D239AC40B7D48EDB2B96CF7CD5DA3AE-->  <IGNOREINWAD><![CDATA[Y]]></IGNOREINWAD>
+<!--6D239AC40B7D48EDB2B96CF7CD5DA3AE-->  <AD_FIELDGROUP_ID><![CDATA[4E230C937ED04074ACFFC255B4DB93EC]]></AD_FIELDGROUP_ID>
+<!--6D239AC40B7D48EDB2B96CF7CD5DA3AE-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--6D239AC40B7D48EDB2B96CF7CD5DA3AE-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
+<!--6D239AC40B7D48EDB2B96CF7CD5DA3AE-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--6D239AC40B7D48EDB2B96CF7CD5DA3AE-->  <SEQNO><![CDATA[260]]></SEQNO>
+<!--6D239AC40B7D48EDB2B96CF7CD5DA3AE-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--6D239AC40B7D48EDB2B96CF7CD5DA3AE-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--6D239AC40B7D48EDB2B96CF7CD5DA3AE-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--6D239AC40B7D48EDB2B96CF7CD5DA3AE-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--6D239AC40B7D48EDB2B96CF7CD5DA3AE-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--6D239AC40B7D48EDB2B96CF7CD5DA3AE-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--6D239AC40B7D48EDB2B96CF7CD5DA3AE-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--6D239AC40B7D48EDB2B96CF7CD5DA3AE-->  <STARTNEWLINE><![CDATA[Y]]></STARTNEWLINE>
+<!--6D239AC40B7D48EDB2B96CF7CD5DA3AE-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--6D239AC40B7D48EDB2B96CF7CD5DA3AE-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--6D239AC40B7D48EDB2B96CF7CD5DA3AE--></AD_FIELD>
+
 <!--6D33F80D193B495F9BA7B927EDAE1FA7--><AD_FIELD>
 <!--6D33F80D193B495F9BA7B927EDAE1FA7-->  <AD_FIELD_ID><![CDATA[6D33F80D193B495F9BA7B927EDAE1FA7]]></AD_FIELD_ID>
 <!--6D33F80D193B495F9BA7B927EDAE1FA7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -12357,6 +12519,33 @@
 <!--8E4434A6CBD54C3E8AC186D020003252-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--8E4434A6CBD54C3E8AC186D020003252--></AD_FIELD>
 
+<!--9081ABC15835406BA6BEE3C8A8039CCE--><AD_FIELD>
+<!--9081ABC15835406BA6BEE3C8A8039CCE-->  <AD_FIELD_ID><![CDATA[9081ABC15835406BA6BEE3C8A8039CCE]]></AD_FIELD_ID>
+<!--9081ABC15835406BA6BEE3C8A8039CCE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9081ABC15835406BA6BEE3C8A8039CCE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9081ABC15835406BA6BEE3C8A8039CCE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9081ABC15835406BA6BEE3C8A8039CCE-->  <NAME><![CDATA[Reconciled Item No.]]></NAME>
+<!--9081ABC15835406BA6BEE3C8A8039CCE-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--9081ABC15835406BA6BEE3C8A8039CCE-->  <AD_TAB_ID><![CDATA[FF8080813320657F0133209DE21B0042]]></AD_TAB_ID>
+<!--9081ABC15835406BA6BEE3C8A8039CCE-->  <AD_COLUMN_ID><![CDATA[590088D9DDB34C1FB99E97CF50022B62]]></AD_COLUMN_ID>
+<!--9081ABC15835406BA6BEE3C8A8039CCE-->  <IGNOREINWAD><![CDATA[Y]]></IGNOREINWAD>
+<!--9081ABC15835406BA6BEE3C8A8039CCE-->  <AD_FIELDGROUP_ID><![CDATA[4E230C937ED04074ACFFC255B4DB93EC]]></AD_FIELDGROUP_ID>
+<!--9081ABC15835406BA6BEE3C8A8039CCE-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--9081ABC15835406BA6BEE3C8A8039CCE-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
+<!--9081ABC15835406BA6BEE3C8A8039CCE-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--9081ABC15835406BA6BEE3C8A8039CCE-->  <SEQNO><![CDATA[200]]></SEQNO>
+<!--9081ABC15835406BA6BEE3C8A8039CCE-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--9081ABC15835406BA6BEE3C8A8039CCE-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--9081ABC15835406BA6BEE3C8A8039CCE-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--9081ABC15835406BA6BEE3C8A8039CCE-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--9081ABC15835406BA6BEE3C8A8039CCE-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--9081ABC15835406BA6BEE3C8A8039CCE-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--9081ABC15835406BA6BEE3C8A8039CCE-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--9081ABC15835406BA6BEE3C8A8039CCE-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--9081ABC15835406BA6BEE3C8A8039CCE-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--9081ABC15835406BA6BEE3C8A8039CCE-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--9081ABC15835406BA6BEE3C8A8039CCE--></AD_FIELD>
+
 <!--91A2800B187341CB8FFAE20119B0BA5E--><AD_FIELD>
 <!--91A2800B187341CB8FFAE20119B0BA5E-->  <AD_FIELD_ID><![CDATA[91A2800B187341CB8FFAE20119B0BA5E]]></AD_FIELD_ID>
 <!--91A2800B187341CB8FFAE20119B0BA5E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -17382,6 +17571,33 @@
 <!--BAA13A396982401AAA699F5D5EDEAB40-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--BAA13A396982401AAA699F5D5EDEAB40--></AD_FIELD>
 
+<!--BB0C947FC413441D98D676868EC89D94--><AD_FIELD>
+<!--BB0C947FC413441D98D676868EC89D94-->  <AD_FIELD_ID><![CDATA[BB0C947FC413441D98D676868EC89D94]]></AD_FIELD_ID>
+<!--BB0C947FC413441D98D676868EC89D94-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BB0C947FC413441D98D676868EC89D94-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BB0C947FC413441D98D676868EC89D94-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BB0C947FC413441D98D676868EC89D94-->  <NAME><![CDATA[Reconciled Items Amount]]></NAME>
+<!--BB0C947FC413441D98D676868EC89D94-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--BB0C947FC413441D98D676868EC89D94-->  <AD_TAB_ID><![CDATA[FF8080813320657F0133209DE21B0042]]></AD_TAB_ID>
+<!--BB0C947FC413441D98D676868EC89D94-->  <AD_COLUMN_ID><![CDATA[7791426B8C214F0EB68C13D99A577229]]></AD_COLUMN_ID>
+<!--BB0C947FC413441D98D676868EC89D94-->  <IGNOREINWAD><![CDATA[Y]]></IGNOREINWAD>
+<!--BB0C947FC413441D98D676868EC89D94-->  <AD_FIELDGROUP_ID><![CDATA[4E230C937ED04074ACFFC255B4DB93EC]]></AD_FIELDGROUP_ID>
+<!--BB0C947FC413441D98D676868EC89D94-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--BB0C947FC413441D98D676868EC89D94-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
+<!--BB0C947FC413441D98D676868EC89D94-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--BB0C947FC413441D98D676868EC89D94-->  <SEQNO><![CDATA[210]]></SEQNO>
+<!--BB0C947FC413441D98D676868EC89D94-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--BB0C947FC413441D98D676868EC89D94-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--BB0C947FC413441D98D676868EC89D94-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--BB0C947FC413441D98D676868EC89D94-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--BB0C947FC413441D98D676868EC89D94-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--BB0C947FC413441D98D676868EC89D94-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--BB0C947FC413441D98D676868EC89D94-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--BB0C947FC413441D98D676868EC89D94-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--BB0C947FC413441D98D676868EC89D94-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--BB0C947FC413441D98D676868EC89D94-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--BB0C947FC413441D98D676868EC89D94--></AD_FIELD>
+
 <!--BB7E2DFBDCF94FBCA31B53E736CF9D57--><AD_FIELD>
 <!--BB7E2DFBDCF94FBCA31B53E736CF9D57-->  <AD_FIELD_ID><![CDATA[BB7E2DFBDCF94FBCA31B53E736CF9D57]]></AD_FIELD_ID>
 <!--BB7E2DFBDCF94FBCA31B53E736CF9D57-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELDGROUP.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELDGROUP.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -10,6 +10,16 @@
 <!--0C672A3B7CDF416F9522DF3FA5AE4022-->  <ISCOLLAPSED><![CDATA[N]]></ISCOLLAPSED>
 <!--0C672A3B7CDF416F9522DF3FA5AE4022--></AD_FIELDGROUP>
 
+<!--4E230C937ED04074ACFFC255B4DB93EC--><AD_FIELDGROUP>
+<!--4E230C937ED04074ACFFC255B4DB93EC-->  <AD_FIELDGROUP_ID><![CDATA[4E230C937ED04074ACFFC255B4DB93EC]]></AD_FIELDGROUP_ID>
+<!--4E230C937ED04074ACFFC255B4DB93EC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4E230C937ED04074ACFFC255B4DB93EC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4E230C937ED04074ACFFC255B4DB93EC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4E230C937ED04074ACFFC255B4DB93EC-->  <NAME><![CDATA[Details]]></NAME>
+<!--4E230C937ED04074ACFFC255B4DB93EC-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--4E230C937ED04074ACFFC255B4DB93EC-->  <ISCOLLAPSED><![CDATA[N]]></ISCOLLAPSED>
+<!--4E230C937ED04074ACFFC255B4DB93EC--></AD_FIELDGROUP>
+
 <!--612BAE7A8D3E4170936F79A760FCF94C--><AD_FIELDGROUP>
 <!--612BAE7A8D3E4170936F79A760FCF94C-->  <AD_FIELDGROUP_ID><![CDATA[612BAE7A8D3E4170936F79A760FCF94C]]></AD_FIELDGROUP_ID>
 <!--612BAE7A8D3E4170936F79A760FCF94C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -6,7 +6,7 @@
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></NAME>
-<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.24984]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.25650]]></VERSION>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <DESCRIPTION><![CDATA[Managing your finances with an ERP does not have to be difficult. Enjoy a radically improved user experience that combines the power of an enterprise grade financial application with the simplicity and ease of a web 2.0 personal accounting service.]]></DESCRIPTION>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <HELP><![CDATA[Advanced Payables and Receivables Management simplifies and automates the business processes around the management of financial accounts, from the receipt and issue of payment, to the reconciliation of those events with bank statements.
 If you would like to help shape this module you are welcome to take part in the forum discussions or register feature requests or issues in the corresponding (Forum and Bug Tracking) sections in the Advanced Payables and Receivable project in the OB Forge.]]></HELP>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -7,7 +7,7 @@
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID>
-<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.24984]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.25650]]></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.24984]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->  <STARTVERSION><![CDATA[3.0.25650]]></STARTVERSION>
 <!--B97FC854C6DD41E692161585645A900F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--B97FC854C6DD41E692161585645A900F-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--B97FC854C6DD41E692161585645A900F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -519,18 +519,6 @@
 <!--FF8080812E443491012E443C053A001A-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
 <!--FF8080812E443491012E443C053A001A--></AD_REFERENCE>
 
-<!--FF80808133186ADD01331B465E32002D--><AD_REFERENCE>
-<!--FF80808133186ADD01331B465E32002D-->  <AD_REFERENCE_ID><![CDATA[FF80808133186ADD01331B465E32002D]]></AD_REFERENCE_ID>
-<!--FF80808133186ADD01331B465E32002D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--FF80808133186ADD01331B465E32002D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--FF80808133186ADD01331B465E32002D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FF80808133186ADD01331B465E32002D-->  <NAME><![CDATA[Reconciliation Detail Widget]]></NAME>
-<!--FF80808133186ADD01331B465E32002D-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--FF80808133186ADD01331B465E32002D-->  <ISBASEREFERENCE><![CDATA[N]]></ISBASEREFERENCE>
-<!--FF80808133186ADD01331B465E32002D-->  <PARENTREFERENCE_ID><![CDATA[FF8080813123BF670131241C2BB30012]]></PARENTREFERENCE_ID>
-<!--FF80808133186ADD01331B465E32002D-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
-<!--FF80808133186ADD01331B465E32002D--></AD_REFERENCE>
-
 <!--FF808181312414380131241C5A41001F--><AD_REFERENCE>
 <!--FF808181312414380131241C5A41001F-->  <AD_REFERENCE_ID><![CDATA[FF808181312414380131241C5A41001F]]></AD_REFERENCE_ID>
 <!--FF808181312414380131241C5A41001F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -110,12 +110,15 @@
 <!--59ED9B23854A4B048CBBAE38436B99C2-->  <AD_PACKAGE_ID><![CDATA[AC33B2262748414A816510545755435A]]></AD_PACKAGE_ID>
 <!--59ED9B23854A4B048CBBAE38436B99C2-->  <DATAORIGINTYPE><![CDATA[HQL]]></DATAORIGINTYPE>
 <!--59ED9B23854A4B048CBBAE38436B99C2-->  <ISTREE><![CDATA[N]]></ISTREE>
-<!--59ED9B23854A4B048CBBAE38436B99C2-->  <HQLQUERY><![CDATA[select f.id, f.documentNo, f.description, f.paymentDate, f.generatedCredit - f.usedCredit as outstandingAmount, '0' as paymentAmount
-from FIN_Payment f
-where f.generatedCredit != '0'
+<!--59ED9B23854A4B048CBBAE38436B99C2-->  <HQLQUERY><![CDATA[select f.id, f.documentNo, f.description, f.paymentDate, f.generatedCredit - f.usedCredit as outstandingAmount, '0' as paymentAmount 
+@selectClause@ 
+from FIN_Payment f 
+@joinClause@ 
+where f.generatedCredit != '0' 
 and f.generatedCredit != f.usedCredit
-and @additional_filters@
-and @insertion_point_0@]]></HQLQUERY>
+@whereClause@ 
+and @additional_filters@ 
+and @insertion_point_0@ ]]></HQLQUERY>
 <!--59ED9B23854A4B048CBBAE38436B99C2-->  <ENTITY_ALIAS><![CDATA[f]]></ENTITY_ALIAS>
 <!--59ED9B23854A4B048CBBAE38436B99C2--></AD_TABLE>
 
@@ -326,26 +329,4 @@
 <!--FF80808130BB89090130BB8E3D7E0012-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--FF80808130BB89090130BB8E3D7E0012--></AD_TABLE>
 
-<!--FF808081331848750133184B38D20009--><AD_TABLE>
-<!--FF808081331848750133184B38D20009-->  <AD_TABLE_ID><![CDATA[FF808081331848750133184B38D20009]]></AD_TABLE_ID>
-<!--FF808081331848750133184B38D20009-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--FF808081331848750133184B38D20009-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--FF808081331848750133184B38D20009-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FF808081331848750133184B38D20009-->  <NAME><![CDATA[APRM_Rec_Detail_v]]></NAME>
-<!--FF808081331848750133184B38D20009-->  <TABLENAME><![CDATA[APRM_Rec_Detail_v]]></TABLENAME>
-<!--FF808081331848750133184B38D20009-->  <CLASSNAME><![CDATA[ReconciliationDetail]]></CLASSNAME>
-<!--FF808081331848750133184B38D20009-->  <ISVIEW><![CDATA[Y]]></ISVIEW>
-<!--FF808081331848750133184B38D20009-->  <ACCESSLEVEL><![CDATA[1]]></ACCESSLEVEL>
-<!--FF808081331848750133184B38D20009-->  <ISSECURITYENABLED><![CDATA[N]]></ISSECURITYENABLED>
-<!--FF808081331848750133184B38D20009-->  <ISDELETEABLE><![CDATA[N]]></ISDELETEABLE>
-<!--FF808081331848750133184B38D20009-->  <ISHIGHVOLUME><![CDATA[N]]></ISHIGHVOLUME>
-<!--FF808081331848750133184B38D20009-->  <IMPORTTABLE><![CDATA[N]]></IMPORTTABLE>
-<!--FF808081331848750133184B38D20009-->  <ISCHANGELOG><![CDATA[N]]></ISCHANGELOG>
-<!--FF808081331848750133184B38D20009-->  <ISDEFAULTACCT><![CDATA[N]]></ISDEFAULTACCT>
-<!--FF808081331848750133184B38D20009-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--FF808081331848750133184B38D20009-->  <AD_PACKAGE_ID><![CDATA[AC33B2262748414A816510545755435A]]></AD_PACKAGE_ID>
-<!--FF808081331848750133184B38D20009-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
-<!--FF808081331848750133184B38D20009-->  <ISTREE><![CDATA[N]]></ISTREE>
-<!--FF808081331848750133184B38D20009--></AD_TABLE>
-
 </data>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBCQL_QUERY_COLUMN.xml	Mon Jan 05 12:18:46 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<data>
-<!--FF80808133186ADD01331B407CE5001D--><OBCQL_QUERY_COLUMN>
-<!--FF80808133186ADD01331B407CE5001D-->  <OBCQL_QUERY_COLUMN_ID><![CDATA[FF80808133186ADD01331B407CE5001D]]></OBCQL_QUERY_COLUMN_ID>
-<!--FF80808133186ADD01331B407CE5001D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--FF80808133186ADD01331B407CE5001D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--FF80808133186ADD01331B407CE5001D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FF80808133186ADD01331B407CE5001D-->  <OBCQL_WIDGET_QUERY_ID><![CDATA[FF80808133186ADD01331B3B733B0011]]></OBCQL_WIDGET_QUERY_ID>
-<!--FF80808133186ADD01331B407CE5001D-->  <DISPLAY_EXPRESSION><![CDATA[regType]]></DISPLAY_EXPRESSION>
-<!--FF80808133186ADD01331B407CE5001D-->  <NAME><![CDATA[Item Type]]></NAME>
-<!--FF80808133186ADD01331B407CE5001D-->  <WIDTH><![CDATA[40]]></WIDTH>
-<!--FF80808133186ADD01331B407CE5001D-->  <SEQNO><![CDATA[10]]></SEQNO>
-<!--FF80808133186ADD01331B407CE5001D-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
-<!--FF80808133186ADD01331B407CE5001D-->  <INCLUDE_IN><![CDATA[W]]></INCLUDE_IN>
-<!--FF80808133186ADD01331B407CE5001D-->  <HAS_LINK><![CDATA[N]]></HAS_LINK>
-<!--FF80808133186ADD01331B407CE5001D-->  <CAN_BE_FILTERED><![CDATA[N]]></CAN_BE_FILTERED>
-<!--FF80808133186ADD01331B407CE5001D--></OBCQL_QUERY_COLUMN>
-
-<!--FF80808133186ADD01331B41475B0022--><OBCQL_QUERY_COLUMN>
-<!--FF80808133186ADD01331B41475B0022-->  <OBCQL_QUERY_COLUMN_ID><![CDATA[FF80808133186ADD01331B41475B0022]]></OBCQL_QUERY_COLUMN_ID>
-<!--FF80808133186ADD01331B41475B0022-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--FF80808133186ADD01331B41475B0022-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--FF80808133186ADD01331B41475B0022-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FF80808133186ADD01331B41475B0022-->  <OBCQL_WIDGET_QUERY_ID><![CDATA[FF80808133186ADD01331B3B733B0011]]></OBCQL_WIDGET_QUERY_ID>
-<!--FF80808133186ADD01331B41475B0022-->  <DISPLAY_EXPRESSION><![CDATA[itemNo]]></DISPLAY_EXPRESSION>
-<!--FF80808133186ADD01331B41475B0022-->  <NAME><![CDATA[Item No]]></NAME>
-<!--FF80808133186ADD01331B41475B0022-->  <WIDTH><![CDATA[30]]></WIDTH>
-<!--FF80808133186ADD01331B41475B0022-->  <SEQNO><![CDATA[20]]></SEQNO>
-<!--FF80808133186ADD01331B41475B0022-->  <AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID>
-<!--FF80808133186ADD01331B41475B0022-->  <INCLUDE_IN><![CDATA[W]]></INCLUDE_IN>
-<!--FF80808133186ADD01331B41475B0022-->  <HAS_LINK><![CDATA[N]]></HAS_LINK>
-<!--FF80808133186ADD01331B41475B0022-->  <CAN_BE_FILTERED><![CDATA[N]]></CAN_BE_FILTERED>
-<!--FF80808133186ADD01331B41475B0022--></OBCQL_QUERY_COLUMN>
-
-<!--FF80808133186ADD01331B41D7830027--><OBCQL_QUERY_COLUMN>
-<!--FF80808133186ADD01331B41D7830027-->  <OBCQL_QUERY_COLUMN_ID><![CDATA[FF80808133186ADD01331B41D7830027]]></OBCQL_QUERY_COLUMN_ID>
-<!--FF80808133186ADD01331B41D7830027-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--FF80808133186ADD01331B41D7830027-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--FF80808133186ADD01331B41D7830027-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FF80808133186ADD01331B41D7830027-->  <OBCQL_WIDGET_QUERY_ID><![CDATA[FF80808133186ADD01331B3B733B0011]]></OBCQL_WIDGET_QUERY_ID>
-<!--FF80808133186ADD01331B41D7830027-->  <DISPLAY_EXPRESSION><![CDATA[itemAmt]]></DISPLAY_EXPRESSION>
-<!--FF80808133186ADD01331B41D7830027-->  <NAME><![CDATA[Item Amount]]></NAME>
-<!--FF80808133186ADD01331B41D7830027-->  <WIDTH><![CDATA[30]]></WIDTH>
-<!--FF80808133186ADD01331B41D7830027-->  <SEQNO><![CDATA[30]]></SEQNO>
-<!--FF80808133186ADD01331B41D7830027-->  <AD_REFERENCE_ID><![CDATA[12]]></AD_REFERENCE_ID>
-<!--FF80808133186ADD01331B41D7830027-->  <INCLUDE_IN><![CDATA[W]]></INCLUDE_IN>
-<!--FF80808133186ADD01331B41D7830027-->  <HAS_LINK><![CDATA[N]]></HAS_LINK>
-<!--FF80808133186ADD01331B41D7830027-->  <CAN_BE_FILTERED><![CDATA[N]]></CAN_BE_FILTERED>
-<!--FF80808133186ADD01331B41D7830027--></OBCQL_QUERY_COLUMN>
-
-</data>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBCQL_WIDGET_QUERY.xml	Mon Jan 05 12:18:46 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<data>
-<!--FF80808133186ADD01331B3B733B0011--><OBCQL_WIDGET_QUERY>
-<!--FF80808133186ADD01331B3B733B0011-->  <OBCQL_WIDGET_QUERY_ID><![CDATA[FF80808133186ADD01331B3B733B0011]]></OBCQL_WIDGET_QUERY_ID>
-<!--FF80808133186ADD01331B3B733B0011-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--FF80808133186ADD01331B3B733B0011-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--FF80808133186ADD01331B3B733B0011-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FF80808133186ADD01331B3B733B0011-->  <OBKMO_WIDGET_CLASS_ID><![CDATA[FF80808133186ADD01331B3A932C000D]]></OBKMO_WIDGET_CLASS_ID>
-<!--FF80808133186ADD01331B3B733B0011-->  <HQL><![CDATA[select ad_message_get2(m.searchKey, :language) as regType, a.reconciledItems as itemNo, a.reconciledItemsAmount as itemAmt
-from APRM_Rec_Detail_v as a, ADMessage as m
-where a.type = m.searchKey and a.reconciliation.id = :reconciliationId]]></HQL>
-<!--FF80808133186ADD01331B3B733B0011-->  <TYPE><![CDATA[HQL]]></TYPE>
-<!--FF80808133186ADD01331B3B733B0011--></OBCQL_WIDGET_QUERY>
-
-</data>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml	Mon Jan 05 12:18:46 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<data>
-<!--FF80808133186ADD01331B3A932C000D--><OBKMO_WIDGET_CLASS>
-<!--FF80808133186ADD01331B3A932C000D-->  <OBKMO_WIDGET_CLASS_ID><![CDATA[FF80808133186ADD01331B3A932C000D]]></OBKMO_WIDGET_CLASS_ID>
-<!--FF80808133186ADD01331B3A932C000D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--FF80808133186ADD01331B3A932C000D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--FF80808133186ADD01331B3A932C000D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FF80808133186ADD01331B3A932C000D-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--FF80808133186ADD01331B3A932C000D-->  <TITLE><![CDATA[Reconciliation Details]]></TITLE>
-<!--FF80808133186ADD01331B3A932C000D-->  <HEIGHT><![CDATA[300]]></HEIGHT>
-<!--FF80808133186ADD01331B3A932C000D-->  <ALLOW_ANONYMOUS_ACCESS><![CDATA[Y]]></ALLOW_ANONYMOUS_ACCESS>
-<!--FF80808133186ADD01331B3A932C000D-->  <ISSUPERCLASS><![CDATA[N]]></ISSUPERCLASS>
-<!--FF80808133186ADD01331B3A932C000D-->  <WIDGET_SUPERCLASS_ID><![CDATA[2A32CF26F3F64FE39C7F94E9D82497D1]]></WIDGET_SUPERCLASS_ID>
-<!--FF80808133186ADD01331B3A932C000D-->  <CAN_MAXIMIZE><![CDATA[N]]></CAN_MAXIMIZE>
-<!--FF80808133186ADD01331B3A932C000D-->  <ACCESSLEVEL><![CDATA[1]]></ACCESSLEVEL>
-<!--FF80808133186ADD01331B3A932C000D--></OBKMO_WIDGET_CLASS>
-
-</data>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBKMO_WIDGET_REFERENCE.xml	Mon Jan 05 12:18:46 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<data>
-<!--FF80808133186ADD01331B465E32002D--><OBKMO_WIDGET_REFERENCE>
-<!--FF80808133186ADD01331B465E32002D-->  <AD_REFERENCE_ID><![CDATA[FF80808133186ADD01331B465E32002D]]></AD_REFERENCE_ID>
-<!--FF80808133186ADD01331B465E32002D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--FF80808133186ADD01331B465E32002D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--FF80808133186ADD01331B465E32002D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FF80808133186ADD01331B465E32002D-->  <OBKMO_WIDGET_CLASS_ID><![CDATA[FF80808133186ADD01331B3A932C000D]]></OBKMO_WIDGET_CLASS_ID>
-<!--FF80808133186ADD01331B465E32002D-->  <SHOWFIELDTITLE><![CDATA[Y]]></SHOWFIELDTITLE>
-<!--FF80808133186ADD01331B465E32002D--></OBKMO_WIDGET_REFERENCE>
-
-</data>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -75,29 +75,6 @@
 <!--075F4BA7A03F4548A7A501BAFD073DEE-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
 <!--075F4BA7A03F4548A7A501BAFD073DEE--></OBUIAPP_PARAMETER>
 
-<!--0A9E075CCC6E4D59AAC37E3AEF1FE269--><OBUIAPP_PARAMETER>
-<!--0A9E075CCC6E4D59AAC37E3AEF1FE269-->  <OBUIAPP_PARAMETER_ID><![CDATA[0A9E075CCC6E4D59AAC37E3AEF1FE269]]></OBUIAPP_PARAMETER_ID>
-<!--0A9E075CCC6E4D59AAC37E3AEF1FE269-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--0A9E075CCC6E4D59AAC37E3AEF1FE269-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--0A9E075CCC6E4D59AAC37E3AEF1FE269-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--0A9E075CCC6E4D59AAC37E3AEF1FE269-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--0A9E075CCC6E4D59AAC37E3AEF1FE269-->  <NAME><![CDATA[Show all data]]></NAME>
-<!--0A9E075CCC6E4D59AAC37E3AEF1FE269-->  <SEQNO><![CDATA[10]]></SEQNO>
-<!--0A9E075CCC6E4D59AAC37E3AEF1FE269-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
-<!--0A9E075CCC6E4D59AAC37E3AEF1FE269-->  <COLUMNNAME><![CDATA[showAll]]></COLUMNNAME>
-<!--0A9E075CCC6E4D59AAC37E3AEF1FE269-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--0A9E075CCC6E4D59AAC37E3AEF1FE269-->  <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
-<!--0A9E075CCC6E4D59AAC37E3AEF1FE269-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
-<!--0A9E075CCC6E4D59AAC37E3AEF1FE269-->  <DEFAULTVALUE><![CDATA[false]]></DEFAULTVALUE>
-<!--0A9E075CCC6E4D59AAC37E3AEF1FE269-->  <AD_ELEMENT_ID><![CDATA[9A0C92898CEE7AC8E040007F01003160]]></AD_ELEMENT_ID>
-<!--0A9E075CCC6E4D59AAC37E3AEF1FE269-->  <ISFIXED><![CDATA[N]]></ISFIXED>
-<!--0A9E075CCC6E4D59AAC37E3AEF1FE269-->  <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE>
-<!--0A9E075CCC6E4D59AAC37E3AEF1FE269-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
-<!--0A9E075CCC6E4D59AAC37E3AEF1FE269-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
-<!--0A9E075CCC6E4D59AAC37E3AEF1FE269-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
-<!--0A9E075CCC6E4D59AAC37E3AEF1FE269-->  <EM_OBKMO_WIDGET_CLASS_ID><![CDATA[FF80808133186ADD01331B3A932C000D]]></EM_OBKMO_WIDGET_CLASS_ID>
-<!--0A9E075CCC6E4D59AAC37E3AEF1FE269--></OBUIAPP_PARAMETER>
-
 <!--0B13DC2C52424F36BDAFC790A0AB5886--><OBUIAPP_PARAMETER>
 <!--0B13DC2C52424F36BDAFC790A0AB5886-->  <OBUIAPP_PARAMETER_ID><![CDATA[0B13DC2C52424F36BDAFC790A0AB5886]]></OBUIAPP_PARAMETER_ID>
 <!--0B13DC2C52424F36BDAFC790A0AB5886-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -386,29 +363,6 @@
 <!--200C902859B746D5BDDC773D0C91C1BB-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
 <!--200C902859B746D5BDDC773D0C91C1BB--></OBUIAPP_PARAMETER>
 
-<!--2653B134344A4BBEBA417F6CFEDE8D91--><OBUIAPP_PARAMETER>
-<!--2653B134344A4BBEBA417F6CFEDE8D91-->  <OBUIAPP_PARAMETER_ID><![CDATA[2653B134344A4BBEBA417F6CFEDE8D91]]></OBUIAPP_PARAMETER_ID>
-<!--2653B134344A4BBEBA417F6CFEDE8D91-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--2653B134344A4BBEBA417F6CFEDE8D91-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--2653B134344A4BBEBA417F6CFEDE8D91-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--2653B134344A4BBEBA417F6CFEDE8D91-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--2653B134344A4BBEBA417F6CFEDE8D91-->  <NAME><![CDATA[Number of Rows]]></NAME>
-<!--2653B134344A4BBEBA417F6CFEDE8D91-->  <SEQNO><![CDATA[0]]></SEQNO>
-<!--2653B134344A4BBEBA417F6CFEDE8D91-->  <AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID>
-<!--2653B134344A4BBEBA417F6CFEDE8D91-->  <COLUMNNAME><![CDATA[RowsNumber]]></COLUMNNAME>
-<!--2653B134344A4BBEBA417F6CFEDE8D91-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--2653B134344A4BBEBA417F6CFEDE8D91-->  <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
-<!--2653B134344A4BBEBA417F6CFEDE8D91-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
-<!--2653B134344A4BBEBA417F6CFEDE8D91-->  <DEFAULTVALUE><![CDATA[4]]></DEFAULTVALUE>
-<!--2653B134344A4BBEBA417F6CFEDE8D91-->  <AD_ELEMENT_ID><![CDATA[9A0C92898CF17AC8E040007F01003160]]></AD_ELEMENT_ID>
-<!--2653B134344A4BBEBA417F6CFEDE8D91-->  <ISFIXED><![CDATA[N]]></ISFIXED>
-<!--2653B134344A4BBEBA417F6CFEDE8D91-->  <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE>
-<!--2653B134344A4BBEBA417F6CFEDE8D91-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
-<!--2653B134344A4BBEBA417F6CFEDE8D91-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
-<!--2653B134344A4BBEBA417F6CFEDE8D91-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
-<!--2653B134344A4BBEBA417F6CFEDE8D91-->  <EM_OBKMO_WIDGET_CLASS_ID><![CDATA[FF80808133186ADD01331B3A932C000D]]></EM_OBKMO_WIDGET_CLASS_ID>
-<!--2653B134344A4BBEBA417F6CFEDE8D91--></OBUIAPP_PARAMETER>
-
 <!--2AC4B53D136E4167B673265DAF6660DA--><OBUIAPP_PARAMETER>
 <!--2AC4B53D136E4167B673265DAF6660DA-->  <OBUIAPP_PARAMETER_ID><![CDATA[2AC4B53D136E4167B673265DAF6660DA]]></OBUIAPP_PARAMETER_ID>
 <!--2AC4B53D136E4167B673265DAF6660DA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1812,12 +1766,12 @@
 <!--E2FB4840B65A44D4B3090A7E3C95FD95-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--E2FB4840B65A44D4B3090A7E3C95FD95-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--E2FB4840B65A44D4B3090A7E3C95FD95-->  <NAME><![CDATA[Payment Date]]></NAME>
-<!--E2FB4840B65A44D4B3090A7E3C95FD95-->  <DESCRIPTION><![CDATA[Date of the payment event. It is used in the posting record of the Payment to the general ledger. Defaulted to the Invoice Date field.]]></DESCRIPTION>
-<!--E2FB4840B65A44D4B3090A7E3C95FD95-->  <HELP><![CDATA[Date of the payment event. It is used in the posting record of the Payment to the general ledger. Defaulted to the Invoice Date field.]]></HELP>
+<!--E2FB4840B65A44D4B3090A7E3C95FD95-->  <DESCRIPTION><![CDATA[Date of the payment event. It is used in the posting record of the Payment to the general ledger as accounting date. Defaulted to the current date, it can always be changed.]]></DESCRIPTION>
+<!--E2FB4840B65A44D4B3090A7E3C95FD95-->  <HELP><![CDATA[Date of the payment event. It is used in the posting record of the Payment to the general ledger as accounting date. Defaulted to the current date, it can always be changed.]]></HELP>
 <!--E2FB4840B65A44D4B3090A7E3C95FD95-->  <SEQNO><![CDATA[90]]></SEQNO>
 <!--E2FB4840B65A44D4B3090A7E3C95FD95-->  <AD_REFERENCE_ID><![CDATA[15]]></AD_REFERENCE_ID>
 <!--E2FB4840B65A44D4B3090A7E3C95FD95-->  <COLUMNNAME><![CDATA[payment_date]]></COLUMNNAME>
-<!--E2FB4840B65A44D4B3090A7E3C95FD95-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--E2FB4840B65A44D4B3090A7E3C95FD95-->  <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED>
 <!--E2FB4840B65A44D4B3090A7E3C95FD95-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
 <!--E2FB4840B65A44D4B3090A7E3C95FD95-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
 <!--E2FB4840B65A44D4B3090A7E3C95FD95-->  <DEFAULTVALUE><![CDATA[OB.getFilterExpression("org.openbravo.advpaymentmngt.filterexpression.AddPaymentDefaultValuesExpression")]]></DEFAULTVALUE>
@@ -2130,50 +2084,4 @@
 <!--FDF5AB17A1154D6AB440E1F5A02B45F5-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
 <!--FDF5AB17A1154D6AB440E1F5A02B45F5--></OBUIAPP_PARAMETER>
 
-<!--FF808081331B5EE901331B68C4540018--><OBUIAPP_PARAMETER>
-<!--FF808081331B5EE901331B68C4540018-->  <OBUIAPP_PARAMETER_ID><![CDATA[FF808081331B5EE901331B68C4540018]]></OBUIAPP_PARAMETER_ID>
-<!--FF808081331B5EE901331B68C4540018-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--FF808081331B5EE901331B68C4540018-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--FF808081331B5EE901331B68C4540018-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FF808081331B5EE901331B68C4540018-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--FF808081331B5EE901331B68C4540018-->  <NAME><![CDATA[reconciliationId]]></NAME>
-<!--FF808081331B5EE901331B68C4540018-->  <SEQNO><![CDATA[30]]></SEQNO>
-<!--FF808081331B5EE901331B68C4540018-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
-<!--FF808081331B5EE901331B68C4540018-->  <COLUMNNAME><![CDATA[reconciliationId]]></COLUMNNAME>
-<!--FF808081331B5EE901331B68C4540018-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--FF808081331B5EE901331B68C4540018-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
-<!--FF808081331B5EE901331B68C4540018-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--FF808081331B5EE901331B68C4540018-->  <DEFAULTVALUE><![CDATA[${formValues.id}]]></DEFAULTVALUE>
-<!--FF808081331B5EE901331B68C4540018-->  <AD_ELEMENT_ID><![CDATA[720C4FC08FBD43419FF7EACABECA6AE3]]></AD_ELEMENT_ID>
-<!--FF808081331B5EE901331B68C4540018-->  <ISFIXED><![CDATA[N]]></ISFIXED>
-<!--FF808081331B5EE901331B68C4540018-->  <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE>
-<!--FF808081331B5EE901331B68C4540018-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
-<!--FF808081331B5EE901331B68C4540018-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
-<!--FF808081331B5EE901331B68C4540018-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
-<!--FF808081331B5EE901331B68C4540018-->  <EM_OBKMO_WIDGET_CLASS_ID><![CDATA[FF80808133186ADD01331B3A932C000D]]></EM_OBKMO_WIDGET_CLASS_ID>
-<!--FF808081331B5EE901331B68C4540018--></OBUIAPP_PARAMETER>
-
-<!--FF808081332719060133276EBC680065--><OBUIAPP_PARAMETER>
-<!--FF808081332719060133276EBC680065-->  <OBUIAPP_PARAMETER_ID><![CDATA[FF808081332719060133276EBC680065]]></OBUIAPP_PARAMETER_ID>
-<!--FF808081332719060133276EBC680065-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--FF808081332719060133276EBC680065-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--FF808081332719060133276EBC680065-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FF808081332719060133276EBC680065-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--FF808081332719060133276EBC680065-->  <NAME><![CDATA[language]]></NAME>
-<!--FF808081332719060133276EBC680065-->  <SEQNO><![CDATA[0]]></SEQNO>
-<!--FF808081332719060133276EBC680065-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
-<!--FF808081332719060133276EBC680065-->  <COLUMNNAME><![CDATA[language]]></COLUMNNAME>
-<!--FF808081332719060133276EBC680065-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--FF808081332719060133276EBC680065-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
-<!--FF808081332719060133276EBC680065-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
-<!--FF808081332719060133276EBC680065-->  <AD_ELEMENT_ID><![CDATA[77E12B7AAB9F45BF9D3263E5967A696A]]></AD_ELEMENT_ID>
-<!--FF808081332719060133276EBC680065-->  <ISFIXED><![CDATA[Y]]></ISFIXED>
-<!--FF808081332719060133276EBC680065-->  <FIXEDVALUE><![CDATA[OB.getContext().getLanguage().getLanguage()]]></FIXEDVALUE>
-<!--FF808081332719060133276EBC680065-->  <EVALUATEFIXEDVALUE><![CDATA[Y]]></EVALUATEFIXEDVALUE>
-<!--FF808081332719060133276EBC680065-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
-<!--FF808081332719060133276EBC680065-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
-<!--FF808081332719060133276EBC680065-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
-<!--FF808081332719060133276EBC680065-->  <EM_OBKMO_WIDGET_CLASS_ID><![CDATA[FF80808133186ADD01331B3A932C000D]]></EM_OBKMO_WIDGET_CLASS_ID>
-<!--FF808081332719060133276EBC680065--></OBUIAPP_PARAMETER>
-
 </data>
--- a/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/AlertsForWrongInvoices_data.xsql	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/AlertsForWrongInvoices_data.xsql	Mon Jan 05 16:47:23 2015 +0100
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
  ************************************************************************************
- * Copyright (C) 2011 Openbravo S.L.U.
+ * Copyright (C) 2011 - 2014 Openbravo S.L.U.
  * Licensed under the Openbravo Commercial License version 1.0
  * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
  * or in the legal folder of this module distribution.
@@ -50,7 +50,6 @@
        SELECT COUNT(*) AS EXISTING
        FROM AD_ALERTRULE
        WHERE NAME = ?
-         AND ISACTIVE = 'Y'
          AND AD_CLIENT_ID = ?
       ]]>
     </Sql>
--- a/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/src/org/openbravo/advpaymentmngt/modulescript/AlertsForWrongInvoicesData.java	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/src/org/openbravo/advpaymentmngt/modulescript/AlertsForWrongInvoicesData.java	Mon Jan 05 16:47:23 2015 +0100
@@ -29,21 +29,21 @@
   }
 
   public String getField(String fieldName) {
-    if (fieldName.equalsIgnoreCase("AD_CLIENT_ID") || fieldName.equals("adClientId"))
+    if (fieldName.equalsIgnoreCase("ad_client_id") || fieldName.equals("adClientId"))
       return adClientId;
-    else if (fieldName.equalsIgnoreCase("INVOICE"))
+    else if (fieldName.equalsIgnoreCase("invoice"))
       return invoice;
-    else if (fieldName.equalsIgnoreCase("C_INVOICE_ID") || fieldName.equals("cInvoiceId"))
+    else if (fieldName.equalsIgnoreCase("c_invoice_id") || fieldName.equals("cInvoiceId"))
       return cInvoiceId;
-    else if (fieldName.equalsIgnoreCase("AD_ORG_ID") || fieldName.equals("adOrgId"))
+    else if (fieldName.equalsIgnoreCase("ad_org_id") || fieldName.equals("adOrgId"))
       return adOrgId;
-    else if (fieldName.equalsIgnoreCase("ISSOTRX"))
+    else if (fieldName.equalsIgnoreCase("issotrx"))
       return issotrx;
-    else if (fieldName.equalsIgnoreCase("AD_ROLE_ID") || fieldName.equals("adRoleId"))
+    else if (fieldName.equalsIgnoreCase("ad_role_id") || fieldName.equals("adRoleId"))
       return adRoleId;
-    else if (fieldName.equalsIgnoreCase("AD_ALERTRULE_ID") || fieldName.equals("adAlertruleId"))
+    else if (fieldName.equalsIgnoreCase("ad_alertrule_id") || fieldName.equals("adAlertruleId"))
       return adAlertruleId;
-    else if (fieldName.equalsIgnoreCase("AD_ALERT_ID") || fieldName.equals("adAlertId"))
+    else if (fieldName.equalsIgnoreCase("ad_alert_id") || fieldName.equals("adAlertId"))
       return adAlertId;
    else {
      log4j.debug("Field does not exist: " + fieldName);
@@ -86,14 +86,14 @@
       while(continueResult && result.next()) {
         countRecord++;
         AlertsForWrongInvoicesData objectAlertsForWrongInvoicesData = new AlertsForWrongInvoicesData();
-        objectAlertsForWrongInvoicesData.adClientId = UtilSql.getValue(result, "AD_CLIENT_ID");
-        objectAlertsForWrongInvoicesData.invoice = UtilSql.getValue(result, "INVOICE");
-        objectAlertsForWrongInvoicesData.cInvoiceId = UtilSql.getValue(result, "C_INVOICE_ID");
-        objectAlertsForWrongInvoicesData.adOrgId = UtilSql.getValue(result, "AD_ORG_ID");
-        objectAlertsForWrongInvoicesData.issotrx = UtilSql.getValue(result, "ISSOTRX");
-        objectAlertsForWrongInvoicesData.adRoleId = UtilSql.getValue(result, "AD_ROLE_ID");
-        objectAlertsForWrongInvoicesData.adAlertruleId = UtilSql.getValue(result, "AD_ALERTRULE_ID");
-        objectAlertsForWrongInvoicesData.adAlertId = UtilSql.getValue(result, "AD_ALERT_ID");
+        objectAlertsForWrongInvoicesData.adClientId = UtilSql.getValue(result, "ad_client_id");
+        objectAlertsForWrongInvoicesData.invoice = UtilSql.getValue(result, "invoice");
+        objectAlertsForWrongInvoicesData.cInvoiceId = UtilSql.getValue(result, "c_invoice_id");
+        objectAlertsForWrongInvoicesData.adOrgId = UtilSql.getValue(result, "ad_org_id");
+        objectAlertsForWrongInvoicesData.issotrx = UtilSql.getValue(result, "issotrx");
+        objectAlertsForWrongInvoicesData.adRoleId = UtilSql.getValue(result, "ad_role_id");
+        objectAlertsForWrongInvoicesData.adAlertruleId = UtilSql.getValue(result, "ad_alertrule_id");
+        objectAlertsForWrongInvoicesData.adAlertId = UtilSql.getValue(result, "ad_alert_id");
         objectAlertsForWrongInvoicesData.InitRecordNumber = Integer.toString(firstRegister);
         vector.addElement(objectAlertsForWrongInvoicesData);
         if (countRecord >= numberRegisters && numberRegisters != 0) {
@@ -164,8 +164,8 @@
       while(continueResult && result.next()) {
         countRecord++;
         AlertsForWrongInvoicesData objectAlertsForWrongInvoicesData = new AlertsForWrongInvoicesData();
-        objectAlertsForWrongInvoicesData.cInvoiceId = UtilSql.getValue(result, "C_INVOICE_ID");
-        objectAlertsForWrongInvoicesData.adAlertId = UtilSql.getValue(result, "AD_ALERT_ID");
+        objectAlertsForWrongInvoicesData.cInvoiceId = UtilSql.getValue(result, "c_invoice_id");
+        objectAlertsForWrongInvoicesData.adAlertId = UtilSql.getValue(result, "ad_alert_id");
         objectAlertsForWrongInvoicesData.InitRecordNumber = Integer.toString(firstRegister);
         vector.addElement(objectAlertsForWrongInvoicesData);
         if (countRecord >= numberRegisters && numberRegisters != 0) {
@@ -197,7 +197,6 @@
       "       SELECT COUNT(*) AS EXISTING" +
       "       FROM AD_ALERTRULE" +
       "       WHERE NAME = ?" +
-      "         AND ISACTIVE = 'Y'" +
       "         AND AD_CLIENT_ID = ?";
 
     ResultSet result;
@@ -212,7 +211,7 @@
 
       result = st.executeQuery();
       if(result.next()) {
-        boolReturn = !UtilSql.getValue(result, "EXISTING").equals("0");
+        boolReturn = !UtilSql.getValue(result, "existing").equals("0");
       }
       result.close();
     } catch(SQLException e){
@@ -252,7 +251,7 @@
 
       result = st.executeQuery();
       if(result.next()) {
-        boolReturn = !UtilSql.getValue(result, "EXISTING").equals("0");
+        boolReturn = !UtilSql.getValue(result, "existing").equals("0");
       }
       result.close();
     } catch(SQLException e){
@@ -292,7 +291,7 @@
 
       result = st.executeQuery();
       if(result.next()) {
-        strReturn = UtilSql.getValue(result, "NAME");
+        strReturn = UtilSql.getValue(result, "name");
       }
       result.close();
     } catch(SQLException e){
@@ -343,7 +342,7 @@
       while(continueResult && result.next()) {
         countRecord++;
         AlertsForWrongInvoicesData objectAlertsForWrongInvoicesData = new AlertsForWrongInvoicesData();
-        objectAlertsForWrongInvoicesData.adAlertruleId = UtilSql.getValue(result, "AD_ALERTRULE_ID");
+        objectAlertsForWrongInvoicesData.adAlertruleId = UtilSql.getValue(result, "ad_alertrule_id");
         objectAlertsForWrongInvoicesData.InitRecordNumber = Integer.toString(firstRegister);
         vector.addElement(objectAlertsForWrongInvoicesData);
         if (countRecord >= numberRegisters && numberRegisters != 0) {
@@ -403,7 +402,7 @@
       while(continueResult && result.next()) {
         countRecord++;
         AlertsForWrongInvoicesData objectAlertsForWrongInvoicesData = new AlertsForWrongInvoicesData();
-        objectAlertsForWrongInvoicesData.adRoleId = UtilSql.getValue(result, "AD_ROLE_ID");
+        objectAlertsForWrongInvoicesData.adRoleId = UtilSql.getValue(result, "ad_role_id");
         objectAlertsForWrongInvoicesData.InitRecordNumber = Integer.toString(firstRegister);
         vector.addElement(objectAlertsForWrongInvoicesData);
         if (countRecord >= numberRegisters && numberRegisters != 0) {
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/PaymentMethodMulticurrencyActionHandler.java	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/PaymentMethodMulticurrencyActionHandler.java	Mon Jan 05 16:47:23 2015 +0100
@@ -77,7 +77,7 @@
       }
       if (finAccPaymentMethod != null) {
         if (finAccPaymentMethod.getAccount().getCurrency().getId().equals(currencyId)) {
-          result.put("conversionrate", "1");
+          result.put("conversionrate", 1);
         } else {
           ConversionRate convRate = FinancialUtils.getConversionRate(paymentDate, OBDal
               .getInstance().get(Currency.class, currencyId), finAccPaymentMethod.getAccount()
@@ -86,14 +86,14 @@
           if (convRate != null) {
             result.put("conversionrate", convRate.getMultipleRateBy());
           } else {
-            result.put("conversionrate", "1");
+            result.put("conversionrate", 1);
           }
         }
         result.put("currencyToId", finAccPaymentMethod.getAccount().getCurrency().getId());
         result.put("currencyToIdentifier", finAccPaymentMethod.getAccount().getCurrency()
             .getIdentifier());
       } else {
-        result.put("conversionrate", "1");
+        result.put("conversionrate", 1);
         result.put("currencyToId", currencyId);
       }
       return result;
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java	Mon Jan 05 16:47:23 2015 +0100
@@ -153,7 +153,23 @@
             return;
           }
         }
+        // check BP currency
+        if ("CO".equals(strdocaction)) {
+            // check BP currency
+            if (invoice.getBusinessPartner().getCurrency() == null) {
+            	String errorMSG =  
+            			Utility.messageBD(this, "InitBPCurrencyLnk", vars.getLanguage(), false);
+               msg = new OBError();
+               msg.setType("Error");
+               msg.setTitle(Utility.messageBD(this, "Error", vars.getLanguage()));
+               msg.setMessage(String.format(errorMSG, invoice.getBusinessPartner().getId(), invoice.getBusinessPartner().getName()));
 
+               vars.setMessage(strTabId, msg);
+               printPageClosePopUp(response, vars, Utility.getTabURL(strTabId, "R", true));
+               return;
+            }
+        }
+        
         OBContext.setAdminMode(true);
         Process process = null;
         try {
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/hqlinjections/AddPaymentOrderInvoicesTransformer.java	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/hqlinjections/AddPaymentOrderInvoicesTransformer.java	Mon Jan 05 16:47:23 2015 +0100
@@ -109,7 +109,7 @@
     return transformedHql;
   }
 
-  private StringBuffer getSelectClause(String transactionType, boolean hasSelectedIds) {
+  protected StringBuffer getSelectClause(String transactionType, boolean hasSelectedIds) {
     StringBuffer selectClause = new StringBuffer();
     // Create Select Clause
     selectClause.append(getAggregatorFunction("psd.id") + " as paymentScheduleDetail, ");
@@ -161,7 +161,7 @@
     return selectClause;
   }
 
-  private StringBuffer getWhereClause(String transactionType,
+  protected StringBuffer getWhereClause(String transactionType,
       Map<String, String> requestParameters, List<String> selectedPSDs) {
     String strBusinessPartnerId = requestParameters.get("received_from");
     String strFinPaymentId = requestParameters.get("fin_payment_id");
@@ -244,7 +244,7 @@
 
   }
 
-  private StringBuffer getGroupByClause(String transactionType) {
+  protected StringBuffer getGroupByClause(String transactionType) {
     StringBuffer groupByClause = new StringBuffer();
     // Create GroupBy Clause
     if ("I".equals(transactionType)) {
@@ -279,7 +279,7 @@
    * @param transactionType
    * @return
    */
-  private StringBuffer getOrderByClause(String transactionType, List<String> selectedPSDs,
+  protected StringBuffer getOrderByClause(String transactionType, List<String> selectedPSDs,
       Map<String, String> requestParameters) {
     StringBuffer orderByClause = new StringBuffer();
     if (selectedPSDs.size() == 0) {
@@ -321,7 +321,7 @@
     return orderByClause;
   }
 
-  private String removeGridFilters(String _hqlQuery) {
+  protected String removeGridFilters(String _hqlQuery) {
     String hqlQuery = _hqlQuery;
     // Get the substring of grid filter inside where clause, if transaction type is "Orders" or
     // "Invoices", put in the having clause
@@ -343,7 +343,7 @@
    * @param queryNamedParameters
    * @return
    */
-  private String calculateHavingClause(String _hqlQuery, String transactionType,
+  protected String calculateHavingClause(String _hqlQuery, String transactionType,
       JSONObject criteria, Map<String, Object> queryNamedParameters) {
     String hqlQuery = _hqlQuery;
     StringBuffer havingClause = new StringBuffer();
@@ -470,7 +470,8 @@
    * @param orderByClause
    * @return
    */
-  private String appendOrderByClause(String _hqlQuery, StringBuffer orderByClause, boolean justCount) {
+  protected String appendOrderByClause(String _hqlQuery, StringBuffer orderByClause,
+      boolean justCount) {
     String hqlQuery = _hqlQuery;
     if (!justCount) {
       if (hqlQuery.contains(" ORDER BY ")) {
@@ -483,7 +484,7 @@
     return hqlQuery;
   }
 
-  private void transformCriteria(JSONObject buildCriteria, List<String> selectedPSDs)
+  protected void transformCriteria(JSONObject buildCriteria, List<String> selectedPSDs)
       throws JSONException {
     JSONArray criteriaArray = buildCriteria.getJSONArray("criteria");
     JSONArray newCriteriaArray = new JSONArray();
@@ -509,14 +510,14 @@
    * @param expression
    * @return
    */
-  private String getAggregatorFunction(String expression) {
+  protected String getAggregatorFunction(String expression) {
     return " hqlagg(" + expression + ")";
   }
 
   /**
    * @see HQLDataSourceService#replaceParametersWithAlias(Table, String)
    */
-  private String replaceParametersWithAlias(Table table, String whereClause) {
+  protected String replaceParametersWithAlias(Table table, String whereClause) {
     if (whereClause.trim().isEmpty()) {
       return whereClause;
     }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/hqlinjections/CreditToUseTransformer.java	Mon Jan 05 16:47:23 2015 +0100
@@ -0,0 +1,47 @@
+/*
+ *************************************************************************
+ * 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) 2014 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+ */
+
+package org.openbravo.advpaymentmngt.hqlinjections;
+
+import java.util.Map;
+
+import org.openbravo.client.kernel.ComponentProvider;
+import org.openbravo.service.datasource.hql.HqlQueryTransformer;
+
+@ComponentProvider.Qualifier("59ED9B23854A4B048CBBAE38436B99C2")
+public class CreditToUseTransformer extends HqlQueryTransformer {
+
+  @Override
+  public String transformHqlQuery(String hqlQuery, Map<String, String> requestParameters,
+      Map<String, Object> queryNamedParameters) {
+
+    String transformedHQL = hqlQuery.replace("@selectClause@", " ");
+    transformedHQL = transformedHQL.replace("@joinClause@", " ");
+    transformedHQL = transformedHQL.replace("@whereClause@",
+        getWhereClause(requestParameters, queryNamedParameters));
+
+    return transformedHQL;
+  }
+
+  private CharSequence getWhereClause(Map<String, String> requestParameters,
+      Map<String, Object> queryNamedParameters) {
+    return " ";
+  }
+
+}
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java	Mon Jan 05 16:47:23 2015 +0100
@@ -415,6 +415,18 @@
                         .getInvoicePaymentSchedule().getInvoice() : null;
                     paidAmount = BigDecimal.ZERO;
                     String fromCurrency = payment.getCurrency().getId();
+                    if (businessPartner.getCurrency() == null) {
+                    	String errorMSG = 
+                    			Utility.messageBD(conProvider, "InitBPCurrencyLnk", language, false);
+                    	
+                    	 msg.setType("Error");
+                         msg.setTitle(Utility.messageBD(conProvider, "Error", language));
+                         msg.setMessage(String.format(errorMSG, businessPartner.getId(), businessPartner.getName()));
+                         bundle.setResult(msg);
+                         OBDal.getInstance().rollbackAndClose();
+                         return;
+                    	
+                    }
                     String toCurrency = businessPartner.getCurrency().getId();
                     if (!fromCurrency.equals(toCurrency)) {
                       BigDecimal exchangeRate = BigDecimal.ZERO;
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_BankStatementImport.java	Mon Jan 05 16:47:23 2015 +0100
@@ -305,9 +305,11 @@
     OBContext.setAdminMode();
     try {
       whereClause.append(" as bsl ");
-      whereClause.append(" where translate(bsl." + FIN_BankStatementLine.PROPERTY_BPARTNERNAME
-          + ",'0123456789', '          ') = translate( ?,'0123456789', '          ')");
-      parameters.add(partnername);
+      whereClause
+          .append(" where translate(replace(bsl."
+              + FIN_BankStatementLine.PROPERTY_BPARTNERNAME
+              + ",' ', ''),'0123456789', '          ') = translate( replace(?,' ',''),'0123456789', '          ')");
+      parameters.add(partnername.replaceAll("\\r\\n|\\r|\\n", " "));
       whereClause.append(" and (bsl." + FIN_BankStatementLine.PROPERTY_BUSINESSPARTNER
           + " is not null or bsl." + FIN_BankStatementLine.PROPERTY_GLITEM + " is not null)");
       whereClause.append(" and bsl." + FIN_BankStatementLine.PROPERTY_BANKSTATEMENT + ".");
@@ -321,7 +323,7 @@
       final OBQuery<FIN_BankStatementLine> bsl = OBDal.getInstance().createQuery(
           FIN_BankStatementLine.class, whereClause.toString(), parameters);
       bsl.setFilterOnReadableOrganization(false);
-      // Just look in las 10 matches
+      // Just look in 10 matches
       bsl.setMaxResult(10);
       for (FIN_BankStatementLine line : bsl.list()) {
         if (line.getGLItem() != null && "".equals(result.get("GLItemID"))) {
--- a/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-matchStatement.js	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-matchStatement.js	Mon Jan 05 16:47:23 2015 +0100
@@ -102,18 +102,16 @@
         var processId = '154CB4F9274A479CB38A285E16984539',
             grid = me.grid,
             record = me.record,
-            standardWindow = grid.view.parentWindow.view.standardWindow, 
-            process, 
-            callback, 
-            bankStatementLineId = me.record.id, 
+            standardWindow = grid.view.parentWindow.view.standardWindow,
+            process, callback, bankStatementLineId = me.record.id,
             updated = new Date(),
             view = me.grid.view;
-            updated.setTime(me.record.bslUpdated.getTime());
-	    callback = function (response, data, request) {
-	      view.onRefreshFunction(view);
-	      if (data && data.message && data.message.severity === 'error') {
-	        view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR, data.message.title, data.message.text);
-	      }else{
+        updated.setTime(me.record.bslUpdated.getTime());
+        callback = function (response, data, request) {
+          view.onRefreshFunction(view);
+          if (data && data.message && data.message.severity === 'error') {
+            view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR, data.message.title, data.message.text);
+          } else {
             var process = standardWindow.openProcess({
               callerField: me,
               paramWindow: true,
@@ -125,11 +123,12 @@
               },
               windowTitle: OB.I18N.getLabel('APRM_MATCHTRANSACTION_SEARCH_BUTTON', [this.title])
             });
-	      }
-	    };
-	    OB.RemoteCallManager.call('org.openbravo.advpaymentmngt.actionHandler.CheckRecordChangedActionHandler', {
-	      bankStatementLineId: bankStatementLineId, updated: updated
-	    }, {}, callback);
+          }
+        };
+        OB.RemoteCallManager.call('org.openbravo.advpaymentmngt.actionHandler.CheckRecordChangedActionHandler', {
+          bankStatementLineId: bankStatementLineId,
+          updated: updated
+        }, {}, callback);
       }
     });
 
@@ -141,33 +140,32 @@
         var processId = 'E68790A7B65F4D45AB35E2BAE34C1F39',
             grid = me.grid,
             record = me.record,
-            standardWindow = grid.view.parentWindow.view.standardWindow, 
-            process, 
-            callback, 
-            bankStatementLineId = me.record.id, 
+            standardWindow = grid.view.parentWindow.view.standardWindow,
+            process, callback, bankStatementLineId = me.record.id,
             updated = new Date(),
             view = me.grid.view;
-            updated.setTime(me.record.bslUpdated.getTime());
-	    callback = function (response, data, request) {
-	      view.onRefreshFunction(view);
-	      if (data && data.message && data.message.severity === 'error') {
-	        view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR, data.message.title, data.message.text);
-	      }else{
-	        process = standardWindow.openProcess({
-	            callerField: me,
-	            paramWindow: true,
-	            processId: processId,
-	            windowId: grid.view.windowId,
-	            externalParams: {
-	              bankStatementLineId: me.record.id
-	            },
-	            windowTitle: OB.I18N.getLabel('APRM_MATCHTRANSACTION_ADD_BUTTON', [this.title])
-	          });
-	      }
-	    };
-	    OB.RemoteCallManager.call('org.openbravo.advpaymentmngt.actionHandler.CheckRecordChangedActionHandler', {
-	      bankStatementLineId: bankStatementLineId, updated: updated
-	    }, {}, callback);
+        updated.setTime(me.record.bslUpdated.getTime());
+        callback = function (response, data, request) {
+          view.onRefreshFunction(view);
+          if (data && data.message && data.message.severity === 'error') {
+            view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR, data.message.title, data.message.text);
+          } else {
+            process = standardWindow.openProcess({
+              callerField: me,
+              paramWindow: true,
+              processId: processId,
+              windowId: grid.view.windowId,
+              externalParams: {
+                bankStatementLineId: me.record.id
+              },
+              windowTitle: OB.I18N.getLabel('APRM_MATCHTRANSACTION_ADD_BUTTON', [this.title])
+            });
+          }
+        };
+        OB.RemoteCallManager.call('org.openbravo.advpaymentmngt.actionHandler.CheckRecordChangedActionHandler', {
+          bankStatementLineId: bankStatementLineId,
+          updated: updated
+        }, {}, callback);
       }
     });
 
@@ -177,10 +175,10 @@
       originalPrompt: OB.I18N.getLabel('APRM_MATCHTRANSACTION_DELETE_BUTTON'),
       prompt: OB.I18N.getLabel('APRM_MATCHTRANSACTION_DELETE_BUTTON'),
       action: function () {
-        var callback, bankStatementLineId = me.record.id, 
+        var callback, bankStatementLineId = me.record.id,
             updated = new Date(),
             view = me.grid.view;
-            updated.setTime(me.record.bslUpdated.getTime());
+        updated.setTime(me.record.bslUpdated.getTime());
         callback = function (response, data, request) {
           view.onRefreshFunction(view);
           if (data && data.message && data.message.severity === 'error') {
@@ -188,7 +186,8 @@
           }
         };
         OB.RemoteCallManager.call('org.openbravo.advpaymentmngt.actionHandler.UnMatchTransactionActionHandler', {
-          bankStatementLineId: bankStatementLineId, updated: updated
+          bankStatementLineId: bankStatementLineId,
+          updated: updated
         }, {}, callback);
       }
     });
--- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -6,7 +6,7 @@
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <NAME><![CDATA[JBoss Weld]]></NAME>
-<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.24984]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.25650]]></VERSION>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <DESCRIPTION><![CDATA[JBoss Weld]]></DESCRIPTION>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <HELP><![CDATA[Provides the JBoss Weld framework: Java Contexts and Dependency Injection for the Java EE platform (CDI). For more information see http://seamframework.org/Weld]]></HELP>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <URL><![CDATA[http://forge.openbravo.com/projects/weld]]></URL>
--- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -7,7 +7,7 @@
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <AD_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_MODULE_ID>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.24984]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.25650]]></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.base.weld/src/META-INF/beans.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.base.weld/src/META-INF/beans.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -7,7 +7,12 @@
     
     <weld:scan>
         <weld:include name="**"/>
-        <weld:exclude name="org.openbravo.erpCommon.**"/>
+        <weld:exclude name="org.openbravo.erpCommon.info.**"/>
+        <weld:exclude name="org.openbravo.erpCommon.modules.**"/>
+        <weld:exclude name="org.openbravo.erpCommon.obps.**"/>
+        <weld:exclude name="org.openbravo.erpCommon.reference.**"/>
+        <weld:exclude name="org.openbravo.erpCommon.security.**"/>
+        <weld:exclude name="org.openbravo.erpCommon.utility.**"/>
         <weld:exclude name="org.openbravo.erpWindows.**"/>
         <weld:exclude name="org.openbravo.base.exception.**"/>
         <weld:exclude name="org.openbravo.base.expression.**"/>
@@ -20,7 +25,6 @@
         <weld:exclude name="org.openbravo.base.util.**"/>
         <weld:exclude name="org.openbravo.base.validation.**"/>
         <weld:exclude name="org.openbravo.dal.**"/>
-        <weld:exclude name="org.openbravo.erpCommon.**"/> 
         <weld:exclude name="org.openbravo.erpReports.**"/>
         <weld:exclude name="org.openbravo.reference.**"/>
         <weld:exclude name="org.openbravo.scheduling.**"/>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -348,6 +348,18 @@
 <!--20EBBDD0DE864992AD7B8090D1126A06-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--20EBBDD0DE864992AD7B8090D1126A06--></AD_MESSAGE>
 
+<!--2333963CB96745B1BC645FEF9F92F269--><AD_MESSAGE>
+<!--2333963CB96745B1BC645FEF9F92F269-->  <AD_MESSAGE_ID><![CDATA[2333963CB96745B1BC645FEF9F92F269]]></AD_MESSAGE_ID>
+<!--2333963CB96745B1BC645FEF9F92F269-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2333963CB96745B1BC645FEF9F92F269-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2333963CB96745B1BC645FEF9F92F269-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2333963CB96745B1BC645FEF9F92F269-->  <VALUE><![CDATA[OBUIAPP_Image_Error_ERROR_UPLOADING]]></VALUE>
+<!--2333963CB96745B1BC645FEF9F92F269-->  <MSGTEXT><![CDATA[Error uploading image: %0]]></MSGTEXT>
+<!--2333963CB96745B1BC645FEF9F92F269-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--2333963CB96745B1BC645FEF9F92F269-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--2333963CB96745B1BC645FEF9F92F269-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--2333963CB96745B1BC645FEF9F92F269--></AD_MESSAGE>
+
 <!--2588E18549E74C79BD24F6717AF1DD8B--><AD_MESSAGE>
 <!--2588E18549E74C79BD24F6717AF1DD8B-->  <AD_MESSAGE_ID><![CDATA[2588E18549E74C79BD24F6717AF1DD8B]]></AD_MESSAGE_ID>
 <!--2588E18549E74C79BD24F6717AF1DD8B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -6,7 +6,7 @@
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <NAME><![CDATA[User Interface Application]]></NAME>
-<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.24984]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.25650]]></VERSION>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <DESCRIPTION><![CDATA[Provides the main application components for the openbravo user interface]]></DESCRIPTION>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <HELP><![CDATA[Provides the main application components for the openbravo user interface. The main layout incorporates a navigation bar and a main view area.]]></HELP>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <URL><![CDATA[http://forge.openbravo.com/projects/clientapplication]]></URL>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -7,7 +7,7 @@
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID>
-<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.24984]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.25650]]></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.24984]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->  <STARTVERSION><![CDATA[2.1.25650]]></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.24984]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->  <STARTVERSION><![CDATA[3.0.25650]]></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.24984]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->  <STARTVERSION><![CDATA[8.1.25650]]></STARTVERSION>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java	Mon Jan 05 16:47:23 2015 +0100
@@ -465,6 +465,7 @@
     }
     globalResources.add(createStaticResource("web/js/periodControlStatus.js", true));
     globalResources.add(createStaticResource("web/js/productCharacteristicsProcess.js", true));
+    globalResources.add(createStaticResource("web/js/validateCostingRuleProcess.js", true));
 
     return globalResources;
   }
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/MenuManager.java	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/MenuManager.java	Mon Jan 05 16:47:23 2015 +0100
@@ -30,13 +30,18 @@
 
 import org.hibernate.Hibernate;
 import org.hibernate.Query;
+import org.hibernate.criterion.Restrictions;
 import org.openbravo.base.session.SessionFactoryController;
 import org.openbravo.dal.core.DalUtil;
 import org.openbravo.dal.core.OBContext;
+import org.openbravo.dal.service.OBCriteria;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.erpCommon.obps.ActivationKey;
 import org.openbravo.erpCommon.obps.ActivationKey.FeatureRestriction;
 import org.openbravo.erpCommon.utility.Utility;
+import org.openbravo.model.ad.access.Role;
+import org.openbravo.model.ad.access.TabAccess;
+import org.openbravo.model.ad.access.WindowAccess;
 import org.openbravo.model.ad.ui.Form;
 import org.openbravo.model.ad.ui.Menu;
 import org.openbravo.model.ad.ui.MenuTrl;
@@ -311,8 +316,57 @@
       return Boolean.toString(isSingleRecord());
     }
 
+    /**
+     * This method returns true if the menu entry is read only. The menu entry will be read only
+     * either if the uipattern of its tab is "RO" (Read Only) or if the current role only has read
+     * only access to the tab or to its window
+     */
     public boolean isReadOnly() {
-      return getTab() != null && getTab().getUIPattern().equals("RO");
+      boolean tabIsReadOnlyForAll = getTab() != null && getTab().getUIPattern().equals("RO");
+      boolean tabIsReadOnlyForRole = isTabReadOnlyforRole();
+      return tabIsReadOnlyForAll || tabIsReadOnlyForRole;
+    }
+
+    /**
+     * Returns true if the tab is not editable by the current role by checking the WindowAccess and
+     * TabAccess entities
+     */
+    public boolean isTabReadOnlyforRole() {
+      boolean isReadOnly = false;
+      // If there is no tab there is nothing to check
+      if (getTab() == null) {
+        return false;
+      }
+      // Obtains the Window Access for the current role
+      Role role = OBContext.getOBContext().getRole();
+      OBCriteria<WindowAccess> windowAccessCriteria = OBDal.getInstance().createCriteria(
+          WindowAccess.class);
+      windowAccessCriteria.add(Restrictions.eq(WindowAccess.PROPERTY_ROLE, role));
+      windowAccessCriteria.add(Restrictions.eq(WindowAccess.PROPERTY_WINDOW, getTab().getWindow()));
+      WindowAccess windowAccess = (WindowAccess) windowAccessCriteria.uniqueResult();
+      if (windowAccess != null) {
+        // there is a window access defined for this window and this role
+        OBCriteria<TabAccess> tabAccessCriteria = OBDal.getInstance().createCriteria(
+            TabAccess.class);
+        tabAccessCriteria.add(Restrictions.eq(TabAccess.PROPERTY_TAB, tab));
+        tabAccessCriteria.add(Restrictions.eq(TabAccess.PROPERTY_WINDOWACCESS, windowAccess));
+        TabAccess tabAccess = (TabAccess) tabAccessCriteria.uniqueResult();
+        if (tabAccess != null) {
+          // there is a window access defined and a tab access defined too
+          // The menu entry will be read only if the tab is not editable by this role
+          isReadOnly = !tabAccess.isEditableField();
+          //
+        } else {
+          // There is a window access defined but there is not a tab access defined
+          // The menu entry will be read only if the window is not editable by this role
+          isReadOnly = !windowAccess.isEditableField();
+        }
+      } else {
+        // there is not a window access defined. the user should not even be capable of opening the
+        // window
+        isReadOnly = true;
+      }
+      return isReadOnly;
     }
 
     public String getReadOnlyStringValue() {
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/WindowPersonalizationEventHandler.java	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/WindowPersonalizationEventHandler.java	Mon Jan 05 16:47:23 2015 +0100
@@ -19,18 +19,25 @@
 
 package org.openbravo.client.application.event;
 
+import java.util.List;
+
 import javax.enterprise.event.Observes;
 
 import org.apache.log4j.Logger;
+import org.hibernate.criterion.Restrictions;
 import org.openbravo.base.exception.OBException;
 import org.openbravo.base.model.Entity;
 import org.openbravo.base.model.ModelProvider;
 import org.openbravo.client.application.UIPersonalization;
+import org.openbravo.client.kernel.event.EntityDeleteEvent;
 import org.openbravo.client.kernel.event.EntityPersistenceEventObserver;
 import org.openbravo.client.kernel.event.EntityUpdateEvent;
 import org.openbravo.dal.core.OBContext;
+import org.openbravo.dal.service.OBCriteria;
+import org.openbravo.dal.service.OBDal;
 import org.openbravo.database.ConnectionProvider;
 import org.openbravo.erpCommon.utility.Utility;
+import org.openbravo.model.ad.domain.Preference;
 import org.openbravo.model.ad.ui.Tab;
 import org.openbravo.model.ad.ui.Window;
 import org.openbravo.service.db.DalConnectionProvider;
@@ -46,8 +53,7 @@
     return entities;
   }
 
-  public void onUpdate(@Observes
-  EntityUpdateEvent event) {
+  public void onUpdate(@Observes EntityUpdateEvent event) {
     if (!isValidEvent(event)) {
       return;
     }
@@ -66,4 +72,49 @@
       throw new OBException(Utility.messageBD(conn, "OBUIAPP_TabFieldMandatory", language));
     }
   }
+
+  public void onDelete(@Observes EntityDeleteEvent event) {
+    if (!isValidEvent(event)) {
+      return;
+    }
+    final UIPersonalization uiPersonalization = (UIPersonalization) event.getTargetInstance();
+    deleteDefaultViewPreferences(uiPersonalization);
+  }
+
+  /**
+   * Given an UIPersonalization, deletes the OBUIAPP_DefaultSavedView preferences that reference it
+   */
+  private void deleteDefaultViewPreferences(UIPersonalization uiPersonalization) {
+    try {
+      List<Preference> preferenceList = this
+          .getDefaultViewPreferencesForUiPersonalization(uiPersonalization);
+      // don't do a client access check, the preference to delete might belong to another client
+      // (i.e. System)
+      OBContext.setAdminMode(false);
+      for (Preference preference : preferenceList) {
+        OBDal.getInstance().remove(preference);
+      }
+    } catch (Exception e) {
+      logger.error("Error while deleting a default view preference", e);
+    } finally {
+      OBContext.restorePreviousMode();
+    }
+  }
+
+  /**
+   * Given an UIPersonalization, returns the list of OBUIAPP_DefaultSavedView preferences that
+   * reference it
+   */
+  private List<Preference> getDefaultViewPreferencesForUiPersonalization(
+      UIPersonalization uiPersonalization) {
+    OBCriteria<Preference> preferenceCriteria = OBDal.getInstance()
+        .createCriteria(Preference.class);
+    // filter out the preferences that do not store the default view
+    preferenceCriteria.add(Restrictions
+        .eq(Preference.PROPERTY_PROPERTY, "OBUIAPP_DefaultSavedView"));
+    // filter out the preferences whose default view is not the one being deleted
+    preferenceCriteria
+        .add(Restrictions.eq(Preference.PROPERTY_SEARCHKEY, uiPersonalization.getId()));
+    return preferenceCriteria.list();
+  }
 }
--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java	Mon Jan 05 16:47:23 2015 +0100
@@ -903,6 +903,12 @@
     }
 
     public String getUrl() {
+      if (url == null) {
+        url = "/";
+        log.error("The button " + column.getName() + " of the table "
+            + column.getTable().getDBTableName()
+            + " has not process or a process definition assigned to it");
+      }
       return url;
     }
 
@@ -911,6 +917,12 @@
     }
 
     public String getCommand() {
+      if (command == null) {
+        command = "/";
+        log.error("The button " + column.getName() + " of the table "
+            + column.getTable().getDBTableName()
+            + " has not process or a process definition assigned to it");
+      }
       return command;
     }
 
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js	Mon Jan 05 16:47:23 2015 +0100
@@ -84,7 +84,10 @@
         requestProperties = requestProperties || {};
         requestProperties.params = grid.getFetchRequestParams(requestProperties.params) || {};
         if (gridView) {
-          requestProperties.params.tabId = gridView.tabId || (gridView.sourceView && gridView.sourceView.tabId);
+          requestProperties.params.tabId = gridView.tabId || (grid.viewProperties && grid.viewProperties.tabId) || (gridView.sourceView && gridView.sourceView.tabId);
+          if (gridView.buttonOwnerView && gridView.buttonOwnerView.tabId) {
+            requestProperties.params.buttonOwnerViewTabId = gridView.buttonOwnerView.tabId;
+          }
         }
         // send the display field in request params to add it to the list of fields to be fetched in DefaultJsonDataService.
         // used for displaying table references properly. Refer issue https://issues.openbravo.com/view.php?id=26696
@@ -94,6 +97,10 @@
         delete me.forceReload;
       },
 
+      // drawAllMaxCells is set to 0 to prevent extra reads of data
+      // Smartclient will try to read until drawAllMaxCells has been reached
+      drawAllMaxCells: 0,
+
       fetchDelay: 400,
       // prevent aggressive local filtering by smartclient
       filterLocally: false,
@@ -125,15 +132,30 @@
       // place after the first item was selected.
       // This first selection happens in ScrollingMenu.dataChanged
       dataArrived: function (startRow, endRow) {
-        var record, rowNum, i, values = this.formItem.getValue();
+        var record, rowNum, i, values = this.formItem.getValue(),
+            fixedValues = [],
+            value;
         this.Super('dataArrived', arguments);
         if (values) {
           if (!isc.isA.Array(values)) {
             values = [values];
           }
+
+          // fix selected values before checking them in the data to re-select them
+          for (i = 0; i < values.length; i++) {
+            value = values[i];
+            if (isc.isAn.Array(value)) {
+              value = value[0];
+            }
+            fixedValues.push(value.startsWith('==') ? value.substring(2) : value);
+          }
+
           for (rowNum = startRow; rowNum < (endRow + 1); rowNum++) {
             record = this.getRecord(rowNum);
-            if (record && values.contains(record[me.displayField])) {
+            if (record && fixedValues.contains(record[me.displayField])) {
+              // selectRecord asynchronously invokes handleChanged, this should be
+              // managed as when the value is picked from the list by pickValue
+              this.formItem._pickingArrivedValue = true;
               this.selectRecord(record, true);
             }
           }
@@ -192,18 +214,15 @@
     }
     if (value && isc.isA.Array(value) && value.length > 0 && rows) {
       for (i = 0; i < value.length; i++) {
-        if (value[i].indexOf('==') === 0) {
-          value[i] = value[i].substring(2, value[i].length);
-          if (rows.find('name', value[i]) === undefined) {
-            performFetch = true;
-          }
+        if (value[i].indexOf('==') === 0 && rows.find('name', value[i].substring(2, value[i].length)) === undefined) {
+          performFetch = true;
+          break;
         }
       }
-    } else {
-      if (rows && rows.find('name', value)) {
-        performFetch = true;
-      }
+    } else if (rows && rows.find('name', value)) {
+      performFetch = true;
     }
+
     if (performFetch) {
       this.Super('handleEditorExit', arguments);
     } else {
@@ -294,11 +313,36 @@
   getPickListFilterCriteria: function () {
     var forceFilterByIdentifier = true,
         pickListCriteria = this.getCriterion(null, forceFilterByIdentifier),
-        gridCriteria, i, criteriaFieldName = this.getCriteriaFieldName();
+        gridCriteria, criteriaFieldName = this.getCriteriaFieldName(),
+        me = this;
+
+    function cleanCriteria(crit, fkItem) {
+      var i, criterion, fkFilterOnThisField;
+      for (i = crit.length - 1; i >= 0; i--) {
+        criterion = crit[i];
+        if (criterion.criteria && isc.isAn.Array(criterion.criteria)) {
+          // nested criterion, clean inside
+          cleanCriteria(criterion.criteria);
+          continue;
+        }
+
+        fkFilterOnThisField = criterion.operator === 'equals' && criterion.fieldName === me.name;
+
+        if (fkFilterOnThisField || (criteriaFieldName === criterion.fieldName)) {
+          crit.removeAt(i);
+        }
+
+        if (me.grid && me.grid.parentElement && me.grid.parentElement.getClassName() === 'OBPickAndExecuteGrid' && criterion.fieldName === 'id') {
+          // we're in a P&E grid, selected ids should also be removed from criteria
+          crit.removeAt(i);
+        }
+      }
+    }
 
     if (this.form.grid.sourceWidget.lazyFiltering) {
       // Fetch the criteria from the current values of the filter editor
-      gridCriteria = this.form.grid.getValues();
+      // Invoke the convertCriteria function to filter by the record selected in the parent tab if needed
+      gridCriteria = this.grid.sourceWidget.convertCriteria(this.form.grid.getValues());
     } else {
       gridCriteria = this.form.grid.sourceWidget.getCriteria();
     }
@@ -309,12 +353,9 @@
     };
     gridCriteria.criteria = gridCriteria.criteria || [];
 
-    for (i = 0; i < gridCriteria.criteria.length; i++) {
-      if (criteriaFieldName === gridCriteria.criteria[i].fieldName) {
-        gridCriteria.criteria.removeAt(i);
-        break;
-      }
-    }
+    // remove from criteria the field used for current filter so drop down doesn't
+    // restrict its values
+    cleanCriteria(gridCriteria.criteria);
 
     // when in refresh picklist the user is typing
     // a value, filter using that
@@ -554,7 +595,7 @@
   },
 
   handleChanged: function (value) {
-    if (!this.grid.sourceWidget.alwaysFilterFksByIdentifier && (this._pickingValue || this.allowFkFilterByIdentifier === false)) {
+    if (!this.grid.sourceWidget.alwaysFilterFksByIdentifier && (this._pickingValue || this._pickingArrivedValue || this.allowFkFilterByIdentifier === false)) {
       // if the filter text has changed because a value has been ficked from the filter drop down, use the id filter
       // do this also if the only filter type allowed is 'id'
       this.filterType = 'id';
@@ -562,6 +603,11 @@
       // otherwise use the standard filter using the record identifier
       this.filterType = 'identifier';
     }
+    if (this._pickingArrivedValue) {
+      // changed caused by showing the pick list having a value previously selected
+      // as it is invoked asynchronously, remove flag here
+      delete this._pickingArrivedValue;
+    }
     this.Super('handleChanged', arguments);
   },
 
@@ -573,6 +619,10 @@
     if (values && this.filterType === 'id') {
       for (i = 0; i < values.length; i++) {
         value = values[i];
+        if (isc.isAn.Array(value)) {
+          // when "or" criteria value is an array of 1 element
+          value = value[0];
+        }
         if (value.startsWith('==')) {
           // if the value has the equals operator prefix, get rid of it
           value = value.substring(2);
@@ -604,6 +654,13 @@
     } else if (this.filterAuxCache && this.filterAuxCache.find(OB.Constants.IDENTIFIER, identifier)) {
       records = this.filterAuxCache.findAll(OB.Constants.IDENTIFIER, identifier);
     }
+
+    if (!records) {
+      // it is possible not to have any records in case of multitple items selected in current criteria,
+      // after that another criteria is added making some of current one not to apply anymore 
+      return recordIds;
+    }
+
     for (i = 0; i < records.length; i++) {
       recordIds.add(records[i][OB.Constants.ID]);
     }
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-image.js	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-image.js	Mon Jan 05 16:47:23 2015 +0100
@@ -269,8 +269,8 @@
       });
     }
     //Buttons will not be shown if the form is readonly
-    this.canvas.deleteButton.updateState(newValue && (this.form && !this.form.readOnly) && !this.readOnly);
-    this.canvas.selectorButton.updateState((this.form && !this.form.readOnly) && !this.readOnly);
+    this.canvas.deleteButton.updateState(newValue && (this.form && !this.form.readOnly) && !this.disabled);
+    this.canvas.selectorButton.updateState((this.form && !this.form.readOnly) && !this.disabled);
     return this.Super('setValue', arguments);
   },
   refreshImage: function (imageId) {
@@ -281,6 +281,19 @@
     }
     this.setValue(imageId);
     this.form.itemChangeActions();
+  },
+  //This function has been overwritten because this class needs to do specific things if the object is
+  //disabled. It is necessary to hide the delete and selector buttons when the status is disabled 
+  //and to show them when enabled.
+  setDisabled: function (disabled) {
+    if (disabled) {
+      this.canvas.deleteButton.hide();
+      this.canvas.selectorButton.hide();
+    } else {
+      this.canvas.deleteButton.show();
+      this.canvas.selectorButton.show();
+    }
+    this.Super('setDisabled', arguments);
   }
 });
 
@@ -423,7 +436,7 @@
     })]);
     this.Super('initWidget', arguments);
   },
-  getMessageText: function (type, imageSizeAction, XXX, YYY, AAA, BBB) {
+  getMessageText: function (type, imageSizeAction, XXX, YYY, AAA, BBB, msgInfo) {
     var message = '';
     if (imageSizeAction === 'N') {
       return message;
@@ -443,7 +456,7 @@
     if (!BBB) {
       BBB = 'ANY';
     }
-    message = OB.I18N.getLabel('OBUIAPP_Image_' + type + '_' + imageSizeAction);
+    message = OB.I18N.getLabel('OBUIAPP_Image_' + type + '_' + imageSizeAction, [msgInfo]);
     message = message.replace('XXX', XXX).replace('YYY', YYY).replace('AAA', AAA).replace('BBB', BBB);
     message = message.replace(/\n/g, '<br />');
     return message;
@@ -454,14 +467,14 @@
       this.formDeleteImage.submitForm();
     }
   },
-  callback: function (imageId, imageSizeAction, oldWidth, oldHeight, newWidth, newHeight) {
+  callback: function (imageId, imageSizeAction, oldWidth, oldHeight, newWidth, newHeight, msgInfo) {
     oldWidth = parseInt(oldWidth, 10);
     oldHeight = parseInt(oldHeight, 10);
     newWidth = parseInt(newWidth, 10);
     newHeight = parseInt(newHeight, 10);
     var selector = this;
-    if (imageSizeAction === 'WRONGFORMAT') {
-      isc.warn(this.getMessageText('Error', imageSizeAction), function () {
+    if (imageSizeAction === 'WRONGFORMAT' || imageSizeAction === 'ERROR_UPLOADING') {
+      isc.warn(this.getMessageText('Error', imageSizeAction, null, null, null, null, msgInfo), function () {
         return true;
       }, {
         icon: '[SKINIMG]Dialog/error.png',
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list-filter.js	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list-filter.js	Mon Jan 05 16:47:23 2015 +0100
@@ -55,7 +55,7 @@
     value = this.getValue();
     if (value && value.length > 0) {
       for (i = 0; i < value.length; i++) {
-        if (value[i].indexOf("==") === 0) {
+        if (value[i].indexOf('==') === 0) {
           value[i] = value[i].substring(2, value[i].length);
         }
       }
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-text.js	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-text.js	Mon Jan 05 16:47:23 2015 +0100
@@ -39,6 +39,7 @@
   },
 
   resetMaskValidator: function (createNew) {
+    var gridField;
     if (this.maskValidator && this.validators) {
       this.validators.remove(this.maskValidator);
       delete this.maskValidator;
@@ -49,6 +50,13 @@
       this.validators = this.validators || [];
       this.validators.push(this.maskValidator);
     }
+    if (this.grid) {
+      gridField = this.grid.getField(this.name);
+      if (gridField) {
+        // update the validators of the grid field, so that it is taken into account in the ListGrid.validateRowValues function
+        gridField.validators = this.validators;
+      }
+    }
   },
 
   createRegExpFromMask: function (mask) {
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-time.js	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-time.js	Mon Jan 05 16:47:23 2015 +0100
@@ -216,9 +216,25 @@
       }
       this.setValue(data[this.name]);
     }
+  },
+
+  setDisabled: function (disabled) {
+    // SC doesn't handle properly dynamically disabling timeItem, this temporary hack
+    // solves the problem by disabling/enabling inner textItem
+    //    see issue #27670
+    this.textField.setDisabled(disabled);
+    this.Super('setDisabled', arguments);
   }
 });
 
+isc.OBTimeItem.changeDefaults('textFieldDefaults', {
+  getTextBoxStyle: function () {
+    // SC does not handle properly styles for inner textItem representing the time,
+    // this is a temporary hack till it is fixed in SC code
+    //   see issue #27670
+    return this.parentItem.textBoxStyle + (this.isDisabled() ? 'Disabled' : (this.required ? 'Required' : ''));
+  }
+});
 
 isc.ClassFactory.defineClass("OBTimeItemGrid", isc.ListGrid);
 
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js	Mon Jan 05 16:47:23 2015 +0100
@@ -185,7 +185,7 @@
     }
   },
 
-  editRecord: function (record, preventFocus, hasChanges, focusFieldName, isLocalTime) {
+  editRecord: function (record, preventFocus, hasChanges, focusFieldName, isLocalTime, wasEditingGrid) {
     var timeFields, ret;
     this.clearValues();
     // if editRecord is called from OBStandardView.editRecord, then the time fields have already
@@ -204,18 +204,21 @@
       this.forceFocusedField = focusFieldName;
     }
 
-    this.doEditRecordActions(preventFocus, record._new);
+    this.doEditRecordActions(preventFocus, record._new, wasEditingGrid);
 
     if (hasChanges) {
       this.setHasChanged(true);
     }
 
     this.view.setTargetRecordInWindow(record.id);
+    // the originalValuesOfEditedRow attribute of the form if set after invoking editRecord
+    // delete it here to ensure that it is not shared among records
+    delete this.originalValuesOfEditedRow;
 
     return ret;
   },
 
-  doEditRecordActions: function (preventFocus, isNew) {
+  doEditRecordActions: function (preventFocus, isNew, wasEditingGrid) {
     delete this.contextInfo;
 
     this.initializing = true;
@@ -253,7 +256,7 @@
     this.ignoreFirstFocusEvent = preventFocus;
 
     // retrieveinitialvalues does focus and clear of errors
-    this.retrieveInitialValues(isNew);
+    this.retrieveInitialValues(isNew, wasEditingGrid);
 
     if (isNew) {
       this.view.statusBar.mode = 'NEW';
@@ -476,12 +479,20 @@
   // sets the focus in the current focusitem 
   // if it is not focusable then a next item is 
   // searched for
-  setFocusInForm: function () {
+  setFocusInForm: function (initializingForm) {
     if (!this.view || !this.view.isActiveView()) {
       return;
     }
 
     var focusItem = this.getFocusItem();
+
+    if (initializingForm && isc.isA.SectionItem(focusItem)) {
+      // if the form does not have any editable fields, the first section item will be focused
+      // in that case dont move the scroll to the focused item and show the first batch of fields
+      this.view.formContainerLayout.scrollToTop();
+      return;
+    }
+
     // an edit form in a grid is not
     // drawn it seems...
     if ((!this.grid && !this.isDrawn()) && !this.isVisible()) {
@@ -557,7 +568,13 @@
     var i, length, localResult, fields;
     if (!this.fieldsByFieldName) {
       localResult = {};
-      fields = this.getFields();
+      if (this.view && this.view.formFields) {
+        // standard windows don't load the fields till view form is opened, so let's
+        // use formFields in view which is always loaded
+        fields = this.view.formFields;
+      } else {
+        fields = this.getFields();
+      }
       length = fields.length;
       for (i = 0; i < fields.length; i++) {
         if (fields[i].name) {
@@ -590,13 +607,13 @@
 
   },
 
-  retrieveInitialValues: function (isNew) {
+  retrieveInitialValues: function (isNew, wasEditingGrid) {
     var parentId = this.view.getParentId(),
         i, fldNames = [],
         requestParams, allProperties, parentColumn, me = this,
         mode, length = this.getFields().length,
         gridVisibleProperties = [],
-        len;
+        len, initializingForm;
 
     this.setParentDisplayInfo();
 
@@ -656,46 +673,72 @@
       editRow: this.view.viewGrid.getEditRow()
     } : null;
 
-    this.inFicCall = true;
+    // do not make a request to the FIC in NEW mode if:
+    // - the record is new and
+    // - the record was being edited in the grid
+    if (!isNew || !wasEditingGrid) {
+      this.inFicCall = true;
+      OB.RemoteCallManager.call('org.openbravo.client.application.window.FormInitializationComponent', allProperties, requestParams, function (response, data, request) {
+        // no focus item found, focus on the body of the grid
+        // this makes sure that keypresses end up in the 
+        // bodyKeyPress method
+        if (!me.getFocusItem() || !me.getFocusItem().isFocusable()) {
+          me.view.viewGrid.body.focus();
+        }
 
-    OB.RemoteCallManager.call('org.openbravo.client.application.window.FormInitializationComponent', allProperties, requestParams, function (response, data, request) {
+        me.processFICReturn(response, data, request, gridEditInformation);
 
-      // no focus item found, focus on the body of the grid
-      // this makes sure that keypresses end up in the 
-      // bodyKeyPress method
-      if (!me.getFocusItem() || !me.getFocusItem().isFocusable()) {
-        me.view.viewGrid.body.focus();
+        if (!this.grid || !gridEditInformation || this.grid.getEditRow() !== gridEditInformation.editRow) {
+          // remember the initial values, if we are still editing the same row
+          me.rememberValues();
+        }
+        me.initializing = false;
+
+        // do here because during initial form drawing
+        // fields get blurred and will show an error
+        me.clearErrors(true);
+
+        // only compute a new focus item if the form is active
+        if (me.view.isActiveView()) {
+          me.computeFocusItem();
+        }
+
+        // if the focus item is not really enabled
+        // then find a new one, even if the form is not active
+        if (me.getFocusItem() && !me.getFocusItem().isFocusable(true)) {
+          me.computeFocusItem(me.getFocusItem());
+        }
+        // note the focus is set in the field when the FIC call
+        // returns
+        // at this point select the focused value      
+        if (me.getFocusItem()) {
+          initializingForm = true;
+          me.setFocusInForm(initializingForm);
+        }
+      });
+    } else {
+      // enable the grid (this would have been done in the processFICReturn function)
+      this.disableForm(false);
+      // copy the value maps from the grid edit form
+      this.copyValueMaps();
+      this.markForRedraw();
+    }
+  },
+
+  // use the grid valueMaps to populate the valueMaps of the form
+  copyValueMaps: function () {
+    var itemName, item, storedValueMaps = this.view.viewGrid.storedValueMaps;
+    if (!storedValueMaps) {
+      return;
+    }
+    for (itemName in storedValueMaps) {
+      if (storedValueMaps.hasOwnProperty(itemName)) {
+        item = this.getItem(itemName);
+        if (item) {
+          item.setValueMap(storedValueMaps[itemName]);
+        }
       }
-
-      me.processFICReturn(response, data, request, gridEditInformation);
-
-      if (!this.grid || !gridEditInformation || this.grid.getEditRow() !== gridEditInformation.editRow) {
-        // remember the initial values, if we are still editing the same row
-        me.rememberValues();
-      }
-      me.initializing = false;
-
-      // do here because during initial form drawing
-      // fields get blurred and will show an error
-      me.clearErrors(true);
-
-      // only compute a new focus item if the form is active
-      if (me.view.isActiveView()) {
-        me.computeFocusItem();
-      }
-
-      // if the focus item is not really enabled
-      // then find a new one, even if the form is not active
-      if (me.getFocusItem() && !me.getFocusItem().isFocusable(true)) {
-        me.computeFocusItem(me.getFocusItem());
-      }
-      // note the focus is set in the field when the FIC call
-      // returns
-      // at this point select the focused value      
-      if (me.getFocusItem()) {
-        me.setFocusInForm();
-      }
-    });
+    }
   },
 
   rememberValues: function () {
@@ -955,11 +998,31 @@
     }
   },
 
-  refresh: function () {
+  refresh: function (callback, refreshChildren) {
     var criteria = {
       id: this.getValue(OB.Constants.ID)
+    },
+        me = this,
+        innerCallback;
+    innerCallback = function (dsResponse, data, dsRequest) {
+      var index;
+      if (data[0]) {
+        index = me.view.viewGrid.getRecordIndex(me.view.viewGrid.getSelectedRecord());
+        if (index !== -1) {
+          me.view.viewGrid.updateRecord(index, data, dsRequest);
+          if (refreshChildren) {
+            // only refresh the children when needed.
+            // i.e. when a sub tab is saved the form view of its parent tab is refreshed,
+            // but then there is no need to refresh the sub tab
+            me.view.refreshChildViews();
+          }
+        }
+      }
+      if (callback && isc.isA.Function(callback)) {
+        callback();
+      }
     };
-    this.fetchData(criteria);
+    this.fetchData(criteria, innerCallback);
   },
 
   processColumnValue: function (columnName, columnValue, gridEditInformation, mode) {
@@ -1046,7 +1109,8 @@
           delete field.textField._textChanged;
         }
       } else if (isDateTime) {
-        jsDateTime = isc.Date.parseStandardDate(columnValue.value);
+        // FIC returns date-time in UTC
+        jsDateTime = isc.Date.parseSchemaDate(columnValue.value);
         this.setItemValue(field.name, jsDateTime);
         if (field.textField) {
           delete field.textField._textChanged;
@@ -1452,7 +1516,8 @@
     var i, flds = this.getFields(),
         length = flds.length,
         doClose = !this.hasChanged;
-
+    this.removeRecordFromGridIfNew();
+    this.discardEditsOfSelectedRecord();
     if (doClose) {
       this.doClose();
       return;
@@ -1477,11 +1542,43 @@
     this.view.toolBar.updateButtonState(true);
   },
 
+  discardEditsOfSelectedRecord: function () {
+    var selectedRecords = this.view.viewGrid.getSelectedRecords();
+    if (selectedRecords.length === 1) {
+      this.view.viewGrid.discardEdits(selectedRecords[0]);
+    }
+  },
+
+  resetValues: function () {
+    this.Super('resetValues', arguments);
+    // if the form view was opened from a grid view that was currently being edited, restore the original values of the
+    // edited row instead of the edited row itself
+    if (this.originalValuesOfEditedRow) {
+      this.setValues(this.originalValuesOfEditedRow);
+    }
+  },
+
+  // if a record has been created in the grid and then edited in the form without having been saved first, 
+  // it should be removed from the grid if the edition is canceled in the form
+  removeRecordFromGridIfNew: function () {
+    var values = this.getValues(),
+        grid;
+    // the property _new will only be true if the record has been created in the grid and is being edited
+    // in the form without having been saved 
+    if (values._new) {
+      grid = this.view.viewGrid;
+      // the record addition is being cancelled, remove the record from the grid if possible
+      if (isc.isA.ResultSet(grid.data) && grid.data.find('id', values[OB.Constants.ID])) {
+        grid.data.localData.remove(grid.data.find('id', values[OB.Constants.ID]));
+      }
+    }
+  },
+
   doClose: function () {
     if (this.view.isShowingTree) {
       this.view.treeGrid.refreshRecord(this.getValues());
     }
-
+    this.removeRecordFromGridIfNew();
     this.view.switchFormGridVisibility();
     this.view.messageBar.hide();
     if (this.isNew) {
@@ -1508,9 +1605,8 @@
 
   // always let the saveRow callback handle the error
   saveEditorReply: function (response, data, request) {
-    var form, isNewRecord;
-    form = request.editor.view.isShowingForm ? request.editor.view.viewForm : request.editor.view.viewGrid.getEditForm();
-    isNewRecord = form === null ? false : form.isNew;
+    var isNewRecord;
+    isNewRecord = request.editor.view.isEditingNewRecord();
     if (request.editor && request.editor.view && isNewRecord) {
       delete request.editor.view._savingNewRecord;
     }
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js	Mon Jan 05 16:47:23 2015 +0100
@@ -697,7 +697,9 @@
           if (!this._iconEnabled) {
             return;
           }
-          if (grid.filterHasChanged) {
+          if (grid.filterHasChanged || grid.filterClauseJustRemoved) {
+            // the filter clause can only be removed once
+            delete grid.filterClauseJustRemoved;
             // Do not change the sorting after receiving the data from the datasource
             grid._filteringAndSortingManually = true;
             grid.filterEditor.performFilter(true, true);
@@ -746,6 +748,7 @@
       if (this.sorter) {
         this.filterHasChanged = true;
         this.sorter.enable();
+        this.filterImage.hide();
       }
     }
     if (!keepFilterClause) {
@@ -1376,7 +1379,6 @@
 isc.OBViewGridBody.addProperties({
   redraw: function () {
     var newDrawArea, grid, drawArea, firstRecord, loading;
-
     this.Super('redraw', arguments);
 
     grid = this.grid;
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-view-grid.js	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-view-grid.js	Mon Jan 05 16:47:23 2015 +0100
@@ -442,7 +442,7 @@
   },
 
   dataArrived: function (startRow, endRow) {
-	// reset noDataEmptyMessage to prevent showing "loading..." indefinitely if the datasource does not return any data
+    // reset noDataEmptyMessage to prevent showing "loading..." indefinitely if the datasource does not return any data
     this.noDataEmptyMessage = '<span class="' + this.emptyMessageStyle + '">' + OB.I18N.getLabel('OBUIAPP_NoDataInGrid') + '</span>';
     this.resetEmptyMessage();
     if (this.actionAfterDataArrived) {
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js	Mon Jan 05 16:47:23 2015 +0100
@@ -25,7 +25,7 @@
   // ListGrid._$ArrowUp and ListGrid._$ArrowDown
   ARROW_UP_KEY_NAME: 'Arrow_Up',
   ARROW_DOWN_KEY_NAME: 'Arrow_Down',
-  ERROR_MESSAGE_PROP: isc.OBViewGrid.ERROR_MESSAGE_PROP,
+  ERROR_MESSAGE_PROP: '_hasErrors',
   ICONS: {
     PROGRESS: 0,
     OPEN_IN_FORM: 1,
@@ -206,7 +206,12 @@
       // clone to prevent side effects
       var requestProperties = isc.clone(this.context);
       this.context.params = this.grid.getFetchRequestParams(requestProperties.params);
-
+      if (this.grid.refreshingWithSelectedRecord) {
+        // if the grid was refreshed with a record selected, use the range that contained that record 
+        //  instead of using targetRecordId to improve the performance
+        startRow = this.grid.selectedRecordInitInterval;
+        endRow = this.grid.selectedRecordEndInterval;
+      }
       return this.Super('fetchRemoteData', arguments);
     },
 
@@ -272,6 +277,13 @@
           // increase one to request additional page to backend
         }
 
+        // detects if the request was issued due to having scrolled up
+        if (this.grid.body.lastScrollTop !== undefined && this.grid.body.lastScrollTop > this.grid.body.getScrollTop()) {
+          // in that case, set the totalRows of the response to the length of the localData, to avoid
+          // setting the totalRows of the grid to an invalid value
+          dsResponse.totalRows = this.localData.length;
+        }
+
         // get rid of old loading markers, this has to be done explicitly
         // as we can return another rowset than requested
         // call with a delay otherwise the grid will keep requesting rows while processing the
@@ -457,6 +469,13 @@
       };
     }
 
+    if (this.view.isRootView && this.view.standardWindow.emptyFilterClause) {
+      // this.view.standardWindow.emptyFilterClause will be true if the grid is being built based on
+      // an URL that was obtained from a grid that either did not have originally a filterClause or
+      // whose filters had been cleared
+      delete this.filterClause;
+    }
+
     var ret = this.Super('initWidget', arguments);
 
     // only show summary rows if there are summary functions
@@ -748,6 +767,10 @@
 
   // overridden to load all data in one request
   requestVisibleRows: function () {
+    if (this.refreshingWithRecordSelected || this.refreshingWithScrolledGrid) {
+      // don't make a request for the visible rows if the grid is already being refreshed
+      return;
+    }
     // fake smartclient to think that there groupByMaxRecords + 1 records
     if (this.data && this.isGrouped && !this.data.allRows) {
       this.data.totalRows = this.groupByMaxRecords + 1;
@@ -1418,9 +1441,35 @@
     OB.KeyboardManager.Shortcuts.set('ViewGrid_EditInGrid', 'OBViewGrid.body', ksAction_EditInGrid);
 
     ksAction_EditInForm = function () {
+      var wasEditingGrid = false,
+          autoSaveEditsBackup = me.autoSaveEdits,
+          recordToEdit, originalValuesOfEditedRow;
       if (me.getSelectedRecords().length === 1) {
+        if (me.view.isEditingGrid) {
+          // do not save the provisional changes
+          me.autoSaveEdits = false;
+          if (me.getSelectedRecords()[0]._new) {
+            // if the record is new set the wasEditingGrid flag to true to prevent 
+            // doing a FIC request in mode NEW
+            wasEditingGrid = true;
+            // open the form view with the current values of the edited row
+            recordToEdit = me.getEditedRecord(me.getEditRow());
+            me.storeValueMaps();
+          } else {
+            recordToEdit = me.getSelectedRecords()[0];
+            // store the original values of the row (previous ot the edition in grid)
+            originalValuesOfEditedRow = recordToEdit;
+          }
+        } else {
+          recordToEdit = me.getSelectedRecords()[0];
+        }
         me.endEditing();
-        me.view.editRecord(me.getSelectedRecords()[0]);
+        me.autoSaveEdits = autoSaveEditsBackup;
+        me.view.editRecord(recordToEdit, null, null, wasEditingGrid);
+        if (originalValuesOfEditedRow) {
+          me.view.viewForm.originalValuesOfEditedRow = originalValuesOfEditedRow;
+        }
+        delete me.storedValueMaps;
         return false; // To avoid keyboard shortcut propagation
       } else {
         return true;
@@ -1431,6 +1480,21 @@
     this.Super('enableShortcuts', arguments);
   },
 
+  storeValueMaps: function () {
+    var i, items, editForm = this.getEditForm(),
+        item;
+    if (!editForm) {
+      return;
+    }
+    this.storedValueMaps = {};
+    items = editForm.getItems();
+    for (i = 0; i < items.length; i++) {
+      if (items[i].valueMap) {
+        this.storedValueMaps[items[i].name] = items[i].valueMap;
+      }
+    }
+  },
+
   deselectAllRecords: function (preventUpdateSelectInfo, autoSaveDone) {
     // if there is nothing to deselect then don't deselect
     if (!this.getSelectedRecord()) {
@@ -1618,7 +1682,7 @@
       // so just show grid mode
       // don't need to do anything here
       delete this.targetOpenGrid;
-    } else if (this.targetRecordId) {
+    } else if (this.targetRecordId || this.selectedRecordId) {
       // direct link from other tab to a specific record
       this.delayedHandleTargetRecord(startRow, endRow);
     } else if (this.view.shouldOpenDefaultEditMode()) {
@@ -1678,7 +1742,7 @@
 
   refreshGrid: function (callback, newRecordsToBeIncluded) {
     var originalCriteria, criteria = {},
-        newRecordsCriteria, newRecordsLength, i, index;
+        newRecordsCriteria, newRecordsLength, i, index, selectedRecordIndex, visibleRows, filterDataCallback, me = this;
 
     //check whether newRecordsToBeIncluded contains records not part of the current grid and remove them.
     if (newRecordsToBeIncluded && newRecordsToBeIncluded.length > 0 && this.data) {
@@ -1693,9 +1757,27 @@
     }
 
     if (this.getSelectedRecord()) {
-      this.targetRecordId = this.getSelectedRecord()[OB.Constants.ID];
-      // as the record is already selected it is already in the filter
+      // this property is used to prevent an unneeded request in OBViewGridBody.redraw
+      this.refreshingWithSelectedRecord = true;
+      // obtain a range that contains the selected record
+      selectedRecordIndex = this.getRecordIndex(this.getSelectedRecord());
+      if (selectedRecordIndex !== -1) {
+        this.selectedRecordId = this.getSelectedRecord()[OB.Constants.ID];
+        this.selectedRecordInitInterval = selectedRecordIndex - Math.round(this.data.resultSize / 2);
+        if (this.selectedRecordInitInterval < 0) {
+          this.selectedRecordInitInterval = 0;
+        }
+        this.selectedRecordEndInterval = this.selectedRecordInitInterval + this.data.resultSize;
+      }
       this.notRemoveFilter = true;
+    } else {
+      visibleRows = this.getVisibleRows();
+      if (visibleRows && visibleRows[0] > 0) {
+        // save the index of the record placed in the middle of the viewport to 
+        // move the scroll to it after receiving the response
+        this.recordIndexToScroll = Math.round((visibleRows[0] + visibleRows[1]) / 2);
+      }
+
     }
     this.actionAfterDataArrived = callback;
     this.invalidateCache();
@@ -1735,7 +1817,29 @@
     } else {
       criteria = originalCriteria;
     }
-    this.filterData(criteria, null, context);
+    filterDataCallback = function () {
+      if (me.refreshingWithScrolledGrid) {
+        // move the scroll to part of the grid that contains the data that was just received to
+        // prevent unneded requests (see https://issues.openbravo.com/view.php?id=25811)
+        // the adjustment is needed to show the records in the same exact position where they were
+        // placed before refreshing the grid, if no records were added/removed
+        me.scrollCellIntoView(me.recordIndexToScroll + 1, null, true, true);
+      }
+      delete me.recordIndexToScroll;
+      delete me.refreshingWithScrolledGrid;
+      delete me.refreshingWithRecordSelected;
+      delete me.selectedRecordInitInterval;
+      delete me.selectedRecordEndInterval;
+      delete me.selectedRecordId;
+    };
+    this.filterData(criteria, filterDataCallback, context);
+    // Set the refreshingWithRecordSelected and refreshingWithScrolledGrid flags to true when needed after
+    // actually start filtering the data. These flags will prevent unneeded multiple datasource requests
+    if (this.selectedRecordInitInterval !== undefined) {
+      this.refreshingWithRecordSelected = true;
+    } else if (this.recordIndexToScroll) {
+      this.refreshingWithScrolledGrid = true;
+    }
     // At this point the original criteria should be restored, to prevent
     // the 'or' clause that was just added to be used in subsequent refreshes.
     // It is not possible to do it here, though, because a this.setCriteria(originalCriteria)
@@ -1746,8 +1850,8 @@
   // with a delay to handle the target record when the body has been drawn
   delayedHandleTargetRecord: function (startRow, endRow) {
     var rowTop, recordIndex, i, data = this.data,
-        tmpTargetRecordId = this.targetRecordId;
-    if (!this.targetRecordId) {
+        tmpTargetRecordId = this.targetRecordId || this.selectedRecordId;
+    if (!tmpTargetRecordId) {
       delete this.isOpenDirectModeLeaf;
       return;
     }
@@ -1807,7 +1911,7 @@
 
   filterData: function (criteria, callback, requestProperties) {
     var theView = this.view,
-        newCallBack;
+        newCallBack, me = this;
 
     if (!requestProperties) {
       requestProperties = {};
@@ -1817,6 +1921,8 @@
 
     newCallBack = function () {
       theView.recordSelected();
+      delete me.refreshingWithSelectedRecord;
+      me.markForRedraw();
       if (typeof callback === 'function') {
         callback();
       }
@@ -2836,7 +2942,7 @@
     // set the default error message,
     // is possibly overridden in the next call
     if (record) {
-      record._hasValidationErrors = true;
+      this.addRecordToValidationErrorList(record);
       if (!record[isc.OBViewGrid.ERROR_MESSAGE_PROP]) {
         this.setRecordErrorMessage(rowNum, OB.I18N.getLabel('OBUIAPP_ErrorInFields'));
         // do not automatically remove this message
@@ -2852,6 +2958,10 @@
       isc.warn(OB.I18N.getLabel('OBUIAPP_AutoSaveError', [this.view.tabTitle]));
     }
 
+    // show an error message in the toolbar if the event that triggered the action was an autosave, to mimic the way client side validation errors are handled
+    if (view.standardWindow.isAutoSaving) {
+      view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR, null, OB.I18N.getLabel('OBUIAPP_ErrorInFieldsGrid', [view.ID]));
+    }
     view.standardWindow.cleanUpAutoSaveProperties();
     view.updateTabTitle();
     view.toolBar.updateButtonState(true);
@@ -2868,6 +2978,45 @@
     }
   },
 
+  addRecordToValidationErrorList: function (record) {
+    if (!record) {
+      return;
+    }
+    record._hasValidationErrors = true;
+    this.recordIdsWithValidationError = this.recordIdsWithValidationError || [];
+    if (!this.recordIdsWithValidationError.contains(record[OB.Constants.ID])) {
+      this.recordIdsWithValidationError.push(record[OB.Constants.ID]);
+    }
+  },
+
+  removeRecordFromValidationErrorList: function (record) {
+    if (!record) {
+      return;
+    }
+    delete record._hasValidationErrors;
+    this.recordIdsWithValidationError = this.recordIdsWithValidationError || [];
+    this.recordIdsWithValidationError.remove(record[OB.Constants.ID]);
+  },
+
+  selectedRecordHasValidationErrors: function () {
+    var record;
+    // if the number of selected records is not 1, return false
+    if (this.getSelectedRecords().length !== 1 || !isc.isA.Array(this.recordIdsWithValidationError)) {
+      return false;
+    }
+    record = this.getSelectedRecord();
+    return this.recordIdsWithValidationError.contains(record[OB.Constants.ID]);
+  },
+
+  gridHasValidationErrors: function () {
+    if (!isc.isA.Array(this.recordIdsWithValidationError)) {
+      return false;
+    } else {
+      // return true if the list of record ids with validation errors is not empty
+      return !this.recordIdsWithValidationError.isEmpty();
+    }
+  },
+
   recordHasChanges: function (rowNum, colNum, checkEditor) {
     var record = this.getRecord(rowNum);
     // If a record has validation errors but had all the mandatory fields set,
@@ -2925,6 +3074,9 @@
       return;
     }
 
+    // the record has been sucessfully saved so it does not have validation errors
+    this.removeRecordFromValidationErrorList(record);
+
     // a new id has been computed use that now
     if (record && record._newId) {
       record.id = record._newId;
@@ -3002,6 +3154,7 @@
     for (i = 0; i < length; i++) {
       var rowNum = this.getRecordIndex(selectedRecords[i]);
       var record = selectedRecords[i];
+      this.removeRecordFromValidationErrorList(record);
       this.Super('discardEdits', [rowNum, false, false, isc.ListGrid.PROGRAMMATIC]);
       // remove the record if new
       if (record._new) {
@@ -3044,6 +3197,10 @@
         totalRows, me = this,
         record = this.getRecord(rowNum);
 
+    if (record) {
+      this.removeRecordFromValidationErrorList(record);
+    }
+
     if (!preventConfirm && ((editForm && editForm.hasChanged) || this.rowHasErrors(rowNum))) {
       me.Super('discardEdits', localArguments);
 
@@ -3586,9 +3743,6 @@
     if (this.Super('rowHasErrors', arguments)) {
       return true;
     }
-    if (!this.getEditForm()) {
-      return false;
-    }
     if (this.getEditRow() === rowNum && this.getEditForm().hasErrors()) {
       return true;
     }
@@ -3672,6 +3826,10 @@
       rowNum = this.getEditSessionRowNum(rowNum);
       return this.Super('getRecord', [rowNum]);
     }
+    if (this.refreshingWithRecordSelected || this.refreshingWithScrolledGrid) {
+      // if the grid if being refreshed do not try to return a record, just notify that is being loaded
+      return Array.LOADING;
+    }
     return this.Super('getRecord', arguments);
   },
 
@@ -3801,11 +3959,64 @@
         field = this.getFieldFromColumnName(prop);
         // This call to the FIC was done to retrieve the missing values
         // Do not try to overwrite the existing values
-        if (field && !this.getRecord(rowNum)[field.property]) {
+        if (field && !this.fieldIsVisible(field.property) && !this.getRecord(rowNum)[field.property]) {
           grid.processColumnValue(rowNum, prop, columnValues[prop]);
         }
       }
     }
+  },
+
+  fieldIsVisible: function (fieldName) {
+    // this.getFields returns the list of fields that are currently visible in the grid, 
+    // as opposed to this.completeFields that contains the whole list of fields that can be shown in the grid  
+    var visibleFields = this.getFields();
+    return visibleFields.containsProperty('name', fieldName);
+  },
+
+  updateRecord: function (recordIndex, data, req) {
+    var sessionProperties = this.view.getContextInfo(true, true, false, true),
+        me = this;
+    data = OB.Utilities.Date.convertUTCTimeToLocalTime(data, this.completeFields);
+    if (this.data.updateCacheData) {
+      this.data.updateCacheData(data, req);
+    }
+    if (this.isGrouped) {
+      // if the grid is group update its values to show the updated data
+      this.setEditValues(recordIndex, data[0]);
+    }
+    this.selectRecord(this.getRecord(recordIndex));
+    this.refreshRow(recordIndex);
+    this.redraw();
+    if (!this.view.isShowingForm) {
+      OB.RemoteCallManager.call('org.openbravo.client.application.window.FormInitializationComponent', sessionProperties, {
+        MODE: 'SETSESSION',
+        TAB_ID: this.view.tabId,
+        PARENT_ID: this.view.getParentId(),
+        ROW_ID: this.getSelectedRecord() ? this.getSelectedRecord().id : this.view.getCurrentValues().id
+      }, function (response, data, request) {
+        var sessionAttributes = data.sessionAttributes,
+            auxInputs = data.auxiliaryInputValues,
+            attachmentExists = data.attachmentExists,
+            prop;
+        if (sessionAttributes) {
+          me.view.viewForm.sessionAttributes = sessionAttributes;
+        }
+
+        if (auxInputs) {
+          this.auxInputs = {};
+          for (prop in auxInputs) {
+            if (auxInputs.hasOwnProperty(prop)) {
+              me.view.viewForm.setValue(prop, auxInputs[prop].value);
+              me.view.viewForm.auxInputs[prop] = auxInputs[prop].value;
+            }
+          }
+        }
+        me.view.viewForm.view.attachmentExists = attachmentExists;
+        //compute and apply tab display logic again after fetching auxilary inputs.
+        me.view.handleDefaultTreeView();
+        me.view.updateSubtabVisibility();
+      });
+    }
   }
 });
 
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view-datasource.js	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view-datasource.js	Mon Jan 05 16:47:23 2015 +0100
@@ -157,6 +157,8 @@
     }
   },
 
+  // delete null values of columns that do not have a field
+  // this prevents setting to null the value of a column just because it was not returned by the datasource due to not having an active field
   deleteNulls: function (data) {
     var column;
     for (column in data) {
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js	Mon Jan 05 16:47:23 2015 +0100
@@ -264,17 +264,19 @@
 
     this.toolBar.updateButtonState(true, false, true);
 
-    // It will only enter if this is a lazy initialized tab
+    // Update the subtab visibility before the tabs are shown to the client
+    this.handleDefaultTreeView();
+    this.updateSubtabVisibility();
+  },
+
+  // updates some view properties based on its uiPattern
+  updateViewBasedOnUiPattern: function () {
     // this.standardWindow.getClass().uiPattern will only exists after setWindowSettings is executed
     if (this.standardWindow.getClass().uiPattern) {
       this.setReadOnly(this.standardWindow.getClass().uiPattern[this.tabId] === isc.OBStandardView.UI_PATTERN_READONLY);
       this.setSingleRecord(this.standardWindow.getClass().uiPattern[this.tabId] === isc.OBStandardView.UI_PATTERN_SINGLERECORD);
       this.setEditOrDeleteOnly(this.standardWindow.getClass().uiPattern[this.tabId] === isc.OBStandardView.UI_PATTERN_EDITORDELETEONLY);
     }
-
-    // Update the subtab visibility before the tabs are shown to the client
-    this.handleDefaultTreeView();
-    this.updateSubtabVisibility();
   },
 
   show: function () {
@@ -369,6 +371,8 @@
       if (!lazyFiltering) {
         if (!this.standardWindow.checkIfDefaultSavedView()) {
           this.viewGrid.fetchData(this.viewGrid.getCriteria());
+        } else {
+          this.dataLoadDelayedForDefaultSavedView = true;
         }
       }
       this.refreshContents = false;
@@ -743,6 +747,11 @@
           })) + '&';
         }
       }
+      if (!this.viewGrid.filterClause) {
+        // if the grid does not currently have a filterClause (i.e. because the filters have been cleared), make it explicit in the URL
+        // this way the filter clause can be removed when building a grid based on this URL (see issue https://issues.openbravo.com/view.php?id=24577)
+        url = url + '&emptyFilterClause=true';
+      }
     }
 
     return url;
@@ -900,6 +909,8 @@
     // build the structure of the children
     childView.buildStructure();
 
+    childView.updateViewBasedOnUiPattern();
+
     var childTabDef = {
       title: childView.tabTitle,
       pane: childView
@@ -1437,8 +1448,8 @@
   // ** {{{ editRecord }}} **
   // Opens the edit form and selects the record in the grid, will refresh
   // child views also
-  editRecord: function (record, preventFocus, focusFieldName) {
-    var rowNum,
+  editRecord: function (record, preventFocus, focusFieldName, wasEditingGrid) {
+    var rowNum, recordToEdit,
     // at this point the time fields of the record are formatted in local time
     localTime = true;
     this.messageBar.hide();
@@ -1454,10 +1465,17 @@
     } else {
       this.viewGrid.doSelectSingleRecord(record);
 
-      // also handle the case that there are unsaved values in the grid
+      // also handle the case that there are unsaved values in the grid 
       // show them in the form
       rowNum = this.viewGrid.getRecordIndex(record);
-      this.viewForm.editRecord(this.viewGrid.getEditedRecord(rowNum), preventFocus, this.viewGrid.recordHasChanges(rowNum), focusFieldName, localTime);
+      // If the record to be edited is new and was being edited in the grid, use it,
+      // because this.viewGrid.getEditedRecord would return an empty record in this case
+      if (record._new && wasEditingGrid) {
+        recordToEdit = record;
+      } else {
+        recordToEdit = this.viewGrid.getEditedRecord(rowNum);
+      }
+      this.viewForm.editRecord(recordToEdit, preventFocus, this.viewGrid.recordHasChanges(rowNum), focusFieldName, localTime, wasEditingGrid);
     }
   },
 
@@ -1687,7 +1705,7 @@
         } else {
           if (this.childTabSet.visibility === 'hidden') {
             this.childTabSet.show();
-            if (tabViewPane.showTabIf && !tabViewPane.data && !tabViewPane.refreshingData && tabViewPane.isVisible()) {
+            if (tabViewPane.showTabIf && !tabViewPane.data && !tabViewPane.refreshingData && tabViewPane.isVisible() && !this.isEditingNewRecord()) {
               // If the child tab does not have data yet, refresh it
               tabViewPane.refreshingData = true;
               tabViewPane.refresh();
@@ -1723,6 +1741,12 @@
     }
   },
 
+  //This function returns true if it is a new record and it is being edited
+  isEditingNewRecord: function () {
+    var form = this.isShowingForm ? this.viewForm : this.viewGrid.getEditForm();
+    return form === null ? false : form.isNew;
+  },
+
   // Adds to contextInfo the session attributes of the childView, 
   // unless the session attribute is an auxiliary input of its parent tab
   addPreferenceValues: function (contextInfo, childView) {
@@ -1977,7 +2001,7 @@
 
   refreshCurrentRecord: function (callBackFunction) {
     var me = this,
-        record, criteria, callback;
+        criteria, callback;
 
     if (!this.viewGrid.getSelectedRecord()) {
       return;
@@ -1988,89 +2012,53 @@
       this.viewGrid.getSummaryRow();
     }
 
-    record = this.viewGrid.getSelectedRecord();
-
-    criteria = {
+    callback = function (resp, data, req) {
+      // this line does not work, but it should:
+      //      me.getDataSource().updateCaches(resp, req);
+      // therefore do an explicit update of the visual components
+      if (me.viewGrid.data) {
+        var recordIndex = me.viewGrid.getRecordIndex(me.viewGrid.getSelectedRecord());
+        me.viewGrid.updateRecord(recordIndex, data, req);
+      }
+
+      if (callBackFunction) {
+        callBackFunction();
+      }
+    };
+
+    if (this.viewForm && this.viewForm.contextInfo) {
+      this.viewForm.contextInfo = null;
+    }
+
+    if (this.isShowingForm) {
+      // Refresh the form. This function will also update the info of the selected record with
+      // the data returned by the datasource request done to update the form
+      this.viewForm.refresh(callBackFunction);
+    } else {
+      // Make a request to refresh the grid
+      criteria = this.buildCriteriaToRefreshSelectedRecord();
+      this.getDataSource().fetchData(criteria, callback);
+    }
+    this.refreshParentRecord(callBackFunction);
+  },
+
+  buildCriteriaToRefreshSelectedRecord: function () {
+    var record, criteria = {
       operator: 'and',
-      _constructor: "AdvancedCriteria",
+      _constructor: 'AdvancedCriteria',
       criteria: []
     };
-
     // add a dummy criteria to force a fetch
     criteria.criteria.push(isc.OBRestDataSource.getDummyCriterion());
 
+    record = this.viewGrid.getSelectedRecord();
     // and add a criteria for the record itself
     criteria.criteria.push({
       fieldName: OB.Constants.ID,
       operator: 'equals',
       value: record.id
     });
-
-    callback = function (resp, data, req) {
-      var sessionProperties = me.getContextInfo(true, true, false, true);
-      // this line does not work, but it should:
-      //      me.getDataSource().updateCaches(resp, req);
-      // therefore do an explicit update of the visual components
-      if (me.isShowingForm) {
-        me.viewForm.refresh();
-      }
-      if (me.viewGrid.data) {
-        var recordIndex = me.viewGrid.getRecordIndex(me.viewGrid.getSelectedRecord());
-        data = OB.Utilities.Date.convertUTCTimeToLocalTime(data, me.viewGrid.completeFields);
-        if (me.viewGrid.data.updateCacheData) {
-          me.viewGrid.data.updateCacheData(data, req);
-        }
-        if (me.viewGrid.isGrouped) {
-          // if the grid is group update its values to show the updated data
-          me.viewGrid.setEditValues(recordIndex, data[0]);
-        }
-        me.viewGrid.selectRecord(me.viewGrid.getRecord(recordIndex));
-        me.viewGrid.refreshRow(recordIndex);
-        me.viewGrid.redraw();
-        if (!me.isShowingForm) {
-          OB.RemoteCallManager.call('org.openbravo.client.application.window.FormInitializationComponent', sessionProperties, {
-            MODE: 'SETSESSION',
-            TAB_ID: me.tabId,
-            PARENT_ID: me.getParentId(),
-            ROW_ID: me.viewGrid.getSelectedRecord() ? me.viewGrid.getSelectedRecord().id : me.getCurrentValues().id
-          }, function (response, data, request) {
-            var sessionAttributes = data.sessionAttributes,
-                auxInputs = data.auxiliaryInputValues,
-                attachmentExists = data.attachmentExists,
-                prop;
-            if (sessionAttributes) {
-              me.viewForm.sessionAttributes = sessionAttributes;
-            }
-
-            if (auxInputs) {
-              this.auxInputs = {};
-              for (prop in auxInputs) {
-                if (auxInputs.hasOwnProperty(prop)) {
-                  me.viewForm.setValue(prop, auxInputs[prop].value);
-                  me.viewForm.auxInputs[prop] = auxInputs[prop].value;
-                }
-              }
-            }
-            me.viewForm.view.attachmentExists = attachmentExists;
-            //compute and apply tab display logic again after fetching auxilary inputs.
-            me.handleDefaultTreeView();
-            me.updateSubtabVisibility();
-          });
-        }
-      }
-
-
-      if (callBackFunction) {
-        callBackFunction();
-      }
-    };
-
-    if (this.viewForm && this.viewForm.contextInfo) {
-      this.viewForm.contextInfo = null;
-    }
-
-    this.getDataSource().fetchData(criteria, callback);
-    this.refreshParentRecord(callBackFunction);
+    return criteria;
   },
 
   hasNotChanged: function () {
@@ -2534,6 +2522,10 @@
             if (propertyObj.type && convertToClassicFormat) {
               type = isc.SimpleType.getType(propertyObj.type);
               if (type.createClassicString) {
+                if (type.editorType === 'OBDateTimeItem') {
+                  // converting time to UTC before it is sent to FIC
+                  value = OB.Utilities.Date.addTimezoneOffset(value);
+                }
                 contextInfo[properties[i].inpColumn] = type.createClassicString(value);
               } else {
                 contextInfo[properties[i].inpColumn] = this.convertContextValue(value, propertyObj.type);
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js	Mon Jan 05 16:47:23 2015 +0100
@@ -548,8 +548,8 @@
 
     // find the default view, the personalizations are
     // returned in order of prio, then do sort by name
-    if (this.getClass().personalization.views) {
-      views = this.getClass().personalization.views;
+    views = this.getClass().personalization.views;
+    if (views && isc.isA.Array(views) && views.length > 0) {
       length = views.length;
 
       this.getClass().personalization.views.sort(function (v1, v2) {
@@ -598,6 +598,13 @@
           }
         }
       }
+    } else {
+      if (this.view.dataLoadDelayedForDefaultSavedView) {
+        // it might happen that the load of the initial grid data was delayed because it had a 
+        // default saved view, but then the default saved view is not returned by the WindowSettingsActionHandler.
+        // in that case, detect it and load the grid now
+        this.view.viewGrid.fetchData(this.view.viewGrid.getCriteria());
+      }
     }
 
     // restore focus as the focusitem may have been hidden now
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-quick-launch.js	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-quick-launch.js	Mon Jan 05 16:47:23 2015 +0100
@@ -142,7 +142,7 @@
     if (this.members[2].getField('value').getValue() && this.members[2].getField('value').getValue().contains('?')) {
       var params = OB.Utilities.getUrlParameters(this.members[2].getField('value').getValue());
       if (params && params.tabId) {
-        OB.Utilities.openDirectTab(params.tabId, params.recordId, params.command);
+        OB.Utilities.openDirectTab(params.tabId, params.recordId, params.command, null, null, null, params);
       }
     }
     if (this.members[1].getMembers()) {
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js	Mon Jan 05 16:47:23 2015 +0100
@@ -190,9 +190,18 @@
       } catch (_exception) {
         isc.warn(_exception + ' ' + _exception.message + ' ' + _exception.stack);
       }
-      if (originalShowIfValue && item.defaultFilter !== null && !isc.isA.emptyObject(item.defaultFilter) && item.getType() === 'OBPickEditGridItem') {
-        item.canvas.viewGrid.setFilterEditorCriteria(item.defaultFilter);
-        item.canvas.viewGrid.filterByEditor();
+      if (originalShowIfValue && item.getType() === 'OBPickEditGridItem') {
+        // load the grid if it is being shown for the first time
+        if (item.canvas && item.canvas.viewGrid && !isc.isA.ResultSet(item.canvas.viewGrid.data)) {
+          if (item.defaultFilter !== null && !isc.isA.emptyObject(item.defaultFilter)) {
+            // if it has a default filter, apply it and use it when filtering
+            item.canvas.viewGrid.setFilterEditorCriteria(item.defaultFilter);
+            item.canvas.viewGrid.filterByEditor();
+          } else {
+            // if it does not have a default filter, just refresh the grid
+            item.canvas.viewGrid.refreshGrid();
+          }
+        }
       }
       if (this.view && this.view.theForm) {
         this.view.theForm.markForRedraw();
@@ -319,7 +328,7 @@
   handleResponse: function (refreshParent, message, responseActions, retryExecution, data) {
     var window = this.parentWindow,
         tab = OB.MainView.TabSet.getTab(this.viewTabId),
-        i;
+        i, afterRefreshCallback, me = this;
 
     // change title to done
     if (tab) {
@@ -385,13 +394,18 @@
 
     if (this.popup && !retryExecution) {
       this.buttonOwnerView.setAsActiveView();
-
+      afterRefreshCallback = function () {
+        if (me.buttonOwnerView && isc.isA.Function(me.buttonOwnerView.refreshParentRecord) && isc.isA.Function(me.buttonOwnerView.refreshChildViews)) {
+          me.buttonOwnerView.refreshParentRecord();
+          me.buttonOwnerView.refreshChildViews();
+        }
+      };
       if (refreshParent) {
         if (this.callerField && this.callerField.view && typeof this.callerField.view.onRefreshFunction === 'function') {
           // In this case we are inside a process called from another process, so we want to refresh the caller process instead of the main window.
           this.callerField.view.onRefreshFunction(this.callerField.view);
         } else {
-          window.refresh();
+          this.buttonOwnerView.refreshCurrentRecord(afterRefreshCallback);
         }
       }
 
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js	Mon Jan 05 16:47:23 2015 +0100
@@ -176,6 +176,14 @@
         isc.addProperties(dsRequest.params, me.view.theForm.getValues());
       }
       dsRequest.params[OB.Constants.ORG_PARAMETER] = me.getOrgParameter();
+      // Add to the params the tabId of the P&E window
+      if (me.viewProperties && me.viewProperties.tabId) {
+        dsRequest.params.tabId = me.viewProperties.tabId;
+      }
+      // Add to the params the tabId owner of the button that opens the P&E window
+      if (me.view && me.view.buttonOwnerView && me.view.buttonOwnerView.tabId) {
+        dsRequest.params.buttonOwnerViewTabId = me.view.buttonOwnerView.tabId;
+      }
       return this.Super('transformRequest', arguments);
     };
     filterableProperties = this.getFields().findAll('canFilter', true);
@@ -572,6 +580,10 @@
   },
 
   clearFilter: function () {
+    if (this.lazyFiltering && this.filterClause) {
+      // store that the filter has been removed to enable showing potential new records
+      this.filterClauseJustRemoved = true;
+    }
     this.filterClause = null;
     this._cleaningFilter = true;
     this.contentView.messageBar.hide();
@@ -876,6 +888,11 @@
     } else {
       this.Super('getMinFieldWidth', arguments);
     }
+  },
+
+  refreshGrid: function () {
+    // fetch the data with the current criteria and context info
+    this.filterData(this.getCriteria(), null, this.getContextInfo());
   }
 
 });
\ No newline at end of file
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/return-material/ob-return-material.js	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/return-material/ob-return-material.js	Mon Jan 05 16:47:23 2015 +0100
@@ -90,11 +90,11 @@
       selectedRecordsLength = selectedRecords.length,
       editedRecord = null,
       storageBin = record.storageBin,
-      i; 
+      i;
   //Cheking available stock
-  if (storageBin === null){
-	item.grid.view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR, null, OB.I18N.getLabel('OBUIAPP_RM_NotAvailableStock', [record.rMOrderNo]));
-	return false;
+  if (storageBin === null) {
+    item.grid.view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR, null, OB.I18N.getLabel('OBUIAPP_RM_NotAvailableStock', [record.rMOrderNo]));
+    return false;
   }
   // check value is positive and below available qty and pending qty
   if (value === null || value < 0 || value > record.pending || value > record.availableQty) {
@@ -116,7 +116,7 @@
       }
     }
   }
-  
+
   return true;
 };
 
@@ -134,11 +134,11 @@
       editedRecord = null,
       i;
   if (state) {
-	//Cheking available stock
-	if (storageBin === null){
-	  grid.view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR, null, OB.I18N.getLabel('OBUIAPP_RM_NotAvailableStock', [record.rMOrderNo]));
-	  return false;
-	}
+    //Cheking available stock
+    if (storageBin === null) {
+      grid.view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR, null, OB.I18N.getLabel('OBUIAPP_RM_NotAvailableStock', [record.rMOrderNo]));
+      return false;
+    }
     // calculate already shipped qty on grid
     for (i = 0; i < selectedRecords.length; i++) {
       editedRecord = isc.addProperties({}, selectedRecords[i], grid.getEditedRecord(selectedRecords[i]));
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-action-button.js	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-action-button.js	Mon Jan 05 16:47:23 2015 +0100
@@ -150,9 +150,8 @@
         currentView = this.view,
         afterRefresh, isAfterRefreshAlreadyExecuted, parsePathPart, parts;
 
-    afterRefresh = function (doRefresh) {
-      var undef, refresh = (doRefresh === undef || doRefresh),
-          autosaveDone = false,
+    afterRefresh = function () {
+      var autosaveDone = false,
           currentRecordId, recordsAfterRefresh;
 
       if (isAfterRefreshAlreadyExecuted) {
@@ -178,41 +177,31 @@
         // let's set half for each in order to see the message
         contextView.setHalfSplit();
       }
-      // Refresh in order to show possible new records
-      if (refresh) {
-        // The selected record should be shown after the refresh, even
-        // if the filter would exclude it
-        // See issue https://issues.openbravo.com/view.php?id=20722
-        if (currentView.parentTabId) {
-          recordsAfterRefresh = currentView.newRecordsAfterRefresh[currentView.parentTabId];
-        } else {
-          recordsAfterRefresh = currentView.newRecordsAfterRefresh;
-        }
-        currentView.refresh(null, autosaveDone, recordsAfterRefresh);
-      }
       if (contextView.viewGrid.isGrouped) {
         // if the grid is grouped refresh the grid to show the records properly
         contextView.viewGrid.refreshGrid();
       }
+      contextView.refreshParentRecord();
+      contextView.refreshChildViews();
     };
 
     if (this.autosave) {
-      if (currentView.parentView) {
-        currentView.parentView.setChildsToRefresh();
+      if (contextView.parentView) {
+        contextView.parentView.setChildsToRefresh();
       } else {
-        currentView.setChildsToRefresh();
+        contextView.setChildsToRefresh();
       }
 
-      if (currentView.viewGrid.getSelectedRecord()) {
+      if (contextView.viewGrid.getSelectedRecord()) {
         // There is a record selected, refresh it and its parent
-        currentView.refreshCurrentRecord(afterRefresh);
+        contextView.refreshCurrentRecord(afterRefresh);
       } else {
         // No record selected, refresh parent
-        currentView.refreshParentRecord(afterRefresh);
+        contextView.refreshParentRecord(afterRefresh);
       }
     } else {
       // If the button is not autosave, do not refresh but get message.
-      afterRefresh(false);
+      afterRefresh();
     }
 
     OB.ActionButton.executingProcess = null;
@@ -256,15 +245,18 @@
   },
 
   updateState: function (record, hide, context, keepNonAutosave) {
-    var currentValues = isc.shallowClone(record || this.contextView.getCurrentValues() || {});
+    var currentValues = isc.shallowClone(record || this.contextView.getCurrentValues() || {}),
+        grid;
     // do not hide non autosave buttons when hidding the rest if keepNonAutosave === true
     var hideButton = hide && (!keepNonAutosave || this.autosave);
 
     var multiSelect = false,
         readonly, i, selection;
 
+    grid = this.contextView.isShowingTree ? this.contextView.treeGrid : this.contextView.viewGrid;
+
     if (hideButton || !record) {
-      multiSelect = this.multiRecord && this.contextView.viewGrid.getSelectedRecords().length > 1;
+      multiSelect = this.multiRecord && grid.getSelectedRecords().length > 1;
       if (!multiSelect) {
         this.hide();
         return;
@@ -302,7 +294,7 @@
       // For multi selection processes:
       //   -Button is displayed in case it should be displayed in ALL selected records
       //   -Button is readonly in case it should be readonly in ALL sected records
-      selection = this.contextView.viewGrid.getSelectedRecords();
+      selection = grid.getSelectedRecords();
       readonly = false;
       this.visible = true;
       for (i = 0; i < selection.length; i++) {
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js	Mon Jan 05 16:47:23 2015 +0100
@@ -52,7 +52,7 @@
         form = view.viewGrid.getEditForm();
         editRow = view.viewGrid.getEditRow();
         hasErrors = view.viewGrid.rowHasErrors(editRow);
-        this.setDisabled(!(form.isNew && form.allRequiredFieldsSet()) && !hasErrors && (form.isSaving || form.readOnly || !view.hasValidState() || form.hasErrors() || !form.hasChanged || !form.allRequiredFieldsSet()));
+        this.setDisabled(!(form.isNew && form.allRequiredFieldsSet()) && (form.isSaving || form.readOnly || !view.hasValidState() || hasErrors || form.hasErrors() || !form.hasChanged || !form.allRequiredFieldsSet()));
       } else {
         this.setDisabled(true);
       }
@@ -192,14 +192,38 @@
 
   REFRESH_BUTTON_PROPERTIES: {
     action: function () {
-      this.view.refresh();
+      var refreshChildren = true,
+          callbackEnableButton, me = this;
+      this.view.isRefreshing = true;
+      // Disable the refresh button until the refresh is finished
+      this.setDisabled(true);
+      callbackEnableButton = function () {
+        // Enable the refresh button in the callback
+        delete me.view.isRefreshing;
+        me.setDisabled(false);
+      };
+      try {
+        if (this.view.isShowingForm) {
+          // Refresh the form and its children records
+          this.view.viewForm.refresh(callbackEnableButton, refreshChildren);
+        } else {
+          this.view.refresh(callbackEnableButton);
+        }
+      } catch (e) {
+        callbackEnableButton();
+      }
     },
     disabled: false,
     buttonType: 'refresh',
     sortPosition: 70,
     prompt: OB.I18N.getLabel('OBUIAPP_RefreshData'),
     updateState: function () {
-      this.setDisabled(!this.view.hasNotChanged());
+      var gridVisibleAndWithValidationErrors = false;
+      if (!this.view.isShowingForm && this.view.viewGrid.gridHasValidationErrors()) {
+        // do not allow refreshing the grid if it has validation errors
+        gridVisibleAndWithValidationErrors = true;
+      }
+      this.setDisabled(gridVisibleAndWithValidationErrors || this.view.isRefreshing || !this.view.hasNotChanged());
     },
     keyboardShortcutId: 'ToolBar_Refresh'
   },
@@ -216,12 +240,13 @@
     sortPosition: 50,
     prompt: OB.I18N.getLabel('OBUIAPP_CancelEdit'),
     updateState: function () {
+      var recordWithValidationErrorsSelected = false;
       if (this.view.isShowingForm) {
         this.setDisabled(false);
       } else {
         // Only enabled when the grid is being edited or when
         // the selected records have errors
-        this.setDisabled(!this.view.isEditingGrid && this.view.hasNotChanged());
+        this.setDisabled(!this.view.isEditingGrid && this.view.hasNotChanged() && !this.view.viewGrid.selectedRecordHasValidationErrors());
       }
     },
     keyboardShortcutId: 'ToolBar_Undo'
@@ -1228,7 +1253,8 @@
       // This is needed to prevent JSLint complaining about "Don't make functions within a loop.
       callbackHandler = function (currentContext, me) {
         return function (response, data, request) {
-          var noneOrMultipleRecordsSelected = currentContext.viewGrid.getSelectedRecords().length !== 1;
+          var grid = currentContext.isShowingTree ? currentContext.treeGrid : currentContext.viewGrid,
+              noneOrMultipleRecordsSelected = grid.getSelectedRecords().length !== 1;
           var sessionAttributes = data.sessionAttributes,
               auxInputs = data.auxiliaryInputValues,
               attachmentExists = data.attachmentExists,
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-action-def.js	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-action-def.js	Mon Jan 05 16:47:23 2015 +0100
@@ -133,4 +133,13 @@
     return;
   }
   callerField.setValueFromRecord(paramObj.record, true, true);
+});
+
+//** {{{ refreshGrid }}} **
+//It refreshes the grid where the process button is defined. Only needed if the process adds or deletes records from this tab
+OB.Utilities.Action.set('refreshGrid', function (paramObj) {
+  var processView = paramObj._processView;
+  if (processView && processView.buttonOwnerView && processView.buttonOwnerView.viewGrid) {
+    processView.buttonOwnerView.viewGrid.refreshGrid();
+  }
 });
\ No newline at end of file
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js	Mon Jan 05 16:47:23 2015 +0100
@@ -213,7 +213,8 @@
   loadingLayout.addMember(isc.Label.create({
     contents: label,
     styleName: OB.Styles.LoadingPrompt.loadingTextStyleName,
-    width: 1,
+    width: 100,
+    align: 'right',
     overflow: 'visible'
   }));
   loadingLayout.addMember(isc.Img.create(OB.Styles.LoadingPrompt.loadingImage));
@@ -337,15 +338,14 @@
 // Open a view using a tab id and record id. The tab can be a child tab. If the record id
 // is not set then the tab is opened in grid mode. If command is not set then default is
 // used.
-OB.Utilities.openDirectTab = function (tabId, recordId, command, position, criteria, direct) {
-
+OB.Utilities.openDirectTab = function (tabId, recordId, command, position, criteria, direct, urlParams) {
+  var callback, isDirect = direct;
+  // if the url params are not passed to the function, obtain then from the url
+  urlParams = urlParams || OB.Utilities.getUrlParameters();
   tabId = OB.Utilities.removeFragment(tabId);
   recordId = OB.Utilities.removeFragment(recordId);
   command = OB.Utilities.removeFragment(command);
 
-  var urlParams = OB.Utilities.getUrlParameters(),
-      callback, isDirect = direct;
-
   //added to have the additional filter clause and tabid. Mallikarjun M
   callback = function (response, data, request) {
     command = command || 'DEFAULT';
@@ -384,6 +384,10 @@
       }
     }
 
+    if (urlParams.emptyFilterClause) {
+      view.emptyFilterClause = urlParams.emptyFilterClause;
+    }
+
     if (urlParams.replaceDefaultFilter) {
       view.replaceDefaultFilter = urlParams.replaceDefaultFilter;
     }
@@ -426,10 +430,12 @@
     if (direct !== false) {
       isDirect = true;
     }
-    if (singleRecord !== false) {
-      isSingleRecord = true;
-    }
+
   }
+  if (singleRecord !== false) {
+    isSingleRecord = true;
+  }
+
   if (isClassicEnvironment) {
     if (recordId) {
       OB.Layout.ClassicOBCompatibility.openLinkedItem(tabId, recordId);
--- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -6,7 +6,7 @@
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <NAME><![CDATA[HTML Widget]]></NAME>
-<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.24984]]></VERSION>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.25650]]></VERSION>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <DESCRIPTION><![CDATA[Provides the HTML Widget superclass that allows to create widget classes that embed the html code.]]></DESCRIPTION>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <HELP><![CDATA[With this module you can define your own widget classes just setting up your own html code or the html code provided by third parties.]]></HELP>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <URL><![CDATA[http://forge.openbravo.com/projects/htmlwidget]]></URL>
--- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -7,7 +7,7 @@
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <AD_MODULE_ID><![CDATA[D393BE6F22BB44B7B728259B34FC795A]]></AD_MODULE_ID>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.24984]]></STARTVERSION>
+<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.25650]]></STARTVERSION>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -6,7 +6,7 @@
 <!--4B828F4D03264080AA1D2057B13F613C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <NAME><![CDATA[User Interface Client Kernel]]></NAME>
-<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.24984]]></VERSION>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.25650]]></VERSION>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <DESCRIPTION><![CDATA[Provides framework functionality for the Openbravo User Interface]]></DESCRIPTION>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <HELP><![CDATA[The user interface client kernel is a generation framework for generating client (browser) components used in Openbravo. Its components are mainly used by other modules to provide customizable and extendable user interfaces.]]></HELP>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <URL><![CDATA[http://forge.openbravo.com/projects/openbravoclientkernel]]></URL>
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -7,7 +7,7 @@
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.24984]]></STARTVERSION>
+<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.25650]]></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.24984]]></STARTVERSION>
+<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <STARTVERSION><![CDATA[1.1.25650]]></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.24984]]></STARTVERSION>
+<!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <STARTVERSION><![CDATA[2.0.25650]]></STARTVERSION>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON REST Webservice]]></DEPENDANT_MODULE_NAME>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/DateTimeUIDefinition.java	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/DateTimeUIDefinition.java	Mon Jan 05 16:47:23 2015 +0100
@@ -11,14 +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) 2010-2012 Openbravo SLU 
+ * All portions are Copyright (C) 2010-2014 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
  */
 package org.openbravo.client.kernel.reference;
 
+import java.text.FieldPosition;
 import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Date;
 
 import org.openbravo.base.exception.OBException;
@@ -33,6 +35,7 @@
 public class DateTimeUIDefinition extends DateUIDefinition {
   private String lastUsedPattern = null;
   private SimpleDateFormat dateFormat = null;
+  private static final SimpleDateFormat ficDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
   @Override
   public String getParentType() {
@@ -49,6 +52,38 @@
   }
 
   @Override
+  public String convertToClassicString(Object value) {
+    if (value == null || value == "") {
+      return "";
+    }
+
+    if (value instanceof String) {
+      return (String) value;
+    }
+
+    StringBuffer convertedValue = convertLocalDateTimeToUTC((Date) value);
+    return convertedValue.toString();
+  }
+
+  private StringBuffer convertLocalDateTimeToUTC(Date UTCDate) {
+    StringBuffer localTimeColumnValue = null;
+    Calendar now = Calendar.getInstance();
+
+    Calendar calendar = Calendar.getInstance();
+    calendar.setTime(UTCDate);
+    calendar.set(Calendar.DATE, now.get(Calendar.DATE));
+    calendar.set(Calendar.MONTH, now.get(Calendar.MONTH));
+    calendar.set(Calendar.YEAR, now.get(Calendar.YEAR));
+
+    int gmtMillisecondOffset = (now.get(Calendar.ZONE_OFFSET) + now.get(Calendar.DST_OFFSET));
+    calendar.add(Calendar.MILLISECOND, -gmtMillisecondOffset);
+    localTimeColumnValue = getClassicFormat().format(calendar.getTime(), new StringBuffer(),
+        new FieldPosition(0));
+
+    return localTimeColumnValue;
+  }
+
+  @Override
   protected SimpleDateFormat getClassicFormat() {
     String pattern = RequestContext.get().getSessionAttribute("#AD_JavaDateTimeFormat").toString();
     if (dateFormat == null || !pattern.equals(lastUsedPattern)) {
@@ -68,7 +103,13 @@
       if (value.contains("T")) {
         return value;
       }
+      Calendar now = Calendar.getInstance();
       final Date date = getClassicFormat().parse(value);
+      Calendar calendar = Calendar.getInstance();
+      calendar.setTime(date);
+      // Applies the zone offset and the dst offset to convert the time from local to UTC
+      int gmtMillisecondOffset = (now.get(Calendar.ZONE_OFFSET) + now.get(Calendar.DST_OFFSET));
+      calendar.add(Calendar.MILLISECOND, -gmtMillisecondOffset);
       return ((PrimitiveDomainType) getDomainType()).convertToString(date);
     } catch (Exception e) {
       throw new OBException(e);
--- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -6,7 +6,7 @@
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <NAME><![CDATA[Workspace & Widgets]]></NAME>
-<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.24984]]></VERSION>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.25650]]></VERSION>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <DESCRIPTION><![CDATA[Workspace & Widgets]]></DESCRIPTION>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <HELP><![CDATA[Provides the infrastructure of workspace tab (formerly My Openbravo)]]></HELP>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <URL><![CDATA[http://forge.openbravo.com/projects/myopenbravo]]></URL>
--- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -7,7 +7,7 @@
 <!--15F51F03882F444CAB6593B4566DC929-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--15F51F03882F444CAB6593B4566DC929-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
 <!--15F51F03882F444CAB6593B4566DC929-->  <AD_DEPENDENT_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_DEPENDENT_MODULE_ID>
-<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.24984]]></STARTVERSION>
+<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.25650]]></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.24984]]></STARTVERSION>
+<!--E71B28FC949D481D9F59C17D01E46EF9-->  <STARTVERSION><![CDATA[3.0.25650]]></STARTVERSION>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.myob/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.myob/ob-widget-styles.css	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.client.myob/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.myob/ob-widget-styles.css	Mon Jan 05 16:47:23 2015 +0100
@@ -235,7 +235,7 @@
   font-size: 16px;
   background-repeat: no-repeat;
   background-position: center 6px;
-  background-image: url(../../../../../../utility/ShowImageLogo?logo=banner-production);
+  background-image: url(../../utility/ShowImageLogo?logo=banner-production);
 }
 
 .OBWidgetAboutLabels {
--- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -6,7 +6,7 @@
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <NAME><![CDATA[Query/List Widget]]></NAME>
-<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.24984]]></VERSION>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.25650]]></VERSION>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <DESCRIPTION><![CDATA[Provides the Query/List superclass widget that allows to create widget classes that prints a grid of data based on a query.]]></DESCRIPTION>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <HELP><![CDATA[With this module you can define your own widget classes that just with simple Application Dictionary shows a grid of data based on a HQL Query.]]></HELP>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <URL><![CDATA[http://forge.openbravo.com/projects/querylistwidget]]></URL>
--- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -7,7 +7,7 @@
 <!--26558497C31140BFAB067BA4BC47D799-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--26558497C31140BFAB067BA4BC47D799-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
 <!--26558497C31140BFAB067BA4BC47D799-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.24984]]></STARTVERSION>
+<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.25650]]></STARTVERSION>
 <!--26558497C31140BFAB067BA4BC47D799-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--26558497C31140BFAB067BA4BC47D799-->  <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME>
 <!--26558497C31140BFAB067BA4BC47D799-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -6,7 +6,7 @@
 <!--FF8080812D842086012D844F3CC0003E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FF8080812D842086012D844F3CC0003E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080812D842086012D844F3CC0003E-->  <NAME><![CDATA[Widgets Collection]]></NAME>
-<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.24984]]></VERSION>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.25650]]></VERSION>
 <!--FF8080812D842086012D844F3CC0003E-->  <DESCRIPTION><![CDATA[Collection of Workspace Widgets]]></DESCRIPTION>
 <!--FF8080812D842086012D844F3CC0003E-->  <HELP><![CDATA[Collection of Workspace Widgets]]></HELP>
 <!--FF8080812D842086012D844F3CC0003E-->  <URL><![CDATA[http://forge.openbravo.com/projects/widgetscollection]]></URL>
--- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -7,7 +7,7 @@
 <!--FF8080812D842086012D845002070046-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080812D842086012D845002070046-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
 <!--FF8080812D842086012D845002070046-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.24984]]></STARTVERSION>
+<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.25650]]></STARTVERSION>
 <!--FF8080812D842086012D845002070046-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080812D842086012D845002070046-->  <DEPENDANT_MODULE_NAME><![CDATA[Workspace & Widgets]]></DEPENDANT_MODULE_NAME>
 <!--FF8080812D842086012D845002070046-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -6,7 +6,7 @@
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <NAME><![CDATA[Payment Report]]></NAME>
-<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.24984]]></VERSION>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.25650]]></VERSION>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <DESCRIPTION><![CDATA[Payment Report]]></DESCRIPTION>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <URL><![CDATA[http://forge.openbravo.com/projects/paymentreport]]></URL>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <TYPE><![CDATA[M]]></TYPE>
--- a/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -7,7 +7,7 @@
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_DEPENDENT_MODULE_ID>
-<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.24984]]></STARTVERSION>
+<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.25650]]></STARTVERSION>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <DEPENDANT_MODULE_NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></DEPENDANT_MODULE_NAME>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -6,7 +6,7 @@
 <!--3A3A943684D64DEF9EC39F588A656848-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <NAME><![CDATA[Orders Awaiting Delivery]]></NAME>
-<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.24984]]></VERSION>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.25650]]></VERSION>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <DESCRIPTION><![CDATA[Report displaying sales orders not shipped.]]></DESCRIPTION>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <URL><![CDATA[http://forge.openbravo.com/projects/ordersawaitingdlivery]]></URL>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <TYPE><![CDATA[M]]></TYPE>
--- a/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -7,7 +7,7 @@
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <AD_MODULE_ID><![CDATA[3A3A943684D64DEF9EC39F588A656848]]></AD_MODULE_ID>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.24984]]></STARTVERSION>
+<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.25650]]></STARTVERSION>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -6,7 +6,7 @@
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <NAME><![CDATA[JSON Datasource]]></NAME>
-<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION><![CDATA[2.1.24984]]></VERSION>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION><![CDATA[2.1.25650]]></VERSION>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <DESCRIPTION><![CDATA[Provides data source CRUD functionality using JSON as the data format]]></DESCRIPTION>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <HELP><![CDATA[This module implements the datasource concept. Datasources play a central role in Smartclient applications. The datasource module automatically creates a datasource for each Openbravo entity. In addition custom data source implementations can be defined.]]></HELP>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <URL><![CDATA[http://forge.openbravo.com/projects/datasourceservice]]></URL>
--- a/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -7,7 +7,7 @@
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <STARTVERSION><![CDATA[1.1.24984]]></STARTVERSION>
+<!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <STARTVERSION><![CDATA[1.1.25650]]></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.24984]]></STARTVERSION>
+<!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <STARTVERSION><![CDATA[2.0.25650]]></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.24984]]></STARTVERSION>
+<!--4FCE95802A854F7E8623AFF7C33D13EE-->  <STARTVERSION><![CDATA[3.0.25650]]></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.24984]]></STARTVERSION>
+<!--54AF8B39C55E4E7496902893ECD82786-->  <STARTVERSION><![CDATA[2.1.25650]]></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.24984]]></STARTVERSION>
+<!--D03C56D8A4E14F45A5466350E05C631F-->  <STARTVERSION><![CDATA[8.1.25650]]></STARTVERSION>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ADTreeDatasourceService.java	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ADTreeDatasourceService.java	Mon Jan 05 16:47:23 2015 +0100
@@ -124,6 +124,7 @@
       }
       Tree tree = getTree(table, bobProperties);
       OBCriteria<TreeNode> adTreeNodeCriteria = OBDal.getInstance().createCriteria(TreeNode.class);
+      adTreeNodeCriteria.setFilterOnActive(false);
       adTreeNodeCriteria.add(Restrictions.eq(TreeNode.PROPERTY_TREE, tree));
       adTreeNodeCriteria.add(Restrictions.eq(TreeNode.PROPERTY_NODE, bobId));
       TreeNode treeNode = (TreeNode) adTreeNodeCriteria.uniqueResult();
@@ -263,6 +264,7 @@
     String selectClause = " tn.id as treeNodeId, tn.reportSet as parentId, tn.sequenceNumber as seqNo, tn.node as nodeId, e as entity";
     OBQuery<BaseOBObject> obq = OBDal.getInstance()
         .createQuery("ADTreeNode", joinClause.toString());
+    obq.setFilterOnActive(false);
     obq.setSelectClause(selectClause);
     obq.setFilterOnReadableOrganization(false);
     int nResults = obq.count();
@@ -360,6 +362,7 @@
     joinClause.append(" and tn.reportSet = ? order by tn.sequenceNumber ");
     OBQuery<BaseOBObject> obq = OBDal.getInstance()
         .createQuery("ADTreeNode", joinClause.toString());
+    obq.setFilterOnActive(false);
     final List<Object> parameters = new ArrayList<Object>();
     parameters.add(nodeId);
     obq.setParameters(parameters);
@@ -392,6 +395,7 @@
       // Last positioned child. Pick the highest sequence number of its brothers and add 10
       // No need to recompute sequence numbers
       OBCriteria<TreeNode> maxSeqNoCriteria = OBDal.getInstance().createCriteria(TreeNode.class);
+      maxSeqNoCriteria.setFilterOnActive(false);
       maxSeqNoCriteria.add(Restrictions.eq(TreeNode.PROPERTY_TREE, tree));
       maxSeqNoCriteria.add(Restrictions.eq(TreeNode.PROPERTY_REPORTSET, newParentId));
       maxSeqNoCriteria.setProjection(Projections.max(TreeNode.PROPERTY_SEQUENCENUMBER));
@@ -400,6 +404,7 @@
     } else {
       // Sequence numbers of the nodes that are positioned after the new one needs to be recomputed
       OBCriteria<TreeNode> nextNodeCriteria = OBDal.getInstance().createCriteria(TreeNode.class);
+      nextNodeCriteria.setFilterOnActive(false);
       nextNodeCriteria.add(Restrictions.eq(TreeNode.PROPERTY_TREE, tree));
       nextNodeCriteria.add(Restrictions.eq(TreeNode.PROPERTY_NODE, nextNodeId));
       TreeNode nextNode = (TreeNode) nextNodeCriteria.uniqueResult();
@@ -528,6 +533,7 @@
     Table referencedTable = OBDal.getInstance().get(Table.class, referencedTableId);
 
     OBCriteria<Tree> treeCriteria = OBDal.getInstance().createCriteria(Tree.class);
+    treeCriteria.setFilterOnActive(false);
     treeCriteria.add(Restrictions.eq(Tree.PROPERTY_TABLE, referencedTable));
     treeCriteria.add(Restrictions.eq(Tree.PROPERTY_CLIENT, OBContext.getOBContext()
         .getCurrentClient()));
@@ -546,6 +552,7 @@
   private Tree getTree(Table table, JSONObject bobProperties) {
     Tree tree = null;
     OBCriteria<Tree> adTreeCriteria = OBDal.getInstance().createCriteria(Tree.class);
+    adTreeCriteria.setFilterOnActive(false);
     adTreeCriteria.add(Restrictions.eq(Tree.PROPERTY_TABLE, table));
     tree = (Tree) adTreeCriteria.uniqueResult();
     return tree;
@@ -618,6 +625,7 @@
     }
 
     OBCriteria<TreeNode> treeNodeCriteria = OBDal.getInstance().createCriteria(TreeNode.class);
+    treeNodeCriteria.setFilterOnActive(false);
     treeNodeCriteria.add(Restrictions.eq(TreeNode.PROPERTY_TREE, tree));
     treeNodeCriteria.add(Restrictions.eq(TreeNode.PROPERTY_NODE, nodeId));
     TreeNode treeNode = (TreeNode) treeNodeCriteria.uniqueResult();
@@ -669,6 +677,7 @@
     JSONObject json = null;
     try {
       OBCriteria<TreeNode> treeNodeCriteria = OBDal.getInstance().createCriteria(TreeNode.class);
+      treeNodeCriteria.setFilterOnActive(false);
       treeNodeCriteria.add(Restrictions.eq(TreeNode.PROPERTY_TREE, tree));
       treeNodeCriteria.add(Restrictions.eq(TreeNode.PROPERTY_NODE, bobId));
       TreeNode treeNode = (TreeNode) treeNodeCriteria.uniqueResult();
@@ -706,6 +715,7 @@
     joinClause.append(" and tn.node = ?");
     OBQuery<BaseOBObject> obq = OBDal.getInstance()
         .createQuery("ADTreeNode", joinClause.toString());
+    obq.setFilterOnActive(false);
 
     final List<Object> parameters = new ArrayList<Object>();
     parameters.add(nodeId);
--- a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServiceProvider.java	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServiceProvider.java	Mon Jan 05 16:47:23 2015 +0100
@@ -26,6 +26,7 @@
 
 import org.hibernate.criterion.Restrictions;
 import org.openbravo.base.exception.OBException;
+import org.openbravo.base.model.Entity;
 import org.openbravo.base.model.ModelProvider;
 import org.openbravo.base.util.OBClassLoader;
 import org.openbravo.base.weld.WeldUtils;
@@ -54,63 +55,124 @@
    * Checks the internal cache for a datasource with the requested name and returns it if found. If
    * not found a new one is created, which is cached and then returned.
    * 
-   * @param name
+   * @param dataSourceIdentifier
    *          the name by which to search and identify the data source.
    * @return a {@link DataSourceService} object
    */
-  @SuppressWarnings("unchecked")
-  public DataSourceService getDataSource(String name) {
-    DataSourceService ds = dataSources.get(name);
-    if (ds == null) {
+  public DataSourceService getDataSource(String dataSourceIdentifier) {
+    DataSourceService dataSourceService = dataSources.get(dataSourceIdentifier);
+    if (dataSourceService == null) {
       OBContext.setAdminMode();
       try {
-        DataSource dataSource = OBDal.getInstance().get(DataSource.class, name);
-        if (dataSource == null) {
-
-          final OBCriteria<DataSource> obCriteria = OBDal.getInstance().createCriteria(
-              DataSource.class);
-          obCriteria.add(Restrictions.eq(DataSource.PROPERTY_NAME, name));
-          if (!obCriteria.list().isEmpty()) {
-            dataSource = obCriteria.list().get(0);
-          }
-        }
-        if (dataSource == null) {
-          final OBCriteria<Table> qTable = OBDal.getInstance().createCriteria(Table.class);
-          qTable.add(Restrictions.eq(Table.PROPERTY_NAME, name));
-          if (!qTable.list().isEmpty()) {
-            Table table = (Table) qTable.list().get(0);
-            if (ApplicationConstants.DATASOURCEBASEDTABLE.equals(table.getDataOriginType())) {
-              dataSource = table.getObserdsDatasource();
-              ds.setEntity(ModelProvider.getInstance().getEntityByTableId(table.getId()));
-            } else if (ApplicationConstants.HQLBASEDTABLE.equals(table.getDataOriginType())) {
-              dataSource = OBDal.getInstance().get(DataSource.class,
-                  ApplicationConstants.HQL_TABLE_DATASOURCE_ID);
-            }
-          }
-          if (dataSource == null) {
-            ds = weldUtils.getInstance(DefaultDataSourceService.class);
-            ds.setName(name);
-            ds.setEntity(ModelProvider.getInstance().getEntity(name));
-            dataSources.put(name, ds);
-          }
-
-        } else {
-          if (dataSource.getJavaClassName() != null) {
-            final Class<DataSourceService> clz = (Class<DataSourceService>) OBClassLoader
-                .getInstance().loadClass(dataSource.getJavaClassName());
-            ds = weldUtils.getInstance(clz);
-          } else {
-            ds = new DefaultDataSourceService();
-          }
-          ds.setDataSource(dataSource);
-          dataSources.put(name, ds);
-        }
+        DataSource dataSource = getRealDataSource(dataSourceIdentifier);
+        dataSourceService = getDataSourceServiceFromDataSource(dataSource, dataSourceIdentifier);
+        dataSources.put(dataSourceIdentifier, dataSourceService);
       } catch (Exception e) {
         throw new OBException(e);
       } finally {
         OBContext.restorePreviousMode();
       }
     }
+    return dataSourceService;
+  }
+
+  /**
+   * Obtains a dataSource given a dataSource identifier.
+   * 
+   * This class should have been named getDataSource instead of getRealDataSource, but the name was
+   * already taken by a public method that returns a DataSourceService
+   * 
+   * @param dataSourceIdentifier
+   *          a string that identifies the dataSource. it can be either the ID of the DataSource,
+   *          the name of the DataSource or the name of the Table whose datasource is to be
+   *          retrieved
+   * @return the datasource associated with the provided identifier or null if there aren't any
+   */
+  private DataSource getRealDataSource(String dataSourceIdentifier) {
+    // Checks if the dataSourceIdentifier the ID of the DataSource
+    DataSource dataSource = getDataSourceFromDataSourceId(dataSourceIdentifier);
+    if (dataSource == null) {
+      // If it is not the ID of the DataSource, checks if it is its name
+      dataSource = getDataSourceFromDataSourceName(dataSourceIdentifier);
+      if (dataSource == null) {
+        // If the dataSourceIdentifier is not the DataSource ID nor its name, checks if it is the
+        // name of a Table
+        dataSource = getDataSourceFromTableName(dataSourceIdentifier);
+      }
+    }
+    return dataSource;
+  }
+
+  private DataSource getDataSourceFromDataSourceId(String dataSourceId) {
+    return OBDal.getInstance().get(DataSource.class, dataSourceId);
+  }
+
+  private DataSource getDataSourceFromDataSourceName(String dataSourceName) {
+    DataSource dataSource = null;
+    final OBCriteria<DataSource> obCriteria = OBDal.getInstance().createCriteria(DataSource.class);
+    obCriteria.add(Restrictions.eq(DataSource.PROPERTY_NAME, dataSourceName));
+    if (!obCriteria.list().isEmpty()) {
+      dataSource = obCriteria.list().get(0);
+    }
+    return dataSource;
+  }
+
+  private DataSource getDataSourceFromTableName(String tableName) {
+    DataSource dataSource = null;
+    final OBCriteria<Table> qTable = OBDal.getInstance().createCriteria(Table.class);
+    qTable.add(Restrictions.eq(Table.PROPERTY_NAME, tableName));
+    if (!qTable.list().isEmpty()) {
+      Table table = (Table) qTable.list().get(0);
+      if (ApplicationConstants.DATASOURCEBASEDTABLE.equals(table.getDataOriginType())) {
+        // If the table is based on a manual datasource, return that particular datasource
+        dataSource = table.getObserdsDatasource();
+      } else if (ApplicationConstants.HQLBASEDTABLE.equals(table.getDataOriginType())) {
+        // If the table is based on a HQL table, use the 'HQL Tables Datasource'
+        dataSource = OBDal.getInstance().get(DataSource.class,
+            ApplicationConstants.HQL_TABLE_DATASOURCE_ID);
+      }
+    }
+    return dataSource;
+  }
+
+  /**
+   * Returns a DataSourceService given a DataSource
+   * 
+   * @param dataSource
+   *          the dataSource whose DataSourceService is to be retrieved
+   * @param dataSourceIdentifier
+   *          the name that was used to retrieve the dataSource
+   * @return the DataSourceService associated with the provided DataSource, or the
+   *         DefaultDataSourceService otherwise
+   * @throws ClassNotFoundException
+   */
+  private DataSourceService getDataSourceServiceFromDataSource(DataSource dataSource,
+      String dataSourceIdentifier) throws ClassNotFoundException {
+    DataSourceService ds = null;
+    if (dataSource == null) {
+      // if no dataSource is provided, return the DefaultDataSourceService
+      ds = weldUtils.getInstance(DefaultDataSourceService.class);
+      ds.setName(dataSourceIdentifier);
+    } else {
+      // try to retrieve the DataSourceService through the dataSource java class name, otherwise
+      // return the DefaultDataSourceService
+      if (dataSource.getJavaClassName() != null) {
+        @SuppressWarnings("unchecked")
+        final Class<DataSourceService> clz = (Class<DataSourceService>) OBClassLoader.getInstance()
+            .loadClass(dataSource.getJavaClassName());
+        ds = weldUtils.getInstance(clz);
+      } else {
+        ds = new DefaultDataSourceService();
+      }
+      ds.setDataSource(dataSource);
+    }
+    // don't fail if the entity does not exist, just don't assign it to the DataSourceService
+    boolean checkIfNotExists = false;
+    Entity entity = ModelProvider.getInstance().getEntity(dataSourceIdentifier, checkIfNotExists);
+    if (entity != null) {
+      ds.setEntity(entity);
+    }
     return ds;
   }
+
 }
--- a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java	Mon Jan 05 16:47:23 2015 +0100
@@ -555,7 +555,10 @@
           } else if (keyValue instanceof Number && keyValue != null) {
             DecimalFormat format = formats.get(key);
             if (format == null) {
-              keyValue = keyValue.toString().replace(".", decimalSeparator);
+              // if the CSV decimal separator property is defined, used it over the character
+              // defined in Format.xml
+              keyValue = keyValue.toString().replace(".",
+                  prefDecimalSeparator != null ? prefDecimalSeparator : decimalSeparator);
             } else {
               keyValue = format.format(new BigDecimal(keyValue.toString()));
               if (prefDecimalSeparator != null) {
--- a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/HQLDataSourceService.java	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/HQLDataSourceService.java	Mon Jan 05 16:47:23 2015 +0100
@@ -37,6 +37,8 @@
 import org.openbravo.base.model.ModelProvider;
 import org.openbravo.base.model.Property;
 import org.openbravo.base.model.domaintype.PrimitiveDomainType;
+import org.openbravo.base.structure.BaseOBObject;
+import org.openbravo.base.structure.IdentifierProvider;
 import org.openbravo.client.kernel.ComponentProvider;
 import org.openbravo.client.kernel.reference.EnumUIDefinition;
 import org.openbravo.client.kernel.reference.ForeignKeyUIDefinition;
@@ -46,7 +48,6 @@
 import org.openbravo.client.kernel.reference.UIDefinitionController;
 import org.openbravo.client.kernel.reference.YesNoUIDefinition;
 import org.openbravo.dal.core.OBContext;
-import org.openbravo.dal.service.OBCriteria;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.model.ad.datamodel.Column;
 import org.openbravo.model.ad.datamodel.Table;
@@ -67,6 +68,8 @@
   private static final String WHERE = " WHERE ";
   private static final String ORDERBY = " ORDER BY ";
   private static final String GROUPBY = "GROUP BY";
+  private static final String MAIN_FROM = "MAINFROM";
+  private static final String FROM = "FROM ";
   private static final String ADDITIONAL_FILTERS = "@additional_filters@";
   private static final String INSERTION_POINT_GENERIC_ID = "@insertion_point_#@";
   private static final String INSERTION_POINT_INDEX_PLACEHOLDER = "#";
@@ -176,15 +179,19 @@
     for (Object row : query.list()) {
       Map<String, Object> record = new HashMap<String, Object>();
       if (distinct != null) {
-        // TODO: Find a better way to do this, use the proper id
-        record.put(JsonConstants.ID, row);
-        record.put(JsonConstants.IDENTIFIER, row);
+        Object[] result = (Object[]) row;
+        // the whole referenced BaseOBObject is stored in the first position of the result
+        BaseOBObject bob = (BaseOBObject) result[0];
+        record.put(JsonConstants.ID, bob.getId());
+        record.put(JsonConstants.IDENTIFIER, IdentifierProvider.getInstance().getIdentifier(bob));
       } else {
         Object[] properties = (Object[]) row;
         for (int i = 0; i < returnAliases.length; i++) {
-          Property property = entity.getPropertyByColumnName(returnAliases[i], checkIsNotNull);
+          Property property = entity.getPropertyByColumnName(returnAliases[i].toLowerCase(),
+              checkIsNotNull);
           if (property == null) {
-            property = entity.getPropertyByColumnName(columns.get(i).getDBColumnName());
+            property = entity.getPropertyByColumnName(columns.get(i).getDBColumnName()
+                .toLowerCase());
           }
           record.put(property.getName(), properties[i]);
         }
@@ -235,22 +242,36 @@
     AdvancedQueryBuilder queryBuilder = new AdvancedQueryBuilder();
     queryBuilder.setEntity(ModelProvider.getInstance().getEntityByTableId(table.getId()));
     queryBuilder.setCriteria(criteria);
+    if (table.getEntityAlias() != null) {
+      queryBuilder.setMainAlias(table.getEntityAlias());
+    }
     String whereClause = queryBuilder.getWhereClause();
     // replace the property names with the column alias
     whereClause = replaceParametersWithAlias(table, whereClause);
 
     String distinct = parameters.get(JsonConstants.DISTINCT_PARAMETER);
     if (distinct != null) {
-      final String from = "from ";
-      String formClause = hqlQuery.substring(hqlQuery.toLowerCase().indexOf(from));
+      String formClause = null;
+      if (hqlQuery.indexOf(MAIN_FROM) != -1) {
+        formClause = hqlQuery.substring(hqlQuery.indexOf(MAIN_FROM));
+      } else {
+        formClause = hqlQuery.substring(hqlQuery.toUpperCase().lastIndexOf(FROM));
+      }
       Entity entity = ModelProvider.getInstance().getEntityByTableId(table.getId());
       Property property = entity.getProperty(distinct);
+      Column distinctColumn = OBDal.getInstance().get(Column.class, property.getColumnId());
       // TODO: Improve distinct query like this: https://issues.openbravo.com/view.php?id=25182
       if (justCount) {
-        hqlQuery = "select count(distinct " + table.getEntityAlias() + "." + distinct + "."
+        hqlQuery = "select count(distinct " + distinctColumn.getEntityAlias() + "."
             + getNameOfFirstIdentifierProperty(property.getTargetEntity()) + ") " + formClause;
       } else {
-        hqlQuery = "select distinct " + table.getEntityAlias() + "." + distinct + "."
+        // Retrieve:
+        // - the whole referenced object, so that later it is easier to obtain its id and
+        // its identifier (which can be a translation)
+        // - the first property of the entity's identifier. This is needed because it is the column
+        // that will be used to order the rows
+        hqlQuery = "select distinct " + distinctColumn.getEntityAlias() + ","
+            + distinctColumn.getEntityAlias() + "."
             + getNameOfFirstIdentifierProperty(property.getTargetEntity()) + " " + formClause;
       }
     }
@@ -285,11 +306,18 @@
     hqlQuery = fillInInsertionPoints(hqlQuery, queryNamedParameters, parameters);
 
     if (distinct == null && justCount) {
-      final String from = "from ";
-      String formClause = hqlQuery.substring(hqlQuery.toLowerCase().indexOf(from));
+      String formClause = null;
+      if (hqlQuery.indexOf(MAIN_FROM) != -1) {
+        formClause = hqlQuery.substring(hqlQuery.indexOf(MAIN_FROM));
+      } else {
+        formClause = hqlQuery.substring(hqlQuery.toUpperCase().lastIndexOf(FROM));
+      }
       hqlQuery = "select count(*) " + formClause;
     }
 
+    if (hqlQuery.indexOf(MAIN_FROM) != -1) {
+      hqlQuery = hqlQuery.replace(MAIN_FROM, FROM);
+    }
     Query query = OBDal.getInstance().getSession().createQuery(hqlQuery);
 
     // sets the parameters of the query
@@ -458,6 +486,7 @@
     for (Column column : table.getADColumnList()) {
       // look for the property name, replace it with the column alias
       Property property = entity.getPropertyByColumnName(column.getDBColumnName());
+      // Map used to replace the property name used in the criteria with its alias
       Map<String, String> replacementMap = new HashMap<String, String>();
       String propertyNameBefore = null;
       String propertyNameAfter = null;
@@ -465,34 +494,40 @@
         // if the property is a primitive, just replace the property name with the column alias
         propertyNameBefore = property.getName();
         propertyNameAfter = column.getEntityAlias();
+        addEntryToReplacementMap(replacementMap, propertyNameBefore, propertyNameAfter);
       } else {
-        // if the property is a FK, then the name of the identifier property of the referenced
-        // entity has to be appended
-
-        if (column.isLinkToParentColumn()) {
-          propertyNameBefore = property.getName() + "." + JsonConstants.ID;
-          propertyNameAfter = column.getEntityAlias() + "." + JsonConstants.ID;
-        } else {
-          Entity refEntity = property.getReferencedProperty().getEntity();
-          String identifierPropertyName = refEntity.getIdentifierProperties().get(0).getName();
-          propertyNameBefore = property.getName() + "." + identifierPropertyName;
-          propertyNameAfter = column.getEntityAlias() + "." + identifierPropertyName;
-        }
-
+        // the criteria can refer to the foreign key via its ID...
+        propertyNameBefore = property.getName() + "." + JsonConstants.ID;
+        propertyNameAfter = column.getEntityAlias() + "." + JsonConstants.ID;
+        addEntryToReplacementMap(replacementMap, propertyNameBefore, propertyNameAfter);
+        // ... or through its identifier
+        Entity refEntity = property.getReferencedProperty().getEntity();
+        String identifierPropertyName = refEntity.getIdentifierProperties().get(0).getName();
+        propertyNameBefore = property.getName() + "." + identifierPropertyName;
+        propertyNameAfter = column.getEntityAlias() + "." + identifierPropertyName;
+        addEntryToReplacementMap(replacementMap, propertyNameBefore, propertyNameAfter);
       }
-      replacementMap.put(" " + propertyNameBefore + " ", " " + propertyNameAfter + " ");
-      replacementMap.put("(" + propertyNameBefore + ")", "(" + propertyNameAfter + ")");
       for (String toBeReplaced : replacementMap.keySet()) {
-        if (updatedWhereClause.contains(toBeReplaced)) {
-          updatedWhereClause = updatedWhereClause.replace(toBeReplaced,
-              replacementMap.get(toBeReplaced));
-        }
+        updatedWhereClause = updatedWhereClause.replaceAll(toBeReplaced,
+            replacementMap.get(toBeReplaced));
       }
     }
     return updatedWhereClause;
   }
 
   /**
+   * Adds a pair oldName-newName to the replacement map All possible parenthesis combinations are
+   * added to the replacement map
+   */
+  private void addEntryToReplacementMap(Map<String, String> replacementMap, String oldName,
+      String newName) {
+    replacementMap.put(" " + oldName + " ", " " + newName + " ");
+    replacementMap.put("[(]" + oldName + "[)]", "(" + newName + ")");
+    replacementMap.put("[(]" + oldName + " ", "(" + newName + " ");
+    replacementMap.put(" " + oldName + "[)]", " " + newName + ")");
+  }
+
+  /**
    * Adds the additional filters to the hql query. The additional filters include the client filter,
    * the organization filter and the filter created from the grid criteria
    * 
@@ -526,11 +561,7 @@
       additionalFilter.append(entityAlias + ".organization in (" + orgs + ")");
     }
 
-    if (!filterWhereClause.trim().isEmpty()) {
-      // if the filter where clause contains the string 'where', get rid of it
-      String whereClause = filterWhereClause.replaceAll("(?i)" + WHERE, " ");
-      additionalFilter.append(AND + whereClause);
-    }
+    addFilterWhereClause(additionalFilter, filterWhereClause);
 
     // the _where parameter contains the filter clause and the where clause defined at tab level
     String whereClauseParameter = parameters.get(JsonConstants.WHERE_PARAMETER);
@@ -559,6 +590,16 @@
     return hqlQueryWithFilters;
   }
 
+  private void addFilterWhereClause(StringBuffer additionalFilter, String filterWhereClause) {
+    if (!filterWhereClause.trim().isEmpty()) {
+      additionalFilter.append(AND + removeLeadingWhere(filterWhereClause));
+    }
+  }
+
+  private String removeLeadingWhere(String whereClause) {
+    return whereClause.replaceAll("^(?i)" + WHERE, " ");
+  }
+
   /**
    * Returns a HQL sort by clause based on the parameters sent to the datasource
    * 
@@ -577,13 +618,13 @@
 
     boolean isDistinctQuery = false;
     final String sortBy = parameters.get(JsonConstants.SORTBY_PARAMETER);
-    if (sortBy != null) {
+    if (parameters.get(JsonConstants.DISTINCT_PARAMETER) != null) {
+      orderByClause = parameters.get(JsonConstants.DISTINCT_PARAMETER);
+      isDistinctQuery = true;
+    } else if (sortBy != null) {
       orderByClause = sortBy;
     } else if (parameters.get(JsonConstants.ORDERBY_PARAMETER) != null) {
       orderByClause = parameters.get(JsonConstants.ORDERBY_PARAMETER);
-    } else if (parameters.get(JsonConstants.DISTINCT_PARAMETER) != null) {
-      orderByClause = parameters.get(JsonConstants.DISTINCT_PARAMETER);
-      isDistinctQuery = true;
     } else {
       return "";
     }
@@ -603,18 +644,22 @@
     }
 
     Entity entity = ModelProvider.getInstance().getEntityByTableId(table.getId());
-    Property property = entity.getProperty(propertyName);
-    OBCriteria<Column> columnCriteria = OBDal.getInstance().createCriteria(Column.class);
-    Column column = OBDal.getInstance().get(Column.class, property.getColumnId());
-    if (!orderByClause.isEmpty()) {
-      orderByClause = ORDERBY + column.getEntityAlias();
-      if (property.getTargetEntity() != null) {
-        orderByClause = orderByClause + "."
-            + getNameOfFirstIdentifierProperty(property.getTargetEntity());
-      }
-      orderByClause = orderByClause + direction;
-      if (includeMainEntityID && !isDistinctQuery) {
-        orderByClause = orderByClause + ", " + table.getEntityAlias() + ".id";
+    boolean checkIsNotNull = false;
+    Property property = entity.getProperty(propertyName, checkIsNotNull);
+    if (property == null) {
+      orderByClause = ORDERBY + propertyName;
+    } else {
+      Column column = OBDal.getInstance().get(Column.class, property.getColumnId());
+      if (!orderByClause.isEmpty()) {
+        orderByClause = ORDERBY + column.getEntityAlias();
+        if (property.getTargetEntity() != null) {
+          orderByClause = orderByClause + "."
+              + getNameOfFirstIdentifierProperty(property.getTargetEntity());
+        }
+        orderByClause = orderByClause + direction;
+        if (includeMainEntityID && !isDistinctQuery) {
+          orderByClause = orderByClause + ", " + table.getEntityAlias() + ".id";
+        }
       }
     }
     return orderByClause;
--- a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/TreeDatasourceService.java	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/TreeDatasourceService.java	Mon Jan 05 16:47:23 2015 +0100
@@ -42,6 +42,7 @@
 import org.openbravo.base.model.Property;
 import org.openbravo.base.structure.BaseOBObject;
 import org.openbravo.client.kernel.ComponentProvider;
+import org.openbravo.client.kernel.RequestContext;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBCriteria;
 import org.openbravo.dal.service.OBDal;
@@ -745,7 +746,16 @@
     }
     String hqlCopy = new String(hqlTreeWhereClause);
     for (String key : replacements.keySet()) {
-      hqlCopy = hqlCopy.replaceAll(key, replacements.get(key));
+      // if the key is not found in the request parameters, its value in the replacement list will
+      // be 'null'
+      if (replacements.get(key).equals("'null'")) {
+        // Strip the "@" from the key
+        String keyWithoutAt = key.substring(1, key.length() - 1);
+        hqlCopy = hqlCopy.replaceAll(key,
+            "'" + (String) RequestContext.get().getSessionAttribute(keyWithoutAt) + "'");
+      } else {
+        hqlCopy = hqlCopy.replaceAll(key, replacements.get(key));
+      }
     }
     return hqlCopy;
   }
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -6,7 +6,7 @@
 <!--FF8080813129ADA401312CA1222A0005-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FF8080813129ADA401312CA1222A0005-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813129ADA401312CA1222A0005-->  <NAME><![CDATA[Integration with Google APIs]]></NAME>
-<!--FF8080813129ADA401312CA1222A0005-->  <VERSION><![CDATA[0.1.24984]]></VERSION>
+<!--FF8080813129ADA401312CA1222A0005-->  <VERSION><![CDATA[0.1.25650]]></VERSION>
 <!--FF8080813129ADA401312CA1222A0005-->  <DESCRIPTION><![CDATA[Integration with Google APIs]]></DESCRIPTION>
 <!--FF8080813129ADA401312CA1222A0005-->  <TYPE><![CDATA[M]]></TYPE>
 <!--FF8080813129ADA401312CA1222A0005-->  <LICENSE><![CDATA[Licensed under the Openbravo Public License Version 1.1.
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -7,7 +7,7 @@
 <!--FF8080813141B198013141BA0F7D0012-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813141B198013141BA0F7D0012-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
 <!--FF8080813141B198013141BA0F7D0012-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813141B198013141BA0F7D0012-->  <STARTVERSION><![CDATA[0.1.24984]]></STARTVERSION>
+<!--FF8080813141B198013141BA0F7D0012-->  <STARTVERSION><![CDATA[0.1.25650]]></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.24984]]></STARTVERSION>
+<!--FF8080813151AEE1013151C4ACE6001B-->  <STARTVERSION><![CDATA[2.1.25650]]></STARTVERSION>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -6,7 +6,7 @@
 <!--FF8080813141B198013141B86DD70003-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FF8080813141B198013141B86DD70003-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813141B198013141B86DD70003-->  <NAME><![CDATA[OpenID Service Integration]]></NAME>
-<!--FF8080813141B198013141B86DD70003-->  <VERSION><![CDATA[0.1.24984]]></VERSION>
+<!--FF8080813141B198013141B86DD70003-->  <VERSION><![CDATA[0.1.25650]]></VERSION>
 <!--FF8080813141B198013141B86DD70003-->  <DESCRIPTION><![CDATA[OpenID Service Integration]]></DESCRIPTION>
 <!--FF8080813141B198013141B86DD70003-->  <TYPE><![CDATA[M]]></TYPE>
 <!--FF8080813141B198013141B86DD70003-->  <LICENSE><![CDATA[Licensed under the Openbravo Public License Version 1.1.
--- a/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -7,7 +7,7 @@
 <!--FF8080813141B198013141B8B21B0006-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813141B198013141B8B21B0006-->  <AD_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_MODULE_ID>
 <!--FF8080813141B198013141B8B21B0006-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813141B198013141B8B21B0006-->  <STARTVERSION><![CDATA[3.0.24984]]></STARTVERSION>
+<!--FF8080813141B198013141B8B21B0006-->  <STARTVERSION><![CDATA[3.0.25650]]></STARTVERSION>
 <!--FF8080813141B198013141B8B21B0006-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080813141B198013141B8B21B0006-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813141B198013141B8B21B0006-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -6,7 +6,7 @@
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <NAME><![CDATA[JSON REST Webservice]]></NAME>
-<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION><![CDATA[2.0.24984]]></VERSION>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION><![CDATA[2.0.25650]]></VERSION>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <DESCRIPTION><![CDATA[Provides a JSON REST webservice for CRUD service requests]]></DESCRIPTION>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <HELP><![CDATA[Provides a JSON REST webservice for CRUD service requests. Both the servlet implementation (receiving HTTP REST requests in JSON) as the backend processing are provided.]]></HELP>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <URL><![CDATA[http://forge.openbravo.com/projects/openbravojsonrest]]></URL>
--- a/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -7,7 +7,7 @@
 <!--9E3E7B42DB16405FB794496D309D7044-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <AD_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_MODULE_ID>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--9E3E7B42DB16405FB794496D309D7044-->  <STARTVERSION><![CDATA[3.0.24984]]></STARTVERSION>
+<!--9E3E7B42DB16405FB794496D309D7044-->  <STARTVERSION><![CDATA[3.0.25650]]></STARTVERSION>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java	Mon Jan 05 16:47:23 2015 +0100
@@ -1207,6 +1207,7 @@
           tab = OBDal.getInstance().get(Tab.class, tabId);
         }
         Tab ancestorTab = KernelUtils.getInstance().getParentTab(tab);
+        boolean checkIsNotNull = false;
 
         while (ancestorTab != null && paramValue.equals("")) {
 
@@ -1217,8 +1218,12 @@
             paramValue = vars.getStringParameter("@" + paramEntity.getName() + ".id@");
           } else {
             try {
-              Property prop = tabEntity.getPropertyByColumnName(param);
-              paramValue = vars.getStringParameter("@" + tabEntity + "." + prop.getName() + "@");
+              Property prop = tabEntity.getPropertyByColumnName(param, checkIsNotNull);
+              if (prop == null) {
+                paramValue = "";
+              } else {
+                paramValue = vars.getStringParameter("@" + tabEntity + "." + prop.getName() + "@");
+              }
             } catch (Exception ignore) {
               // ignoring exception as the property might be found from context.
               // for eg., refer issue https://issues.openbravo.com/view.php?id=26871
--- a/modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java	Mon Jan 05 16:47:23 2015 +0100
@@ -261,9 +261,14 @@
     final DataEntityQueryService queryService = createSetQueryService(parameters, false);
     queryService.setEntityName(entityName);
 
+    String selectedProperties = parameters.get(JsonConstants.SELECTEDPROPERTIES_PARAMETER);
+
     final DataToJsonConverter toJsonConverter = OBProvider.getInstance().get(
         DataToJsonConverter.class);
     toJsonConverter.setAdditionalProperties(JsonUtils.getAdditionalProperties(parameters));
+    // Convert to Json only the properties specified in the request. If no properties are specified,
+    // all of them will be converted to Json
+    toJsonConverter.setSelectedProperties(selectedProperties);
 
     final ScrollableResults scrollableResults = queryService.scroll();
     try {
@@ -388,12 +393,8 @@
     if ((StringUtils.isEmpty(startRowStr) || StringUtils.isEmpty(endRowStr))
         && !isIDCriteria(criteria) && !parameters.containsKey("exportAs")) {
       // pagination is not set, this is most likely a bug
-      String paramMsg = "";
-      for (String paramKey : parameters.keySet()) {
-        paramMsg += paramKey + ":" + parameters.get(paramKey) + "\n";
-      }
       log.warn("Fetching data without pagination, this can cause perfomance issues. Parameters: "
-          + paramMsg);
+          + convertParameterToString(parameters));
 
       if (parameters.containsKey(JsonConstants.TAB_PARAMETER)
           || parameters.containsKey(SelectorConstants.DS_REQUEST_SELECTOR_ID_PARAMETER)) {
@@ -407,6 +408,14 @@
         && "true".equals(parameters.get("_directNavigation"))
         && parameters.containsKey(JsonConstants.TARGETRECORDID_PARAMETER);
 
+    if (parameters.containsKey(JsonConstants.TARGETRECORDID_PARAMETER)
+        && parameters.get(JsonConstants.TARGETRECORDID_PARAMETER) != null
+        && !"null".equals(parameters.get(JsonConstants.TARGETRECORDID_PARAMETER))
+        && !"true".equals(parameters.get("_directNavigation"))) {
+      log.warn("Datasource request with targetRecordId but without directNavigation detected. This type of requests should be avoided because they result in a query that performs poorly. Parameters: "
+          + convertParameterToString(parameters));
+    }
+
     if (!directNavigation) {
       // set the where/org filter parameters and the @ parameters
       for (String key : parameters.keySet()) {
@@ -499,6 +508,15 @@
     return queryService;
   }
 
+  // Given a map of parameters, returns a string with the pairs key:value
+  private String convertParameterToString(Map<String, String> parameters) {
+    String paramMsg = "";
+    for (String paramKey : parameters.keySet()) {
+      paramMsg += paramKey + ":" + parameters.get(paramKey) + "\n";
+    }
+    return paramMsg;
+  }
+
   private void addWritableAttribute(List<JSONObject> jsonObjects) throws JSONException {
     for (JSONObject jsonObject : jsonObjects) {
       if (!jsonObject.has("client") || !jsonObject.has("organization")) {
--- a/modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonToDataConverter.java	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonToDataConverter.java	Mon Jan 05 16:47:23 2015 +0100
@@ -47,6 +47,7 @@
 import org.openbravo.base.model.domaintype.BinaryDomainType;
 import org.openbravo.base.model.domaintype.EncryptedStringDomainType;
 import org.openbravo.base.model.domaintype.HashedStringDomainType;
+import org.openbravo.base.model.domaintype.ProductCharacteristicsDomainType;
 import org.openbravo.base.model.domaintype.TimestampDomainType;
 import org.openbravo.base.provider.OBProvider;
 import org.openbravo.base.structure.BaseOBObject;
@@ -227,6 +228,10 @@
         }
       } else if (value instanceof String && property.getDomainType() instanceof BinaryDomainType) {
         return Base64.decodeBase64((String) value);
+      } else if (property.getDomainType() instanceof ProductCharacteristicsDomainType) {
+        // under certain conditions the Product Characteristics value needs to be fixed
+        // see issue https://issues.openbravo.com/view.php?id=28187
+        return ProductCharacteristicsDomainType.fixValue(value);
       }
       return value;
     } catch (Exception e) {
--- a/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -6,7 +6,7 @@
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <NAME><![CDATA[User Interface Selector]]></NAME>
-<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION><![CDATA[2.1.24984]]></VERSION>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION><![CDATA[2.1.25650]]></VERSION>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <DESCRIPTION><![CDATA[Provides a selector with a suggestion box and popup grid window]]></DESCRIPTION>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <HELP><![CDATA[The Openbravo selector provides new selector functionality which is used inside of existing Openbravo forms. The selector is mainly used for supporting foreign key references in the user interface. The selector combines both suggestion box behavior with a popup grid.]]></HELP>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <URL><![CDATA[http://forge.openbravo.com/projects/selector]]></URL>
--- a/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -7,7 +7,7 @@
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID>
-<!--38825CAED43941D38CA0C78DB04FCFA0-->  <STARTVERSION><![CDATA[8.1.24984]]></STARTVERSION>
+<!--38825CAED43941D38CA0C78DB04FCFA0-->  <STARTVERSION><![CDATA[8.1.25650]]></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.24984]]></STARTVERSION>
+<!--6DDE7B1A70174242AF82B5022FB89279-->  <STARTVERSION><![CDATA[2.1.25650]]></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.24984]]></STARTVERSION>
+<!--94F9CD2CB5EF4467A67475C786C984A7-->  <STARTVERSION><![CDATA[2.1.25650]]></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.24984]]></STARTVERSION>
+<!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <STARTVERSION><![CDATA[1.1.25650]]></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.24984]]></STARTVERSION>
+<!--C8DAC574B88649D08C9468521B343F12-->  <STARTVERSION><![CDATA[3.0.25650]]></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.24984]]></STARTVERSION>
+<!--F14EB17946BE4724A46F80CB1A47EC70-->  <STARTVERSION><![CDATA[2.1.25650]]></STARTVERSION>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDefaultFilterActionHandler.java	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDefaultFilterActionHandler.java	Mon Jan 05 16:47:23 2015 +0100
@@ -41,6 +41,7 @@
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBCriteria;
 import org.openbravo.dal.service.OBDal;
+import org.openbravo.model.ad.datamodel.Table;
 
 /**
  * 
@@ -66,7 +67,18 @@
       String selectorId = params.get("_selectorDefinitionId");
 
       Selector sel = OBDal.getInstance().get(Selector.class, selectorId);
-      final String entityName = sel.getTable().getName();
+      final Table table;
+      // Some selectors have a definition that do not use a table but a datasource
+      if (sel.getTable() != null) {
+        table = sel.getTable();
+      } else if (sel.getObserdsDatasource() != null
+          && sel.getObserdsDatasource().getTable() != null) {
+        table = sel.getObserdsDatasource().getTable();
+      } else {
+        // no table, don't do anything
+        return result;
+      }
+      final String entityName = table.getName();
       final Entity entity = ModelProvider.getInstance().getEntity(entityName);
 
       OBCriteria<SelectorField> obc = OBDal.getInstance().createCriteria(SelectorField.class);
--- a/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -6,7 +6,7 @@
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <NAME><![CDATA[2.50 to 3.00 Compatibility Skin]]></NAME>
-<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION><![CDATA[2.0.24984]]></VERSION>
+<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION><![CDATA[2.0.25650]]></VERSION>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <DESCRIPTION><![CDATA[Skin module to proper visualization of classic windows inside the MDI interface]]></DESCRIPTION>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <HELP><![CDATA[With this skin module the classic windows styles will display in a way more coherent with the new 3.00 styles]]></HELP>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <URL><![CDATA[www.openbravo.com]]></URL>
--- a/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -7,7 +7,7 @@
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <AD_MODULE_ID><![CDATA[96998CBC42744B3DBEE28AC8095C9335]]></AD_MODULE_ID>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--39BF75AD9AB3453698BF5DE29E727AA9-->  <STARTVERSION><![CDATA[3.0.24984]]></STARTVERSION>
+<!--39BF75AD9AB3453698BF5DE29E727AA9-->  <STARTVERSION><![CDATA[3.0.25650]]></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	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -6,7 +6,7 @@
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <NAME><![CDATA[Smartclient]]></NAME>
-<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION><![CDATA[8.1.24984]]></VERSION>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION><![CDATA[8.1.25650]]></VERSION>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <DESCRIPTION><![CDATA[SmartClient libraries for use within Openbravo]]></DESCRIPTION>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <HELP><![CDATA[This module contains the SmartClient libraries for usage by other modules. It also contains some simple test pages to validate that SmartClient is working correctly. Also contains generic Openbravo SmartClient components]]></HELP>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <URL><![CDATA[http://forge.openbravo.com/projects/obsmartclient]]></URL>
--- a/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -7,7 +7,7 @@
 <!--086331E18477496B8AC74D2CFEBD1307-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <AD_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_MODULE_ID>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--086331E18477496B8AC74D2CFEBD1307-->  <STARTVERSION><![CDATA[3.0.24984]]></STARTVERSION>
+<!--086331E18477496B8AC74D2CFEBD1307-->  <STARTVERSION><![CDATA[3.0.25650]]></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.24984]]></STARTVERSION>
+<!--DC5D4EF450244482BD2B458DAA496333-->  <STARTVERSION><![CDATA[2.1.25650]]></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.24984]]></STARTVERSION>
+<!--F2AF15C0AF5540E393D96BE506E20648-->  <STARTVERSION><![CDATA[1.1.25650]]></STARTVERSION>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/system/helpers/printFrame.html	Mon Jan 05 16:47:23 2015 +0100
@@ -0,0 +1,91 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<HTML>
+<HEAD>
+
+<SCRIPT>
+
+
+
+if (!window.isc && document.domain && document.domain.indexOf(".") != -1 
+	&& !(new RegExp("^(\\d{1,3}\\.){3}\\d{1,3}$").test(document.domain))) 
+{
+    
+    var set = false;
+    while (document.domain.indexOf(".") != -1) {
+        try {
+            if (window.opener && window.opener.isc) break;
+            if (window.top.isc) break;
+            
+            if (!set) { document.domain = document.domain; set = true; }
+            else { document.domain = document.domain.replace(/.*?\./, ''); }
+        } catch (e) {
+            try {
+                if (!set) { document.domain = document.domain; set = true }
+                else { document.domain = document.domain.replace(/.*?\./, ''); }
+            } catch (ee) {
+                break;
+            }
+        }
+    } 
+}
+
+// document.write out our title and skin styles file
+if (window.parent && window.parent.isc) {
+
+    // Page title, and print target ID are driven by parameters to this page.
+    // We may not have a java server, so use the client-side getParams method to pick these up
+    window.params = window.parent.isc.getParams(window);
+
+    // Write out the title so we print with the appropriate title
+    if (params.title) document.write("<TITLE>" + params.title + "</TITLE>");
+}
+</SCRIPT>
+</HEAD>
+<BODY STYLE="overflow:visible;" onload="pageLoaded()" onafterprint="printed()">
+<SCRIPT>
+if (window.parent && window.parent.isc) {
+    // note that we need the parent.isc object to resolve the skinImgDir
+    document.write('<LINK REL="STYLESHEET" TYPE="text/css" HREF=' + 
+                   window.parent.isc.Page.getURL("[SKIN]/skin_styles.css")+
+                   ">");
+}
+</SCRIPT>
+
+<SCRIPT>
+function pageLoaded() {
+    window.controllerCanvas = params.id;
+    // Sanity check: Unclear why we should get into this state but if we can't
+    // find the print canvas for this iframe, log a warning and avoid the JS error
+    if (controllerCanvas == null || parent[controllerCanvas] == null) {
+        parent.isc.logWarn("Print canvas with ID:" + controllerCanvas + 
+            " failed to render correctly.", "printing");
+    } else {
+        parent[controllerCanvas].iframeLoad();
+    }
+}
+
+function printed() {
+    parent[window.controllerCanvas].printComplete();
+}
+
+function assignHTML(HTML) {
+    getPrintElement().innerHTML = HTML;
+}
+
+function getPrintElement() {
+    return document.getElementById('printElement');
+}
+
+function doPrint(callback) {
+    // focus() required for IE - otherwise it prints the top-level window
+    focus();
+    print();
+    
+}
+
+</SCRIPT>
+
+<span id='printElement'></span>
+
+</BODY>
+</HTML>
--- a/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js	Mon Jan 05 16:47:23 2015 +0100
@@ -35,7 +35,7 @@
   compareDates: function (date1, date2, fieldName, otherFieldName) {
     var field = this.getField(fieldName),
         otherField = otherFieldName ? this.getField(otherFieldName) : null;
-    if ((field && (field.type === "datetime" || field.type === "_id_24")) || (otherField && (otherField.type === "datetime" || otherField.type === "_id_24"))) {
+    if ((field && (field.type === 'datetime' || field.type === '_id_24')) || (otherField && (otherField.type === 'datetime' || otherField.type === '_id_24'))) {
       return Date.compareDates(date1, date2);
     } else {
       return Date.compareLogicalDates(date1, date2);
@@ -262,7 +262,7 @@
         opIndex = isc.DynamicForm.getOperatorIndex(),
         validOps = isc.getKeys(opIndex),
         result = {
-        operator: "and",
+        operator: 'and',
         criteria: []
         },
         crit = result.criteria,
@@ -278,7 +278,7 @@
     }
 
     if (!isc.isA.String(value)) {
-      value += "";
+      value += '';
     }
 
     var tempOps, tempOp;
@@ -295,28 +295,28 @@
     var field, insensitive = defOp.caseInsensitive;
     var partIndex, parts, partCrit, part;
 
-    if (isValidLogicType && value.contains(" and ")) {
-      valueParts = value.split(" and ");
-    } else if (isValidLogicType && value.contains(" or ")) {
-      valueParts = value.split(" or ");
-      result.operator = "or";
-    } else if (value.contains("...")) {
-      valueParts = value.split("...");
+    if (isValidLogicType && value.contains(' and ')) {
+      valueParts = value.split(' and ');
+    } else if (isValidLogicType && value.contains(' or ')) {
+      valueParts = value.split(' or ');
+      result.operator = 'or';
+    } else if (value.contains('...')) {
+      valueParts = value.split('...');
       if (valueParts.length === 2) {
-        tempOps = opIndex["..."];
+        tempOps = opIndex['...'];
 
         if (tempOps) {
-          tempOp = (insensitive ? tempOps.find("caseInsensitive", true) : tempOps[0]);
+          tempOp = (insensitive ? tempOps.find('caseInsensitive', true) : tempOps[0]);
         }
 
         field = ds ? ds.getField(fieldName) : null;
 
-        if (field && isc.SimpleType.inheritsFrom(field.type, "date")) {
+        if (field && isc.SimpleType.inheritsFrom(field.type, 'date')) {
           valueParts[0] = new Date(Date.parse(valueParts[0]));
           valueParts[0].logicalDate = true;
           valueParts[1] = new Date(Date.parse(valueParts[1]));
           valueParts[1].logicalDate = true;
-        } else if (field && field.type === "text") {
+        } else if (field && field.type === 'text') {
 
           if (!valueParts[1].endsWith(this._betweenInclusiveEndCrit)) {
             valueParts[1] += this._betweenInclusiveEndCrit;
@@ -334,7 +334,7 @@
       valueParts = [value];
     }
 
-    var skipTheseOps = [" and ", " or "];
+    var skipTheseOps = [' and ', ' or '];
 
     for (i = 0; i < valueParts.length; i++) {
       var key, valuePart = valueParts[i],
@@ -343,7 +343,7 @@
           };
 
       field = ds ? ds.getField(fieldName) : null;
-      var isDateField = (field ? field && isc.SimpleType.inheritsFrom(field.type, "date") : false),
+      var isDateField = (field ? field && isc.SimpleType.inheritsFrom(field.type, 'date') : false),
           valueHasExpression = false;
 
       for (key in opIndex) {
@@ -356,12 +356,12 @@
               wildCard = false,
               op;
 
-          if (key === "==" && isc.isA.String(valuePart) && valuePart.startsWith("=") && !valuePart.startsWith("==") && !valuePart.startsWith("=(")) {
+          if (key === '==' && isc.isA.String(valuePart) && valuePart.startsWith('=') && !valuePart.startsWith('==') && !valuePart.startsWith('=(')) {
             wildCard = true;
           }
 
           if (ops && ops.length) {
-            op = ops.find("caseInsensitive", insensitive) || ops[0];
+            op = ops.find('caseInsensitive', insensitive) || ops[0];
           }
 
           if (!op || !op.symbol || skipTheseOps.contains(op.symbol)) {
@@ -370,7 +370,7 @@
 
           if (validOps.contains(op.symbol) && ((isc.isA.String(valuePart) && (valuePart.startsWith(op.symbol) ||
 
-          (op.symbol === "..." && valuePart.contains(op.symbol)))) || wildCard)) {
+          (op.symbol === '...' && valuePart.contains(op.symbol)))) || wildCard)) {
             valueHasExpression = true;
 
             if (valuePart.startsWith(op.symbol)) {
@@ -387,24 +387,24 @@
               }
             }
 
-            if (valuePart.contains("...")) {
+            if (valuePart.contains('...')) {
               // allow range operators as well as conjunctives
-              var rangeValueParts = valuePart.split("...");
+              var rangeValueParts = valuePart.split('...');
               if (rangeValueParts.length === 2) {
-                tempOps = opIndex["..."];
+                tempOps = opIndex['...'];
 
                 if (tempOps) {
-                  tempOp = (insensitive ? tempOps.find("caseInsensitive", true) : tempOps[0]);
+                  tempOp = (insensitive ? tempOps.find('caseInsensitive', true) : tempOps[0]);
                 }
 
                 field = ds ? ds.getField(fieldName) : null;
 
-                if (field && isc.SimpleType.inheritsFrom(field.type, "date")) {
+                if (field && isc.SimpleType.inheritsFrom(field.type, 'date')) {
                   rangeValueParts[0] = new Date(Date.parse(rangeValueParts[0]));
                   rangeValueParts[0].logicalDate = true;
                   rangeValueParts[1] = new Date(Date.parse(rangeValueParts[1]));
                   rangeValueParts[1].logicalDate = true;
-                } else if (field && field.type === "text") {
+                } else if (field && field.type === 'text') {
 
                   if (!rangeValueParts[1].endsWith(this._betweenInclusiveEndCrit)) {
                     rangeValueParts[1] += this._betweenInclusiveEndCrit;
@@ -455,13 +455,13 @@
 
                   if (hasPrefix && hasSuffix) {
                     // this is a contains criteria
-                    partCrit.operator = insensitive ? "iContains" : "contains";
+                    partCrit.operator = insensitive ? 'iContains' : 'contains';
                   } else if (hasPrefix) {
                     // this is an endsWith criteria
-                    partCrit.operator = insensitive ? "iEndsWith" : "endsWith";
+                    partCrit.operator = insensitive ? 'iEndsWith' : 'endsWith';
                   } else if (hasSuffix) {
                     // this is a startsWith criteria
-                    partCrit.operator = insensitive ? "iStartsWith" : "startsWith";
+                    partCrit.operator = insensitive ? 'iStartsWith' : 'startsWith';
                   }
 
                   result.criteria.add(partCrit);
@@ -478,7 +478,7 @@
               }
             } else {
               // set the value if one is required for the op
-              if (op.valueType !== "none") {
+              if (op.valueType !== 'none') {
                 subCrit.value = valuePart;
               }
             }
@@ -553,9 +553,6 @@
 
     // prevent validation when we are showing the editor and moving
     // the focus around
-    if (this.form && this.form.grid && this.form.grid._showingEditor) {
-      return;
-    }
 
     if (this.preventValidation) {
       return;
@@ -763,10 +760,16 @@
 // if not overridden then also errors handled by OB are shown in a popup
 // see https://issues.openbravo.com/view.php?id=17136
 isc.RPCManager.addClassProperties({
-  _handleError: isc.RPCManager.getPrototype().handleError,
+  _originalhandleError: isc.RPCManager.handleError,
   handleError: function (response, request) {
+    var target = window[request.componentId];
+    // refresh the toolbar buttons if possible to ensure that the refresh button is enabled
+    if (target && target.view && target.view.toolBar && isc.isA.Function(target.view.toolBar.updateButtonState)) {
+      delete target.view.isRefreshing;
+      target.view.toolBar.updateButtonState();
+    }
     if (!request.willHandleError) {
-      isc.RPCManager.handleError(response, request);
+      this._originalhandleError(response, request);
     }
   },
   _originalEvalResult: isc.RPCManager.evalResult,
@@ -888,7 +891,7 @@
 }());
 
 isc.builtinTypes.textArea = {
-  inheritsFrom: "text"
+  inheritsFrom: 'text'
 };
 
 //delete the wildCard to avoid strange behaviour when filtering '*'
--- a/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -6,7 +6,7 @@
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <NAME><![CDATA[Standard Roles]]></NAME>
-<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION><![CDATA[3.0.24984]]></VERSION>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION><![CDATA[3.0.25650]]></VERSION>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <DESCRIPTION><![CDATA[Pre-configured collection of standard ERP roles]]></DESCRIPTION>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <HELP><![CDATA[This dataset contains the following roles with their access to corresponding Openbravo entities - windows, reports, actions.
 * Employee - Any person of the enterprise
--- a/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -7,7 +7,7 @@
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <AD_MODULE_ID><![CDATA[883B5872CA0548F9AF2BBBE7D2DDFA61]]></AD_MODULE_ID>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--148A000EE9A04A3CA653B1296A00B8E6-->  <STARTVERSION><![CDATA[3.0.24984]]></STARTVERSION>
+<!--148A000EE9A04A3CA653B1296A00B8E6-->  <STARTVERSION><![CDATA[3.0.25650]]></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.24984]]></STARTVERSION>
+<!--30F966407A6F4E15965821BAEE34D25B-->  <STARTVERSION><![CDATA[3.0.25650]]></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.24984]]></STARTVERSION>
+<!--F93CE30003B24F8F8886510B0065EECC-->  <STARTVERSION><![CDATA[1.1.25650]]></STARTVERSION>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <DEPENDANT_MODULE_NAME><![CDATA[Orders Awaiting Delivery]]></DEPENDANT_MODULE_NAME>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -6,7 +6,7 @@
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <NAME><![CDATA[Openbravo 3.0 Framework]]></NAME>
-<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION><![CDATA[2.1.24984]]></VERSION>
+<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION><![CDATA[2.1.25650]]></VERSION>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <DESCRIPTION><![CDATA[Openbravo 3.0 Framework]]></DESCRIPTION>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <HELP><![CDATA[Contains all the components required to run the Openbravo 3.0 framework]]></HELP>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <URL><![CDATA[http://forge.openbravo.com/projects/openbravov30framework]]></URL>
--- a/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -7,7 +7,7 @@
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--01E1BCCEC9114DE0960538DF34E30E6F-->  <STARTVERSION><![CDATA[2.1.24984]]></STARTVERSION>
+<!--01E1BCCEC9114DE0960538DF34E30E6F-->  <STARTVERSION><![CDATA[2.1.25650]]></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.24984]]></STARTVERSION>
+<!--025B181F63CA47B48A920F6983242390-->  <STARTVERSION><![CDATA[3.0.25650]]></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.24984]]></STARTVERSION>
+<!--054B4FEAF919478AA3FF27098A46D1D6-->  <STARTVERSION><![CDATA[2.1.25650]]></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.24984]]></STARTVERSION>
+<!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <STARTVERSION><![CDATA[1.0.25650]]></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.24984]]></STARTVERSION>
+<!--224754C3EF674C93B0D468F47BAAB824-->  <STARTVERSION><![CDATA[2.1.25650]]></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.24984]]></STARTVERSION>
+<!--5B72D24032DD4879A950194139D961B6-->  <STARTVERSION><![CDATA[2.1.25650]]></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.24984]]></STARTVERSION>
+<!--8730CA6A4224439D82E0DD31B3806E36-->  <STARTVERSION><![CDATA[1.0.25650]]></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.24984]]></STARTVERSION>
+<!--98C47FF058F8413B8A2B26036061446E-->  <STARTVERSION><![CDATA[8.1.25650]]></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.24984]]></STARTVERSION>
+<!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <STARTVERSION><![CDATA[2.0.25650]]></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.24984]]></STARTVERSION>
+<!--A9CB99330AF34944877F889DD8A0AB3C-->  <STARTVERSION><![CDATA[2.1.25650]]></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.24984]]></STARTVERSION>
+<!--E72A053A403C4A98A189C105B850ADB0-->  <STARTVERSION><![CDATA[1.1.25650]]></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.24984]]></STARTVERSION>
+<!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <STARTVERSION><![CDATA[2.0.25650]]></STARTVERSION>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON REST Webservice]]></DEPENDANT_MODULE_NAME>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -6,7 +6,7 @@
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <NAME><![CDATA[Openbravo 3.0]]></NAME>
-<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION><![CDATA[3.0.24984]]></VERSION>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION><![CDATA[3.0.25650]]></VERSION>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <DESCRIPTION><![CDATA[Openbravo 3.0 distribution template]]></DESCRIPTION>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <HELP><![CDATA[Openbravo 3.0 is a collection (distribution) of modules. This template is a container of all the modules and configuration changes that compose Openbravo 3.0.]]></HELP>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <URL><![CDATA[http://forge.openbravo.com/projects/vthree]]></URL>
--- a/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -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.24984]]></STARTVERSION>
+<!--4D11E3A70650475381139522373CD191-->  <STARTVERSION><![CDATA[2.1.25650]]></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.24984]]></STARTVERSION>
+<!--52CE523C40634C47A99C6EBBD9C3125C-->  <STARTVERSION><![CDATA[3.0.25650]]></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.24984]]></STARTVERSION>
+<!--60834727BB114764ACEF019F40A34562-->  <STARTVERSION><![CDATA[1.1.25650]]></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.24984]]></STARTVERSION>
+<!--8418885E97D643138B6D907671351E3D-->  <STARTVERSION><![CDATA[3.0.25650]]></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.24984]]></STARTVERSION>
+<!--A32F3279B3374FC0A6CFEA2368BB7053-->  <STARTVERSION><![CDATA[3.0.25650]]></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.24984]]></STARTVERSION>
+<!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <STARTVERSION><![CDATA[3.0.25650]]></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.24984]]></STARTVERSION>
+<!--FF8080813189932B013189B45B59003A-->  <STARTVERSION><![CDATA[0.1.25650]]></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.24984]]></STARTVERSION>
+<!--FF8080813189932B013189B4C00F003D-->  <STARTVERSION><![CDATA[0.1.25650]]></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.24984]]></STARTVERSION>
+<!--FF8081812E2F6F3C012E2F750109001C-->  <STARTVERSION><![CDATA[0.0.25650]]></STARTVERSION>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <DEPENDANT_MODULE_NAME><![CDATA[Widgets Collection]]></DEPENDANT_MODULE_NAME>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/referencedata/sampledata/F_B_International_Group/AD_PINSTANCE.xml	Mon Jan 05 12:18:46 2015 +0100
+++ b/referencedata/sampledata/F_B_International_Group/AD_PINSTANCE.xml	Mon Jan 05 16:47:23 2015 +0100
@@ -509,6 +509,23 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[0205B8D4FBF542B88439C12AA0172849]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[154]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[F5BDAD1564394783A33F04713C6AD4EF]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 12:20:05.366792]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 12:20:05.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[@DocumentNo@ = 10000624. 3 @UsedPricesFromOrder@]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[0213817E13F94D30BD6FC06C07115341]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[FF80818132C964E30132C9747257002E]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[0]]></RECORD_ID>
@@ -772,6 +789,23 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[03AB12E6983949AE9C7B2C7ED2768D84]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[104]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[A79B746BDB85445497C6F390873EAF96]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 12:05:38.267689]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 12:05:38.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[03C2638C9AA04C26AA79125D13EA7E4E]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[111]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[6A02F3C29D0640FF99E8ACD7DE1AC941]]></RECORD_ID>
@@ -972,6 +1006,23 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[046E2142FFA144468D8AFD7963794584]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[111]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[E581D5DAA7484959BCF7A8899E5CCC0B]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 14:07:13.763]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 14:07:13.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[0485812A4E8F4694815AECFB99817E14]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[FF80818132C964E30132C9747257002E]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[0]]></RECORD_ID>
@@ -1529,6 +1580,23 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[0703969D96D64444842F6511C8B9E587]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[104]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[A907F8F16F9849E4A9A4AFD842BB2E18]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 11:46:48.575272]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 11:46:48.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[070A06292BD7488CACFA01A03131B6BD]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[800064]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[B843C30461EA4501935CB1D125C9C25A]]></RECORD_ID>
@@ -1839,6 +1907,22 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[0862E61ADCEA4CF3946596028EDFAA8B]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[109]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[DACA66C5B56B45158F73CD5654293BCB]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 22:05:41.688]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 22:05:41.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[086B4AD2CE8D4A1C83E20778C47F99F9]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[109]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[9042A703798243AE921D17D6F88E2930]]></RECORD_ID>
@@ -1904,6 +1988,23 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[0885B35BF78B42BE9E26B78DF4D19D78]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[104]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[31FAEB694F594C76B4EF05F12CFD8CA0]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-14 12:55:59.418332]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-14 12:55:59.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[08B1DBFE22E74CEAA76B07D1DCE44BEE]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[111]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[DFAA1F7C1F004DD58C76CFE3FC0A47A7]]></RECORD_ID>
@@ -2791,6 +2892,22 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[0C27BE1164BE4DE3AA0D9EFB08D74793]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[109]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[EEF4669E268147219DBCD419A2627B9E]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 21:02:42.870953]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 21:02:42.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[0C4762AD09EA4682B7AE0472533F5A4B]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[111]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[55A4BBF1940F42F8A95B44EAEB630B10]]></RECORD_ID>
@@ -3051,6 +3168,22 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[0D255DF6FBF54832A924E5E987279DF3]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[109]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[630C476616D34CDA8F74210058B88048]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 21:01:30.023381]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 21:01:29.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[0D3F5C99B28447B0B1DB6C935DDCF8D5]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[FF80818132C964E30132C9747257002E]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[0]]></RECORD_ID>
@@ -3804,6 +3937,23 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[101F7AE6FF8F4466B4DEBB5D78619FE2]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[104]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[501ED21F2CDA4DFFA2D046BABB3CCF1E]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 10:03:29.365146]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 10:03:29.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[104D16FE70A4462EBE55FD438DDBAFA9]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[107]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[BA24330D73414F10A62E00A54005445B]]></RECORD_ID>
@@ -3935,6 +4085,23 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[10F4CFA6456B4F0890D5DDC799D238ED]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[154]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[EC85AED8E05241B084EC98313BE2DDF4]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-14 13:03:15.873333]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-14 13:03:16.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[@DocumentNo@ = 10000606. 3 @UsedPricesFromOrder@]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[11182434F8A744F69E4AA30A38C7A3F8]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[FF80818132C964E30132C9747257002E]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[0]]></RECORD_ID>
@@ -4263,6 +4430,22 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[12B4FBF263C0421494C36B0D6CC635D3]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[109]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[6F3107EA9A084D7FA6178AF86BF221F0]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 11:50:57.671505]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 11:50:57.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[12C06CBB40E24D76A6B519BA3BD1915A]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[111]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[1FDD8BBD4F414503BC0484AE7C356B54]]></RECORD_ID>
@@ -4574,6 +4757,23 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[13EDA8C9E9B44763AAA8D3F47DD2A5E7]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[111]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[1B7937877074414BBC421B123A0B63AD]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 10:45:41.845]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 10:45:41.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[13FA6017D1A14377937A566DFB5B8584]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[107]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[F76C48603D504B40AA465B987A6C662F]]></RECORD_ID>
@@ -4835,6 +5035,22 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[14A7B80353884F86952308205F6689EA]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[109]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[65C08582CA6C491DBFB9BFB18ECA436A]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-14 12:58:18.492302]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-14 12:58:18.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[14B4857525D54918B3DB9E5B33E81914]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[FF80818132C964E30132C9747257002E]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[0]]></RECORD_ID>
@@ -4917,6 +5133,23 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[14DDA5F344B14C41B0F3ABEAEB8E34DC]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[154]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[65C08582CA6C491DBFB9BFB18ECA436A]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-14 13:03:30.902368]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-14 13:03:30.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[@DocumentNo@ = 10000608. 4 @UsedPricesFromOrder@]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[14DF09255D6246DFBBE562416F8AEEFD]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[134]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[0]]></RECORD_ID>
@@ -5583,6 +5816,23 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[17851622525E48D0A3E55F9100CCECA6]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[800134]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[F032ACDF75444F3BBD8E6AF0379CA5DF]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 23:03:15.911589]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 23:03:16.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[1785CCEC612B4DE8B5289EE8C9198E48]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[FF80818132C964E30132C9747257002E]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[0]]></RECORD_ID>
@@ -5878,6 +6128,22 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[186EF83B2BE34B419A8738418846D526]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[109]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[4CAE0E8886F849BE94B9502BAD1D9E7F]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 12:08:41.561]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 12:08:41.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[1876C31CC85B406FAF86855E7E0383B6]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[FF80818132C964E30132C9747257002E]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[0]]></RECORD_ID>
@@ -6306,6 +6572,22 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[19B77E4910E54C7EAB6D594C6943E1EB]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[109]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[3717E11ACA954E96A0B33BEB80E0C30D]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 10:11:18.784]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 10:11:18.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[19D6BAF6349F4B43AF9D36C6078D19A2]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[111]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[25517F24CADB4A0383E10488E19A5FFA]]></RECORD_ID>
@@ -6974,6 +7256,22 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[1C3F21E858E746969F706D545C55DB72]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[109]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[5667FE1084D94297A9CB6A13019086EB]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 22:05:00.424]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 22:05:00.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[1C533388D0B94E44886C390A5D82B072]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[104]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[C55B0A27249245A38CDD08835DB954CB]]></RECORD_ID>
@@ -7838,6 +8136,23 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[1FE9B658BE4D427B8C34AFF9C6CDB13C]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[109]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[3717E11ACA954E96A0B33BEB80E0C30D]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 10:10:50.396]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 10:10:50.0]]></UPDATED>
+  <RESULT><![CDATA[0]]></RESULT>
+  <ERRORMSG><![CDATA[@ERROR=@NotEnoughStocked@ @line@ 20, @Product@ Pear Juice]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[1FEF9CB86783498192AF7C4B80CB9DC1]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[111]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[4FC5B86D922E4789899B46AC9EB83BDA]]></RECORD_ID>
@@ -8282,6 +8597,23 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[21A4DEDFB93449FD82CC2A0CB25F0B77]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[104]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[C4601A6A7B35434D83344599465EF746]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-14 12:55:37.412586]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-14 12:55:37.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[21A9F869FAA54DADBF163588EBA4D5BC]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[104]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[32F8FE4002054DABA0D2227598CE239E]]></RECORD_ID>
@@ -8969,6 +9301,23 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[2426D255C5CB4EAFA846BC8C8A0F46B7]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[111]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[FC38DA926871426FA4A278249535D610]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 22:17:32.531]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 22:17:32.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[242B93680FD141B59BEF0678F66088FD]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[109]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[9042A703798243AE921D17D6F88E2930]]></RECORD_ID>
@@ -9327,6 +9676,23 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[255CF1A5A8D1470CAC8A258CE7566228]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[104]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[9FCB94674376432EBF50398F9EC1C453]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 20:59:11.520573]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 20:59:11.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[255FA09871DE46948793C270458C2999]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[122]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[174305B5AA2C424E84E3A41313A4E830]]></RECORD_ID>
@@ -9423,6 +9789,38 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[25F77D07C5C247A98AF5CDDA6F028437]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[109]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[09CB2FE7899246E7923ADE838A51386E]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 21:03:05.425354]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 21:03:05.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[260B321AF8804381B59EAA6A798C5054]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[109]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[26325301CCF648388CC22E83E746E3BD]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 22:04:28.274]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 22:04:28.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[260D6C088D6E4E2A86F427AFA717ED7F]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[104]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[212135AD51484732A1FF6895EE0283DD]]></RECORD_ID>
@@ -9603,6 +10001,22 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[2688D2DC43DC4AFFB77E86998B1AB06F]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[109]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[BC3450AE4D2A45E08ED4ABCFE9744AC3]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 11:49:40.725909]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 11:49:40.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[269C98C3FA934000A43641D4501B83F9]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[111]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[B9D43854EDEE48E6B0573B1A796F62CB]]></RECORD_ID>
@@ -9818,6 +10232,22 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[277FF67E104A43D9B91F15E82738366C]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[109]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[C30BF7B740CE4967997E202EABAD580F]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 10:10:28.091]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 10:10:28.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[27877E0A8B384439BD7F62AAC9CF90FE]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[FF80818132C964E30132C9747257002E]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[0]]></RECORD_ID>
@@ -10045,6 +10475,23 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[2843ED8A2BB041928F54FA394DF64990]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[154]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[6F3107EA9A084D7FA6178AF86BF221F0]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 12:20:19.284367]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 12:20:19.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[@DocumentNo@ = 10000626. 5 @UsedPricesFromOrder@]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[2845EA759CBC4F07A38ECD81BE3B400B]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[FF80818132C964E30132C9747257002E]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[0]]></RECORD_ID>
@@ -10533,6 +10980,22 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[2A4D657FB0604AA9821222D4F8FFC0CC]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[109]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[BF8B26704CF948E695CCE485BF9493AF]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-14 12:57:44.102183]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-14 12:57:44.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[2A55330BB0E145ABA586B9BC84D0E41E]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[104]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[7AC74BA0A7AC4008A32BE90A5CE46854]]></RECORD_ID>
@@ -11528,6 +11991,23 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[2E58D18C692644F090049BE9E6817C34]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[104]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[6A65106FAC2E49A583C708045EAE456E]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 20:59:17.999943]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 20:59:18.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[2E72522DF5D74C30A048B1849503BD2F]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[167]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[E2E8BAED5E9B4C68878566BDC6013114]]></RECORD_ID>
@@ -12607,6 +13087,23 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[327228F93F4B47AC94B86C397CC6FD4F]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[104]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[30204C46DFAC4675AB50C637A167BFE3]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-14 12:54:15.688241]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-14 12:54:15.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[3282656B072D49A682676CA8AB61181C]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[800134]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[F032ACDF75444F3BBD8E6AF0379CA5DF]]></RECORD_ID>
@@ -12936,6 +13433,23 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[339A05B6F5684D3690A60157634D09F7]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[111]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[0DC7252D2180425388555B290C3596EE]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 12:18:05.938]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 12:18:05.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[33A07320A5C648088730EE19EA907036]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[FF80818132C964E30132C9747257002E]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[0]]></RECORD_ID>
@@ -14546,6 +15060,23 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[39FE48C2C68841739407614D36E6C880]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[104]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[281475138CA246F3982A889F20825BB1]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 12:04:53.650433]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 12:04:53.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[3A0440D333104C5BA4ADDD033E08B6A2]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[111]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[AD483FEAA46E416EA08BABBE215DBDEC]]></RECORD_ID>
@@ -15065,6 +15596,22 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[3C32CF42EE7448C3BD020FCC23A2D6B0]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[109]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[1E0820F157BC47258FDA20CEDC83D58E]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 10:09:38.132]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 10:09:38.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[3C44EE62C3344A6CAEF94C2C5ADEE714]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[111]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[21C493AD8EE24C1B9BE6100257EE4C7F]]></RECORD_ID>
@@ -15527,6 +16074,23 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[3DEB1E4682C74C6295E6A7AFB80BA72D]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[104]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[84662965AF74487F9B3C27ABE432EAE0]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 10:03:39.16157]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 10:03:39.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[3DEB519A4852465E884581723A608207]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[134]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[0]]></RECORD_ID>
@@ -15593,6 +16157,23 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[3E40DCB9E04949EB8F036052EC86CE69]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[111]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[AEAD8FD2E8E546F798CB2BAC09236CD0]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 14:06:06.071]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 14:06:06.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[3E45B935DD2845D69DDAC3DD59A33C05]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[134]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[0]]></RECORD_ID>
@@ -17035,6 +17616,23 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[436F3668CA0749BC9926F7CFB90663A7]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[104]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[D15FB45ECA03426A88EBDC2AE05A7046]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 10:01:31.027967]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 10:01:31.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[437BB5F1CAA446FF9E12427639F62775]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[111]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[BD7B52A455434DE8BC9DC990B60D3CAC]]></RECORD_ID>
@@ -17526,6 +18124,23 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[446BC27CC0FF4DCEB9A618BD17E6C791]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[111]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[1A8A2B87F12644668885DDE6EA784689]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 21:07:16.859]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 21:07:16.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[446DE4DCEE0E4C20983D2B0D75E70D5B]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[FF80818132C964E30132C9747257002E]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[0]]></RECORD_ID>
@@ -17707,6 +18322,39 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[44DCB50750244549BAC5F9D6039FC80E]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[104]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[6F9DECD384BF46E280D65ED48C926DCF]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 10:03:50.814546]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 10:03:50.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[44F5CBF7268E471688840BF75F9968AC]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[109]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[494D4D290D0C4C3C8F44BFE9FD261952]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 12:08:47.989]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 12:08:47.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[44FB5BC26B434C349D5A4DAB3F551A13]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[FF80818132C964E30132C9747257002E]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[0]]></RECORD_ID>
@@ -17950,6 +18598,23 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[4623AA4CBDC64FB7BD2479E783C93FC3]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[111]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[B1BB5218D07F47049656689571F99E84]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 21:06:23.186]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 21:06:23.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[4642697567A045749294C77C7514791B]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[111]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[6D89C186F0144CDFA5610B4FACF1A8A4]]></RECORD_ID>
@@ -18373,6 +19038,23 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[47FCD629ABB940D5A008D164B486377A]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[111]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[29887235B2ED4432A730C1522B476C79]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 10:45:10.468]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 10:45:10.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[47FFA65496EA4985BCB5C89B50CB6DDB]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[111]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[D3AE289944B543E881A06BF0DDA90433]]></RECORD_ID>
@@ -18519,6 +19201,23 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[487C297AEE3441FB9FEFB027FAD33420]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[111]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[6DF7B21A63B545BDAB16BDBB3BD03733]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 22:17:26.105]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 22:17:26.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[48A3D2DFA4C6479E881CCD901DB7EDD5]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[FF80818132C964E30132C9747257002E]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[0]]></RECORD_ID>
@@ -18991,6 +19690,23 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[4AAAFD70E4CE4CB2988205EB8019A12A]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[111]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[7E705A8F23E14CF097872F208BB6E3E8]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 21:06:45.724]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 21:06:45.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[4AB461588D2041DE901185C80FBBB0B4]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[104]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[E23BC9C371AA492D90BA27A286F0D738]]></RECORD_ID>
@@ -19596,6 +20312,23 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[4C83787537F641CC851EB1EEEC0279FF]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[111]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[E08913CF699C4DBF902FFDB68D1F31C7]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 14:05:43.33]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 14:05:43.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[4C9504CBDE344D4386F266EF027374BF]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[FF80818132C964E30132C9747257002E]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[0]]></RECORD_ID>
@@ -19742,6 +20475,23 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[4D3DEB4DECA04A1089E0DA23BB2A2CF3]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[104]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[2821D77EF3714C0B87C1B2E00F923683]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 10:01:16.47945]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 10:01:16.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[4D4E338066374462B960A3E1CF59595B]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[FF80818132C964E30132C9747257002E]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[0]]></RECORD_ID>
@@ -19905,6 +20655,23 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[4DD73ACFE41F4A9EB5B49A4637749492]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[104]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[70E2EF70F70A4818AA6A98CC93F42175]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 11:37:29.705536]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 11:37:29.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[4DDF503EC594456083CB7098C1316CAC]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[FF80818132C964E30132C9747257002E]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[0]]></RECORD_ID>
@@ -20570,6 +21337,22 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[500CBA5521BF48A989F8A3E3C697EB9D]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[109]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[3AAF662A06844D28A39E1C41DF70DC8F]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 21:03:37.987259]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 21:03:37.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[50169737B98A4F1E883C51990A0A9CBD]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[FF80818132C964E30132C9747257002E]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[0]]></RECORD_ID>
@@ -21585,6 +22368,23 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[532E23A5A9DC48D380D042AE0826C711]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[104]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[6F9DECD384BF46E280D65ED48C926DCF]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 10:05:41.275437]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 10:05:41.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[5375B52E7D914E3FAE19F36F749B2712]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[111]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[C447F2429BA743A4B2CB838FC2EE9424]]></RECORD_ID>
@@ -21602,6 +22402,22 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[53BB5F2563E34E2EAFA94629222F82E0]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[109]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[EC85AED8E05241B084EC98313BE2DDF4]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-14 12:57:16.50008]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-14 12:57:15.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[53C8F75280004F40A1C99C270E04F1E4]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[FF80818132C964E30132C9747257002E]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[0]]></RECORD_ID>
@@ -21667,6 +22483,23 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[5441E1A313E54C7A9A7A6A4F8360CBA0]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[111]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[AEC8B6DD93634AA0BA6E86A754D35648]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 21:06:11.405]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 21:06:11.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[54447D0FD3B74B8E8F4342BF90D581A0]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[109]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[249D74D6AD9D474CA27865A5252AAD95]]></RECORD_ID>
@@ -21928,6 +22761,23 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[551B847DFDD54B5C9EB851E24749109E]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[154]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[3AAF662A06844D28A39E1C41DF70DC8F]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 21:04:26.106787]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 21:04:26.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[@DocumentNo@ = 10000648. 7 @UsedPricesFromOrder@]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[551BC0365F2C4B60B502D13A7A59A20F]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[104]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[761D42D8692048BEA27E766479A09C28]]></RECORD_ID>
@@ -22060,6 +22910,22 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[55EE4DB85DDA47CBB6E25C180F2E43E5]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[109]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[E90B4D7742AF4E85B43302B2B4B9BE2F]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 21:01:55.217022]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 21:01:54.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[55FA3C80F63147E8B8EE9B39DE0728C1]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[FF80818132C964E30132C9747257002E]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[0]]></RECORD_ID>
@@ -22204,6 +23070,23 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[5681D28B229749DBB56E8941AF778155]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[111]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[7F5B4FBA45B044F6B43534355A149561]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 12:18:12.923]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 12:18:12.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[5689A9DC426745F4B83161664724201E]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[111]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[E749E3D8C3244726B7964D2723D6DD1F]]></RECORD_ID>
@@ -22971,6 +23854,40 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[59A048F36E2448B88F804CDE188614B8]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[800134]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[C8696D902E5A447FB97F687EF73ECF38]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 23:03:23.190377]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 23:03:23.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[59AE61739D484DE79D60BB7E30FB8803]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[111]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[8675CE06F81A4794B05B8CD46D92686A]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 10:44:49.01]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 10:44:48.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[59B2908FD7D142F98011BA84368C1226]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[109]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[2D9F9A4C63474A23B264DD4F840C85DB]]></RECORD_ID>
@@ -23105,6 +24022,40 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[5A3D834315FB4D7F97CC124524D7FDEB]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[111]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[F238C17305FF479795E7F6D96EE53A15]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 22:17:49.066]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 22:17:49.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[5A3FBBACEA2441ABA0C1217F8AF7DE9F]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[154]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[0905E74A95064A76AF6850CD7179F601]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 12:19:46.277627]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 12:19:46.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[@DocumentNo@ = 10000621. 3 @UsedPricesFromOrder@]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[5A7025C2C3EA4046A9900BB378BD4F9F]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[104]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[849CA0CC13AD4DC28E2C58CA6BAE946E]]></RECORD_ID>
@@ -23314,6 +24265,23 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[5B30543504F84EBB83494A1440A52B10]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[154]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[09CB2FE7899246E7923ADE838A51386E]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 21:04:19.698812]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 21:04:19.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[@DocumentNo@ = 10000647. 5 @UsedPricesFromOrder@]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[5B3BB29039F34FDCA022B96825ED04D3]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[109]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[D4409E1B8D7846C1997AD3E15B23EE07]]></RECORD_ID>
@@ -23381,6 +24349,23 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[5BAA7DEF2EF64D61BDB30917FC955B49]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[104]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[EFD1E904A40A4B628ADD7B860733C161]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 12:05:05.295154]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 12:05:05.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[5BB3BF226E3741C08F882DBFEAA9D7BC]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[111]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[54FD8C38CA704D84997868CEAE31A575]]></RECORD_ID>
@@ -23398,6 +24383,23 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[5BB4D907C11448E38796826F087D1334]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[104]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[C575FB49FA3E45718AC9929333E41634]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 11:46:57.038676]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 11:46:57.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[5BF1FEFFDF694A059E5EDE0D794D6C80]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[104]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[BE94861B6B73428D92DE875FBA847710]]></RECORD_ID>
@@ -23513,6 +24515,23 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[5C67C6BA3C4149DFB905096B8D13435E]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[111]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[4A8CF19C73084B52A3FE52ED8841E549]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 10:30:50.957]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 10:30:50.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[5C82FDEEFAEE47BE99A602FB69619FE2]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[109]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[F268ABE807454437BC33DF5400736DC3]]></RECORD_ID>
@@ -23987,6 +25006,23 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[5E3A433912A24119B5596B70CB11F2E5]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[104]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[20B0772D3D0B4FB589C5F54514D98BF0]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 11:47:29.15697]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 11:47:29.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[5E5CD78D4584424094208F74B7881D53]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[109]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[76C628D408F04F6B9FA16A60F9137AD5]]></RECORD_ID>
@@ -24595,6 +25631,23 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[6019278615D346959EC2392079C774F4]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[104]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[72E5E08407324D308B2269C8A2B910FF]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 20:59:01.787251]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 20:59:02.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[601D36CB15F4469DA11B7ED4C42E689D]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[109]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[9C660871601549F7A8F6A3F52E066D76]]></RECORD_ID>
@@ -26449,6 +27502,23 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[6600B4167E8C4D0E82051C8251FE66ED]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[111]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[74D6A54423BA484FB47D98F1A9F7DAFB]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 12:18:24.638]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 12:18:24.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[660746CE0CA54DB39AD54EA8F707CAFC]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[109]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[2F4D31866D8F444395B2EA0311ECF1BE]]></RECORD_ID>
@@ -26661,6 +27731,23 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[6709AF2FAB3A4DFC944094A5F1352DF8]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[111]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[0158FF47F67C41FCAD68959BCD92F1A2]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>
+  <CREATED><![CDATA[2014-12-16 10:30:56.897]]></CREATED>
+  <AD_USER_ID><![CDATA[100]]></AD_USER_ID>
+  <UPDATED><![CDATA[2014-12-16 10:30:56.0]]></UPDATED>
+  <RESULT><![CDATA[1]]></RESULT>
+  <ERRORMSG><![CDATA[]]></ERRORMSG>
+  <AD_CLIENT_ID><![CDATA[23C59575B9CF467C9620760EB255B389]]></AD_CLIENT_ID>
+  <AD_ORG_ID><![CDATA[E443A31992CB4635AFCAEABE7183CE85]]></AD_ORG_ID>
+  <CREATEDBY><![CDATA[100]]></CREATEDBY>
+  <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+</AD_PINSTANCE>
+
+<AD_PINSTANCE>
   <AD_PINSTANCE_ID><![CDATA[670A0EE3EE0A42AEBE8CA777E764BB8F]]></AD_PINSTANCE_ID>
   <AD_PROCESS_ID><![CDATA[109]]></AD_PROCESS_ID>
   <RECORD_ID><![CDATA[F9674EEBAD41427292DE7C29FC3004A0]]></RECORD_ID>
@@ -26878,6 +27965,40 @@
 </AD_PINSTANCE>
 
 <AD_PINSTANCE>
+  <AD_PINSTANCE_ID><![CDATA[67BE42A155984129B1347553A208856F]]></AD_PINSTANCE_ID>
+  <AD_PROCESS_ID><![CDATA[111]]></AD_PROCESS_ID>
+  <RECORD_ID><![CDATA[D6F237720AC7466B98A302AC93A9A152]]></RECORD_ID>
+  <ISPROCESSING><![CDATA[N]]></ISPROCESSING>