CI: promote changesets from pi to main
authorRM packaging bot <staff.rm@openbravo.com>
Sat, 12 Nov 2011 15:43:15 +0100
changeset 14240 9752fe729257
parent 14198 a46f66704813 (current diff)
parent 14239 f7f4bf56c68e (diff)
child 14241 62da5de13070
CI: promote changesets from pi to main
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
src-db/database/sourcedata/AD_MODULE.xml
Binary file modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/LinkCreditPayments.class has changed
Binary file modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/LinkCreditPaymentsData.class has changed
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINACC_TRANSACTION.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINACC_TRANSACTION.xml	Sat Nov 12 15:43:15 2011 +0100
@@ -5,5 +5,9 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="EM_APRM_MODIFY" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault/>
+      </column>
     </table>
   </database>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/views/APRM_FINACC_TRANSACTION_V.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/views/APRM_FINACC_TRANSACTION_V.xml	Sat Nov 12 15:43:15 2011 +0100
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
   <database name="VIEW APRM_FINACC_TRANSACTION_V">
-    <view name="APRM_FINACC_TRANSACTION_V"><![CDATA[SELECT trx.fin_finacc_transaction_id AS aprm_finacc_transaction_v_id, trx.fin_finacc_transaction_id, trx.ad_client_id, trx.ad_org_id, trx.isactive, trx.created, trx.createdby, trx.updated, trx.updatedby, trx.fin_financial_account_id, trx.line, trx.description, trx.statementdate, trx.trxtype, trx.fin_payment_id, trx.c_glitem_id, trx.depositamt, trx.paymentamt, trx.c_currency_id, trx.fin_reconciliation_id, trx.status, trx.createdbyalgorithm, trx.posted, trx.dateacct, trx.processed, trx.processing, trx.user1_id, trx.user2_id, trx.c_activity_id, trx.c_campaign_id, trx.c_project_id, trx.foreign_currency_id, trx.foreign_amount, trx.foreign_convert_rate, 
+    <view name="APRM_FINACC_TRANSACTION_V"><![CDATA[SELECT trx.fin_finacc_transaction_id AS aprm_finacc_transaction_v_id, trx.fin_finacc_transaction_id, trx.ad_client_id, trx.ad_org_id, trx.isactive, trx.created, trx.createdby, trx.updated, trx.updatedby, trx.fin_financial_account_id, trx.line, trx.description, trx.statementdate, trx.trxtype, trx.fin_payment_id, trx.c_glitem_id, trx.depositamt, trx.paymentamt, trx.c_currency_id, trx.fin_reconciliation_id, trx.status, trx.createdbyalgorithm, trx.posted, trx.dateacct, trx.processed, trx.processing, trx.user1_id, trx.user2_id, trx.c_activity_id, trx.c_campaign_id, trx.c_project_id, trx.foreign_currency_id, trx.foreign_amount, trx.em_aprm_modify, trx.foreign_convert_rate, 
 CASE trx.status
 WHEN 'RPPC' THEN 'Y'
 ELSE 'N'
-END AS cleared, p.c_bpartner_id, p.documentno AS paymentdocno, COALESCE(r.processed, 'N') AS reconciled, 'N' AS delete_btn, (SELECT ad_table.ad_table_id
+END AS cleared, COALESCE(trx.c_bpartner_id, p.c_bpartner_id) AS c_bpartner_id, trx.m_product_id, trx.c_salesregion_id, p.documentno AS paymentdocno, COALESCE(r.processed, 'N') AS reconciled, 'N' AS delete_btn, (SELECT ad_table.ad_table_id
 FROM ad_table
 WHERE lower(ad_table.tablename) = 'fin_finacc_transaction') AS forced_table_id
 FROM fin_finacc_transaction trx
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml	Sat Nov 12 15:43:15 2011 +0100
@@ -4616,6 +4616,40 @@
 <!--A04179EAC69FF848E040007F01004523-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
 <!--A04179EAC69FF848E040007F01004523--></AD_COLUMN>
 
+<!--A13138E3D6E44C72A7F24B7AA9365B37--><AD_COLUMN>
+<!--A13138E3D6E44C72A7F24B7AA9365B37-->  <AD_COLUMN_ID><![CDATA[A13138E3D6E44C72A7F24B7AA9365B37]]></AD_COLUMN_ID>
+<!--A13138E3D6E44C72A7F24B7AA9365B37-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A13138E3D6E44C72A7F24B7AA9365B37-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A13138E3D6E44C72A7F24B7AA9365B37-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A13138E3D6E44C72A7F24B7AA9365B37-->  <NAME><![CDATA[Sales Region]]></NAME>
+<!--A13138E3D6E44C72A7F24B7AA9365B37-->  <DESCRIPTION><![CDATA[A defined section of the world where sales efforts will be focused.]]></DESCRIPTION>
+<!--A13138E3D6E44C72A7F24B7AA9365B37-->  <HELP><![CDATA[The Sales Region indicates a specific area of sales coverage.]]></HELP>
+<!--A13138E3D6E44C72A7F24B7AA9365B37-->  <COLUMNNAME><![CDATA[C_Salesregion_ID]]></COLUMNNAME>
+<!--A13138E3D6E44C72A7F24B7AA9365B37-->  <AD_TABLE_ID><![CDATA[FF8080812FFEC82D012FFECCE3400030]]></AD_TABLE_ID>
+<!--A13138E3D6E44C72A7F24B7AA9365B37-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--A13138E3D6E44C72A7F24B7AA9365B37-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--A13138E3D6E44C72A7F24B7AA9365B37-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--A13138E3D6E44C72A7F24B7AA9365B37-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--A13138E3D6E44C72A7F24B7AA9365B37-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--A13138E3D6E44C72A7F24B7AA9365B37-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--A13138E3D6E44C72A7F24B7AA9365B37-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--A13138E3D6E44C72A7F24B7AA9365B37-->  <SEQNO><![CDATA[430]]></SEQNO>
+<!--A13138E3D6E44C72A7F24B7AA9365B37-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--A13138E3D6E44C72A7F24B7AA9365B37-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--A13138E3D6E44C72A7F24B7AA9365B37-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--A13138E3D6E44C72A7F24B7AA9365B37-->  <AD_ELEMENT_ID><![CDATA[210]]></AD_ELEMENT_ID>
+<!--A13138E3D6E44C72A7F24B7AA9365B37-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--A13138E3D6E44C72A7F24B7AA9365B37-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--A13138E3D6E44C72A7F24B7AA9365B37-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--A13138E3D6E44C72A7F24B7AA9365B37-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--A13138E3D6E44C72A7F24B7AA9365B37-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--A13138E3D6E44C72A7F24B7AA9365B37-->  <POSITION><![CDATA[39]]></POSITION>
+<!--A13138E3D6E44C72A7F24B7AA9365B37-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--A13138E3D6E44C72A7F24B7AA9365B37-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--A13138E3D6E44C72A7F24B7AA9365B37-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--A13138E3D6E44C72A7F24B7AA9365B37-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--A13138E3D6E44C72A7F24B7AA9365B37--></AD_COLUMN>
+
 <!--A2622D5C7B194885A112B0FC5765C55E--><AD_COLUMN>
 <!--A2622D5C7B194885A112B0FC5765C55E-->  <AD_COLUMN_ID><![CDATA[A2622D5C7B194885A112B0FC5765C55E]]></AD_COLUMN_ID>
 <!--A2622D5C7B194885A112B0FC5765C55E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -5219,7 +5253,7 @@
 <!--A37C6F84AA2D3F50E040007F01006E35-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--A37C6F84AA2D3F50E040007F01006E35-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
 <!--A37C6F84AA2D3F50E040007F01006E35-->  <AD_ELEMENT_ID><![CDATA[800080]]></AD_ELEMENT_ID>
-<!--A37C6F84AA2D3F50E040007F01006E35-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--A37C6F84AA2D3F50E040007F01006E35-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
 <!--A37C6F84AA2D3F50E040007F01006E35-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--A37C6F84AA2D3F50E040007F01006E35-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--A37C6F84AA2D3F50E040007F01006E35-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
@@ -5661,7 +5695,7 @@
 <!--A37C6F84AA3A3F50E040007F01006E35-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--A37C6F84AA3A3F50E040007F01006E35-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
 <!--A37C6F84AA3A3F50E040007F01006E35-->  <AD_ELEMENT_ID><![CDATA[1005]]></AD_ELEMENT_ID>
-<!--A37C6F84AA3A3F50E040007F01006E35-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--A37C6F84AA3A3F50E040007F01006E35-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
 <!--A37C6F84AA3A3F50E040007F01006E35-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--A37C6F84AA3A3F50E040007F01006E35-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--A37C6F84AA3A3F50E040007F01006E35-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
@@ -5695,7 +5729,7 @@
 <!--A37C6F84AA3B3F50E040007F01006E35-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--A37C6F84AA3B3F50E040007F01006E35-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
 <!--A37C6F84AA3B3F50E040007F01006E35-->  <AD_ELEMENT_ID><![CDATA[550]]></AD_ELEMENT_ID>
-<!--A37C6F84AA3B3F50E040007F01006E35-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--A37C6F84AA3B3F50E040007F01006E35-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
 <!--A37C6F84AA3B3F50E040007F01006E35-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--A37C6F84AA3B3F50E040007F01006E35-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--A37C6F84AA3B3F50E040007F01006E35-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
@@ -5729,7 +5763,7 @@
 <!--A37C6F84AA3C3F50E040007F01006E35-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--A37C6F84AA3C3F50E040007F01006E35-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
 <!--A37C6F84AA3C3F50E040007F01006E35-->  <AD_ELEMENT_ID><![CDATA[208]]></AD_ELEMENT_ID>
-<!--A37C6F84AA3C3F50E040007F01006E35-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--A37C6F84AA3C3F50E040007F01006E35-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
 <!--A37C6F84AA3C3F50E040007F01006E35-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--A37C6F84AA3C3F50E040007F01006E35-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--A37C6F84AA3C3F50E040007F01006E35-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
@@ -5766,7 +5800,7 @@
 <!--A37C6F84AA3D3F50E040007F01006E35-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--A37C6F84AA3D3F50E040007F01006E35-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--A37C6F84AA3D3F50E040007F01006E35-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--A37C6F84AA3D3F50E040007F01006E35-->  <POSITION><![CDATA[35]]></POSITION>
+<!--A37C6F84AA3D3F50E040007F01006E35-->  <POSITION><![CDATA[36]]></POSITION>
 <!--A37C6F84AA3D3F50E040007F01006E35-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--A37C6F84AA3D3F50E040007F01006E35-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--A37C6F84AA3D3F50E040007F01006E35-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -5796,12 +5830,12 @@
 <!--A37C6F84AA3E3F50E040007F01006E35-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--A37C6F84AA3E3F50E040007F01006E35-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
 <!--A37C6F84AA3E3F50E040007F01006E35-->  <AD_ELEMENT_ID><![CDATA[187]]></AD_ELEMENT_ID>
-<!--A37C6F84AA3E3F50E040007F01006E35-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--A37C6F84AA3E3F50E040007F01006E35-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
 <!--A37C6F84AA3E3F50E040007F01006E35-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--A37C6F84AA3E3F50E040007F01006E35-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--A37C6F84AA3E3F50E040007F01006E35-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--A37C6F84AA3E3F50E040007F01006E35-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--A37C6F84AA3E3F50E040007F01006E35-->  <POSITION><![CDATA[36]]></POSITION>
+<!--A37C6F84AA3E3F50E040007F01006E35-->  <POSITION><![CDATA[37]]></POSITION>
 <!--A37C6F84AA3E3F50E040007F01006E35-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--A37C6F84AA3E3F50E040007F01006E35-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--A37C6F84AA3E3F50E040007F01006E35-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -5833,7 +5867,7 @@
 <!--A37C6F84AA3F3F50E040007F01006E35-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--A37C6F84AA3F3F50E040007F01006E35-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--A37C6F84AA3F3F50E040007F01006E35-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--A37C6F84AA3F3F50E040007F01006E35-->  <POSITION><![CDATA[37]]></POSITION>
+<!--A37C6F84AA3F3F50E040007F01006E35-->  <POSITION><![CDATA[40]]></POSITION>
 <!--A37C6F84AA3F3F50E040007F01006E35-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--A37C6F84AA3F3F50E040007F01006E35-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--A37C6F84AA3F3F50E040007F01006E35-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -5865,7 +5899,7 @@
 <!--A37C6F84AA403F50E040007F01006E35-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--A37C6F84AA403F50E040007F01006E35-->  <DEVELOPMENTSTATUS><![CDATA[DP]]></DEVELOPMENTSTATUS>
 <!--A37C6F84AA403F50E040007F01006E35-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--A37C6F84AA403F50E040007F01006E35-->  <POSITION><![CDATA[38]]></POSITION>
+<!--A37C6F84AA403F50E040007F01006E35-->  <POSITION><![CDATA[41]]></POSITION>
 <!--A37C6F84AA403F50E040007F01006E35-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--A37C6F84AA403F50E040007F01006E35-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--A37C6F84AA403F50E040007F01006E35-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -5898,7 +5932,7 @@
 <!--A37C6F84AA413F50E040007F01006E35-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--A37C6F84AA413F50E040007F01006E35-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--A37C6F84AA413F50E040007F01006E35-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--A37C6F84AA413F50E040007F01006E35-->  <POSITION><![CDATA[39]]></POSITION>
+<!--A37C6F84AA413F50E040007F01006E35-->  <POSITION><![CDATA[42]]></POSITION>
 <!--A37C6F84AA413F50E040007F01006E35-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--A37C6F84AA413F50E040007F01006E35-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--A37C6F84AA413F50E040007F01006E35-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -5933,7 +5967,7 @@
 <!--A3A1CA451F85C5FBE040007F0100386C-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--A3A1CA451F85C5FBE040007F0100386C-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--A3A1CA451F85C5FBE040007F0100386C-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--A3A1CA451F85C5FBE040007F0100386C-->  <POSITION><![CDATA[40]]></POSITION>
+<!--A3A1CA451F85C5FBE040007F0100386C-->  <POSITION><![CDATA[43]]></POSITION>
 <!--A3A1CA451F85C5FBE040007F0100386C-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--A3A1CA451F85C5FBE040007F0100386C-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--A3A1CA451F85C5FBE040007F0100386C-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -6241,6 +6275,41 @@
 <!--B01D6A5AF6F14FD6947BDEEF22C35CF8-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
 <!--B01D6A5AF6F14FD6947BDEEF22C35CF8--></AD_COLUMN>
 
+<!--B44BDBCFCEC243179D78A333FA0497A5--><AD_COLUMN>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->  <AD_COLUMN_ID><![CDATA[B44BDBCFCEC243179D78A333FA0497A5]]></AD_COLUMN_ID>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->  <NAME><![CDATA[Modify]]></NAME>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->  <DESCRIPTION><![CDATA[Modify existing transaction once created]]></DESCRIPTION>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->  <HELP><![CDATA[Process to modify transactions GL Item type once they have been created]]></HELP>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->  <COLUMNNAME><![CDATA[EM_APRM_Modify]]></COLUMNNAME>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->  <AD_TABLE_ID><![CDATA[FF8080812FFEC82D012FFECCE3400030]]></AD_TABLE_ID>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->  <AD_REFERENCE_ID><![CDATA[28]]></AD_REFERENCE_ID>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->  <SEQNO><![CDATA[410]]></SEQNO>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->  <AD_ELEMENT_ID><![CDATA[91DD92021CFA438DBBF2ABAFCB2089C5]]></AD_ELEMENT_ID>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->  <AD_PROCESS_ID><![CDATA[15C8708DFC464C2D91286E59624FDD18]]></AD_PROCESS_ID>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->  <POSITION><![CDATA[34]]></POSITION>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->  <ISAUTOSAVE><![CDATA[N]]></ISAUTOSAVE>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--B44BDBCFCEC243179D78A333FA0497A5-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--B44BDBCFCEC243179D78A333FA0497A5--></AD_COLUMN>
+
 <!--B50241F11C4F404583CACB2A88CE875F--><AD_COLUMN>
 <!--B50241F11C4F404583CACB2A88CE875F-->  <AD_COLUMN_ID><![CDATA[B50241F11C4F404583CACB2A88CE875F]]></AD_COLUMN_ID>
 <!--B50241F11C4F404583CACB2A88CE875F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -6517,6 +6586,41 @@
 <!--BB2A987CBD534A18B91D77B7D43AF879-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
 <!--BB2A987CBD534A18B91D77B7D43AF879--></AD_COLUMN>
 
+<!--BBA3DB68DBD844B29F1EEC9A04F112E8--><AD_COLUMN>
+<!--BBA3DB68DBD844B29F1EEC9A04F112E8-->  <AD_COLUMN_ID><![CDATA[BBA3DB68DBD844B29F1EEC9A04F112E8]]></AD_COLUMN_ID>
+<!--BBA3DB68DBD844B29F1EEC9A04F112E8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BBA3DB68DBD844B29F1EEC9A04F112E8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BBA3DB68DBD844B29F1EEC9A04F112E8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BBA3DB68DBD844B29F1EEC9A04F112E8-->  <NAME><![CDATA[Product]]></NAME>
+<!--BBA3DB68DBD844B29F1EEC9A04F112E8-->  <DESCRIPTION><![CDATA[An item produced by a process.]]></DESCRIPTION>
+<!--BBA3DB68DBD844B29F1EEC9A04F112E8-->  <HELP><![CDATA[Identifies an item which is either purchased or sold in this organization.]]></HELP>
+<!--BBA3DB68DBD844B29F1EEC9A04F112E8-->  <COLUMNNAME><![CDATA[M_Product_ID]]></COLUMNNAME>
+<!--BBA3DB68DBD844B29F1EEC9A04F112E8-->  <AD_TABLE_ID><![CDATA[FF8080812FFEC82D012FFECCE3400030]]></AD_TABLE_ID>
+<!--BBA3DB68DBD844B29F1EEC9A04F112E8-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--BBA3DB68DBD844B29F1EEC9A04F112E8-->  <AD_REFERENCE_VALUE_ID><![CDATA[800060]]></AD_REFERENCE_VALUE_ID>
+<!--BBA3DB68DBD844B29F1EEC9A04F112E8-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--BBA3DB68DBD844B29F1EEC9A04F112E8-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--BBA3DB68DBD844B29F1EEC9A04F112E8-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--BBA3DB68DBD844B29F1EEC9A04F112E8-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--BBA3DB68DBD844B29F1EEC9A04F112E8-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--BBA3DB68DBD844B29F1EEC9A04F112E8-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--BBA3DB68DBD844B29F1EEC9A04F112E8-->  <SEQNO><![CDATA[420]]></SEQNO>
+<!--BBA3DB68DBD844B29F1EEC9A04F112E8-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--BBA3DB68DBD844B29F1EEC9A04F112E8-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--BBA3DB68DBD844B29F1EEC9A04F112E8-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--BBA3DB68DBD844B29F1EEC9A04F112E8-->  <AD_ELEMENT_ID><![CDATA[454]]></AD_ELEMENT_ID>
+<!--BBA3DB68DBD844B29F1EEC9A04F112E8-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--BBA3DB68DBD844B29F1EEC9A04F112E8-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--BBA3DB68DBD844B29F1EEC9A04F112E8-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--BBA3DB68DBD844B29F1EEC9A04F112E8-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--BBA3DB68DBD844B29F1EEC9A04F112E8-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--BBA3DB68DBD844B29F1EEC9A04F112E8-->  <POSITION><![CDATA[38]]></POSITION>
+<!--BBA3DB68DBD844B29F1EEC9A04F112E8-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--BBA3DB68DBD844B29F1EEC9A04F112E8-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--BBA3DB68DBD844B29F1EEC9A04F112E8-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--BBA3DB68DBD844B29F1EEC9A04F112E8-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--BBA3DB68DBD844B29F1EEC9A04F112E8--></AD_COLUMN>
+
 <!--BBE36F9268AD4E4D9F8BD3E152E7D3BA--><AD_COLUMN>
 <!--BBE36F9268AD4E4D9F8BD3E152E7D3BA-->  <AD_COLUMN_ID><![CDATA[BBE36F9268AD4E4D9F8BD3E152E7D3BA]]></AD_COLUMN_ID>
 <!--BBE36F9268AD4E4D9F8BD3E152E7D3BA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -6552,6 +6656,42 @@
 <!--BBE36F9268AD4E4D9F8BD3E152E7D3BA-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
 <!--BBE36F9268AD4E4D9F8BD3E152E7D3BA--></AD_COLUMN>
 
+<!--BC78354AB2F7403FA9725CDF267C0A70--><AD_COLUMN>
+<!--BC78354AB2F7403FA9725CDF267C0A70-->  <AD_COLUMN_ID><![CDATA[BC78354AB2F7403FA9725CDF267C0A70]]></AD_COLUMN_ID>
+<!--BC78354AB2F7403FA9725CDF267C0A70-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BC78354AB2F7403FA9725CDF267C0A70-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BC78354AB2F7403FA9725CDF267C0A70-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BC78354AB2F7403FA9725CDF267C0A70-->  <NAME><![CDATA[EM_APRM_Modify]]></NAME>
+<!--BC78354AB2F7403FA9725CDF267C0A70-->  <DESCRIPTION><![CDATA[Modify existing transaction once created]]></DESCRIPTION>
+<!--BC78354AB2F7403FA9725CDF267C0A70-->  <HELP><![CDATA[Process to modify transactions GL Item type once they have been created]]></HELP>
+<!--BC78354AB2F7403FA9725CDF267C0A70-->  <COLUMNNAME><![CDATA[EM_APRM_Modify]]></COLUMNNAME>
+<!--BC78354AB2F7403FA9725CDF267C0A70-->  <AD_TABLE_ID><![CDATA[4D8C3B3C31D1410DA046140C9F024D17]]></AD_TABLE_ID>
+<!--BC78354AB2F7403FA9725CDF267C0A70-->  <AD_REFERENCE_ID><![CDATA[28]]></AD_REFERENCE_ID>
+<!--BC78354AB2F7403FA9725CDF267C0A70-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--BC78354AB2F7403FA9725CDF267C0A70-->  <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE>
+<!--BC78354AB2F7403FA9725CDF267C0A70-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--BC78354AB2F7403FA9725CDF267C0A70-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--BC78354AB2F7403FA9725CDF267C0A70-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--BC78354AB2F7403FA9725CDF267C0A70-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--BC78354AB2F7403FA9725CDF267C0A70-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--BC78354AB2F7403FA9725CDF267C0A70-->  <SEQNO><![CDATA[380]]></SEQNO>
+<!--BC78354AB2F7403FA9725CDF267C0A70-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--BC78354AB2F7403FA9725CDF267C0A70-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--BC78354AB2F7403FA9725CDF267C0A70-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--BC78354AB2F7403FA9725CDF267C0A70-->  <AD_ELEMENT_ID><![CDATA[91DD92021CFA438DBBF2ABAFCB2089C5]]></AD_ELEMENT_ID>
+<!--BC78354AB2F7403FA9725CDF267C0A70-->  <AD_PROCESS_ID><![CDATA[15C8708DFC464C2D91286E59624FDD18]]></AD_PROCESS_ID>
+<!--BC78354AB2F7403FA9725CDF267C0A70-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--BC78354AB2F7403FA9725CDF267C0A70-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--BC78354AB2F7403FA9725CDF267C0A70-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--BC78354AB2F7403FA9725CDF267C0A70-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--BC78354AB2F7403FA9725CDF267C0A70-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--BC78354AB2F7403FA9725CDF267C0A70-->  <POSITION><![CDATA[38]]></POSITION>
+<!--BC78354AB2F7403FA9725CDF267C0A70-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--BC78354AB2F7403FA9725CDF267C0A70-->  <ISAUTOSAVE><![CDATA[N]]></ISAUTOSAVE>
+<!--BC78354AB2F7403FA9725CDF267C0A70-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--BC78354AB2F7403FA9725CDF267C0A70-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--BC78354AB2F7403FA9725CDF267C0A70--></AD_COLUMN>
+
 <!--BDFC6B326633430292F1C59CEF831534--><AD_COLUMN>
 <!--BDFC6B326633430292F1C59CEF831534-->  <AD_COLUMN_ID><![CDATA[BDFC6B326633430292F1C59CEF831534]]></AD_COLUMN_ID>
 <!--BDFC6B326633430292F1C59CEF831534-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -7225,7 +7365,7 @@
 <!--FDE1E0795CDC4A00AC9D587E0D98D319-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--FDE1E0795CDC4A00AC9D587E0D98D319-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--FDE1E0795CDC4A00AC9D587E0D98D319-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--FDE1E0795CDC4A00AC9D587E0D98D319-->  <POSITION><![CDATA[34]]></POSITION>
+<!--FDE1E0795CDC4A00AC9D587E0D98D319-->  <POSITION><![CDATA[35]]></POSITION>
 <!--FDE1E0795CDC4A00AC9D587E0D98D319-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--FDE1E0795CDC4A00AC9D587E0D98D319-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--FDE1E0795CDC4A00AC9D587E0D98D319-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml	Sat Nov 12 15:43:15 2011 +0100
@@ -269,6 +269,19 @@
 <!--8BBA8342ED3C20FFE040007F01002E9B-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--8BBA8342ED3C20FFE040007F01002E9B--></AD_ELEMENT>
 
+<!--91DD92021CFA438DBBF2ABAFCB2089C5--><AD_ELEMENT>
+<!--91DD92021CFA438DBBF2ABAFCB2089C5-->  <AD_ELEMENT_ID><![CDATA[91DD92021CFA438DBBF2ABAFCB2089C5]]></AD_ELEMENT_ID>
+<!--91DD92021CFA438DBBF2ABAFCB2089C5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--91DD92021CFA438DBBF2ABAFCB2089C5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--91DD92021CFA438DBBF2ABAFCB2089C5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--91DD92021CFA438DBBF2ABAFCB2089C5-->  <COLUMNNAME><![CDATA[EM_APRM_Modify]]></COLUMNNAME>
+<!--91DD92021CFA438DBBF2ABAFCB2089C5-->  <NAME><![CDATA[Modify]]></NAME>
+<!--91DD92021CFA438DBBF2ABAFCB2089C5-->  <PRINTNAME><![CDATA[Modify]]></PRINTNAME>
+<!--91DD92021CFA438DBBF2ABAFCB2089C5-->  <DESCRIPTION><![CDATA[Modify existing transaction once created]]></DESCRIPTION>
+<!--91DD92021CFA438DBBF2ABAFCB2089C5-->  <HELP><![CDATA[Process to modify transactions GL Item type once they have been created]]></HELP>
+<!--91DD92021CFA438DBBF2ABAFCB2089C5-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--91DD92021CFA438DBBF2ABAFCB2089C5--></AD_ELEMENT>
+
 <!--A0417A0E924ACA28E040007F01003C18--><AD_ELEMENT>
 <!--A0417A0E924ACA28E040007F01003C18-->  <AD_ELEMENT_ID><![CDATA[A0417A0E924ACA28E040007F01003C18]]></AD_ELEMENT_ID>
 <!--A0417A0E924ACA28E040007F01003C18-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml	Sat Nov 12 15:43:15 2011 +0100
@@ -6621,6 +6621,33 @@
 <!--8C679A6AD6294811B5936EE59035CE36-->  <ISSHOWNINSTATUSBAR><![CDATA[Y]]></ISSHOWNINSTATUSBAR>
 <!--8C679A6AD6294811B5936EE59035CE36--></AD_FIELD>
 
+<!--8C8A4128A9384B3087CCD1759C603A0B--><AD_FIELD>
+<!--8C8A4128A9384B3087CCD1759C603A0B-->  <AD_FIELD_ID><![CDATA[8C8A4128A9384B3087CCD1759C603A0B]]></AD_FIELD_ID>
+<!--8C8A4128A9384B3087CCD1759C603A0B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8C8A4128A9384B3087CCD1759C603A0B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8C8A4128A9384B3087CCD1759C603A0B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8C8A4128A9384B3087CCD1759C603A0B-->  <NAME><![CDATA[Product]]></NAME>
+<!--8C8A4128A9384B3087CCD1759C603A0B-->  <DESCRIPTION><![CDATA[An item produced by a process.]]></DESCRIPTION>
+<!--8C8A4128A9384B3087CCD1759C603A0B-->  <HELP><![CDATA[Identifies an item which is either purchased or sold in this organization.]]></HELP>
+<!--8C8A4128A9384B3087CCD1759C603A0B-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--8C8A4128A9384B3087CCD1759C603A0B-->  <AD_TAB_ID><![CDATA[FF8080812F213146012F2135BC25000E]]></AD_TAB_ID>
+<!--8C8A4128A9384B3087CCD1759C603A0B-->  <AD_COLUMN_ID><![CDATA[BBA3DB68DBD844B29F1EEC9A04F112E8]]></AD_COLUMN_ID>
+<!--8C8A4128A9384B3087CCD1759C603A0B-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--8C8A4128A9384B3087CCD1759C603A0B-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--8C8A4128A9384B3087CCD1759C603A0B-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--8C8A4128A9384B3087CCD1759C603A0B-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--8C8A4128A9384B3087CCD1759C603A0B-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--8C8A4128A9384B3087CCD1759C603A0B-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--8C8A4128A9384B3087CCD1759C603A0B-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--8C8A4128A9384B3087CCD1759C603A0B-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--8C8A4128A9384B3087CCD1759C603A0B-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--8C8A4128A9384B3087CCD1759C603A0B-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--8C8A4128A9384B3087CCD1759C603A0B-->  <GRID_SEQNO><![CDATA[0]]></GRID_SEQNO>
+<!--8C8A4128A9384B3087CCD1759C603A0B-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--8C8A4128A9384B3087CCD1759C603A0B-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--8C8A4128A9384B3087CCD1759C603A0B-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--8C8A4128A9384B3087CCD1759C603A0B--></AD_FIELD>
+
 <!--8DAAD5774E07425B8B4A46FA3E4A5294--><AD_FIELD>
 <!--8DAAD5774E07425B8B4A46FA3E4A5294-->  <AD_FIELD_ID><![CDATA[8DAAD5774E07425B8B4A46FA3E4A5294]]></AD_FIELD_ID>
 <!--8DAAD5774E07425B8B4A46FA3E4A5294-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -8741,6 +8768,34 @@
 <!--B4F0216426D344DFA60D793E6AB6AB0B-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
 <!--B4F0216426D344DFA60D793E6AB6AB0B--></AD_FIELD>
 
+<!--B70F752A7A85454CAE13D6525C2361EE--><AD_FIELD>
+<!--B70F752A7A85454CAE13D6525C2361EE-->  <AD_FIELD_ID><![CDATA[B70F752A7A85454CAE13D6525C2361EE]]></AD_FIELD_ID>
+<!--B70F752A7A85454CAE13D6525C2361EE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B70F752A7A85454CAE13D6525C2361EE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B70F752A7A85454CAE13D6525C2361EE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B70F752A7A85454CAE13D6525C2361EE-->  <NAME><![CDATA[Modify]]></NAME>
+<!--B70F752A7A85454CAE13D6525C2361EE-->  <DESCRIPTION><![CDATA[Process to modify transactions GL Item type once they have been created]]></DESCRIPTION>
+<!--B70F752A7A85454CAE13D6525C2361EE-->  <HELP><![CDATA[Process to modify transactions GL Item type once they have been created]]></HELP>
+<!--B70F752A7A85454CAE13D6525C2361EE-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--B70F752A7A85454CAE13D6525C2361EE-->  <AD_TAB_ID><![CDATA[FF8080812F213146012F2135BC25000E]]></AD_TAB_ID>
+<!--B70F752A7A85454CAE13D6525C2361EE-->  <AD_COLUMN_ID><![CDATA[B44BDBCFCEC243179D78A333FA0497A5]]></AD_COLUMN_ID>
+<!--B70F752A7A85454CAE13D6525C2361EE-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--B70F752A7A85454CAE13D6525C2361EE-->  <DISPLAYLOGIC><![CDATA[@C_GLITEM_ID@!'']]></DISPLAYLOGIC>
+<!--B70F752A7A85454CAE13D6525C2361EE-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--B70F752A7A85454CAE13D6525C2361EE-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--B70F752A7A85454CAE13D6525C2361EE-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--B70F752A7A85454CAE13D6525C2361EE-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--B70F752A7A85454CAE13D6525C2361EE-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--B70F752A7A85454CAE13D6525C2361EE-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--B70F752A7A85454CAE13D6525C2361EE-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--B70F752A7A85454CAE13D6525C2361EE-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--B70F752A7A85454CAE13D6525C2361EE-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--B70F752A7A85454CAE13D6525C2361EE-->  <GRID_SEQNO><![CDATA[0]]></GRID_SEQNO>
+<!--B70F752A7A85454CAE13D6525C2361EE-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--B70F752A7A85454CAE13D6525C2361EE-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--B70F752A7A85454CAE13D6525C2361EE-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--B70F752A7A85454CAE13D6525C2361EE--></AD_FIELD>
+
 <!--B739AFFFB5CC4E1C847EB25ABE62A233--><AD_FIELD>
 <!--B739AFFFB5CC4E1C847EB25ABE62A233-->  <AD_FIELD_ID><![CDATA[B739AFFFB5CC4E1C847EB25ABE62A233]]></AD_FIELD_ID>
 <!--B739AFFFB5CC4E1C847EB25ABE62A233-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -9327,6 +9382,33 @@
 <!--CAAEE55F40DE45D49E2DB8EC95A4AC46-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
 <!--CAAEE55F40DE45D49E2DB8EC95A4AC46--></AD_FIELD>
 
+<!--CB9B7A7C9AB845E299BA3385935C33B5--><AD_FIELD>
+<!--CB9B7A7C9AB845E299BA3385935C33B5-->  <AD_FIELD_ID><![CDATA[CB9B7A7C9AB845E299BA3385935C33B5]]></AD_FIELD_ID>
+<!--CB9B7A7C9AB845E299BA3385935C33B5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--CB9B7A7C9AB845E299BA3385935C33B5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--CB9B7A7C9AB845E299BA3385935C33B5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--CB9B7A7C9AB845E299BA3385935C33B5-->  <NAME><![CDATA[Sales Region]]></NAME>
+<!--CB9B7A7C9AB845E299BA3385935C33B5-->  <DESCRIPTION><![CDATA[A defined section of the world where sales efforts will be focused.]]></DESCRIPTION>
+<!--CB9B7A7C9AB845E299BA3385935C33B5-->  <HELP><![CDATA[The Sales Region indicates a specific area of sales coverage.]]></HELP>
+<!--CB9B7A7C9AB845E299BA3385935C33B5-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--CB9B7A7C9AB845E299BA3385935C33B5-->  <AD_TAB_ID><![CDATA[FF8080812F213146012F2135BC25000E]]></AD_TAB_ID>
+<!--CB9B7A7C9AB845E299BA3385935C33B5-->  <AD_COLUMN_ID><![CDATA[A13138E3D6E44C72A7F24B7AA9365B37]]></AD_COLUMN_ID>
+<!--CB9B7A7C9AB845E299BA3385935C33B5-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--CB9B7A7C9AB845E299BA3385935C33B5-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--CB9B7A7C9AB845E299BA3385935C33B5-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--CB9B7A7C9AB845E299BA3385935C33B5-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--CB9B7A7C9AB845E299BA3385935C33B5-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--CB9B7A7C9AB845E299BA3385935C33B5-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--CB9B7A7C9AB845E299BA3385935C33B5-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--CB9B7A7C9AB845E299BA3385935C33B5-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--CB9B7A7C9AB845E299BA3385935C33B5-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--CB9B7A7C9AB845E299BA3385935C33B5-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--CB9B7A7C9AB845E299BA3385935C33B5-->  <GRID_SEQNO><![CDATA[0]]></GRID_SEQNO>
+<!--CB9B7A7C9AB845E299BA3385935C33B5-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--CB9B7A7C9AB845E299BA3385935C33B5-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--CB9B7A7C9AB845E299BA3385935C33B5-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--CB9B7A7C9AB845E299BA3385935C33B5--></AD_FIELD>
+
 <!--CCEF625BE5004940A3FC98E1E4EE8CAC--><AD_FIELD>
 <!--CCEF625BE5004940A3FC98E1E4EE8CAC-->  <AD_FIELD_ID><![CDATA[CCEF625BE5004940A3FC98E1E4EE8CAC]]></AD_FIELD_ID>
 <!--CCEF625BE5004940A3FC98E1E4EE8CAC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml	Sat Nov 12 15:43:15 2011 +0100
@@ -386,6 +386,17 @@
 <!--8A4E2745545245ED81BFBC5324648833-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--8A4E2745545245ED81BFBC5324648833--></AD_MESSAGE>
 
+<!--92EC1935A8B947BA83EF82DBD169CA8B--><AD_MESSAGE>
+<!--92EC1935A8B947BA83EF82DBD169CA8B-->  <AD_MESSAGE_ID><![CDATA[92EC1935A8B947BA83EF82DBD169CA8B]]></AD_MESSAGE_ID>
+<!--92EC1935A8B947BA83EF82DBD169CA8B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--92EC1935A8B947BA83EF82DBD169CA8B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--92EC1935A8B947BA83EF82DBD169CA8B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--92EC1935A8B947BA83EF82DBD169CA8B-->  <VALUE><![CDATA[APRM_CreditCurrency]]></VALUE>
+<!--92EC1935A8B947BA83EF82DBD169CA8B-->  <MSGTEXT><![CDATA[For credit generation and/or credit consumption payment currency should map business partner currency: %s]]></MSGTEXT>
+<!--92EC1935A8B947BA83EF82DBD169CA8B-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--92EC1935A8B947BA83EF82DBD169CA8B-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--92EC1935A8B947BA83EF82DBD169CA8B--></AD_MESSAGE>
+
 <!--9350C57F0C194634B4FC83028AC4D31D--><AD_MESSAGE>
 <!--9350C57F0C194634B4FC83028AC4D31D-->  <AD_MESSAGE_ID><![CDATA[9350C57F0C194634B4FC83028AC4D31D]]></AD_MESSAGE_ID>
 <!--9350C57F0C194634B4FC83028AC4D31D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -551,6 +562,17 @@
 <!--B6F8970C7470421FA5375E61D71A8E73-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--B6F8970C7470421FA5375E61D71A8E73--></AD_MESSAGE>
 
+<!--B9F31E06A19240DE87666454DB8A16E1--><AD_MESSAGE>
+<!--B9F31E06A19240DE87666454DB8A16E1-->  <AD_MESSAGE_ID><![CDATA[B9F31E06A19240DE87666454DB8A16E1]]></AD_MESSAGE_ID>
+<!--B9F31E06A19240DE87666454DB8A16E1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B9F31E06A19240DE87666454DB8A16E1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B9F31E06A19240DE87666454DB8A16E1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B9F31E06A19240DE87666454DB8A16E1-->  <VALUE><![CDATA[APRM_CreditWithoutBPartner]]></VALUE>
+<!--B9F31E06A19240DE87666454DB8A16E1-->  <MSGTEXT><![CDATA[Payments without a business partner can not generate/use credit]]></MSGTEXT>
+<!--B9F31E06A19240DE87666454DB8A16E1-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--B9F31E06A19240DE87666454DB8A16E1-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--B9F31E06A19240DE87666454DB8A16E1--></AD_MESSAGE>
+
 <!--BBB2F06979BA4A84BC67B134F9155862--><AD_MESSAGE>
 <!--BBB2F06979BA4A84BC67B134F9155862-->  <AD_MESSAGE_ID><![CDATA[BBB2F06979BA4A84BC67B134F9155862]]></AD_MESSAGE_ID>
 <!--BBB2F06979BA4A84BC67B134F9155862-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -683,6 +705,17 @@
 <!--F302E4040E1B45318BA270BDFA37179C-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--F302E4040E1B45318BA270BDFA37179C--></AD_MESSAGE>
 
+<!--F381A9CA5B51447286C117C68394C6BA--><AD_MESSAGE>
+<!--F381A9CA5B51447286C117C68394C6BA-->  <AD_MESSAGE_ID><![CDATA[F381A9CA5B51447286C117C68394C6BA]]></AD_MESSAGE_ID>
+<!--F381A9CA5B51447286C117C68394C6BA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F381A9CA5B51447286C117C68394C6BA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F381A9CA5B51447286C117C68394C6BA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F381A9CA5B51447286C117C68394C6BA-->  <VALUE><![CDATA[APRM_CreditNoPricelistCurrency]]></VALUE>
+<!--F381A9CA5B51447286C117C68394C6BA-->  <MSGTEXT><![CDATA[No currency in business partner's price list]]></MSGTEXT>
+<!--F381A9CA5B51447286C117C68394C6BA-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--F381A9CA5B51447286C117C68394C6BA-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--F381A9CA5B51447286C117C68394C6BA--></AD_MESSAGE>
+
 <!--F579E42461DC472AA4F21B14DD3D680B--><AD_MESSAGE>
 <!--F579E42461DC472AA4F21B14DD3D680B-->  <AD_MESSAGE_ID><![CDATA[F579E42461DC472AA4F21B14DD3D680B]]></AD_MESSAGE_ID>
 <!--F579E42461DC472AA4F21B14DD3D680B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODEL_OBJECT.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODEL_OBJECT.xml	Sat Nov 12 15:43:15 2011 +0100
@@ -108,6 +108,18 @@
 <!--A7A562CD91CB42D9977E12B098CBC9EC-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
 <!--A7A562CD91CB42D9977E12B098CBC9EC--></AD_MODEL_OBJECT>
 
+<!--AA1C0D6D318943808A75A24F5781AEBF--><AD_MODEL_OBJECT>
+<!--AA1C0D6D318943808A75A24F5781AEBF-->  <AD_MODEL_OBJECT_ID><![CDATA[AA1C0D6D318943808A75A24F5781AEBF]]></AD_MODEL_OBJECT_ID>
+<!--AA1C0D6D318943808A75A24F5781AEBF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--AA1C0D6D318943808A75A24F5781AEBF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--AA1C0D6D318943808A75A24F5781AEBF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--AA1C0D6D318943808A75A24F5781AEBF-->  <ACTION><![CDATA[P]]></ACTION>
+<!--AA1C0D6D318943808A75A24F5781AEBF-->  <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_TransactionModify]]></CLASSNAME>
+<!--AA1C0D6D318943808A75A24F5781AEBF-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
+<!--AA1C0D6D318943808A75A24F5781AEBF-->  <AD_PROCESS_ID><![CDATA[15C8708DFC464C2D91286E59624FDD18]]></AD_PROCESS_ID>
+<!--AA1C0D6D318943808A75A24F5781AEBF-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--AA1C0D6D318943808A75A24F5781AEBF--></AD_MODEL_OBJECT>
+
 <!--B18447439CAB419395BDA44287722832--><AD_MODEL_OBJECT>
 <!--B18447439CAB419395BDA44287722832-->  <AD_MODEL_OBJECT_ID><![CDATA[B18447439CAB419395BDA44287722832]]></AD_MODEL_OBJECT_ID>
 <!--B18447439CAB419395BDA44287722832-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Sat Nov 12 15:43:15 2011 +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.14195]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.14223]]></VERSION>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <DESCRIPTION><![CDATA[Managing your finances with an ERP does not have to be difficult. Enjoy a radically improved user experience that combines the power of an enterprise grade financial application with the simplicity and ease of a web 2.0 personal accounting service.]]></DESCRIPTION>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <HELP><![CDATA[Advanced Payables and Receivables Management simplifies and automates the business processes around the management of financial accounts, from the receipt and issue of payment, to the reconciliation of those events with bank statements.
 If you would like to help shape this module you are welcome to take part in the forum discussions or register feature requests or issues in the corresponding (Forum and Bug Tracking) sections in the Advanced Payables and Receivable project in the OB Forge.]]></HELP>
@@ -25,7 +25,7 @@
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <UPDATEINFO><![CDATA[Fixed issue with document sequence numbers reset in case of applying dataset second time.
 Fixed issue 15305.]]></UPDATEINFO>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <REFERENCEDATAINFO><![CDATA[Document types and default algorithm for bank statement auto matching]]></REFERENCEDATAINFO>
-<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION_LABEL><![CDATA[MP5]]></VERSION_LABEL>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--A918E3331C404B889D69AA9BFAFB23AC--></AD_MODULE>
 
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sat Nov 12 15:43:15 2011 +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.14195]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.14223]]></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.14195]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->  <STARTVERSION><![CDATA[3.0.14223]]></STARTVERSION>
 <!--B97FC854C6DD41E692161585645A900F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--B97FC854C6DD41E692161585645A900F-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--B97FC854C6DD41E692161585645A900F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS.xml	Sat Nov 12 15:43:15 2011 +0100
@@ -19,6 +19,26 @@
 <!--12016E2EDE0245B5A36B84CBA144DBDF-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--12016E2EDE0245B5A36B84CBA144DBDF--></AD_PROCESS>
 
+<!--15C8708DFC464C2D91286E59624FDD18--><AD_PROCESS>
+<!--15C8708DFC464C2D91286E59624FDD18-->  <AD_PROCESS_ID><![CDATA[15C8708DFC464C2D91286E59624FDD18]]></AD_PROCESS_ID>
+<!--15C8708DFC464C2D91286E59624FDD18-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--15C8708DFC464C2D91286E59624FDD18-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--15C8708DFC464C2D91286E59624FDD18-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--15C8708DFC464C2D91286E59624FDD18-->  <VALUE><![CDATA[APRM_TransactionModify]]></VALUE>
+<!--15C8708DFC464C2D91286E59624FDD18-->  <NAME><![CDATA[Modify]]></NAME>
+<!--15C8708DFC464C2D91286E59624FDD18-->  <DESCRIPTION><![CDATA[Process to modify transactions GL Item type once they have been created]]></DESCRIPTION>
+<!--15C8708DFC464C2D91286E59624FDD18-->  <HELP><![CDATA[Process to modify transactions GL Item type once they have been created]]></HELP>
+<!--15C8708DFC464C2D91286E59624FDD18-->  <ACCESSLEVEL><![CDATA[1]]></ACCESSLEVEL>
+<!--15C8708DFC464C2D91286E59624FDD18-->  <ISUSERSTARTABLE><![CDATA[N]]></ISUSERSTARTABLE>
+<!--15C8708DFC464C2D91286E59624FDD18-->  <ISREPORT><![CDATA[N]]></ISREPORT>
+<!--15C8708DFC464C2D91286E59624FDD18-->  <ISDIRECTPRINT><![CDATA[N]]></ISDIRECTPRINT>
+<!--15C8708DFC464C2D91286E59624FDD18-->  <ISBACKGROUND><![CDATA[N]]></ISBACKGROUND>
+<!--15C8708DFC464C2D91286E59624FDD18-->  <ISJASPER><![CDATA[N]]></ISJASPER>
+<!--15C8708DFC464C2D91286E59624FDD18-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
+<!--15C8708DFC464C2D91286E59624FDD18-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--15C8708DFC464C2D91286E59624FDD18-->  <UIPATTERN><![CDATA[S]]></UIPATTERN>
+<!--15C8708DFC464C2D91286E59624FDD18--></AD_PROCESS>
+
 <!--2EED9BC16DB34D2B80BA40A21564BECF--><AD_PROCESS>
 <!--2EED9BC16DB34D2B80BA40A21564BECF-->  <AD_PROCESS_ID><![CDATA[2EED9BC16DB34D2B80BA40A21564BECF]]></AD_PROCESS_ID>
 <!--2EED9BC16DB34D2B80BA40A21564BECF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS_PARA.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS_PARA.xml	Sat Nov 12 15:43:15 2011 +0100
@@ -1,5 +1,68 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <data>
+<!--1913962D2952412B84B8CDD3BC17026F--><AD_PROCESS_PARA>
+<!--1913962D2952412B84B8CDD3BC17026F-->  <AD_PROCESS_PARA_ID><![CDATA[1913962D2952412B84B8CDD3BC17026F]]></AD_PROCESS_PARA_ID>
+<!--1913962D2952412B84B8CDD3BC17026F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1913962D2952412B84B8CDD3BC17026F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1913962D2952412B84B8CDD3BC17026F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1913962D2952412B84B8CDD3BC17026F-->  <NAME><![CDATA[Product]]></NAME>
+<!--1913962D2952412B84B8CDD3BC17026F-->  <DESCRIPTION><![CDATA[An item produced by a process.]]></DESCRIPTION>
+<!--1913962D2952412B84B8CDD3BC17026F-->  <HELP><![CDATA[Identifies an item which is either purchased or sold in this organization.]]></HELP>
+<!--1913962D2952412B84B8CDD3BC17026F-->  <AD_PROCESS_ID><![CDATA[15C8708DFC464C2D91286E59624FDD18]]></AD_PROCESS_ID>
+<!--1913962D2952412B84B8CDD3BC17026F-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--1913962D2952412B84B8CDD3BC17026F-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--1913962D2952412B84B8CDD3BC17026F-->  <AD_REFERENCE_VALUE_ID><![CDATA[FF808181312DA8D801312DDDAA750008]]></AD_REFERENCE_VALUE_ID>
+<!--1913962D2952412B84B8CDD3BC17026F-->  <COLUMNNAME><![CDATA[M_Product_ID]]></COLUMNNAME>
+<!--1913962D2952412B84B8CDD3BC17026F-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--1913962D2952412B84B8CDD3BC17026F-->  <FIELDLENGTH><![CDATA[100]]></FIELDLENGTH>
+<!--1913962D2952412B84B8CDD3BC17026F-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--1913962D2952412B84B8CDD3BC17026F-->  <ISRANGE><![CDATA[N]]></ISRANGE>
+<!--1913962D2952412B84B8CDD3BC17026F-->  <DEFAULTVALUE><![CDATA[@M_Product_ID@]]></DEFAULTVALUE>
+<!--1913962D2952412B84B8CDD3BC17026F-->  <AD_ELEMENT_ID><![CDATA[454]]></AD_ELEMENT_ID>
+<!--1913962D2952412B84B8CDD3BC17026F--></AD_PROCESS_PARA>
+
+<!--4F5EE1017087464EAD95F3CCA4C5AFA5--><AD_PROCESS_PARA>
+<!--4F5EE1017087464EAD95F3CCA4C5AFA5-->  <AD_PROCESS_PARA_ID><![CDATA[4F5EE1017087464EAD95F3CCA4C5AFA5]]></AD_PROCESS_PARA_ID>
+<!--4F5EE1017087464EAD95F3CCA4C5AFA5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4F5EE1017087464EAD95F3CCA4C5AFA5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4F5EE1017087464EAD95F3CCA4C5AFA5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4F5EE1017087464EAD95F3CCA4C5AFA5-->  <NAME><![CDATA[Project]]></NAME>
+<!--4F5EE1017087464EAD95F3CCA4C5AFA5-->  <DESCRIPTION><![CDATA[Identifier of a project defined within the Project & Service Management module.]]></DESCRIPTION>
+<!--4F5EE1017087464EAD95F3CCA4C5AFA5-->  <HELP><![CDATA[Identifier of a project defined within the Project & Service Management module.]]></HELP>
+<!--4F5EE1017087464EAD95F3CCA4C5AFA5-->  <AD_PROCESS_ID><![CDATA[15C8708DFC464C2D91286E59624FDD18]]></AD_PROCESS_ID>
+<!--4F5EE1017087464EAD95F3CCA4C5AFA5-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--4F5EE1017087464EAD95F3CCA4C5AFA5-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--4F5EE1017087464EAD95F3CCA4C5AFA5-->  <AD_REFERENCE_VALUE_ID><![CDATA[FF808181312D569C01312D8FA681005A]]></AD_REFERENCE_VALUE_ID>
+<!--4F5EE1017087464EAD95F3CCA4C5AFA5-->  <COLUMNNAME><![CDATA[C_Project_ID]]></COLUMNNAME>
+<!--4F5EE1017087464EAD95F3CCA4C5AFA5-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--4F5EE1017087464EAD95F3CCA4C5AFA5-->  <FIELDLENGTH><![CDATA[100]]></FIELDLENGTH>
+<!--4F5EE1017087464EAD95F3CCA4C5AFA5-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--4F5EE1017087464EAD95F3CCA4C5AFA5-->  <ISRANGE><![CDATA[N]]></ISRANGE>
+<!--4F5EE1017087464EAD95F3CCA4C5AFA5-->  <DEFAULTVALUE><![CDATA[@C_Project_ID@]]></DEFAULTVALUE>
+<!--4F5EE1017087464EAD95F3CCA4C5AFA5-->  <AD_ELEMENT_ID><![CDATA[208]]></AD_ELEMENT_ID>
+<!--4F5EE1017087464EAD95F3CCA4C5AFA5--></AD_PROCESS_PARA>
+
+<!--6EEE4A4DB1BA476BA7929EC7FCF285F8--><AD_PROCESS_PARA>
+<!--6EEE4A4DB1BA476BA7929EC7FCF285F8-->  <AD_PROCESS_PARA_ID><![CDATA[6EEE4A4DB1BA476BA7929EC7FCF285F8]]></AD_PROCESS_PARA_ID>
+<!--6EEE4A4DB1BA476BA7929EC7FCF285F8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6EEE4A4DB1BA476BA7929EC7FCF285F8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6EEE4A4DB1BA476BA7929EC7FCF285F8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6EEE4A4DB1BA476BA7929EC7FCF285F8-->  <NAME><![CDATA[Business Partner]]></NAME>
+<!--6EEE4A4DB1BA476BA7929EC7FCF285F8-->  <DESCRIPTION><![CDATA[Anyone who takes part in daily business operations by acting as a customer, employee, etc.]]></DESCRIPTION>
+<!--6EEE4A4DB1BA476BA7929EC7FCF285F8-->  <HELP><![CDATA[A Business Partner is anyone with whom you transact.  This can include a customer, vendor, employee or any combination of these.]]></HELP>
+<!--6EEE4A4DB1BA476BA7929EC7FCF285F8-->  <AD_PROCESS_ID><![CDATA[15C8708DFC464C2D91286E59624FDD18]]></AD_PROCESS_ID>
+<!--6EEE4A4DB1BA476BA7929EC7FCF285F8-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--6EEE4A4DB1BA476BA7929EC7FCF285F8-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--6EEE4A4DB1BA476BA7929EC7FCF285F8-->  <AD_REFERENCE_VALUE_ID><![CDATA[56DEFF37A33F46D1AC918C97C4447EAF]]></AD_REFERENCE_VALUE_ID>
+<!--6EEE4A4DB1BA476BA7929EC7FCF285F8-->  <COLUMNNAME><![CDATA[C_BPartner_ID]]></COLUMNNAME>
+<!--6EEE4A4DB1BA476BA7929EC7FCF285F8-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--6EEE4A4DB1BA476BA7929EC7FCF285F8-->  <FIELDLENGTH><![CDATA[100]]></FIELDLENGTH>
+<!--6EEE4A4DB1BA476BA7929EC7FCF285F8-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--6EEE4A4DB1BA476BA7929EC7FCF285F8-->  <ISRANGE><![CDATA[N]]></ISRANGE>
+<!--6EEE4A4DB1BA476BA7929EC7FCF285F8-->  <DEFAULTVALUE><![CDATA[@C_Bpartner_ID@]]></DEFAULTVALUE>
+<!--6EEE4A4DB1BA476BA7929EC7FCF285F8-->  <AD_ELEMENT_ID><![CDATA[187]]></AD_ELEMENT_ID>
+<!--6EEE4A4DB1BA476BA7929EC7FCF285F8--></AD_PROCESS_PARA>
+
 <!--800BEB6BDA99409194CADF23988D7B6D--><AD_PROCESS_PARA>
 <!--800BEB6BDA99409194CADF23988D7B6D-->  <AD_PROCESS_PARA_ID><![CDATA[800BEB6BDA99409194CADF23988D7B6D]]></AD_PROCESS_PARA_ID>
 <!--800BEB6BDA99409194CADF23988D7B6D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -43,6 +106,90 @@
 <!--8A8E1C0D38F144D797698E48F464F97B-->  <AD_ELEMENT_ID><![CDATA[152]]></AD_ELEMENT_ID>
 <!--8A8E1C0D38F144D797698E48F464F97B--></AD_PROCESS_PARA>
 
+<!--8BEBA07E78124B2B92B764D9B452B209--><AD_PROCESS_PARA>
+<!--8BEBA07E78124B2B92B764D9B452B209-->  <AD_PROCESS_PARA_ID><![CDATA[8BEBA07E78124B2B92B764D9B452B209]]></AD_PROCESS_PARA_ID>
+<!--8BEBA07E78124B2B92B764D9B452B209-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8BEBA07E78124B2B92B764D9B452B209-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8BEBA07E78124B2B92B764D9B452B209-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8BEBA07E78124B2B92B764D9B452B209-->  <NAME><![CDATA[G/L Item]]></NAME>
+<!--8BEBA07E78124B2B92B764D9B452B209-->  <DESCRIPTION><![CDATA[An alias for the Account Combination which can be commonly used in daily operations.]]></DESCRIPTION>
+<!--8BEBA07E78124B2B92B764D9B452B209-->  <HELP><![CDATA[General ledger item.]]></HELP>
+<!--8BEBA07E78124B2B92B764D9B452B209-->  <AD_PROCESS_ID><![CDATA[15C8708DFC464C2D91286E59624FDD18]]></AD_PROCESS_ID>
+<!--8BEBA07E78124B2B92B764D9B452B209-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--8BEBA07E78124B2B92B764D9B452B209-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--8BEBA07E78124B2B92B764D9B452B209-->  <AD_REFERENCE_VALUE_ID><![CDATA[1A6C5E0A5868417786ECCF3C02B17D65]]></AD_REFERENCE_VALUE_ID>
+<!--8BEBA07E78124B2B92B764D9B452B209-->  <COLUMNNAME><![CDATA[C_GLItem_ID]]></COLUMNNAME>
+<!--8BEBA07E78124B2B92B764D9B452B209-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--8BEBA07E78124B2B92B764D9B452B209-->  <FIELDLENGTH><![CDATA[100]]></FIELDLENGTH>
+<!--8BEBA07E78124B2B92B764D9B452B209-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--8BEBA07E78124B2B92B764D9B452B209-->  <ISRANGE><![CDATA[N]]></ISRANGE>
+<!--8BEBA07E78124B2B92B764D9B452B209-->  <DEFAULTVALUE><![CDATA[@C_GLItem_ID@]]></DEFAULTVALUE>
+<!--8BEBA07E78124B2B92B764D9B452B209-->  <AD_ELEMENT_ID><![CDATA[800080]]></AD_ELEMENT_ID>
+<!--8BEBA07E78124B2B92B764D9B452B209--></AD_PROCESS_PARA>
+
+<!--9728F9CADE45497E9F583A76B7DE3BE6--><AD_PROCESS_PARA>
+<!--9728F9CADE45497E9F583A76B7DE3BE6-->  <AD_PROCESS_PARA_ID><![CDATA[9728F9CADE45497E9F583A76B7DE3BE6]]></AD_PROCESS_PARA_ID>
+<!--9728F9CADE45497E9F583A76B7DE3BE6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9728F9CADE45497E9F583A76B7DE3BE6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9728F9CADE45497E9F583A76B7DE3BE6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9728F9CADE45497E9F583A76B7DE3BE6-->  <NAME><![CDATA[Sales Campaign]]></NAME>
+<!--9728F9CADE45497E9F583A76B7DE3BE6-->  <DESCRIPTION><![CDATA[An advertising effort aimed at increasing sales.]]></DESCRIPTION>
+<!--9728F9CADE45497E9F583A76B7DE3BE6-->  <HELP><![CDATA[The Campaign defines a unique marketing program.  Projects can be associated with a pre defined Marketing Campaign.  You can then report based on a specific Campaign.]]></HELP>
+<!--9728F9CADE45497E9F583A76B7DE3BE6-->  <AD_PROCESS_ID><![CDATA[15C8708DFC464C2D91286E59624FDD18]]></AD_PROCESS_ID>
+<!--9728F9CADE45497E9F583A76B7DE3BE6-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--9728F9CADE45497E9F583A76B7DE3BE6-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--9728F9CADE45497E9F583A76B7DE3BE6-->  <AD_REFERENCE_VALUE_ID><![CDATA[FF808181312D569C01312D8C837E003C]]></AD_REFERENCE_VALUE_ID>
+<!--9728F9CADE45497E9F583A76B7DE3BE6-->  <COLUMNNAME><![CDATA[C_Campaign_ID]]></COLUMNNAME>
+<!--9728F9CADE45497E9F583A76B7DE3BE6-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--9728F9CADE45497E9F583A76B7DE3BE6-->  <FIELDLENGTH><![CDATA[100]]></FIELDLENGTH>
+<!--9728F9CADE45497E9F583A76B7DE3BE6-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--9728F9CADE45497E9F583A76B7DE3BE6-->  <ISRANGE><![CDATA[N]]></ISRANGE>
+<!--9728F9CADE45497E9F583A76B7DE3BE6-->  <DEFAULTVALUE><![CDATA[@C_Campaign_ID@]]></DEFAULTVALUE>
+<!--9728F9CADE45497E9F583A76B7DE3BE6-->  <AD_ELEMENT_ID><![CDATA[550]]></AD_ELEMENT_ID>
+<!--9728F9CADE45497E9F583A76B7DE3BE6--></AD_PROCESS_PARA>
+
+<!--A7B47A5637A74910ADC70CD66E6C6A29--><AD_PROCESS_PARA>
+<!--A7B47A5637A74910ADC70CD66E6C6A29-->  <AD_PROCESS_PARA_ID><![CDATA[A7B47A5637A74910ADC70CD66E6C6A29]]></AD_PROCESS_PARA_ID>
+<!--A7B47A5637A74910ADC70CD66E6C6A29-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A7B47A5637A74910ADC70CD66E6C6A29-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A7B47A5637A74910ADC70CD66E6C6A29-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A7B47A5637A74910ADC70CD66E6C6A29-->  <NAME><![CDATA[Sales Region]]></NAME>
+<!--A7B47A5637A74910ADC70CD66E6C6A29-->  <DESCRIPTION><![CDATA[A defined section of the world where sales efforts will be focused.]]></DESCRIPTION>
+<!--A7B47A5637A74910ADC70CD66E6C6A29-->  <HELP><![CDATA[The Sales Region indicates a specific area of sales coverage.]]></HELP>
+<!--A7B47A5637A74910ADC70CD66E6C6A29-->  <AD_PROCESS_ID><![CDATA[15C8708DFC464C2D91286E59624FDD18]]></AD_PROCESS_ID>
+<!--A7B47A5637A74910ADC70CD66E6C6A29-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--A7B47A5637A74910ADC70CD66E6C6A29-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--A7B47A5637A74910ADC70CD66E6C6A29-->  <AD_REFERENCE_VALUE_ID><![CDATA[FF808181312D569C01312D8E60800051]]></AD_REFERENCE_VALUE_ID>
+<!--A7B47A5637A74910ADC70CD66E6C6A29-->  <COLUMNNAME><![CDATA[C_SalesRegion_ID]]></COLUMNNAME>
+<!--A7B47A5637A74910ADC70CD66E6C6A29-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--A7B47A5637A74910ADC70CD66E6C6A29-->  <FIELDLENGTH><![CDATA[100]]></FIELDLENGTH>
+<!--A7B47A5637A74910ADC70CD66E6C6A29-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--A7B47A5637A74910ADC70CD66E6C6A29-->  <ISRANGE><![CDATA[N]]></ISRANGE>
+<!--A7B47A5637A74910ADC70CD66E6C6A29-->  <DEFAULTVALUE><![CDATA[@C_Salesregion_ID@]]></DEFAULTVALUE>
+<!--A7B47A5637A74910ADC70CD66E6C6A29-->  <AD_ELEMENT_ID><![CDATA[210]]></AD_ELEMENT_ID>
+<!--A7B47A5637A74910ADC70CD66E6C6A29--></AD_PROCESS_PARA>
+
+<!--E2EB0EFA3CE741C1848590D270CEBE2B--><AD_PROCESS_PARA>
+<!--E2EB0EFA3CE741C1848590D270CEBE2B-->  <AD_PROCESS_PARA_ID><![CDATA[E2EB0EFA3CE741C1848590D270CEBE2B]]></AD_PROCESS_PARA_ID>
+<!--E2EB0EFA3CE741C1848590D270CEBE2B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E2EB0EFA3CE741C1848590D270CEBE2B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E2EB0EFA3CE741C1848590D270CEBE2B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E2EB0EFA3CE741C1848590D270CEBE2B-->  <NAME><![CDATA[Activity]]></NAME>
+<!--E2EB0EFA3CE741C1848590D270CEBE2B-->  <DESCRIPTION><![CDATA[A distinct activity defined and used in activity based management.]]></DESCRIPTION>
+<!--E2EB0EFA3CE741C1848590D270CEBE2B-->  <HELP><![CDATA[Activities indicate tasks that are performed and used to utilize Activity based Costing]]></HELP>
+<!--E2EB0EFA3CE741C1848590D270CEBE2B-->  <AD_PROCESS_ID><![CDATA[15C8708DFC464C2D91286E59624FDD18]]></AD_PROCESS_ID>
+<!--E2EB0EFA3CE741C1848590D270CEBE2B-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--E2EB0EFA3CE741C1848590D270CEBE2B-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--E2EB0EFA3CE741C1848590D270CEBE2B-->  <AD_REFERENCE_VALUE_ID><![CDATA[FF808181312D569C01312D846CC40032]]></AD_REFERENCE_VALUE_ID>
+<!--E2EB0EFA3CE741C1848590D270CEBE2B-->  <COLUMNNAME><![CDATA[C_Activity_ID]]></COLUMNNAME>
+<!--E2EB0EFA3CE741C1848590D270CEBE2B-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--E2EB0EFA3CE741C1848590D270CEBE2B-->  <FIELDLENGTH><![CDATA[100]]></FIELDLENGTH>
+<!--E2EB0EFA3CE741C1848590D270CEBE2B-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--E2EB0EFA3CE741C1848590D270CEBE2B-->  <ISRANGE><![CDATA[N]]></ISRANGE>
+<!--E2EB0EFA3CE741C1848590D270CEBE2B-->  <DEFAULTVALUE><![CDATA[@C_Activity_ID@]]></DEFAULTVALUE>
+<!--E2EB0EFA3CE741C1848590D270CEBE2B-->  <AD_ELEMENT_ID><![CDATA[1005]]></AD_ELEMENT_ID>
+<!--E2EB0EFA3CE741C1848590D270CEBE2B--></AD_PROCESS_PARA>
+
 <!--FF8080812E2F8EAE012E2F98D9680030--><AD_PROCESS_PARA>
 <!--FF8080812E2F8EAE012E2F98D9680030-->  <AD_PROCESS_PARA_ID><![CDATA[FF8080812E2F8EAE012E2F98D9680030]]></AD_PROCESS_PARA_ID>
 <!--FF8080812E2F8EAE012E2F98D9680030-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml	Sat Nov 12 15:43:15 2011 +0100
@@ -129,7 +129,7 @@
 <!--583F20A11FD34C65BEC1F15D5DBF70BA-->  <SORTNO><![CDATA[5]]></SORTNO>
 <!--583F20A11FD34C65BEC1F15D5DBF70BA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--583F20A11FD34C65BEC1F15D5DBF70BA-->  <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
-<!--583F20A11FD34C65BEC1F15D5DBF70BA-->  <DEFAULT_EXPRESSION><![CDATA[if (OB.isSalesTransaction() == true) { '' } else {'true'}]]></DEFAULT_EXPRESSION>
+<!--583F20A11FD34C65BEC1F15D5DBF70BA-->  <DEFAULT_EXPRESSION><![CDATA[if (OB.isSalesTransaction() == false) { 'true' } else {''}]]></DEFAULT_EXPRESSION>
 <!--583F20A11FD34C65BEC1F15D5DBF70BA-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
 <!--583F20A11FD34C65BEC1F15D5DBF70BA--></OBUISEL_SELECTOR_FIELD>
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/LinkCreditPayments.java	Sat Nov 12 15:43:15 2011 +0100
@@ -0,0 +1,100 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2011 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s):  ______________________________________.
+ *************************************************************************
+ */
+package org.openbravo.advpaymentmngt.modulescript;
+
+import java.math.BigDecimal;
+
+import javax.servlet.ServletException;
+
+import org.apache.log4j.Logger;
+import org.openbravo.database.ConnectionProvider;
+import org.openbravo.modulescript.ModuleScript;
+
+public class LinkCreditPayments extends ModuleScript {
+  private static final Logger log4j = Logger.getLogger(LinkCreditPayments.class);
+
+  @Override
+  public void execute() {
+    try {
+      ConnectionProvider cp = getConnectionProvider();
+
+      final LinkCreditPaymentsData[] bPartners = LinkCreditPaymentsData.selectBusinessPartners(cp);
+      for (int i = 0; i < bPartners.length; i++) {
+        linkCreditPayments(cp, bPartners[i].cBpartnerId, bPartners[i].name, "Y");
+        linkCreditPayments(cp, bPartners[i].cBpartnerId, bPartners[i].name, "N");
+      }
+    } catch (Exception e) {
+      handleError(e);
+    }
+
+  }
+
+  private void linkCreditPayments(ConnectionProvider cp, String cbPartnerId, String cbPartnerName,
+      String isReceipt) throws ServletException {
+    LinkCreditPaymentsData[] paymentsUsingCredit = LinkCreditPaymentsData
+        .selectPaymentsUsingCredit(cp, isReceipt, cbPartnerId);
+    LinkCreditPaymentsData[] creditPayments = LinkCreditPaymentsData
+        .selectPaymentsGeneratingCredit(cp, isReceipt, cbPartnerId);
+    if (paymentsUsingCredit.length > 0 && creditPayments.length > 0) {
+      log4j.info("Linking Credit Payments for business Partner: " + cbPartnerName);
+      linkCreditPayment(cp, paymentsUsingCredit, creditPayments);
+    }
+  }
+
+  private void linkCreditPayment(ConnectionProvider cp,
+      LinkCreditPaymentsData[] paymentsUsingCredit, LinkCreditPaymentsData[] creditPayments)
+      throws ServletException {
+    int j = 0;
+    BigDecimal availableCreditPayment = new BigDecimal(creditPayments[j].usedCredit);
+    for (int i = 0; i < paymentsUsingCredit.length; i++) {
+      BigDecimal consumedCredit = new BigDecimal(paymentsUsingCredit[i].usedCredit);
+      while (j < creditPayments.length && consumedCredit.compareTo(BigDecimal.ZERO) > 0) {
+        log4j.info("Payment Using Credit: " + paymentsUsingCredit[i].documentno
+            + ". Pending amount to distribute: " + consumedCredit);
+        if (availableCreditPayment.compareTo(BigDecimal.ZERO) == 0) {
+          availableCreditPayment = new BigDecimal(creditPayments[j].usedCredit);
+        }
+        if (availableCreditPayment.compareTo(consumedCredit) >= 0) {
+          log4j.info("linking with credit payment " + creditPayments[j].documentno + ", amount: "
+              + consumedCredit);
+          LinkCreditPaymentsData.insertUsedCreditSource(cp, paymentsUsingCredit[i].adClientId,
+              paymentsUsingCredit[i].adOrgId, paymentsUsingCredit[i].finPaymentId,
+              creditPayments[j].finPaymentId, consumedCredit.toString(),
+              creditPayments[j].cCurrencyId);
+          availableCreditPayment = availableCreditPayment.subtract(consumedCredit);
+          consumedCredit = BigDecimal.ZERO;
+          log4j.info("(available credit in the payment: " + availableCreditPayment + ") ");
+        } else {
+          log4j.info("linking with credit payment " + creditPayments[j].documentno + ", amount: "
+              + availableCreditPayment);
+          LinkCreditPaymentsData.insertUsedCreditSource(cp, paymentsUsingCredit[i].adClientId,
+              paymentsUsingCredit[i].adOrgId, paymentsUsingCredit[i].finPaymentId,
+              creditPayments[j].finPaymentId, availableCreditPayment.toString(),
+              creditPayments[j].cCurrencyId);
+          consumedCredit = consumedCredit.subtract(availableCreditPayment);
+          availableCreditPayment = BigDecimal.ZERO;
+          log4j.info("(credit payment has been fully used)");
+        }
+        if (availableCreditPayment.compareTo(BigDecimal.ZERO) == 0) {
+          j++;
+        }
+      }
+    }
+  }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/LinkCreditPayments_data.xsql	Sat Nov 12 15:43:15 2011 +0100
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2011 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s):  ______________________________________.
+ *************************************************************************
+-->
+<SqlClass name="LinkCreditPaymentsData" package="org.openbravo.advpaymentmngt.modulescript">
+  <SqlClassComment></SqlClassComment>
+  <SqlMethod name="selectPaymentsUsingCredit" type="preparedStatement" return="multiple">
+    <SqlMethodComment></SqlMethodComment>
+    <Sql>
+      <![CDATA[
+        SELECT FIN_PAYMENT_ID, USED_CREDIT, C_CURRENCY_ID, AD_CLIENT_ID, AD_ORG_ID, C_BPARTNER_ID, DOCUMENTNO, '' AS NAME
+        FROM FIN_PAYMENT P
+        WHERE NOT EXISTS (SELECT 1 
+                          FROM FIN_PAYMENT_CREDIT PC
+                          WHERE PC.FIN_PAYMENT_ID = P.FIN_PAYMENT_ID
+                          )       
+        AND P.GENERATED_CREDIT = 0 AND P.USED_CREDIT > 0
+        AND P.ISRECEIPT = ?
+        AND P.C_BPARTNER_ID = ?
+        ORDER BY P.PAYMENTDATE, P.DOCUMENTNO
+      ]]>
+    </Sql>
+    <Parameter name="isReceipt"/>
+    <Parameter name="cbPartnerId"/>
+  </SqlMethod>
+  <SqlMethod name="selectPaymentsGeneratingCredit" type="preparedStatement" return="multiple">
+    <SqlMethodComment></SqlMethodComment>
+    <Sql>
+      <![CDATA[
+        SELECT FIN_PAYMENT_ID, USED_CREDIT, C_CURRENCY_ID, DOCUMENTNO
+        FROM FIN_PAYMENT P
+        WHERE GENERATED_CREDIT > 0 AND USED_CREDIT > 0
+        AND ISRECEIPT = ?
+        AND C_BPARTNER_ID = ?
+        ORDER BY PAYMENTDATE, DOCUMENTNO
+      ]]>
+    </Sql>
+    <Parameter name="isReceipt"/>
+    <Parameter name="cbPartnerId"/>
+  </SqlMethod>
+  <SqlMethod name="insertUsedCreditSource" type="preparedStatement" return="rowcount">
+    <SqlMethodComment></SqlMethodComment>
+    <Sql>
+      <![CDATA[
+        INSERT INTO fin_payment_credit(
+            fin_payment_credit_id, ad_client_id, ad_org_id, created, createdby, 
+            updated, updatedby, isactive, fin_payment_id, fin_payment_id_used, 
+            amount, c_currency_id)
+        VALUES (get_uuid(), ?, ?, now(), '100',
+                now(), '100', 'Y', ?, ?, 
+                TO_NUMBER( ? ), ?)
+        
+      ]]>
+    </Sql>
+    <Parameter name="clientId"/>
+    <Parameter name="orgId"/>
+    <Parameter name="paymentId"/>
+    <Parameter name="creditpaymentId"/>
+    <Parameter name="amount"/>
+    <Parameter name="currencyId"/>
+  </SqlMethod>
+  <SqlMethod name="selectBusinessPartners" type="preparedStatement" return="multiple">
+    <SqlMethodComment></SqlMethodComment>
+    <Sql>
+      <![CDATA[
+        SELECT C_BPARTNER_ID, NAME
+        FROM C_BPARTNER BP
+        WHERE EXISTS (SELECT 1
+                      FROM FIN_PAYMENT P
+                      WHERE P.C_BPARTNER_ID = BP.C_BPARTNER_ID)
+      ]]>
+    </Sql>
+  </SqlMethod>
+</SqlClass>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/src/org/openbravo/advpaymentmngt/modulescript/LinkCreditPaymentsData.java	Sat Nov 12 15:43:15 2011 +0100
@@ -0,0 +1,288 @@
+//Sqlc generated V1.O00-1
+package org.openbravo.advpaymentmngt.modulescript;
+
+import java.sql.*;
+
+import org.apache.log4j.Logger;
+
+import javax.servlet.ServletException;
+
+import org.openbravo.data.FieldProvider;
+import org.openbravo.database.ConnectionProvider;
+import org.openbravo.data.UtilSql;
+import java.util.*;
+
+class LinkCreditPaymentsData implements FieldProvider {
+static Logger log4j = Logger.getLogger(LinkCreditPaymentsData.class);
+  private String InitRecordNumber="0";
+  public String finPaymentId;
+  public String usedCredit;
+  public String cCurrencyId;
+  public String adClientId;
+  public String adOrgId;
+  public String cBpartnerId;
+  public String documentno;
+  public String name;
+
+  public String getInitRecordNumber() {
+    return InitRecordNumber;
+  }
+
+  public String getField(String fieldName) {
+    if (fieldName.equalsIgnoreCase("fin_payment_id") || fieldName.equals("finPaymentId"))
+      return finPaymentId;
+    else if (fieldName.equalsIgnoreCase("used_credit") || fieldName.equals("usedCredit"))
+      return usedCredit;
+    else if (fieldName.equalsIgnoreCase("c_currency_id") || fieldName.equals("cCurrencyId"))
+      return cCurrencyId;
+    else if (fieldName.equalsIgnoreCase("ad_client_id") || fieldName.equals("adClientId"))
+      return adClientId;
+    else if (fieldName.equalsIgnoreCase("ad_org_id") || fieldName.equals("adOrgId"))
+      return adOrgId;
+    else if (fieldName.equalsIgnoreCase("c_bpartner_id") || fieldName.equals("cBpartnerId"))
+      return cBpartnerId;
+    else if (fieldName.equalsIgnoreCase("documentno"))
+      return documentno;
+    else if (fieldName.equalsIgnoreCase("name"))
+      return name;
+   else {
+     log4j.debug("Field does not exist: " + fieldName);
+     return null;
+   }
+ }
+
+  public static LinkCreditPaymentsData[] selectPaymentsUsingCredit(ConnectionProvider connectionProvider, String isReceipt, String cbPartnerId)    throws ServletException {
+    return selectPaymentsUsingCredit(connectionProvider, isReceipt, cbPartnerId, 0, 0);
+  }
+
+  public static LinkCreditPaymentsData[] selectPaymentsUsingCredit(ConnectionProvider connectionProvider, String isReceipt, String cbPartnerId, int firstRegister, int numberRegisters)    throws ServletException {
+    String strSql = "";
+    strSql = strSql + 
+      "        SELECT FIN_PAYMENT_ID, USED_CREDIT, C_CURRENCY_ID, AD_CLIENT_ID, AD_ORG_ID, C_BPARTNER_ID, DOCUMENTNO, '' AS NAME" +
+      "        FROM FIN_PAYMENT P" +
+      "        WHERE NOT EXISTS (SELECT 1 " +
+      "                          FROM FIN_PAYMENT_CREDIT PC" +
+      "                          WHERE PC.FIN_PAYMENT_ID = P.FIN_PAYMENT_ID" +
+      "                          )       " +
+      "        AND P.GENERATED_CREDIT = 0 AND P.USED_CREDIT > 0" +
+      "        AND P.ISRECEIPT = ?" +
+      "        AND P.C_BPARTNER_ID = ?" +
+      "        ORDER BY P.PAYMENTDATE, P.DOCUMENTNO";
+
+    ResultSet result;
+    Vector<java.lang.Object> vector = new Vector<java.lang.Object>(0);
+    PreparedStatement st = null;
+
+    int iParameter = 0;
+    try {
+    st = connectionProvider.getPreparedStatement(strSql);
+      iParameter++; UtilSql.setValue(st, iParameter, 12, null, isReceipt);
+      iParameter++; UtilSql.setValue(st, iParameter, 12, null, cbPartnerId);
+
+      result = st.executeQuery();
+      long countRecord = 0;
+      long countRecordSkip = 1;
+      boolean continueResult = true;
+      while(countRecordSkip < firstRegister && continueResult) {
+        continueResult = result.next();
+        countRecordSkip++;
+      }
+      while(continueResult && result.next()) {
+        countRecord++;
+        LinkCreditPaymentsData objectLinkCreditPaymentsData = new LinkCreditPaymentsData();
+        objectLinkCreditPaymentsData.finPaymentId = UtilSql.getValue(result, "fin_payment_id");
+        objectLinkCreditPaymentsData.usedCredit = UtilSql.getValue(result, "used_credit");
+        objectLinkCreditPaymentsData.cCurrencyId = UtilSql.getValue(result, "c_currency_id");
+        objectLinkCreditPaymentsData.adClientId = UtilSql.getValue(result, "ad_client_id");
+        objectLinkCreditPaymentsData.adOrgId = UtilSql.getValue(result, "ad_org_id");
+        objectLinkCreditPaymentsData.cBpartnerId = UtilSql.getValue(result, "c_bpartner_id");
+        objectLinkCreditPaymentsData.documentno = UtilSql.getValue(result, "documentno");
+        objectLinkCreditPaymentsData.name = UtilSql.getValue(result, "name");
+        objectLinkCreditPaymentsData.InitRecordNumber = Integer.toString(firstRegister);
+        vector.addElement(objectLinkCreditPaymentsData);
+        if (countRecord >= numberRegisters && numberRegisters != 0) {
+          continueResult = false;
+        }
+      }
+      result.close();
+    } catch(SQLException e){
+      log4j.error("SQL error in query: " + strSql + "Exception:"+ e);
+      throw new ServletException("@CODE=" + Integer.toString(e.getErrorCode()) + "@" + e.getMessage());
+    } catch(Exception ex){
+      log4j.error("Exception in query: " + strSql + "Exception:"+ ex);
+      throw new ServletException("@CODE=@" + ex.getMessage());
+    } finally {
+      try {
+        connectionProvider.releasePreparedStatement(st);
+      } catch(Exception ignore){
+        ignore.printStackTrace();
+      }
+    }
+    LinkCreditPaymentsData objectLinkCreditPaymentsData[] = new LinkCreditPaymentsData[vector.size()];
+    vector.copyInto(objectLinkCreditPaymentsData);
+    return(objectLinkCreditPaymentsData);
+  }
+
+  public static LinkCreditPaymentsData[] selectPaymentsGeneratingCredit(ConnectionProvider connectionProvider, String isReceipt, String cbPartnerId)    throws ServletException {
+    return selectPaymentsGeneratingCredit(connectionProvider, isReceipt, cbPartnerId, 0, 0);
+  }
+
+  public static LinkCreditPaymentsData[] selectPaymentsGeneratingCredit(ConnectionProvider connectionProvider, String isReceipt, String cbPartnerId, int firstRegister, int numberRegisters)    throws ServletException {
+    String strSql = "";
+    strSql = strSql + 
+      "        SELECT FIN_PAYMENT_ID, USED_CREDIT, C_CURRENCY_ID, DOCUMENTNO" +
+      "        FROM FIN_PAYMENT P" +
+      "        WHERE GENERATED_CREDIT > 0 AND USED_CREDIT > 0" +
+      "        AND ISRECEIPT = ?" +
+      "        AND C_BPARTNER_ID = ?" +
+      "        ORDER BY PAYMENTDATE, DOCUMENTNO";
+
+    ResultSet result;
+    Vector<java.lang.Object> vector = new Vector<java.lang.Object>(0);
+    PreparedStatement st = null;
+
+    int iParameter = 0;
+    try {
+    st = connectionProvider.getPreparedStatement(strSql);
+      iParameter++; UtilSql.setValue(st, iParameter, 12, null, isReceipt);
+      iParameter++; UtilSql.setValue(st, iParameter, 12, null, cbPartnerId);
+
+      result = st.executeQuery();
+      long countRecord = 0;
+      long countRecordSkip = 1;
+      boolean continueResult = true;
+      while(countRecordSkip < firstRegister && continueResult) {
+        continueResult = result.next();
+        countRecordSkip++;
+      }
+      while(continueResult && result.next()) {
+        countRecord++;
+        LinkCreditPaymentsData objectLinkCreditPaymentsData = new LinkCreditPaymentsData();
+        objectLinkCreditPaymentsData.finPaymentId = UtilSql.getValue(result, "fin_payment_id");
+        objectLinkCreditPaymentsData.usedCredit = UtilSql.getValue(result, "used_credit");
+        objectLinkCreditPaymentsData.cCurrencyId = UtilSql.getValue(result, "c_currency_id");
+        objectLinkCreditPaymentsData.documentno = UtilSql.getValue(result, "documentno");
+        objectLinkCreditPaymentsData.InitRecordNumber = Integer.toString(firstRegister);
+        vector.addElement(objectLinkCreditPaymentsData);
+        if (countRecord >= numberRegisters && numberRegisters != 0) {
+          continueResult = false;
+        }
+      }
+      result.close();
+    } catch(SQLException e){
+      log4j.error("SQL error in query: " + strSql + "Exception:"+ e);
+      throw new ServletException("@CODE=" + Integer.toString(e.getErrorCode()) + "@" + e.getMessage());
+    } catch(Exception ex){
+      log4j.error("Exception in query: " + strSql + "Exception:"+ ex);
+      throw new ServletException("@CODE=@" + ex.getMessage());
+    } finally {
+      try {
+        connectionProvider.releasePreparedStatement(st);
+      } catch(Exception ignore){
+        ignore.printStackTrace();
+      }
+    }
+    LinkCreditPaymentsData objectLinkCreditPaymentsData[] = new LinkCreditPaymentsData[vector.size()];
+    vector.copyInto(objectLinkCreditPaymentsData);
+    return(objectLinkCreditPaymentsData);
+  }
+
+  public static int insertUsedCreditSource(ConnectionProvider connectionProvider, String clientId, String orgId, String paymentId, String creditpaymentId, String amount, String currencyId)    throws ServletException {
+    String strSql = "";
+    strSql = strSql + 
+      "        INSERT INTO fin_payment_credit(" +
+      "            fin_payment_credit_id, ad_client_id, ad_org_id, created, createdby, " +
+      "            updated, updatedby, isactive, fin_payment_id, fin_payment_id_used, " +
+      "            amount, c_currency_id)" +
+      "        VALUES (get_uuid(), ?, ?, now(), '100'," +
+      "                now(), '100', 'Y', ?, ?, " +
+      "                TO_NUMBER( ? ), ?)";
+
+    int updateCount = 0;
+    PreparedStatement st = null;
+
+    int iParameter = 0;
+    try {
+    st = connectionProvider.getPreparedStatement(strSql);
+      iParameter++; UtilSql.setValue(st, iParameter, 12, null, clientId);
+      iParameter++; UtilSql.setValue(st, iParameter, 12, null, orgId);
+      iParameter++; UtilSql.setValue(st, iParameter, 12, null, paymentId);
+      iParameter++; UtilSql.setValue(st, iParameter, 12, null, creditpaymentId);
+      iParameter++; UtilSql.setValue(st, iParameter, 12, null, amount);
+      iParameter++; UtilSql.setValue(st, iParameter, 12, null, currencyId);
+
+      updateCount = st.executeUpdate();
+    } catch(SQLException e){
+      log4j.error("SQL error in query: " + strSql + "Exception:"+ e);
+      throw new ServletException("@CODE=" + Integer.toString(e.getErrorCode()) + "@" + e.getMessage());
+    } catch(Exception ex){
+      log4j.error("Exception in query: " + strSql + "Exception:"+ ex);
+      throw new ServletException("@CODE=@" + ex.getMessage());
+    } finally {
+      try {
+        connectionProvider.releasePreparedStatement(st);
+      } catch(Exception ignore){
+        ignore.printStackTrace();
+      }
+    }
+    return(updateCount);
+  }
+
+  public static LinkCreditPaymentsData[] selectBusinessPartners(ConnectionProvider connectionProvider)    throws ServletException {
+    return selectBusinessPartners(connectionProvider, 0, 0);
+  }
+
+  public static LinkCreditPaymentsData[] selectBusinessPartners(ConnectionProvider connectionProvider, int firstRegister, int numberRegisters)    throws ServletException {
+    String strSql = "";
+    strSql = strSql + 
+      "        SELECT C_BPARTNER_ID, NAME" +
+      "        FROM C_BPARTNER BP" +
+      "        WHERE EXISTS (SELECT 1" +
+      "                      FROM FIN_PAYMENT P" +
+      "                      WHERE P.C_BPARTNER_ID = BP.C_BPARTNER_ID)";
+
+    ResultSet result;
+    Vector<java.lang.Object> vector = new Vector<java.lang.Object>(0);
+    PreparedStatement st = null;
+
+    try {
+    st = connectionProvider.getPreparedStatement(strSql);
+
+      result = st.executeQuery();
+      long countRecord = 0;
+      long countRecordSkip = 1;
+      boolean continueResult = true;
+      while(countRecordSkip < firstRegister && continueResult) {
+        continueResult = result.next();
+        countRecordSkip++;
+      }
+      while(continueResult && result.next()) {
+        countRecord++;
+        LinkCreditPaymentsData objectLinkCreditPaymentsData = new LinkCreditPaymentsData();
+        objectLinkCreditPaymentsData.cBpartnerId = UtilSql.getValue(result, "c_bpartner_id");
+        objectLinkCreditPaymentsData.name = UtilSql.getValue(result, "name");
+        objectLinkCreditPaymentsData.InitRecordNumber = Integer.toString(firstRegister);
+        vector.addElement(objectLinkCreditPaymentsData);
+        if (countRecord >= numberRegisters && numberRegisters != 0) {
+          continueResult = false;
+        }
+      }
+      result.close();
+    } catch(SQLException e){
+      log4j.error("SQL error in query: " + strSql + "Exception:"+ e);
+      throw new ServletException("@CODE=" + Integer.toString(e.getErrorCode()) + "@" + e.getMessage());
+    } catch(Exception ex){
+      log4j.error("Exception in query: " + strSql + "Exception:"+ ex);
+      throw new ServletException("@CODE=@" + ex.getMessage());
+    } finally {
+      try {
+        connectionProvider.releasePreparedStatement(st);
+      } catch(Exception ignore){
+        ignore.printStackTrace();
+      }
+    }
+    LinkCreditPaymentsData objectLinkCreditPaymentsData[] = new LinkCreditPaymentsData[vector.size()];
+    vector.copyInto(objectLinkCreditPaymentsData);
+    return(objectLinkCreditPaymentsData);
+  }
+}
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java	Sat Nov 12 15:43:15 2011 +0100
@@ -21,7 +21,9 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 
@@ -32,16 +34,19 @@
 import org.hibernate.criterion.Restrictions;
 import org.openbravo.advpaymentmngt.dao.AdvPaymentMngtDao;
 import org.openbravo.advpaymentmngt.process.FIN_AddPayment;
+import org.openbravo.advpaymentmngt.process.FIN_PaymentProcess;
 import org.openbravo.advpaymentmngt.utility.FIN_Utility;
 import org.openbravo.base.filter.IsIDFilter;
 import org.openbravo.base.secureApp.HttpSecureAppServlet;
 import org.openbravo.base.secureApp.VariablesSecureApp;
+import org.openbravo.base.session.OBPropertiesProvider;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.dal.service.OBDao;
 import org.openbravo.data.FieldProvider;
 import org.openbravo.erpCommon.ad_actionButton.ActionButtonUtility;
 import org.openbravo.erpCommon.reference.PInstanceProcessData;
+import org.openbravo.erpCommon.utility.FieldProviderFactory;
 import org.openbravo.erpCommon.utility.OBError;
 import org.openbravo.erpCommon.utility.Utility;
 import org.openbravo.model.ad.process.ProcessInstance;
@@ -60,10 +65,13 @@
 public class ProcessInvoice extends HttpSecureAppServlet {
   private static final long serialVersionUID = 1L;
 
+  private List<FIN_Payment> creditPayments = new ArrayList<FIN_Payment>();
+  private final AdvPaymentMngtDao dao = new AdvPaymentMngtDao();
+
   public void doPost(HttpServletRequest request, HttpServletResponse response)
       throws ServletException, IOException {
     VariablesSecureApp vars = new VariablesSecureApp(request);
-    AdvPaymentMngtDao dao = new AdvPaymentMngtDao();
+
     if (vars.commandIn("DEFAULT")) {
       final String strWindowId = vars.getGlobalVariable("inpwindowId", "ProcessInvoice|Window_ID",
           IsIDFilter.instance);
@@ -105,6 +113,9 @@
       final String strC_Invoice_ID = vars.getGlobalVariable("inpKey",
           strWindowId + "|C_Invoice_ID", "");
       final String strdocaction = vars.getStringParameter("inpdocaction");
+      final String strOrg = vars.getGlobalVariable("inpadOrgId", "ProcessInvoice|Org_ID",
+          IsIDFilter.instance);
+
       OBError myMessage = null;
       try {
 
@@ -124,9 +135,27 @@
         final ProcessInstance pinstance = CallProcess.getInstance().call(process, strC_Invoice_ID,
             null);
 
-        // invoice = dao.getObject(Invoice.class, strC_Invoice_ID);
         OBDal.getInstance().getSession().refresh(invoice);
         invoice.setAPRMProcessinvoice(invoice.getDocumentAction());
+        // Remove invoice's used credit description
+        if ("RE".equals(strdocaction) && pinstance.getResult() != 0L) {
+          final String invDesc = invoice.getDescription();
+          if (invDesc != null) {
+            final String creditMsg = Utility.messageBD(this, "APRM_InvoiceDescUsedCredit",
+                vars.getLanguage());
+            if (creditMsg != null) {
+              final StringBuffer newDesc = new StringBuffer();
+              for (final String line : invDesc.split("\n")) {
+                if (!line.startsWith(creditMsg.substring(0, creditMsg.lastIndexOf("%s")))) {
+                  newDesc.append(line);
+                  if (!"".equals(line))
+                    newDesc.append("\n");
+                }
+              }
+              invoice.setDescription(newDesc.toString());
+            }
+          }
+        }
         OBDal.getInstance().save(invoice);
         OBDal.getInstance().flush();
         OBDal.getInstance().commitAndClose();
@@ -148,6 +177,32 @@
           OBContext.restorePreviousMode();
         }
 
+        if ("CO".equals(strdocaction)) {
+          // Need to refresh the invoice again from the db
+          invoice = dao.getObject(Invoice.class, strC_Invoice_ID);
+          final String invoiceDocCategory = invoice.getDocumentType().getDocumentCategory();
+          /*
+           * Print a grid popup in case of credit payment
+           */
+          // If the invoice grand total is ZERO or already has payments (due to
+          // payment method automation) or the business partner does not have a default financial
+          // account defined or invoice's payment method is not inside BP's financial
+          // account do not cancel credit
+          if (BigDecimal.ZERO.compareTo(invoice.getGrandTotalAmount()) != 0
+              && isPaymentMethodConfigured(invoice) && !isInvoiceWithPayments(invoice)
+              && ("API".equals(invoiceDocCategory) || "ARI".equals(invoiceDocCategory))) {
+            creditPayments = dao.getCustomerPaymentsWithCredit(invoice.getOrganization(),
+                invoice.getBusinessPartner(), invoice.isSalesTransaction());
+            if (creditPayments != null && !creditPayments.isEmpty()) {
+              printPageCreditPaymentGrid(response, vars, strC_Invoice_ID, strdocaction, strTabId,
+                  strC_Invoice_ID, strdocaction, strWindowId, strTabId, invoice.getInvoiceDate(),
+                  strOrg);
+            }
+          }
+
+          executePayments(response, vars, strWindowId, strTabId, strC_Invoice_ID, strOrg);
+        }
+
       } catch (ServletException ex) {
         myMessage = Utility.translateError(this, vars, vars.getLanguage(), ex.getMessage());
         if (!myMessage.isConnectionAvailable()) {
@@ -157,80 +212,125 @@
           vars.setMessage(strTabId, myMessage);
       }
 
+    } else if (vars.commandIn("GRIDLIST")) {
+      final String strWindowId = vars.getGlobalVariable("inpwindowId", "ProcessInvoice|Window_ID",
+          IsIDFilter.instance);
+      final String strC_Invoice_ID = vars.getGlobalVariable("inpKey",
+          strWindowId + "|C_Invoice_ID", "", IsIDFilter.instance);
+
+      printGrid(response, vars, strC_Invoice_ID);
+    } else if (vars.commandIn("USECREDITPAYMENTS") || vars.commandIn("CANCEL_USECREDITPAYMENTS")) {
+      final String strWindowId = vars.getGlobalVariable("inpwindowId", "ProcessInvoice|Window_ID",
+          IsIDFilter.instance);
+      final String strTabId = vars.getGlobalVariable("inpTabId", "ProcessInvoice|Tab_ID",
+          IsIDFilter.instance);
+      final String strC_Invoice_ID = vars.getGlobalVariable("inpKey",
+          strWindowId + "|C_Invoice_ID", "");
+      final String strPaymentDate = vars.getRequiredStringParameter("inpPaymentDate");
+      final String strOrg = vars.getGlobalVariable("inpadOrgId", "ProcessInvoice|Org_ID",
+          IsIDFilter.instance);
+
+      final String strCreditPaymentIds;
+      if (vars.commandIn("CANCEL_USECREDITPAYMENTS")) {
+        strCreditPaymentIds = null;
+      } else {
+        strCreditPaymentIds = vars.getInParameter("inpCreditPaymentId", IsIDFilter.instance);
+      }
+
       /*
-       * Cancel credit (if any) for the invoice's bp
+       * Use credit logic
        */
-      if ("CO".equals(strdocaction)) {
+      if (strCreditPaymentIds != null && !strCreditPaymentIds.isEmpty()) {
+        List<FIN_Payment> selectedCreditPayment = FIN_Utility.getOBObjectList(FIN_Payment.class,
+            strCreditPaymentIds);
+        HashMap<String, BigDecimal> selectedCreditPaymentAmounts = FIN_AddPayment
+            .getSelectedBaseOBObjectAmount(vars, selectedCreditPayment, "inpPaymentAmount");
         try {
           OBContext.setAdminMode(true);
           final Invoice invoice = OBDal.getInstance().get(Invoice.class, strC_Invoice_ID);
-          final String invoiceDocCategory = invoice.getDocumentType().getDocumentCategory();
-          if ("API".equals(invoiceDocCategory) || "ARI".equals(invoiceDocCategory)) {
-            final FIN_Payment creditPayment = dao.getCreditPayment(invoice);
-            // If the invoice grand total is ZERO or already has payments (due to
-            // payment method automation) or the business partner does not have a default financial
-            // account defined or invoice's payment method is not inside BP's financial
-            // account do not cancel credit
-            if (creditPayment != null
-                && BigDecimal.ZERO.compareTo(invoice.getGrandTotalAmount()) != 0
-                && isPaymentMethodConfigured(invoice) && !isInvoiceWithPayments(invoice)) {
-              log4j.info("Detected credit payment: " + creditPayment.getIdentifier()
-                  + ", that matches the invoice: " + invoice.getIdentifier());
-              // Set Used Credit = Invoice's Grand Total Amount
-              creditPayment.setUsedCredit(invoice.getGrandTotalAmount());
-              final StringBuffer description = new StringBuffer();
-              if (creditPayment.getDescription() != null
-                  && !creditPayment.getDescription().equals(""))
-                description.append(creditPayment.getDescription()).append("\n");
-              description.append(String.format(
-                  Utility.messageBD(this, "APRM_CreditUsedinInvoice", vars.getLanguage()),
-                  invoice.getDocumentNo()));
-              creditPayment.setDescription(description.toString());
 
-              final List<FIN_PaymentScheduleDetail> paymentScheduleDetails = new ArrayList<FIN_PaymentScheduleDetail>();
-              final HashMap<String, BigDecimal> paymentScheduleDetailsAmounts = new HashMap<String, BigDecimal>();
-              for (final FIN_PaymentSchedule paymentSchedule : invoice.getFINPaymentScheduleList()) {
-                for (final FIN_PaymentScheduleDetail paymentScheduleDetail : paymentSchedule
-                    .getFINPaymentScheduleDetailInvoicePaymentScheduleList()) {
-                  paymentScheduleDetails.add(paymentScheduleDetail);
-                  paymentScheduleDetailsAmounts.put(paymentScheduleDetail.getId(),
-                      paymentScheduleDetail.getAmount());
-                }
+          final StringBuffer creditPaymentsIdentifiers = new StringBuffer();
+          BigDecimal totalUsedCreditAmt = BigDecimal.ZERO;
+          for (final FIN_Payment creditPayment : selectedCreditPayment) {
+            final BigDecimal usedCreditAmt = selectedCreditPaymentAmounts
+                .get(creditPayment.getId());
+            // Set Used Credit = Amount + Previous used credit introduced by the user
+            creditPayment.setUsedCredit(usedCreditAmt.add(creditPayment.getUsedCredit()));
+            final StringBuffer description = new StringBuffer();
+            if (creditPayment.getDescription() != null
+                && !creditPayment.getDescription().equals(""))
+              description.append(creditPayment.getDescription()).append("\n");
+            description.append(String.format(
+                Utility.messageBD(this, "APRM_CreditUsedinInvoice", vars.getLanguage()),
+                invoice.getDocumentNo()));
+            creditPayment.setDescription(description.toString());
+            totalUsedCreditAmt = totalUsedCreditAmt.add(usedCreditAmt);
+            creditPaymentsIdentifiers.append(creditPayment.getDocumentNo());
+            creditPaymentsIdentifiers.append(", ");
+          }
+          creditPaymentsIdentifiers.delete(creditPaymentsIdentifiers.length() - 2,
+              creditPaymentsIdentifiers.length());
+          creditPaymentsIdentifiers.append("\n");
+
+          final List<FIN_PaymentScheduleDetail> paymentScheduleDetails = new ArrayList<FIN_PaymentScheduleDetail>();
+          final HashMap<String, BigDecimal> paymentScheduleDetailsAmounts = new HashMap<String, BigDecimal>();
+          BigDecimal allocatedAmt = BigDecimal.ZERO;
+          for (final FIN_PaymentScheduleDetail paymentScheduleDetail : dao
+              .getInvoicePendingScheduledPaymentDetails(invoice)) {
+            if (totalUsedCreditAmt.compareTo(allocatedAmt) > 0) {
+              final BigDecimal pendingToAllocate = totalUsedCreditAmt.subtract(allocatedAmt);
+              paymentScheduleDetails.add(paymentScheduleDetail);
+
+              final BigDecimal psdAmt = paymentScheduleDetail.getAmount();
+              if (psdAmt.compareTo(pendingToAllocate) <= 0) {
+                paymentScheduleDetailsAmounts.put(paymentScheduleDetail.getId(), psdAmt);
+                allocatedAmt = allocatedAmt.add(psdAmt);
+              } else {
+                paymentScheduleDetailsAmounts.put(paymentScheduleDetail.getId(), pendingToAllocate);
+                allocatedAmt = allocatedAmt.add(pendingToAllocate);
               }
-
-              // Create new Payment
-              final boolean isSalesTransaction = invoice.isSalesTransaction();
-              final DocumentType docType = FIN_Utility.getDocumentType(invoice.getOrganization(),
-                  isSalesTransaction ? "ARR" : "APP");
-              final String strPaymentDocumentNo = FIN_Utility.getDocumentNo(docType,
-                  docType.getTable() != null ? docType.getTable().getDBTableName() : "");
-              final FIN_FinancialAccount bpFinAccount = isSalesTransaction ? invoice
-                  .getBusinessPartner().getAccount() : invoice.getBusinessPartner()
-                  .getPOFinancialAccount();
-              final FIN_Payment newPayment = FIN_AddPayment.savePayment(null, isSalesTransaction,
-                  docType, strPaymentDocumentNo, invoice.getBusinessPartner(),
-                  invoice.getPaymentMethod(), bpFinAccount, "0", creditPayment.getPaymentDate(),
-                  invoice.getOrganization(), invoice.getDocumentNo(), paymentScheduleDetails,
-                  paymentScheduleDetailsAmounts, false, false);
-              newPayment.setAmount(BigDecimal.ZERO);
-              newPayment.setGeneratedCredit(BigDecimal.ZERO);
-              newPayment.setUsedCredit(invoice.getGrandTotalAmount());
-
-              // Process the new payment
-              FIN_AddPayment.processPayment(vars, this, "P", newPayment);
-
-              // Update Invoice's description
-              final StringBuffer invDesc = new StringBuffer();
-              if (invoice.getDescription() != null) {
-                invDesc.append(invoice.getDescription());
-                invDesc.append("\n");
-              }
-              invDesc.append(String.format(
-                  Utility.messageBD(this, "APRM_InvoiceDescUsedCredit", vars.getLanguage()),
-                  creditPayment.getIdentifier()));
-              invoice.setDescription(invDesc.toString());
             }
           }
+
+          // Create new Payment
+          final boolean isSalesTransaction = invoice.isSalesTransaction();
+          final DocumentType docType = FIN_Utility.getDocumentType(invoice.getOrganization(),
+              isSalesTransaction ? "ARR" : "APP");
+          final String strPaymentDocumentNo = FIN_Utility.getDocumentNo(docType,
+              docType.getTable() != null ? docType.getTable().getDBTableName() : "");
+          final FIN_FinancialAccount bpFinAccount = isSalesTransaction ? invoice
+              .getBusinessPartner().getAccount() : invoice.getBusinessPartner()
+              .getPOFinancialAccount();
+          final FIN_Payment newPayment = FIN_AddPayment.savePayment(null, isSalesTransaction,
+              docType, strPaymentDocumentNo, invoice.getBusinessPartner(),
+              invoice.getPaymentMethod(), bpFinAccount, "0", FIN_Utility.getDate(strPaymentDate),
+              invoice.getOrganization(), invoice.getDocumentNo(), paymentScheduleDetails,
+              paymentScheduleDetailsAmounts, false, false);
+          newPayment.setAmount(BigDecimal.ZERO);
+          newPayment.setGeneratedCredit(BigDecimal.ZERO);
+          newPayment.setUsedCredit(totalUsedCreditAmt);
+
+          // Link new Payment with the credit payments used
+          for (final FIN_Payment creditPayment : selectedCreditPayment) {
+            final BigDecimal usedCreditAmt = selectedCreditPaymentAmounts
+                .get(creditPayment.getId());
+            FIN_PaymentProcess.linkCreditPayment(newPayment, usedCreditAmt, creditPayment);
+          }
+
+          // Process the new payment
+          FIN_AddPayment.processPayment(vars, this, "P", newPayment);
+
+          // Update Invoice's description
+          final StringBuffer invDesc = new StringBuffer();
+          if (invoice.getDescription() != null) {
+            invDesc.append(invoice.getDescription());
+            invDesc.append("\n");
+          }
+          invDesc.append(String.format(
+              Utility.messageBD(this, "APRM_InvoiceDescUsedCredit", vars.getLanguage()),
+              creditPaymentsIdentifiers.toString()));
+          invoice.setDescription(invDesc.toString());
+
         } catch (final Exception e) {
           log4j.error("Exception while canceling the credit in the invoice: " + strC_Invoice_ID);
           e.printStackTrace();
@@ -238,37 +338,41 @@
           OBContext.restorePreviousMode();
         }
       }
+      executePayments(response, vars, strWindowId, strTabId, strC_Invoice_ID, strOrg);
+    }
+  }
 
-      List<FIN_Payment> payments = null;
-      try {
-        OBContext.setAdminMode(true);
-        payments = dao.getPendingExecutionPayments(strC_Invoice_ID);
-      } finally {
-        OBContext.restorePreviousMode();
-      }
+  private void executePayments(HttpServletResponse response, VariablesSecureApp vars,
+      final String strWindowId, final String strTabId, final String strC_Invoice_ID,
+      final String strOrg) throws IOException, ServletException {
+    OBError myMessage = new OBError();
 
-      if (payments != null && payments.size() > 0) {
-        vars.setSessionValue("ExecutePayments|Window_ID", strWindowId);
-        vars.setSessionValue("ExecutePayments|Tab_ID", strTabId);
-        vars.setSessionValue("ExecutePayments|Org_ID",
-            vars.getSessionValue("ProcessInvoice|Org_ID"));
-        vars.setSessionValue("ExecutePayments|payments", FIN_Utility.getInStrList(payments));
-        if (myMessage != null)
-          vars.setMessage("ExecutePayments|message", myMessage);
-        response.sendRedirect(strDireccion
-            + "/org.openbravo.advpaymentmngt.ad_actionbutton/ExecutePayments.html");
-      } else {
-        String strWindowPath = Utility.getTabURL(strTabId, "R", true);
-        if (strWindowPath.equals(""))
-          strWindowPath = strDefaultServlet;
-        printPageClosePopUp(response, vars, strWindowPath);
-      }
+    List<FIN_Payment> payments = null;
+    try {
+      OBContext.setAdminMode(true);
+      payments = dao.getPendingExecutionPayments(strC_Invoice_ID);
+    } finally {
+      OBContext.restorePreviousMode();
+    }
+    if (payments != null && payments.size() > 0) {
+      vars.setSessionValue("ExecutePayments|Window_ID", strWindowId);
+      vars.setSessionValue("ExecutePayments|Tab_ID", strTabId);
+      vars.setSessionValue("ExecutePayments|Org_ID", strOrg);
+      vars.setSessionValue("ExecutePayments|payments", FIN_Utility.getInStrList(payments));
+      if (myMessage != null)
+        vars.setMessage("ExecutePayments|message", myMessage);
+      response.sendRedirect(strDireccion
+          + "/org.openbravo.advpaymentmngt.ad_actionbutton/ExecutePayments.html");
+    } else {
+      String strWindowPath = Utility.getTabURL(strTabId, "R", true);
+      if (strWindowPath.equals(""))
+        strWindowPath = strDefaultServlet;
+      printPageClosePopUp(response, vars, strWindowPath);
+    }
 
-      vars.removeSessionValue("ProcessInvoice|Window_ID");
-      vars.removeSessionValue("ProcessInvoice|Tab_ID");
-      vars.removeSessionValue("ProcessInvoice|Org_ID");
-
-    }
+    vars.removeSessionValue("ProcessInvoice|Window_ID");
+    vars.removeSessionValue("ProcessInvoice|Tab_ID");
+    vars.removeSessionValue("ProcessInvoice|Org_ID");
   }
 
   void printPageDocAction(HttpServletResponse response, VariablesSecureApp vars,
@@ -327,6 +431,100 @@
 
   }
 
+  void printPageCreditPaymentGrid(HttpServletResponse response, VariablesSecureApp vars,
+      String strC_Invoice_ID, String strdocaction, String strProcessing, String strdocstatus,
+      String stradTableId, String strWindowId, String strTabId, Date invoiceDate, String strOrg)
+      throws IOException, ServletException {
+    log4j.debug("Output: Credit Payment Grid popup");
+    String[] discard = { "" };
+    response.setContentType("text/html; charset=UTF-8");
+    PrintWriter out = response.getWriter();
+    XmlDocument xmlDocument = xmlEngine.readXmlTemplate(
+        "org/openbravo/erpCommon/ad_actionButton/CreditPaymentGrid", discard).createXmlDocument();
+    xmlDocument.setParameter("css", vars.getTheme());
+    xmlDocument.setParameter("language", "defaultLang=\"" + vars.getLanguage() + "\";");
+    xmlDocument.setParameter("directory", "var baseDirectory = \"" + strReplaceWith + "/\";\n");
+    xmlDocument.setParameter("cancel", Utility.messageBD(this, "Cancel", vars.getLanguage()));
+    xmlDocument.setParameter("ok", Utility.messageBD(this, "OK", vars.getLanguage()));
+    xmlDocument.setParameter("window", strWindowId);
+    xmlDocument.setParameter("tab", strTabId);
+    xmlDocument.setParameter("adOrgId", strOrg);
+
+    xmlDocument.setParameter("invoiceGrossAmt", dao.getObject(Invoice.class, strC_Invoice_ID)
+        .getGrandTotalAmount().toString());
+
+    OBError myMessage = vars.getMessage("ProcessInvoice|CreditPaymentGrid");
+    vars.removeMessage("ProcessInvoice|CreditPaymentGrid");
+    if (myMessage != null) {
+      xmlDocument.setParameter("messageType", myMessage.getType());
+      xmlDocument.setParameter("messageTitle", myMessage.getTitle());
+      xmlDocument.setParameter("messageMessage", myMessage.getMessage());
+    }
+
+    xmlDocument.setParameter("dateDisplayFormat", vars.getSessionValue("#AD_SqlDateFormat"));
+    xmlDocument.setParameter("paymentDate",
+        Utility.formatDate(invoiceDate, vars.getJavaDateFormat()));
+
+    out.println(xmlDocument.print());
+    out.close();
+
+  }
+
+  private void printGrid(HttpServletResponse response, VariablesSecureApp vars, String invoiceId)
+      throws IOException, ServletException {
+    log4j.debug("Output: Grid with credit payments");
+
+    final Invoice invoice = dao.getObject(Invoice.class, invoiceId);
+
+    String[] discard = {};
+    XmlDocument xmlDocument = xmlEngine.readXmlTemplate(
+        "org/openbravo/erpCommon/ad_actionButton/AddCreditPaymentGrid", discard)
+        .createXmlDocument();
+
+    xmlDocument.setData("structure", getCreditPayments(invoice));
+
+    response.setContentType("text/html; charset=UTF-8");
+    PrintWriter out = response.getWriter();
+    out.println(xmlDocument.print());
+    out.close();
+  }
+
+  private FieldProvider[] getCreditPayments(Invoice invoice) {
+    FieldProvider[] data = FieldProviderFactory.getFieldProviderArray(creditPayments);
+    String dateFormat = OBPropertiesProvider.getInstance().getOpenbravoProperties()
+        .getProperty("dateFormat.java");
+    SimpleDateFormat dateFormater = new SimpleDateFormat(dateFormat);
+
+    BigDecimal pendingToPay = invoice.getGrandTotalAmount();
+    for (int i = 0; i < data.length; i++) {
+      FieldProviderFactory.setField(data[i], "finCreditPaymentId", creditPayments.get(i).getId());
+      FieldProviderFactory.setField(data[i], "documentNo", creditPayments.get(i).getDocumentNo());
+      FieldProviderFactory.setField(data[i], "paymentDescription", creditPayments.get(i)
+          .getDescription());
+      if (creditPayments.get(i).getPaymentDate() != null) {
+        FieldProviderFactory.setField(data[i], "documentDate",
+            dateFormater.format(creditPayments.get(i).getPaymentDate()).toString());
+      }
+
+      final BigDecimal outStandingAmt = creditPayments.get(i).getGeneratedCredit()
+          .subtract(creditPayments.get(i).getUsedCredit());
+      FieldProviderFactory.setField(data[i], "outstandingAmount", outStandingAmt.toString());
+
+      FieldProviderFactory.setField(
+          data[i],
+          "paymentAmount",
+          pendingToPay.compareTo(outStandingAmt) > 0 ? outStandingAmt.toString() : (pendingToPay
+              .compareTo(BigDecimal.ZERO) > 0 ? pendingToPay.toString() : ""));
+      pendingToPay = pendingToPay.subtract(outStandingAmt);
+
+      FieldProviderFactory.setField(data[i], "finSelectedCreditPaymentId",
+          "".equals(data[i].getField("paymentAmount")) ? "" : creditPayments.get(i).getId());
+      FieldProviderFactory.setField(data[i], "rownum", String.valueOf(i));
+    }
+
+    return data;
+  }
+
   private boolean isInvoiceWithPayments(Invoice invoice) {
     for (FIN_PaymentSchedule ps : OBDao.getFilteredCriteria(FIN_PaymentSchedule.class,
         Restrictions.eq(FIN_PaymentSchedule.PROPERTY_INVOICE, invoice)).list()) {
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java	Sat Nov 12 15:43:15 2011 +0100
@@ -1421,6 +1421,7 @@
     obcPayment.add(Restrictions.eq(FIN_Payment.PROPERTY_RECEIPT, isReceipt));
     obcPayment.add(Restrictions.ne(FIN_Payment.PROPERTY_GENERATEDCREDIT, BigDecimal.ZERO));
     obcPayment.add(Restrictions.ne(FIN_Payment.PROPERTY_STATUS, "RPAP"));
+    obcPayment.add(Restrictions.ne(FIN_Payment.PROPERTY_STATUS, "RPVOID"));
     obcPayment.add(Restrictions.neProperty(FIN_Payment.PROPERTY_GENERATEDCREDIT,
         FIN_Payment.PROPERTY_USEDCREDIT));
     obcPayment.addOrderBy(FIN_Payment.PROPERTY_PAYMENTDATE, true);
@@ -1428,6 +1429,38 @@
     return obcPayment.list();
   }
 
+  /**
+   * Returns the list of credit payments for the selected business partner that belongs to the legal
+   * entity's natural tree of the given organization
+   * 
+   * @param org
+   * @param bp
+   * @param isReceipt
+   * @return
+   */
+  public List<FIN_Payment> getCustomerPaymentsWithCredit(Organization org, BusinessPartner bp,
+      boolean isReceipt) {
+    try {
+      OBContext.setAdminMode(true);
+      OBCriteria<FIN_Payment> obcPayment = OBDal.getInstance().createCriteria(FIN_Payment.class);
+      obcPayment.add(Restrictions.eq(FIN_Payment.PROPERTY_BUSINESSPARTNER, bp));
+      obcPayment.add(Restrictions.eq(FIN_Payment.PROPERTY_RECEIPT, isReceipt));
+      obcPayment.add(Restrictions.ne(FIN_Payment.PROPERTY_GENERATEDCREDIT, BigDecimal.ZERO));
+      obcPayment.add(Restrictions.ne(FIN_Payment.PROPERTY_STATUS, "RPAP"));
+      obcPayment.add(Restrictions.ne(FIN_Payment.PROPERTY_STATUS, "RPVOID"));
+      obcPayment.add(Restrictions.neProperty(FIN_Payment.PROPERTY_GENERATEDCREDIT,
+          FIN_Payment.PROPERTY_USEDCREDIT));
+      final Organization legalEntity = FIN_Utility.getLegalEntityOrg(org);
+      obcPayment.add(Restrictions.in("organization.id", OBContext.getOBContext()
+          .getOrganizationStructureProvider().getNaturalTree(legalEntity.getId())));
+      obcPayment.addOrderBy(FIN_Payment.PROPERTY_PAYMENTDATE, true);
+      obcPayment.addOrderBy(FIN_Payment.PROPERTY_DOCUMENTNO, true);
+      return obcPayment.list();
+    } finally {
+      OBContext.restorePreviousMode();
+    }
+  }
+
   public List<FIN_Payment> getCustomerPaymentsWithUsedCredit(BusinessPartner bp, Boolean isReceipt) {
     OBCriteria<FIN_Payment> obcPayment = OBDal.getInstance().createCriteria(FIN_Payment.class);
     obcPayment.add(Restrictions.eq(FIN_Payment.PROPERTY_BUSINESSPARTNER, bp));
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java	Sat Nov 12 15:43:15 2011 +0100
@@ -37,6 +37,7 @@
 import org.openbravo.base.exception.OBException;
 import org.openbravo.base.secureApp.VariablesSecureApp;
 import org.openbravo.base.session.OBPropertiesProvider;
+import org.openbravo.base.structure.BaseOBObject;
 import org.openbravo.dal.core.DalUtil;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBCriteria;
@@ -473,15 +474,30 @@
   public static HashMap<String, BigDecimal> getSelectedPaymentDetailsAndAmount(
       VariablesSecureApp vars, List<FIN_PaymentScheduleDetail> selectedPaymentScheduleDetails)
       throws ServletException {
-    HashMap<String, BigDecimal> selectedPaymentScheduleDetailsAmounts = new HashMap<String, BigDecimal>();
+    return getSelectedBaseOBObjectAmount(vars, selectedPaymentScheduleDetails, "inpPaymentAmount");
+  }
 
-    for (FIN_PaymentScheduleDetail paymentScheduleDetail : selectedPaymentScheduleDetails) {
-      selectedPaymentScheduleDetailsAmounts.put(
-          paymentScheduleDetail.getId(),
-          new BigDecimal(vars.getNumericParameter(
-              "inpPaymentAmount" + paymentScheduleDetail.getId(), "")));
+  /**
+   * Creates a HashMap with the BaseOBObject id's and the amount gotten from the Session.
+   * 
+   * The amounts are stored in Session like "htmlElementId"+basobObject.Id
+   * 
+   * @param vars
+   *          VariablseSecureApp with the session data.
+   * @param selectedPaymentScheduleDetails
+   *          List of FIN_PaymentScheduleDetails that need to be included in the HashMap.
+   * @return A HashMap mapping the FIN_PaymentScheduleDetail's Id with the corresponding amount.
+   */
+  public static <T extends BaseOBObject> HashMap<String, BigDecimal> getSelectedBaseOBObjectAmount(
+      VariablesSecureApp vars, List<T> selectedBaseOBObjects, String htmlElementId)
+      throws ServletException {
+    HashMap<String, BigDecimal> selectedBaseOBObjectAmounts = new HashMap<String, BigDecimal>();
+
+    for (final T o : selectedBaseOBObjects) {
+      selectedBaseOBObjectAmounts.put((String) o.getId(),
+          new BigDecimal(vars.getNumericParameter(htmlElementId + (String) o.getId(), "")));
     }
-    return selectedPaymentScheduleDetailsAmounts;
+    return selectedBaseOBObjectAmounts;
   }
 
   /**
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java	Sat Nov 12 15:43:15 2011 +0100
@@ -21,6 +21,7 @@
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
@@ -45,8 +46,11 @@
 import org.openbravo.model.financialmgmt.payment.FIN_Payment;
 import org.openbravo.model.financialmgmt.payment.FIN_PaymentDetail;
 import org.openbravo.model.financialmgmt.payment.FIN_PaymentScheduleDetail;
+import org.openbravo.model.financialmgmt.payment.FIN_Payment_Credit;
 import org.openbravo.model.financialmgmt.payment.PaymentExecutionProcess;
+import org.openbravo.model.pricing.pricelist.PriceList;
 import org.openbravo.scheduling.ProcessBundle;
+import org.openbravo.service.db.DalConnectionProvider;
 
 public class FIN_PaymentProcess implements org.openbravo.scheduling.Process {
   private static AdvPaymentMngtDao dao;
@@ -180,12 +184,39 @@
           if (paymentAmount.compareTo(payment.getAmount()) != 0)
             payment.setUsedCredit(paymentAmount.subtract(payment.getAmount()));
           if (payment.getUsedCredit().compareTo(BigDecimal.ZERO) != 0)
-            updateUsedCredit(payment.getUsedCredit(), payment.getBusinessPartner(),
-                payment.isReceipt());
+            updateUsedCredit(payment);
 
           payment.setWriteoffAmount(paymentWriteOfAmount);
           payment.setProcessed(true);
           payment.setAPRMProcessPayment("R");
+          if (BigDecimal.ZERO.compareTo(payment.getUsedCredit()) != 0
+              || BigDecimal.ZERO.compareTo(payment.getGeneratedCredit()) != 0) {
+            BusinessPartner businessPartner = payment.getBusinessPartner();
+            if (businessPartner == null) {
+              msg.setType("Error");
+              msg.setTitle(Utility.messageBD(conProvider, "Error", language));
+              msg.setMessage(Utility.parseTranslation(conProvider, vars, language,
+                  "@APRM_CreditWithoutBPartner@"));
+              bundle.setResult(msg);
+              OBDal.getInstance().rollbackAndClose();
+              return;
+            }
+            PriceList priceList = payment.isReceipt() ? businessPartner.getPriceList()
+                : businessPartner.getPurchasePricelist();
+            if (!payment.getCurrency().getId()
+                .equals(priceList != null ? priceList.getCurrency().getId() : "")) {
+              msg.setType("Error");
+              msg.setTitle(Utility.messageBD(conProvider, "Error", language));
+              msg.setMessage(String.format(
+                  Utility.parseTranslation(conProvider, vars, language, "@APRM_CreditCurrency@"),
+                  priceList != null ? priceList.getCurrency().getISOCode() : Utility
+                      .parseTranslation(conProvider, vars, language,
+                          "@APRM_CreditNoPricelistCurrency@")));
+              bundle.setResult(msg);
+              OBDal.getInstance().rollbackAndClose();
+              return;
+            }
+          }
           // Execution Process
           if (dao.isAutomatedExecutionPayment(payment.getAccount(), payment.getPaymentMethod(),
               payment.isReceipt())) {
@@ -372,23 +403,46 @@
           }
           List<FIN_PaymentDetail> paymentDetails = payment.getFINPaymentDetailList();
           List<ConversionRateDoc> conversionRates = payment.getCurrencyConversionRateDocList();
+          Set<String> invoiceDocNos = new HashSet<String>();
           for (FIN_PaymentDetail paymentDetail : paymentDetails) {
             removedPDS = new ArrayList<FIN_PaymentScheduleDetail>();
             for (FIN_PaymentScheduleDetail paymentScheduleDetail : paymentDetail
                 .getFINPaymentScheduleDetailList()) {
               BigDecimal amount = paymentScheduleDetail.getAmount().add(
                   paymentScheduleDetail.getWriteoffAmount());
-              if (paymentScheduleDetail.getInvoicePaymentSchedule() != null && restorePaidAmounts) {
-                FIN_AddPayment.updatePaymentScheduleAmounts(paymentScheduleDetail
-                    .getInvoicePaymentSchedule(), paymentScheduleDetail.getAmount().negate(),
-                    paymentScheduleDetail.getWriteoffAmount().negate());
-                // BP SO_CreditUsed
-                businessPartner = paymentScheduleDetail.getInvoicePaymentSchedule().getInvoice()
-                    .getBusinessPartner();
-                if (isReceipt) {
-                  increaseCustomerCredit(businessPartner, amount);
-                } else {
-                  decreaseCustomerCredit(businessPartner, amount);
+              if (paymentScheduleDetail.getInvoicePaymentSchedule() != null) {
+                // Remove invoice description related to the credit payments
+                final Invoice invoice = paymentScheduleDetail.getInvoicePaymentSchedule()
+                    .getInvoice();
+                invoiceDocNos.add(invoice.getDocumentNo());
+                final String invDesc = invoice.getDescription();
+                if (invDesc != null) {
+                  final String creditMsg = Utility.messageBD(new DalConnectionProvider(),
+                      "APRM_InvoiceDescUsedCredit", vars.getLanguage());
+                  if (creditMsg != null) {
+                    final StringBuffer newDesc = new StringBuffer();
+                    for (final String line : invDesc.split("\n")) {
+                      if (!line.startsWith(creditMsg.substring(0, creditMsg.lastIndexOf("%s")))) {
+                        newDesc.append(line);
+                        if (!"".equals(line))
+                          newDesc.append("\n");
+                      }
+                    }
+                    invoice.setDescription(newDesc.toString());
+                  }
+                }
+                if (restorePaidAmounts) {
+                  FIN_AddPayment.updatePaymentScheduleAmounts(paymentScheduleDetail
+                      .getInvoicePaymentSchedule(), paymentScheduleDetail.getAmount().negate(),
+                      paymentScheduleDetail.getWriteoffAmount().negate());
+                  // BP SO_CreditUsed
+                  businessPartner = paymentScheduleDetail.getInvoicePaymentSchedule().getInvoice()
+                      .getBusinessPartner();
+                  if (isReceipt) {
+                    increaseCustomerCredit(businessPartner, amount);
+                  } else {
+                    decreaseCustomerCredit(businessPartner, amount);
+                  }
                 }
               }
               if (paymentScheduleDetail.getOrderPaymentSchedule() != null && restorePaidAmounts) {
@@ -428,9 +482,43 @@
 
           if (payment.getGeneratedCredit().compareTo(BigDecimal.ZERO) == 0
               && payment.getUsedCredit().compareTo(BigDecimal.ZERO) == 1) {
-            undoUsedCredit(payment.getUsedCredit(), payment.getBusinessPartner(),
-                payment.isReceipt());
+            undoUsedCredit(payment, vars, invoiceDocNos);
           }
+
+          List<FIN_Payment> creditPayments = new ArrayList<FIN_Payment>();
+          for (final FIN_Payment_Credit pc : payment.getFINPaymentCreditList()) {
+            creditPayments.add(pc.getCreditPaymentUsed());
+          }
+          for (final FIN_Payment creditPayment : creditPayments) {
+            // Update Description
+            final String payDesc = creditPayment.getDescription();
+            if (payDesc != null) {
+              final String invoiceDocNoMsg = Utility.messageBD(new DalConnectionProvider(),
+                  "APRM_CreditUsedinInvoice", vars.getLanguage());
+              if (invoiceDocNoMsg != null) {
+                final StringBuffer newDesc = new StringBuffer();
+                for (final String line : payDesc.split("\n")) {
+                  boolean include = true;
+                  if (line.startsWith(invoiceDocNoMsg.substring(0,
+                      invoiceDocNoMsg.lastIndexOf("%s")))) {
+                    for (final String docNo : invoiceDocNos) {
+                      if (line.indexOf(docNo) > 0) {
+                        include = false;
+                        break;
+                      }
+                    }
+                  }
+                  if (include) {
+                    newDesc.append(line);
+                    if (!"".equals(line))
+                      newDesc.append("\n");
+                  }
+                }
+                creditPayment.setDescription(newDesc.toString());
+              }
+            }
+          }
+          payment.getFINPaymentCreditList().clear();
           payment.setGeneratedCredit(BigDecimal.ZERO);
           payment.setUsedCredit(BigDecimal.ZERO);
 
@@ -491,6 +579,7 @@
              * Cancel all payment schedule details related to the payment
              */
             final List<FIN_PaymentScheduleDetail> removedPDS = new ArrayList<FIN_PaymentScheduleDetail>();
+            Set<String> invoiceDocNos = new HashSet<String>();
             for (final FIN_PaymentDetail paymentDetail : payment.getFINPaymentDetailList()) {
               for (final FIN_PaymentScheduleDetail paymentScheduleDetail : paymentDetail
                   .getFINPaymentScheduleDetailList()) {
@@ -508,6 +597,8 @@
                       outStandingAmt = outStandingAmt.add(invScheDetail.getAmount());
                       paymentScheduleDetail.setCanceled(true);
                     }
+                    invoiceDocNos.add(paymentScheduleDetail.getInvoicePaymentSchedule()
+                        .getInvoice().getDocumentNo());
                   }
                   // Create merged Payment Schedule Detail with the pending to be paid amount
                   if (outStandingAmt.compareTo(BigDecimal.ZERO) != 0) {
@@ -555,6 +646,12 @@
               for (FIN_PaymentScheduleDetail removedPD : removedPDS)
                 OBDal.getInstance().remove(removedPD);
             }
+            if (payment.getGeneratedCredit().compareTo(BigDecimal.ZERO) == 0
+                && payment.getUsedCredit().compareTo(BigDecimal.ZERO) == 1) {
+              undoUsedCredit(payment, vars, invoiceDocNos);
+            }
+            payment.getFINPaymentCreditList().clear();
+            payment.setUsedCredit(BigDecimal.ZERO);
           }
         } finally {
           OBDal.getInstance().flush();
@@ -630,36 +727,80 @@
     return true;
   }
 
-  private static void updateUsedCredit(BigDecimal usedAmount, BusinessPartner bp, boolean isReceipt) {
-    List<FIN_Payment> payments = dao.getCustomerPaymentsWithCredit(bp, isReceipt);
-    BigDecimal pendingToAllocateAmount = usedAmount;
-    for (FIN_Payment payment : payments) {
-      BigDecimal availableAmount = payment.getGeneratedCredit().subtract(payment.getUsedCredit());
-      if (pendingToAllocateAmount.compareTo(availableAmount) == 1) {
-        payment.setUsedCredit(payment.getUsedCredit().add(availableAmount));
-        pendingToAllocateAmount = pendingToAllocateAmount.subtract(availableAmount);
-        OBDal.getInstance().save(payment);
-      } else {
-        payment.setUsedCredit(payment.getUsedCredit().add(pendingToAllocateAmount));
-        OBDal.getInstance().save(payment);
-        break;
+  private void updateUsedCredit(FIN_Payment newPayment) {
+    if (newPayment.getFINPaymentCreditList().isEmpty()) {
+      // We process the payment from the Payment In/Out window (not from the Process Invoice flow)
+      final BigDecimal usedAmount = newPayment.getUsedCredit();
+      final BusinessPartner bp = newPayment.getBusinessPartner();
+      final boolean isReceipt = newPayment.isReceipt();
+
+      List<FIN_Payment> creditPayments = dao.getCustomerPaymentsWithCredit(bp, isReceipt);
+      BigDecimal pendingToAllocateAmount = usedAmount;
+      for (FIN_Payment creditPayment : creditPayments) {
+        BigDecimal availableAmount = creditPayment.getGeneratedCredit().subtract(
+            creditPayment.getUsedCredit());
+        if (pendingToAllocateAmount.compareTo(availableAmount) == 1) {
+          creditPayment.setUsedCredit(creditPayment.getUsedCredit().add(availableAmount));
+          pendingToAllocateAmount = pendingToAllocateAmount.subtract(availableAmount);
+          linkCreditPayment(newPayment, availableAmount, creditPayment);
+          OBDal.getInstance().save(creditPayment);
+        } else {
+          creditPayment.setUsedCredit(creditPayment.getUsedCredit().add(pendingToAllocateAmount));
+          linkCreditPayment(newPayment, pendingToAllocateAmount, creditPayment);
+          OBDal.getInstance().save(creditPayment);
+          break;
+        }
       }
     }
   }
 
-  private void undoUsedCredit(BigDecimal usedAmount, BusinessPartner bp, Boolean isReceipt) {
-    List<FIN_Payment> payments = dao.getCustomerPaymentsWithUsedCredit(bp, isReceipt);
-    BigDecimal pendingDeallocateAmount = usedAmount;
-    for (FIN_Payment payment : payments) {
-      BigDecimal paymentUsedAmount = payment.getUsedCredit();
-      if (usedAmount.compareTo(paymentUsedAmount) == 1) {
-        payment.setUsedCredit(BigDecimal.ZERO);
-        pendingDeallocateAmount = pendingDeallocateAmount.subtract(paymentUsedAmount);
-        OBDal.getInstance().save(payment);
-      } else {
-        payment.setUsedCredit(payment.getUsedCredit().subtract(pendingDeallocateAmount));
-        OBDal.getInstance().save(payment);
-        break;
+  public static void linkCreditPayment(FIN_Payment newPayment, BigDecimal usedAmount,
+      FIN_Payment creditPayment) {
+    final FIN_Payment_Credit creditInfo = OBProvider.getInstance().get(FIN_Payment_Credit.class);
+    creditInfo.setPayment(newPayment);
+    creditInfo.setAmount(usedAmount);
+    creditInfo.setCurrency(newPayment.getCurrency());
+    creditInfo.setCreditPaymentUsed(creditPayment);
+    creditInfo.setOrganization(newPayment.getOrganization());
+    creditInfo.setClient(newPayment.getClient());
+    newPayment.getFINPaymentCreditList().add(creditInfo);
+  }
+
+  private void undoUsedCredit(FIN_Payment myPayment, VariablesSecureApp vars,
+      Set<String> invoiceDocNos) {
+    final List<FIN_Payment> payments = new ArrayList<FIN_Payment>();
+    for (final FIN_Payment_Credit pc : myPayment.getFINPaymentCreditList()) {
+      final FIN_Payment creditPaymentUsed = pc.getCreditPaymentUsed();
+      creditPaymentUsed.setUsedCredit(creditPaymentUsed.getUsedCredit().subtract(pc.getAmount()));
+      payments.add(creditPaymentUsed);
+    }
+
+    for (final FIN_Payment payment : payments) {
+      // Update Description
+      final String payDesc = payment.getDescription();
+      if (payDesc != null) {
+        final String invoiceDocNoMsg = Utility.messageBD(new DalConnectionProvider(),
+            "APRM_CreditUsedinInvoice", vars.getLanguage());
+        if (invoiceDocNoMsg != null) {
+          final StringBuffer newDesc = new StringBuffer();
+          for (final String line : payDesc.split("\n")) {
+            boolean include = true;
+            if (line.startsWith(invoiceDocNoMsg.substring(0, invoiceDocNoMsg.lastIndexOf("%s")))) {
+              for (final String docNo : invoiceDocNos) {
+                if (line.indexOf(docNo) > 0) {
+                  include = false;
+                  break;
+                }
+              }
+            }
+            if (include) {
+              newDesc.append(line);
+              if (!"".equals(line))
+                newDesc.append("\n");
+            }
+          }
+          payment.setDescription(newDesc.toString());
+        }
       }
     }
   }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionModify.java	Sat Nov 12 15:43:15 2011 +0100
@@ -0,0 +1,232 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2010-2011 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s):  ______________________________________.
+ *************************************************************************
+ */
+package org.openbravo.advpaymentmngt.process;
+
+import java.util.List;
+
+import org.hibernate.criterion.Restrictions;
+import org.openbravo.advpaymentmngt.dao.AdvPaymentMngtDao;
+import org.openbravo.advpaymentmngt.utility.FIN_Utility;
+import org.openbravo.dal.core.OBContext;
+import org.openbravo.dal.service.OBCriteria;
+import org.openbravo.dal.service.OBDal;
+import org.openbravo.erpCommon.utility.OBError;
+import org.openbravo.erpCommon.utility.Utility;
+import org.openbravo.model.common.businesspartner.BusinessPartner;
+import org.openbravo.model.common.plm.Product;
+import org.openbravo.model.financialmgmt.accounting.FIN_FinancialAccountAccounting;
+import org.openbravo.model.financialmgmt.gl.GLItem;
+import org.openbravo.model.financialmgmt.payment.FIN_FinaccTransaction;
+import org.openbravo.model.financialmgmt.payment.FIN_Payment;
+import org.openbravo.model.financialmgmt.payment.FinAccPaymentMethod;
+import org.openbravo.model.marketing.Campaign;
+import org.openbravo.model.materialmgmt.cost.ABCActivity;
+import org.openbravo.model.project.Project;
+import org.openbravo.model.sales.SalesRegion;
+import org.openbravo.scheduling.ProcessBundle;
+
+public class FIN_TransactionModify implements org.openbravo.scheduling.Process {
+  private static AdvPaymentMngtDao dao;
+
+  public void execute(ProcessBundle bundle) throws Exception {
+    dao = new AdvPaymentMngtDao();
+    OBError msg = new OBError();
+    msg.setType("Success");
+    msg.setTitle(Utility.messageBD(bundle.getConnection(), "Success", bundle.getContext()
+        .getLanguage()));
+
+    OBContext.setAdminMode();
+    try {
+      String recordID = (String) bundle.getParams().get("FIN_Finacc_Transaction_ID");
+      if (recordID == null || "".equals(recordID)) {
+        recordID = (String) bundle.getParams().get("Aprm_Finacc_Transaction_V_ID");
+      }
+      final FIN_FinaccTransaction transaction = dao
+          .getObject(FIN_FinaccTransaction.class, recordID);
+      // Checks
+      if ("Y".equals(transaction.getPosted()) && isTransactionPostingEnabled(transaction)) {
+        msg.setType("Error");
+        msg.setTitle(Utility.messageBD(bundle.getConnection(), "Error", bundle.getContext()
+            .getLanguage()));
+        msg.setMessage(Utility.parseTranslation(bundle.getConnection(), bundle.getContext()
+            .toVars(), bundle.getContext().getLanguage(), "@PostedDocument@"));
+        bundle.setResult(msg);
+        return;
+      }
+
+      if (transaction.getReconciliation() != null
+          && "Y".equals(transaction.getReconciliation().getPosted())
+          && !isTransactionPostingEnabled(transaction)) {
+        msg.setType("Error");
+        msg.setTitle(Utility.messageBD(bundle.getConnection(), "Error", bundle.getContext()
+            .getLanguage()));
+        msg.setMessage(Utility.parseTranslation(bundle.getConnection(), bundle.getContext()
+            .toVars(), bundle.getContext().getLanguage(), "@APRM_RelatedPostedDocument@"));
+        bundle.setResult(msg);
+        return;
+      }
+      GLItem oldGLItem = transaction.getGLItem();
+      GLItem newGLItem = oldGLItem;
+      final String strGLItemId = (String) bundle.getParams().get("cGlitemId");
+      final String strProductId = (String) bundle.getParams().get("mProductId");
+      final String strBPartnerId = (String) bundle.getParams().get("cBpartnerId");
+      final String strProjectId = (String) bundle.getParams().get("cProjectId");
+      final String strCampaignId = (String) bundle.getParams().get("cCampaignId");
+      final String strActivityId = (String) bundle.getParams().get("cActivityId");
+      final String strSalesRegionId = (String) bundle.getParams().get("cSalesregionId");
+      transaction.setProcessed(false);
+      OBDal.getInstance().save(transaction);
+      OBDal.getInstance().flush();
+      if (strGLItemId != null && !"".equals(strGLItemId)) {
+        newGLItem = OBDal.getInstance().get(GLItem.class, strGLItemId);
+        transaction.setGLItem(OBDal.getInstance().get(GLItem.class, strGLItemId));
+      } else {
+        transaction.setGLItem(null);
+      }
+      if (strProductId != null && !"".equals(strProductId)) {
+        transaction.setProduct(OBDal.getInstance().get(Product.class, strProductId));
+      } else {
+        transaction.setProduct(null);
+      }
+      if (strBPartnerId != null && !"".equals(strBPartnerId)) {
+        transaction.setBusinessPartner(OBDal.getInstance()
+            .get(BusinessPartner.class, strBPartnerId));
+      } else {
+        transaction.setBusinessPartner(null);
+      }
+      if (strProjectId != null && !"".equals(strProjectId)) {
+        transaction.setProject(OBDal.getInstance().get(Project.class, strProjectId));
+      } else {
+        transaction.setProject(null);
+      }
+      if (strCampaignId != null && !"".equals(strCampaignId)) {
+        transaction.setSalesCampaign(OBDal.getInstance().get(Campaign.class, strCampaignId));
+      } else {
+        transaction.setSalesCampaign(null);
+      }
+      if (strActivityId != null && !"".equals(strActivityId)) {
+        transaction.setActivity(OBDal.getInstance().get(ABCActivity.class, strActivityId));
+      } else {
+        transaction.setActivity(null);
+      }
+      if (strSalesRegionId != null && !"".equals(strSalesRegionId)) {
+        transaction.setSalesRegion(OBDal.getInstance().get(SalesRegion.class, strSalesRegionId));
+      } else {
+        transaction.setSalesRegion(null);
+      }
+      String description = transaction.getDescription();
+      String oldGlItemString = Utility.messageBD(bundle.getConnection(), "APRM_GLItem", bundle
+          .getContext().toVars().getLanguage())
+          + ": " + oldGLItem.getName();
+      String newGlItemString = Utility.messageBD(bundle.getConnection(), "APRM_GLItem", bundle
+          .getContext().toVars().getLanguage())
+          + ": " + newGLItem.getName();
+      if (!description.isEmpty()) {
+        description = description.indexOf(oldGlItemString) != -1 ? description.substring(0,
+            description.indexOf(oldGlItemString))
+            + description.substring(
+                oldGlItemString.length() + description.indexOf(oldGlItemString),
+                description.length()) : description;
+      }
+      description = description.isEmpty() ? newGlItemString : description + "\n" + newGlItemString;
+      transaction.setDescription(description);
+      transaction.setProcessed(true);
+      OBDal.getInstance().save(transaction);
+      OBDal.getInstance().flush();
+      bundle.setResult(msg);
+    } catch (final Exception e) {
+      OBDal.getInstance().rollbackAndClose();
+      e.printStackTrace(System.err);
+      msg.setType("Error");
+      msg.setTitle(Utility.messageBD(bundle.getConnection(), "Error", bundle.getContext()
+          .getLanguage()));
+      msg.setMessage(FIN_Utility.getExceptionMessage(e));
+      bundle.setResult(msg);
+    } finally {
+      OBContext.restorePreviousMode();
+    }
+  }
+
+  private boolean isTransactionPostingEnabled(FIN_FinaccTransaction transaction) {
+    boolean confirmation = false;
+    OBContext.setAdminMode();
+    final String TRXTYPE_BPDeposit = "BPD";
+    final String TRXTYPE_BPWithdrawal = "BPW";
+    final String TRXTYPE_BankFee = "BF";
+    try {
+      List<FIN_FinancialAccountAccounting> accounts = transaction.getAccount()
+          .getFINFinancialAccountAcctList();
+      FIN_Payment payment = transaction.getFinPayment();
+      if (payment != null) {
+        OBCriteria<FinAccPaymentMethod> obCriteria = OBDal.getInstance().createCriteria(
+            FinAccPaymentMethod.class);
+        obCriteria.add(Restrictions.eq(FinAccPaymentMethod.PROPERTY_ACCOUNT, payment.getAccount()));
+        obCriteria.add(Restrictions.eq(FinAccPaymentMethod.PROPERTY_PAYMENTMETHOD,
+            payment.getPaymentMethod()));
+        obCriteria.setFilterOnReadableClients(false);
+        obCriteria.setFilterOnReadableOrganization(false);
+        List<FinAccPaymentMethod> lines = obCriteria.list();
+        for (FIN_FinancialAccountAccounting account : accounts) {
+          if (confirmation)
+            return confirmation;
+          if (payment.isReceipt()) {
+            if (("INT").equals(lines.get(0).getUponDepositUse())
+                && account.getInTransitPaymentAccountIN() != null)
+              confirmation = true;
+            else if (("DEP").equals(lines.get(0).getUponDepositUse())
+                && account.getDepositAccount() != null)
+              confirmation = true;
+            else if (("CLE").equals(lines.get(0).getUponDepositUse())
+                && account.getClearedPaymentAccount() != null)
+              confirmation = true;
+          } else {
+            if (("INT").equals(lines.get(0).getUponWithdrawalUse())
+                && account.getFINOutIntransitAcct() != null)
+              confirmation = true;
+            else if (("WIT").equals(lines.get(0).getUponWithdrawalUse())
+                && account.getWithdrawalAccount() != null)
+              confirmation = true;
+            else if (("CLE").equals(lines.get(0).getUponWithdrawalUse())
+                && account.getClearedPaymentAccountOUT() != null)
+              confirmation = true;
+          }
+        }
+      } else {
+        for (FIN_FinancialAccountAccounting account : accounts) {
+          if (confirmation)
+            return confirmation;
+          if ((TRXTYPE_BPDeposit.equals(transaction.getTransactionType()) && account
+              .getDepositAccount() != null)
+              || (TRXTYPE_BPWithdrawal.equals(transaction.getTransactionType()) && account
+                  .getWithdrawalAccount() != null)
+              || (TRXTYPE_BankFee.equals(transaction.getTransactionType()) && account
+                  .getWithdrawalAccount() != null))
+            confirmation = true;
+        }
+      }
+    } catch (Exception e) {
+      return confirmation;
+    } finally {
+      OBContext.restorePreviousMode();
+    }
+    return confirmation;
+
+  }
+
+}
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java	Sat Nov 12 15:43:15 2011 +0100
@@ -45,6 +45,7 @@
 import org.openbravo.base.structure.BaseOBObject;
 import org.openbravo.client.kernel.reference.UIDefinitionController;
 import org.openbravo.dal.core.OBContext;
+import org.openbravo.dal.security.OrganizationStructureProvider;
 import org.openbravo.dal.service.OBCriteria;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.data.FieldProvider;
@@ -981,4 +982,28 @@
     return "Y".equals(result);
   }
 
+  /**
+   * Returns the legal entity of the given organization
+   * 
+   * @param org
+   *          organization to get its legal entity
+   * @return legal entity (with or without accounting) organization or null if not found
+   */
+  public static Organization getLegalEntityOrg(final Organization org) {
+    try {
+      OBContext.setAdminMode(true);
+      final OrganizationStructureProvider osp = OBContext.getOBContext()
+          .getOrganizationStructureProvider(org.getClient().getId());
+      for (final String orgId : osp.getParentList(org.getId(), true)) {
+        final Organization parentOrg = OBDal.getInstance().get(Organization.class, orgId);
+        if (parentOrg.getOrganizationType().isLegalEntity()) {
+          return parentOrg;
+        }
+      }
+      return null;
+    } finally {
+      OBContext.restorePreviousMode();
+    }
+  }
+
 }
--- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Sat Nov 12 15:43:15 2011 +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.14195]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.14223]]></VERSION>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <DESCRIPTION><![CDATA[JBoss Weld]]></DESCRIPTION>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <HELP><![CDATA[Provides the JBoss Weld framework: Java Contexts and Dependency Injection for the Java EE platform (CDI). For more information see http://seamframework.org/Weld]]></HELP>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <URL><![CDATA[http://forge.openbravo.com/projects/weld]]></URL>
@@ -22,7 +22,7 @@
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <UPDATEINFO><![CDATA[Bug fixing.]]></UPDATEINFO>
-<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION_LABEL><![CDATA[MP5]]></VERSION_LABEL>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--C70732EA90A14EC0916078B85CC33D2D--></AD_MODULE>
 
--- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sat Nov 12 15:43:15 2011 +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.14195]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.14223]]></STARTVERSION>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Sat Nov 12 15:43:15 2011 +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.14195]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.14223]]></VERSION>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <DESCRIPTION><![CDATA[Provides the main application components for the openbravo user interface]]></DESCRIPTION>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <HELP><![CDATA[Provides the main application components for the openbravo user interface. The main layout incorporates a navigation bar and a main view area.]]></HELP>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <URL><![CDATA[http://forge.openbravo.com/projects/clientapplication]]></URL>
@@ -22,7 +22,7 @@
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <UPDATEINFO><![CDATA[Styling bugfixing]]></UPDATEINFO>
-<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION_LABEL><![CDATA[MP5]]></VERSION_LABEL>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--9BA0836A3CD74EE4AB48753A47211BCC--></AD_MODULE>
 
--- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sat Nov 12 15:43:15 2011 +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.14195]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.14223]]></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.14195]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->  <STARTVERSION><![CDATA[2.1.14223]]></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.14195]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->  <STARTVERSION><![CDATA[3.0.14223]]></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.14195]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->  <STARTVERSION><![CDATA[8.1.14223]]></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/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-compatibility.js	Sat Nov 12 15:43:15 2011 +0100
@@ -335,11 +335,15 @@
       // * {{{url}}} type: String - the url to be opened in the popup
       // * {{{title}}} type: String - the title to be displayed in the popup
       // * {{{theOpener}}} type: Window Object - the window object of the opener
+      // * {{{showMinimizeControl}}} type: Boolean - to specify if the popup should show the minimize control or not. The default value is "true" if it is not specified
+      // * {{{showMaximizeControl}}} type: Boolean - to specify if the popup should show the maximize control or not. The default value is "true" if it is not specified
+      // * {{{showCloseControl}}} type: Boolean - to specify if the popup should show the close control or not. The default value is "true" if it is not specified
       // * {{{postParams}}} type: Object - parameters to be sent to the url using POST instead of GET
+      // * {{{isModal}}} type: Boolean - to specify if the popup should be modal or not. The default value is "true" if it is not specified
       // of the popup. Used in window.open to allow IE know which is the opener
       // 
       // returns the created OBClassicPopupWindow
-      open: function(name, width, height, url, title, theOpener, showMinimizeControl, showMaximizeControl, showCloseControl, postParams){
+      open: function(name, width, height, url, title, theOpener, showMinimizeControl, showMaximizeControl, showCloseControl, postParams, isModal){
         if (showMinimizeControl !== false) {
           showMinimizeControl = true;
         }
@@ -349,6 +353,9 @@
         if (showCloseControl !== false) {
           showCloseControl = true;
         }
+        if (isModal !== false) {
+          isModal = true;
+        }
         var cPopup = isc.OBClassicPopup.create({
           ID: name + '_' + cobcomp.Popup.secString,
           width: width,
@@ -356,6 +363,8 @@
           showMinimizeButton: showMinimizeControl,
           showMaximizeButton : showMaximizeControl,
           showCloseButton: showCloseControl,
+          isModal : isModal,
+          showModalMask : isModal,
           theOpener: theOpener,
           areParamsSet: false,
           isFramesetDraw: false,
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js	Sat Nov 12 15:43:15 2011 +0100
@@ -248,7 +248,7 @@
       
       // overridden for:
       // https://issues.openbravo.com/view.php?id=18509
-      editorChanged : function (item) {
+      editorChanged: function (item) {
         var prop, same, opDefs, val = item.getElementValue(), 
           actOnKeypress = item.actOnKeypress === true ? item.actOnKeypress : this.actOnKeypress;
         
@@ -256,7 +256,7 @@
           
           // if someone starts typing and and or then do not filter
           // onkeypress either
-          if (val.contains(' and') || val.contains(' or')) {
+          if (val.contains(' and') || val.contains(' or ')) {
             this.preventPerformFilterFiring();
             return;
           }
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js	Sat Nov 12 15:43:15 2011 +0100
@@ -1527,7 +1527,7 @@
     var popupParams = 'Command=DEFAULT';
     popupParams += '&inpTabId=' + tabId;
     popupParams += '&hideMenu=true&noprefs=true';
-    OB.Layout.ClassicOBCompatibility.Popup.open('tree', 750, 625, OB.Application.contextUrl + 'utility/WindowTree.html?' + popupParams, '', window, false, false, true);
+    OB.Layout.ClassicOBCompatibility.Popup.open('tree', 750, 625, OB.Application.contextUrl + 'utility/WindowTree.html?' + popupParams, '', window, true, true, true, null, false);
   }
   
   view.setContextInfo(view.getContextInfo(true, true, true, true), openPopupTree, true);
--- a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js	Sat Nov 12 15:43:15 2011 +0100
@@ -428,12 +428,6 @@
   titleStyle: 'OBFormFieldLabel'
 });
 
-if (navigator.userAgent.toUpperCase().indexOf("MSIE") >= 0) { //IE hack to avoid item be 12 px below the title
-  OBImageCanvas.addProperties({
-    layoutTopMargin: -12
-  });
-}
-
 isc.OBImageCanvas.addProperties({
   height: '0px', // Hack to avoid second line be desplaced in Firefox and IE
   zoomInCursorSrc: OB.Styles.skinsPath + 'Default/org.openbravo.client.application/images/system/zoomIn.cur',
@@ -490,7 +484,7 @@
   height: 24
 });
 
-isc.ClassFactory.defineClass('OBSectionItemButton', ImgSectionHeader);
+isc.ClassFactory.defineClass('OBSectionItemButton', isc.ImgSectionHeader);
 isc.OBSectionItemButton.changeDefaults('backgroundDefaults', {
   showRollOver: true,
   showDown: false,
--- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Sat Nov 12 15:43:15 2011 +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.14195]]></VERSION>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.14223]]></VERSION>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <DESCRIPTION><![CDATA[Provides the HTML Widget superclass that allows to create widget classes that embed the html code.]]></DESCRIPTION>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <HELP><![CDATA[With this module you can define your own widget classes just setting up your own html code or the html code provided by third parties.]]></HELP>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <URL><![CDATA[http://forge.openbravo.com/projects/htmlwidget]]></URL>
@@ -21,7 +21,7 @@
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION_LABEL><![CDATA[MP5]]></VERSION_LABEL>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--D393BE6F22BB44B7B728259B34FC795A--></AD_MODULE>
 
--- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sat Nov 12 15:43:15 2011 +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.14195]]></STARTVERSION>
+<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.14223]]></STARTVERSION>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Sat Nov 12 15:43:15 2011 +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.14195]]></VERSION>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.14223]]></VERSION>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <DESCRIPTION><![CDATA[Provides framework functionality for the Openbravo User Interface]]></DESCRIPTION>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <HELP><![CDATA[The user interface client kernel is a generation framework for generating client (browser) components used in Openbravo. Its components are mainly used by other modules to provide customizable and extendable user interfaces.]]></HELP>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <URL><![CDATA[http://forge.openbravo.com/projects/openbravoclientkernel]]></URL>
@@ -22,7 +22,7 @@
 <!--4B828F4D03264080AA1D2057B13F613C-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <UPDATEINFO><![CDATA[Bug fix for issue 15289]]></UPDATEINFO>
-<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION_LABEL><![CDATA[MP5]]></VERSION_LABEL>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--4B828F4D03264080AA1D2057B13F613C--></AD_MODULE>
 
--- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sat Nov 12 15:43:15 2011 +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.14195]]></STARTVERSION>
+<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.14223]]></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.14195]]></STARTVERSION>
+<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <STARTVERSION><![CDATA[1.1.14223]]></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.14195]]></STARTVERSION>
+<!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <STARTVERSION><![CDATA[2.0.14223]]></STARTVERSION>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON REST Webservice]]></DEPENDANT_MODULE_NAME>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Sat Nov 12 15:43:15 2011 +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.14195]]></VERSION>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.14223]]></VERSION>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <DESCRIPTION><![CDATA[Workspace & Widgets]]></DESCRIPTION>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <HELP><![CDATA[Provides the infrastructure of workspace tab (formerly My Openbravo)]]></HELP>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <URL><![CDATA[http://forge.openbravo.com/projects/myopenbravo]]></URL>
@@ -22,7 +22,7 @@
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <UPDATEINFO><![CDATA[Styling bugfixing]]></UPDATEINFO>
-<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION_LABEL><![CDATA[MP5]]></VERSION_LABEL>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--2758CD25B2704AF6BBAD10365FC82C06--></AD_MODULE>
 
--- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sat Nov 12 15:43:15 2011 +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.14195]]></STARTVERSION>
+<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.14223]]></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.14195]]></STARTVERSION>
+<!--E71B28FC949D481D9F59C17D01E46EF9-->  <STARTVERSION><![CDATA[3.0.14223]]></STARTVERSION>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Sat Nov 12 15:43:15 2011 +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.14195]]></VERSION>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.14223]]></VERSION>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <DESCRIPTION><![CDATA[Provides the Query/List superclass widget that allows to create widget classes that prints a grid of data based on a query.]]></DESCRIPTION>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <HELP><![CDATA[With this module you can define your own widget classes that just with simple Application Dictionary shows a grid of data based on a HQL Query.]]></HELP>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <URL><![CDATA[http://forge.openbravo.com/projects/querylistwidget]]></URL>
@@ -21,7 +21,7 @@
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION_LABEL><![CDATA[MP5]]></VERSION_LABEL>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC--></AD_MODULE>
 
--- a/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sat Nov 12 15:43:15 2011 +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.14195]]></STARTVERSION>
+<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.14223]]></STARTVERSION>
 <!--26558497C31140BFAB067BA4BC47D799-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--26558497C31140BFAB067BA4BC47D799-->  <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME>
 <!--26558497C31140BFAB067BA4BC47D799-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Sat Nov 12 15:43:15 2011 +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.14195]]></VERSION>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.14223]]></VERSION>
 <!--FF8080812D842086012D844F3CC0003E-->  <DESCRIPTION><![CDATA[Collection of Workspace Widgets]]></DESCRIPTION>
 <!--FF8080812D842086012D844F3CC0003E-->  <HELP><![CDATA[Collection of Workspace Widgets]]></HELP>
 <!--FF8080812D842086012D844F3CC0003E-->  <URL><![CDATA[http://forge.openbravo.com/projects/widgetscollection]]></URL>
@@ -22,7 +22,7 @@
 <!--FF8080812D842086012D844F3CC0003E-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--FF8080812D842086012D844F3CC0003E-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--FF8080812D842086012D844F3CC0003E-->  <UPDATEINFO><![CDATA[Added Currency Converter. Added Google Docs]]></UPDATEINFO>
-<!--FF8080812D842086012D844F3CC0003E-->  <VERSION_LABEL><![CDATA[MP5]]></VERSION_LABEL>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--FF8080812D842086012D844F3CC0003E-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--FF8080812D842086012D844F3CC0003E--></AD_MODULE>
 
--- a/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sat Nov 12 15:43:15 2011 +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.14195]]></STARTVERSION>
+<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.14223]]></STARTVERSION>
 <!--FF8080812D842086012D845002070046-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080812D842086012D845002070046-->  <DEPENDANT_MODULE_NAME><![CDATA[Workspace & Widgets]]></DEPENDANT_MODULE_NAME>
 <!--FF8080812D842086012D845002070046-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Sat Nov 12 15:43:15 2011 +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.14195]]></VERSION>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.14223]]></VERSION>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <DESCRIPTION><![CDATA[Payment Report]]></DESCRIPTION>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <URL><![CDATA[http://forge.openbravo.com/projects/paymentreport]]></URL>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <TYPE><![CDATA[M]]></TYPE>
@@ -22,7 +22,7 @@
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION_LABEL><![CDATA[MP5]]></VERSION_LABEL>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--2A5EE903D7974AC298C0504FBC4501A7--></AD_MODULE>
 
--- a/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sat Nov 12 15:43:15 2011 +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.14195]]></STARTVERSION>
+<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.14223]]></STARTVERSION>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <DEPENDANT_MODULE_NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></DEPENDANT_MODULE_NAME>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Sat Nov 12 15:43:15 2011 +0100
@@ -473,6 +473,17 @@
 <!--8B947CC936E44FBCBCE62F4E02A01C63-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
 <!--8B947CC936E44FBCBCE62F4E02A01C63--></AD_TEXTINTERFACES>
 
+<!--8DFAF1EEAAE24EE094C0BF142C0BE56A--><AD_TEXTINTERFACES>
+<!--8DFAF1EEAAE24EE094C0BF142C0BE56A-->  <AD_TEXTINTERFACES_ID><![CDATA[8DFAF1EEAAE24EE094C0BF142C0BE56A]]></AD_TEXTINTERFACES_ID>
+<!--8DFAF1EEAAE24EE094C0BF142C0BE56A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8DFAF1EEAAE24EE094C0BF142C0BE56A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8DFAF1EEAAE24EE094C0BF142C0BE56A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8DFAF1EEAAE24EE094C0BF142C0BE56A-->  <TEXT><![CDATA[Payment Date]]></TEXT>
+<!--8DFAF1EEAAE24EE094C0BF142C0BE56A-->  <FILENAME><![CDATA[/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml]]></FILENAME>
+<!--8DFAF1EEAAE24EE094C0BF142C0BE56A-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--8DFAF1EEAAE24EE094C0BF142C0BE56A-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
+<!--8DFAF1EEAAE24EE094C0BF142C0BE56A--></AD_TEXTINTERFACES>
+
 <!--937AA8C7B9DA4ACF92B9A1ACA7719A65--><AD_TEXTINTERFACES>
 <!--937AA8C7B9DA4ACF92B9A1ACA7719A65-->  <AD_TEXTINTERFACES_ID><![CDATA[937AA8C7B9DA4ACF92B9A1ACA7719A65]]></AD_TEXTINTERFACES_ID>
 <!--937AA8C7B9DA4ACF92B9A1ACA7719A65-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -594,6 +605,105 @@
 <!--AC44B03FF40047059E663CEB9CF49A5A-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
 <!--AC44B03FF40047059E663CEB9CF49A5A--></AD_TEXTINTERFACES>
 
+<!--AF049D5097F14A79E040007F010149FB--><AD_TEXTINTERFACES>
+<!--AF049D5097F14A79E040007F010149FB-->  <AD_TEXTINTERFACES_ID><![CDATA[AF049D5097F14A79E040007F010149FB]]></AD_TEXTINTERFACES_ID>
+<!--AF049D5097F14A79E040007F010149FB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--AF049D5097F14A79E040007F010149FB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--AF049D5097F14A79E040007F010149FB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--AF049D5097F14A79E040007F010149FB-->  <TEXT><![CDATA[Include Payments Using Credit]]></TEXT>
+<!--AF049D5097F14A79E040007F010149FB-->  <FILENAME><![CDATA[/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.html]]></FILENAME>
+<!--AF049D5097F14A79E040007F010149FB-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--AF049D5097F14A79E040007F010149FB-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
+<!--AF049D5097F14A79E040007F010149FB--></AD_TEXTINTERFACES>
+
+<!--AF2D1591711675E8E040007F0101337D--><AD_TEXTINTERFACES>
+<!--AF2D1591711675E8E040007F0101337D-->  <AD_TEXTINTERFACES_ID><![CDATA[AF2D1591711675E8E040007F0101337D]]></AD_TEXTINTERFACES_ID>
+<!--AF2D1591711675E8E040007F0101337D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--AF2D1591711675E8E040007F0101337D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--AF2D1591711675E8E040007F0101337D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--AF2D1591711675E8E040007F0101337D-->  <TEXT><![CDATA[Payment Description]]></TEXT>
+<!--AF2D1591711675E8E040007F0101337D-->  <FILENAME><![CDATA[/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml]]></FILENAME>
+<!--AF2D1591711675E8E040007F0101337D-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--AF2D1591711675E8E040007F0101337D-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
+<!--AF2D1591711675E8E040007F0101337D--></AD_TEXTINTERFACES>
+
+<!--AF2E12144150C776E040007F01013C23--><AD_TEXTINTERFACES>
+<!--AF2E12144150C776E040007F01013C23-->  <AD_TEXTINTERFACES_ID><![CDATA[AF2E12144150C776E040007F01013C23]]></AD_TEXTINTERFACES_ID>
+<!--AF2E12144150C776E040007F01013C23-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--AF2E12144150C776E040007F01013C23-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--AF2E12144150C776E040007F01013C23-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--AF2E12144150C776E040007F01013C23-->  <TEXT><![CDATA[Include Payments Using Credit:]]></TEXT>
+<!--AF2E12144150C776E040007F01013C23-->  <FILENAME><![CDATA[/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportPDF.jrxml]]></FILENAME>
+<!--AF2E12144150C776E040007F01013C23-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--AF2E12144150C776E040007F01013C23-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
+<!--AF2E12144150C776E040007F01013C23--></AD_TEXTINTERFACES>
+
+<!--AFAA1DE81243FDE8E040007F010159B7--><AD_TEXTINTERFACES>
+<!--AFAA1DE81243FDE8E040007F010159B7-->  <AD_TEXTINTERFACES_ID><![CDATA[AFAA1DE81243FDE8E040007F010159B7]]></AD_TEXTINTERFACES_ID>
+<!--AFAA1DE81243FDE8E040007F010159B7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--AFAA1DE81243FDE8E040007F010159B7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--AFAA1DE81243FDE8E040007F010159B7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--AFAA1DE81243FDE8E040007F010159B7-->  <TEXT><![CDATA[* Invoice paid using a credit payment]]></TEXT>
+<!--AFAA1DE81243FDE8E040007F010159B7-->  <FILENAME><![CDATA[/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.html]]></FILENAME>
+<!--AFAA1DE81243FDE8E040007F010159B7-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--AFAA1DE81243FDE8E040007F010159B7-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
+<!--AFAA1DE81243FDE8E040007F010159B7--></AD_TEXTINTERFACES>
+
+<!--AFB970D388478761E040007F01012C25--><AD_TEXTINTERFACES>
+<!--AFB970D388478761E040007F01012C25-->  <AD_TEXTINTERFACES_ID><![CDATA[AFB970D388478761E040007F01012C25]]></AD_TEXTINTERFACES_ID>
+<!--AFB970D388478761E040007F01012C25-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--AFB970D388478761E040007F01012C25-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--AFB970D388478761E040007F01012C25-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--AFB970D388478761E040007F01012C25-->  <TEXT><![CDATA[** Several invoices have been paid using the same credit payment]]></TEXT>
+<!--AFB970D388478761E040007F01012C25-->  <FILENAME><![CDATA[/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.html]]></FILENAME>
+<!--AFB970D388478761E040007F01012C25-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--AFB970D388478761E040007F01012C25-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
+<!--AFB970D388478761E040007F01012C25--></AD_TEXTINTERFACES>
+
+<!--AFBBE094BB53D031E040007F01013B9F--><AD_TEXTINTERFACES>
+<!--AFBBE094BB53D031E040007F01013B9F-->  <AD_TEXTINTERFACES_ID><![CDATA[AFBBE094BB53D031E040007F01013B9F]]></AD_TEXTINTERFACES_ID>
+<!--AFBBE094BB53D031E040007F01013B9F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--AFBBE094BB53D031E040007F01013B9F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--AFBBE094BB53D031E040007F01013B9F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--AFBBE094BB53D031E040007F01013B9F-->  <TEXT><![CDATA[* Invoice paid using a credit payment]]></TEXT>
+<!--AFBBE094BB53D031E040007F01013B9F-->  <FILENAME><![CDATA[/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml]]></FILENAME>
+<!--AFBBE094BB53D031E040007F01013B9F-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--AFBBE094BB53D031E040007F01013B9F-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
+<!--AFBBE094BB53D031E040007F01013B9F--></AD_TEXTINTERFACES>
+
+<!--AFBBE094BB55D031E040007F01013B9F--><AD_TEXTINTERFACES>
+<!--AFBBE094BB55D031E040007F01013B9F-->  <AD_TEXTINTERFACES_ID><![CDATA[AFBBE094BB55D031E040007F01013B9F]]></AD_TEXTINTERFACES_ID>
+<!--AFBBE094BB55D031E040007F01013B9F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--AFBBE094BB55D031E040007F01013B9F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--AFBBE094BB55D031E040007F01013B9F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--AFBBE094BB55D031E040007F01013B9F-->  <TEXT><![CDATA[** Several invoices have been paid using the same credit payment]]></TEXT>
+<!--AFBBE094BB55D031E040007F01013B9F-->  <FILENAME><![CDATA[/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml]]></FILENAME>
+<!--AFBBE094BB55D031E040007F01013B9F-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--AFBBE094BB55D031E040007F01013B9F-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
+<!--AFBBE094BB55D031E040007F01013B9F--></AD_TEXTINTERFACES>
+
+<!--AFBBE094BB57D031E040007F01013B9F--><AD_TEXTINTERFACES>
+<!--AFBBE094BB57D031E040007F01013B9F-->  <AD_TEXTINTERFACES_ID><![CDATA[AFBBE094BB57D031E040007F01013B9F]]></AD_TEXTINTERFACES_ID>
+<!--AFBBE094BB57D031E040007F01013B9F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--AFBBE094BB57D031E040007F01013B9F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--AFBBE094BB57D031E040007F01013B9F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--AFBBE094BB57D031E040007F01013B9F-->  <TEXT><![CDATA[* Invoice paid using a credit payment]]></TEXT>
+<!--AFBBE094BB57D031E040007F01013B9F-->  <FILENAME><![CDATA[/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportPDF.jrxml]]></FILENAME>
+<!--AFBBE094BB57D031E040007F01013B9F-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--AFBBE094BB57D031E040007F01013B9F-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
+<!--AFBBE094BB57D031E040007F01013B9F--></AD_TEXTINTERFACES>
+
+<!--AFBBE094BB59D031E040007F01013B9F--><AD_TEXTINTERFACES>
+<!--AFBBE094BB59D031E040007F01013B9F-->  <AD_TEXTINTERFACES_ID><![CDATA[AFBBE094BB59D031E040007F01013B9F]]></AD_TEXTINTERFACES_ID>
+<!--AFBBE094BB59D031E040007F01013B9F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--AFBBE094BB59D031E040007F01013B9F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--AFBBE094BB59D031E040007F01013B9F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--AFBBE094BB59D031E040007F01013B9F-->  <TEXT><![CDATA[** Several invoices have been paid using the same credit payment]]></TEXT>
+<!--AFBBE094BB59D031E040007F01013B9F-->  <FILENAME><![CDATA[/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportPDF.jrxml]]></FILENAME>
+<!--AFBBE094BB59D031E040007F01013B9F-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--AFBBE094BB59D031E040007F01013B9F-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
+<!--AFBBE094BB59D031E040007F01013B9F--></AD_TEXTINTERFACES>
+
 <!--B682A4F7A92C45A4BE2D04E087F45B6D--><AD_TEXTINTERFACES>
 <!--B682A4F7A92C45A4BE2D04E087F45B6D-->  <AD_TEXTINTERFACES_ID><![CDATA[B682A4F7A92C45A4BE2D04E087F45B6D]]></AD_TEXTINTERFACES_ID>
 <!--B682A4F7A92C45A4BE2D04E087F45B6D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.html	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.html	Sat Nov 12 15:43:15 2011 +0100
@@ -13,7 +13,7 @@
 * under the License. 
 * The Original Code is Openbravo ERP. 
 * The Initial Developer of the Original Code is Openbravo SL 
-* All portions are Copyright (C) 2009 Openbravo SL 
+* All portions are Copyright (C) 2009-2011 Openbravo SL 
 * All Rights Reserved. 
 * Contributor(s):  ______________________________________.
 ************************************************************************
@@ -279,7 +279,7 @@
   <input type="hidden" name="inpSecondKey"></input>
   <input type="hidden" name="inpKeyReferenceId"></input>
   <input type="hidden" name="inpTableReferenceId"></input>
-  <input type="hidden" name="inpissotrx" id="IsSOTrx" value="N">
+  <input type="hidden" name="inpissotrx" id="IsSOTrx" value="N"></input>
   <input type="hidden" name="inpAdTableId"></input>
   <input type="hidden" name="inpIsReceipt"></input>
   <input type="hidden" name="inpRecordId"></input>
@@ -407,6 +407,13 @@
                                 </tbody>
                               </table>
                             <!-- USER CONTROLS -->
+						  </td>
+						</tr>
+					  </table>
+					
+					</td>
+				   </tr>
+				 </table>		
               <table class="Main_Client_TableEdition">
                 <tr>
                   <td class="TableEdition_OneCell_width"></td>
@@ -504,7 +511,7 @@
                         </td>
                         <td class="FieldButton_ContentCell">
                           <a class="FieldButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Calendar'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='FieldButtonLink_active'; return true;" onkeyup="this.className='FieldButtonLink_focus'; return true;" onclick="calculator('frmMain.inpAmountFrom', document.frmMain.inpAmountFrom.value);return false;">
-                            <table class="FieldButton"  onmouseout="window.status='';return true;" onmouseout="this.className='FieldButton';window.status='';return true;" onmouseover="this.className='FieldButton_hover';window.status='Show calculator';return true;" onmousedown="this.className='FieldButton_active';return true;" onmouseup="this.className='FieldButton';return true;">
+                            <table class="FieldButton"  onmouseout="this.className='FieldButton';window.status='';return true;" onmouseover="this.className='FieldButton_hover';window.status='Show calculator';return true;" onmousedown="this.className='FieldButton_active';return true;" onmouseup="this.className='FieldButton';return true;">
                               <tr>
                                 <td class="FieldButton_bg">
                                   <img alt="Calendar" class="FieldButton_Icon FieldButton_Icon_Calc" title="Calendar" src="../../../../../web/images/blank.gif" border="0"></img>
@@ -527,7 +534,7 @@
                         </td>
                         <td class="FieldButton_ContentCell">
                           <a class="FieldButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Calendar'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='FieldButtonLink_active'; return true;" onkeyup="this.className='FieldButtonLink_focus'; return true;" onclick="calculator('frmMain.inpAmountTo', document.frmMain.inpAmountTo.value);return false;">
-                            <table class="FieldButton"  onmouseout="window.status='';return true;" onmouseout="this.className='FieldButton';window.status='';return true;" onmouseover="this.className='FieldButton_hover';window.status='Show calculator';return true;" onmousedown="this.className='FieldButton_active';return true;" onmouseup="this.className='FieldButton';return true;">
+                            <table class="FieldButton"  onmouseout="this.className='FieldButton';window.status='';return true;" onmouseover="this.className='FieldButton_hover';window.status='Show calculator';return true;" onmousedown="this.className='FieldButton_active';return true;" onmouseup="this.className='FieldButton';return true;">
                               <tr>
                                 <td class="FieldButton_bg">
                                   <img alt="Calendar" class="FieldButton_Icon FieldButton_Icon_Calc" title="Calendar" src="../../../../../web/images/blank.gif" border="0"></img>
@@ -788,13 +795,13 @@
                     <select  name="inpPaymentMethodId" id="paramPaymentMethodId" class="Combo Combo_TwoCells_width">
                       <option value=""> <div id="reportPaymentMethod_ID"></div></option>
                     </select>
-                  </td>
-                  <td class="TitleCell"><span class="LabelText">Financial Account</span></td>
-                  <td class="Combo_ContentCell" colspan="2">
-                    <select  name="inpFinancialAccountId" id="paramFinancialAccountId" class="Combo Combo_TwoCells_width">
-                      <option value=""> <div id="reportFinancialAccount_ID"></div></option>
-                    </select>
-                  </td>
+                  </td>  
+                  <td class="ContentCell"></td>
+                  <td class="TitleCell"><span class="LabelText">Include Payments Using Credit</span></td>
+                  <td class="Radio_Check_ContentCell">
+                    <span class="Checkbox_container_NOT_Focused">
+                      <input type="checkbox" name="inpInclPaymentUsingCredit" value="Y" id="paramInclPaymentUsingCredit"></input>
+                    </span></td>
                 </tr>
                 <tr>
                   <td class="TitleCell"><span class="LabelText">Currency</span></td>
@@ -803,9 +810,12 @@
                       <option value=""> <div id="reportC_Currency_ID"></div></option>
                     </select>
                   </td>
-                  <td class="ContentCell"></td>
-                  <td class="ContentCell"></td>
-                  <td class="ContentCell"></td>
+                  <td class="TitleCell"><span class="LabelText">Financial Account</span></td>
+                  <td class="Combo_ContentCell" colspan="2">
+                    <select  name="inpFinancialAccountId" id="paramFinancialAccountId" class="Combo Combo_TwoCells_width">
+                      <option value=""> <div id="reportFinancialAccount_ID"></div></option>
+                    </select>
+                  </td>
                 </tr>
                 
                 
@@ -843,7 +853,7 @@
                   <td class="TitleCell"><span class="LabelText">Payment Type</span></td>
                   <td class="Combo_ContentCell" colspan="2">
                     <select  name="inpPaymType" id="paramPaymType" class="ComboKey Combo_TwoCells_width" required="true">
-                        <option value=""><div id="reportPaymType"></option>
+                        <option value=""><div id="reportPaymType"></div></option>
                     </select>
                   </td>
                   <td class="ContentCell"></td>
@@ -1039,7 +1049,6 @@
                   <td class="ContentCell"></td>
                   <td class="ContentCell"></td>
                 </tr>
-              </table>
               <table class="Main_Client_TableEdition">
                   <tr>
                     <td colspan="6">
@@ -1081,11 +1090,12 @@
                                 <a href="#" onclick="validate(); openInvoiceTab('yy', 'zz');" onmouseover="window.status='Payment Report';return true;" onmouseout="window.status='';return true;" class="LabelLink" id="fieldInvLink" style="xx">
                                   <span id="fieldInvoiceNumber">xx14500.34</span>
                                 </a>
+                                <span id="fieldInvoiceNumber_nolink" class="DataGrid_Body_Cell" style="xx">xx14500.34</span>
                               </td>
                                 
                               <td width="10%" id="fieldInvoiceDate" class="DataGrid_Body_Cell_Amount">xx14500.34</td>
                               <td width="10%" class="DataGrid_Body_Cell_Amount">
-                                <a href="#" onclick="validate(); openPaymentTab('yy', 'zz');" onmouseover="window.status='Payment Report';return true;" onmouseout="window.status='';return true;" class="LabelLink" id="fieldPaymLink" style="xx">
+                                <a href="#" onclick="validate(); openPaymentTab('yy', 'zz');" onmouseover="window.status='Payment Report';return true;" onmouseout="window.status='';return true;" class="LabelLink" id="fieldPaymLink" style="xx" title="xx">
                                   <span id="fieldPayment">xx14500.34</span>
                                 </a>
                               </td>
@@ -1167,10 +1177,11 @@
                                       <a href="#" onclick="validate(); openInvoiceTab('yy', 'zz');" onmouseover="window.status='Payment Report';return true;" onmouseout="window.status='';return true;" class="LabelLink" id="fieldInvLink2" style="xx">
                                         <span id="fieldInvoiceNumber2">xx14500.34</span>
                                       </a>
+                                      <span id="fieldInvoiceNumber2_nolink" class="DataGrid_Body_Cell" style="xx">xx14500.34</span>
                                     </td>
                                     <td width="10%" id="fieldInvoiceDate2" class="DataGrid_Body_Cell_Amount">xx14500.34</td>
                                     <td width="10%" class="DataGrid_Body_Cell_Amount">
-                                      <a href="#" onclick="validate(); openPaymentTab('yy', 'zz');" onmouseover="window.status='Payment Report';return true;" onmouseout="window.status='';return true;" class="LabelLink" id="fieldPaymLink2" style="xx">
+                                      <a href="#" onclick="validate(); openPaymentTab('yy', 'zz');" onmouseover="window.status='Payment Report';return true;" onmouseout="window.status='';return true;" class="LabelLink" id="fieldPaymLink2" style="xx" title="xx">
                                         <span id="fieldPayment2">xx14500.34</span>
                                       </a>
                                     </td>
@@ -1225,18 +1236,23 @@
                 </table>
 
                       <!-- USER CONTROLS -->
-                </td>
+                <table class="Main_Client_TableEdition">
+			      <tr>
+				   <td>					
+				    <div id="paramShowOneAsterisk" style="xx" class="RelationInfoContent">* Invoice paid using a credit payment</div>
+				    <div id="paramShowTwoAsterisk" style="xx" class="RelationInfoContent">** Several invoices have been paid using the same credit payment</div>
+				   </td>
+				  </tr>
+			  </table>		
               </tr>
               </table>
-              </td>
-            </tr>
-          </table>
-        </div>
+        
         <table width="100%" border="0" cellspacing="0" cellpadding="0" class="Menu_ContentPane_Bottom" id="tdbottomSeparator">
           <tr>
-            <td class="Main_Bottom_bg"><img src="../../../../../web/images/blank.gif" border="0"></td>
+            <td class="Main_Bottom_bg"><img src="../../../../../web/images/blank.gif" border="0"/></td>
           </tr>
         </table>
+	</div>
       </td>
       <td valign="top">
         <table width="100%" border="0" cellspacing="0" cellpadding="0" class="Main_ContentPane_Right" id="tdrightSeparator">
--- a/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.java	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.java	Sat Nov 12 15:43:15 2011 +0100
@@ -112,11 +112,13 @@
       String strOrdCrit = vars.getInGlobalVariable("inpShown", "PaymentReport|OrdCrit", "",
           new ValueListFilter("Date", "APRM_FATS_BPARTNER", "Project", "INS_CURRENCY",
               "FINPR_BPartner_Category", ""));
+      final String strInclPaymentUsingCredit = vars.getGlobalVariable("inpInclPaymentUsingCredit",
+          "PaymentReport|IncludePaymentUsingCredit", "Y");
       printPageDataSheet(response, vars, strOrg, strInclSubOrg, strDueDateFrom, strDueDateTo,
           strAmountFrom, strAmountTo, strDocumentDateFrom, strDocumentDateTo, strcBPartnerIdIN,
           strcBPGroupIdIN, strcProjectIdIN, strfinPaymSt, strPaymentMethodId,
           strFinancialAccountId, strcCurrency, strConvertCurrency, strConversionDate, strPaymType,
-          strOverdue, strGroupCrit, strOrdCrit);
+          strOverdue, strGroupCrit, strOrdCrit, strInclPaymentUsingCredit);
     } else if (vars.commandIn("FIND")) {
       String strOrg = vars.getRequestGlobalVariable("inpOrg", "PaymentReport|Organization");
       String strInclSubOrg = vars.getRequestGlobalVariable("inpInclSubOrg",
@@ -166,11 +168,14 @@
       String strOrdCrit = vars.getRequestInGlobalVariable("inpShown", "PaymentReport|OrdCrit",
           new ValueListFilter("Date", "APRM_FATS_BPARTNER", "Project", "INS_CURRENCY",
               "FINPR_BPartner_Category", ""));
+      final String strInclPaymentUsingCredit = vars.getStringParameter("inpInclPaymentUsingCredit",
+          "N");
+      vars.setSessionValue("PaymentReport|IncludePaymentUsingCredit", strInclPaymentUsingCredit);
       printPageDataSheet(response, vars, strOrg, strInclSubOrg, strDueDateFrom, strDueDateTo,
           strAmountFrom, strAmountTo, strDocumentDateFrom, strDocumentDateTo, strcBPartnerIdIN,
           strcBPGroupIdIN, strcProjectIdIN, strfinPaymSt, strPaymentMethodId,
           strFinancialAccountId, strcCurrency, strConvertCurrency, strConversionDate, strPaymType,
-          strOverdue, strGroupCrit, strOrdCrit);
+          strOverdue, strGroupCrit, strOrdCrit, strInclPaymentUsingCredit);
     } else if (vars.commandIn("PDF", "XLS")) {
       String strOrg = vars.getRequestGlobalVariable("inpOrg", "PaymentReport|Organization");
       String strInclSubOrg = vars.getRequestGlobalVariable("inpInclSubOrg",
@@ -215,6 +220,9 @@
           new ValueListFilter("Date", "APRM_FATS_BPARTNER", "Project", "INS_CURRENCY",
               "FINPR_BPartner_Category", ""));
       String strOutput = "html";
+      final String strInclPaymentUsingCredit = vars.getStringParameter("inpInclPaymentUsingCredit",
+          "N");
+      vars.setSessionValue("PaymentReport|IncludePaymentUsingCredit", strInclPaymentUsingCredit);
       if (vars.commandIn("PDF"))
         strOutput = "pdf";
       else if (vars.commandIn("XLS"))
@@ -224,7 +232,7 @@
           strAmountFrom, strAmountTo, strDocumentDateFrom, strDocumentDateTo, strcBPartnerIdIN,
           strcBPGroupIdIN, strcProjectIdIN, strfinPaymSt, strPaymentMethodId,
           strFinancialAccountId, strcCurrency, strConvertCurrency, strConversionDate, strPaymType,
-          strOverdue, strOutput, strGroupCrit, strOrdCrit);
+          strOverdue, strOutput, strGroupCrit, strOrdCrit, strInclPaymentUsingCredit);
 
     } else if (vars.commandIn("LINK")) {
       String strTableId = vars.getRequiredStringParameter("inpAdTableId", IsIDFilter.instance);
@@ -254,7 +262,7 @@
       String strcProjectIdIN, String strfinPaymSt, String strPaymentMethodId,
       String strFinancialAccountId, String strcCurrency, String strConvertCurrency,
       String strConversionDate, String strPaymType, String strOverdue, String strGroupCrit,
-      String strOrdCrit) throws IOException, ServletException {
+      String strOrdCrit, String strInclPaymentUsingCredit) throws IOException, ServletException {
     if (log4j.isDebugEnabled())
       log4j.debug("Output: dataSheet");
     XmlDocument xmlDocument = null;
@@ -269,7 +277,7 @@
           strAmountFrom, strAmountTo, strDocumentDateFrom, strDocumentDateTo, strcBPartnerIdIN,
           strcBPGroupIdIN, strcProjectIdIN, strfinPaymSt, strPaymentMethodId,
           strFinancialAccountId, strcCurrency, strConvertCurrency, strConversionDate, strPaymType,
-          strOverdue, strGroupCrit, strOrdCrit);
+          strOverdue, strGroupCrit, strOrdCrit, strInclPaymentUsingCredit);
 
       if (data.length == 0) {
 
@@ -510,6 +518,7 @@
     xmlDocument
         .setParameter("conversionDatedisplaySave", vars.getSessionValue("#AD_SqlDateFormat"));
     xmlDocument.setParameter("paymType", strPaymType);
+    xmlDocument.setParameter("inclPaymentUsingCredit", strInclPaymentUsingCredit);
 
     Vector<Object> vector = new Vector<Object>(0);
     SQLReturnObject sqlRO = new SQLReturnObject();
@@ -601,12 +610,30 @@
     xmlDocument.setData("reportOrdCrit", "liststructure", objectListData);
     xmlDocument.setData("reportShown", "liststructure", PaymentReportDao.getObjectList(strOrdCrit));
 
+    xmlDocument.setParameter("showOneAsterisk", showAsterisk(data, "*") ? "" : "Display:none");
+    xmlDocument.setParameter("showTwoAsterisk", showAsterisk(data, "**") ? "" : "Display:none");
+
     response.setContentType("text/html; charset=UTF-8");
     PrintWriter out = response.getWriter();
     out.println(xmlDocument.print());
     out.close();
   }
 
+  private boolean showAsterisk(FieldProvider[] data, String asterisk) {
+    if (asterisk == null || "".equals(asterisk) || data == null)
+      return false;
+    boolean showAsterisk = false;
+    for (final FieldProvider fp : data) {
+      if (fp.getField("INVOICE_NUMBER") != null && !"".equals(fp.getField("INVOICE_NUMBER"))
+          && fp.getField("INVOICE_NUMBER").length() >= asterisk.length()
+          && asterisk.equals(fp.getField("INVOICE_NUMBER").substring(0, asterisk.length()))) {
+        showAsterisk = true;
+        break;
+      }
+    }
+    return showAsterisk;
+  }
+
   private void printPage(HttpServletRequest request, HttpServletResponse response,
       VariablesSecureApp vars, String strOrg, String strInclSubOrg, String strDueDateFrom,
       String strDueDateTo, String strAmountFrom, String strAmountTo, String strDocumentDateFrom,
@@ -614,7 +641,8 @@
       String strcProjectIdIN, String strfinPaymSt, String strPaymentMethodId,
       String strFinancialAccountId, String strcCurrency, String strConvertCurrency,
       String strConversionDate, String strPaymType, String strOverdue, String strOutput,
-      String strGroupCrit, String strOrdCrit) throws IOException, ServletException {
+      String strGroupCrit, String strOrdCrit, String strInclPaymentUsingCredit) throws IOException,
+      ServletException {
 
     response.setContentType("text/html; charset=UTF-8");
 
@@ -623,7 +651,7 @@
         strDueDateTo, strAmountFrom, strAmountTo, strDocumentDateFrom, strDocumentDateTo,
         strcBPartnerIdIN, strcBPGroupIdIN, strcProjectIdIN, strfinPaymSt, strPaymentMethodId,
         strFinancialAccountId, strcCurrency, strConvertCurrency, strConversionDate, strPaymType,
-        strOverdue, strGroupCrit, strOrdCrit);
+        strOverdue, strGroupCrit, strOrdCrit, strInclPaymentUsingCredit);
 
     if (data.length == 1 && data[0] == null) {
 
@@ -793,6 +821,14 @@
       parameters.put("OVERDUE_SHOW", Utility.messageBD(this, "No", vars.getLanguage()));
     parameters.put("GROUPCRIT_SHOW", Utility.messageBD(this, strGroupCrit, vars.getLanguage()));
     parameters.put("ORDCRIT_SHOW", strOrdCritShow);
+    if ("Y".equals(strInclPaymentUsingCredit)) {
+      parameters.put("INCL_PAYMENTUSINGCREDIT", Utility.messageBD(this, "Yes", vars.getLanguage()));
+    } else {
+      parameters.put("INCL_PAYMENTUSINGCREDIT", Utility.messageBD(this, "No", vars.getLanguage()));
+    }
+
+    parameters.put("ONE_ASTERISK_SHOW", new Boolean(showAsterisk(data, "*")));
+    parameters.put("TWO_ASTERISK_SHOW", new Boolean(showAsterisk(data, "**")));
 
     renderJR(vars, response, strReportName, strOutput, parameters, data, null);
   }
--- a/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.xml	Sat Nov 12 15:43:15 2011 +0100
@@ -50,6 +50,9 @@
   <PARAMETER id="paramDocumentDateTo" name="documentDateTo" attribute="value"/>
   <PARAMETER id="paramDocumentDateTo" name="documentDateTodisplaySave" attribute="displayformat" replace="xx"/>
   <PARAMETER id="paramDocumentDateTo" name="documentDateTodisplaySave" attribute="saveformat" replace="yy"/>
+
+  <PARAMETER id="parameterInclPaymentUsingCredit" name="pinclPaymentUsingCredit" default="Y"/>
+  <PARAMETER id="paramInclPaymentUsingCredit" name="inclPaymentUsingCredit" boolean="checked" withId="parameterInclPaymentUsingCredit" default="Y"/>
   
   <PARAMETER id="paramcBPartnerId_INselected" name="paramcBPartnerId_INselected" default=""/>
   <SUBREPORT id="paramcBPartnerId_IN" name="paramcBPartnerId_IN" report="org/openbravo/erpCommon/reference/List">
@@ -124,6 +127,8 @@
     <FIELD id="fieldInvLink" attribute="onclick" replace="yy">ISRECEIPT</FIELD>
     <FIELD id="fieldInvLink" attribute="style" replace="xx">PAYMENT_PLAN_Y_N</FIELD>
     <FIELD id="fieldInvoiceNumber">INVOICE_NUMBER</FIELD>
+    <FIELD id="fieldInvoiceNumber_nolink">INVOICE_NUMBER</FIELD>
+    <FIELD id="fieldInvoiceNumber_nolink" attribute="style" replace="xx">NOT_PAYMENT_PLAN_Y_N</FIELD>
     
     <FIELD id="fieldInvoiceDate">INVOICE_DATE</FIELD>
     
@@ -131,6 +136,7 @@
     <FIELD id="fieldPaymLink" attribute="onclick" replace="zz">PAYMENT_ID</FIELD>
     <FIELD id="fieldPaymLink" attribute="onclick" replace="yy">ISRECEIPT</FIELD>
     <FIELD id="fieldPaymLink" attribute="style" replace="xx">PAYMENT_Y_N</FIELD>
+    <FIELD id="fieldPaymLink" attribute="title" replace="xx">PAYMENT_DESC</FIELD>
     
     <FIELD id="fieldDueDate">DUE_DATE</FIELD>
     <FIELD id="fieldPlannedDSO">PLANNED_DSO</FIELD>
@@ -163,12 +169,15 @@
     <FIELD id="fieldInvLink2" attribute="onclick" replace="yy">ISRECEIPT</FIELD>
     <FIELD id="fieldInvLink2" attribute="style" replace="xx">PAYMENT_PLAN_Y_N</FIELD>
     <FIELD id="fieldInvoiceNumber2">INVOICE_NUMBER</FIELD>
+    <FIELD id="fieldInvoiceNumber2_nolink">INVOICE_NUMBER</FIELD>
+    <FIELD id="fieldInvoiceNumber2_nolink" attribute="style" replace="xx">NOT_PAYMENT_PLAN_Y_N</FIELD>
     
     <FIELD id="fieldInvoiceDate2">INVOICE_DATE</FIELD>
     
     <FIELD id="fieldPaymLink2" attribute="onclick" replace="zz">PAYMENT_ID</FIELD>
     <FIELD id="fieldPaymLink2" attribute="onclick" replace="yy">ISRECEIPT</FIELD>
     <FIELD id="fieldPaymLink2" attribute="style" replace="xx">PAYMENT_Y_N</FIELD>
+    <FIELD id="fieldPaymLink2" attribute="title" replace="xx">PAYMENT_DESC</FIELD>
     <FIELD id="fieldPayment2">PAYMENT</FIELD>
     
     <FIELD id="fieldDueDate2">DUE_DATE</FIELD>
@@ -196,6 +205,9 @@
     <SECTION id="sectionStatus2" field="STATUS"/>
     <SECTION id="sectionDetail2"/>
   </structure>
-  
+
+   
+  <PARAMETER id="paramShowOneAsterisk" name="showOneAsterisk" attribute="style" replace="xx"/>
+  <PARAMETER id="paramShowTwoAsterisk" name="showTwoAsterisk" attribute="style" replace="xx"/>  
   <DISCARD id="discard"/>
 </REPORT>
--- a/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java	Sat Nov 12 15:43:15 2011 +0100
@@ -22,12 +22,15 @@
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.Vector;
 
+import org.hibernate.Query;
+import org.hibernate.Session;
 import org.hibernate.criterion.Restrictions;
 import org.openbravo.advpaymentmngt.utility.FIN_Utility;
 import org.openbravo.base.secureApp.VariablesSecureApp;
@@ -62,6 +65,8 @@
 
 public class PaymentReportDao {
 
+  private static final long milisecDayConv = (1000 * 60 * 60 * 24);
+
   public PaymentReportDao() {
   }
 
@@ -76,6 +81,20 @@
       String strPaymentMethodId, String strFinancialAccountId, String strcCurrency,
       String strConvertCurrency, String strConversionDate, String strPaymType, String strOverdue,
       String strGroupCrit, String strOrdCrit) {
+    return getPaymentReport(vars, strOrg, strInclSubOrg, strDueDateFrom, strDueDateTo,
+        strAmountFrom, strAmountTo, strDocumentDateFrom, strDocumentDateTo, strcBPartnerIdIN,
+        strcBPGroupIdIN, strcProjectIdIN, strfinPaymSt, strPaymentMethodId, strFinancialAccountId,
+        strcCurrency, strConvertCurrency, strConversionDate, strPaymType, strOverdue, strGroupCrit,
+        strOrdCrit, "Y");
+  }
+
+  public FieldProvider[] getPaymentReport(VariablesSecureApp vars, String strOrg,
+      String strInclSubOrg, String strDueDateFrom, String strDueDateTo, String strAmountFrom,
+      String strAmountTo, String strDocumentDateFrom, String strDocumentDateTo,
+      String strcBPartnerIdIN, String strcBPGroupIdIN, String strcProjectIdIN, String strfinPaymSt,
+      String strPaymentMethodId, String strFinancialAccountId, String strcCurrency,
+      String strConvertCurrency, String strConversionDate, String strPaymType, String strOverdue,
+      String strGroupCrit, String strOrdCrit, String strInclPaymentUsingCredit) {
 
     final StringBuilder hsqlScript = new StringBuilder();
     final java.util.List<Object> parameters = new ArrayList<Object>();
@@ -84,10 +103,6 @@
         .getProperty("dateFormat.java");
     SimpleDateFormat dateFormat = new SimpleDateFormat(dateFormatString);
     FieldProvider[] data;
-    Date invoicedDate;
-    long plannedDSO = 0;
-    long currentDSO = 0;
-    long currentTime = 0;
     Currency transCurrency;
     BigDecimal transAmount = null;
     ConversionRate convRate = null;
@@ -139,6 +154,12 @@
         }
       }
 
+      // Exclude payments that use credit payment
+      if (!strInclPaymentUsingCredit.equalsIgnoreCase("Y")) {
+        hsqlScript.append(" and not (pay.amount = 0 ");
+        hsqlScript.append(" and pay.usedCredit > pay.generatedCredit) ");
+      }
+
       // due date from - due date to
       if (!strDueDateFrom.isEmpty()) {
         hsqlScript.append(" and invps.");
@@ -381,7 +402,6 @@
       BigDecimal amountSum = BigDecimal.ZERO;
       FieldProvider previousRow = null;
       ConversionRate previousConvRate = null;
-      long milisecDayConv = (1000 * 60 * 60 * 24);
       boolean isReceipt = false;
       boolean isAmtInLimit = false;
 
@@ -408,11 +428,29 @@
               .getPaymentDetails().getFinPayment().getPaymentMethod().getIdentifier());
 
           // payment
-          FieldProviderFactory.setField(data[i], "PAYMENT", FIN_PaymentScheduleDetail[i]
-              .getPaymentDetails().getFinPayment().getIdentifier().toString());
+          FieldProviderFactory.setField(
+              data[i],
+              "PAYMENT",
+              dateFormat.format(FIN_PaymentScheduleDetail[i].getPaymentDetails().getFinPayment()
+                  .getPaymentDate())
+                  + " - "
+                  + FIN_PaymentScheduleDetail[i].getPaymentDetails().getFinPayment()
+                      .getDocumentNo());
+          // payment description
+          FieldProviderFactory.setField(data[i], "PAYMENT_DESC", FIN_PaymentScheduleDetail[i]
+              .getPaymentDetails().getFinPayment().getDescription());
           // payment_id
           FieldProviderFactory.setField(data[i], "PAYMENT_ID", FIN_PaymentScheduleDetail[i]
               .getPaymentDetails().getFinPayment().getId().toString());
+          // payment_date
+          FieldProviderFactory.setField(
+              data[i],
+              "PAYMENT_DATE",
+              dateFormat.format(FIN_PaymentScheduleDetail[i].getPaymentDetails().getFinPayment()
+                  .getPaymentDate()));
+          // payment_docNo
+          FieldProviderFactory.setField(data[i], "PAYMENT_DOCNO", FIN_PaymentScheduleDetail[i]
+              .getPaymentDetails().getFinPayment().getDocumentNo());
           // payment yes / no
           FieldProviderFactory.setField(data[i], "PAYMENT_Y_N", "");
           // financialAccount
@@ -449,6 +487,10 @@
           FieldProviderFactory.setField(data[i], "PAYMENT", "");
           // payment_id
           FieldProviderFactory.setField(data[i], "PAYMENT_ID", "");
+          // payment_date
+          FieldProviderFactory.setField(data[i], "PAYMENT_DATE", "");
+          // payment_docNo
+          FieldProviderFactory.setField(data[i], "PAYMENT_DOCNO", "");
           // payment yes / no
           FieldProviderFactory.setField(data[i], "PAYMENT_Y_N", "Display:None");
           // financialAccount
@@ -469,59 +511,42 @@
         }
 
         if (FIN_PaymentScheduleDetail[i].getInvoicePaymentSchedule() != null) {
-          // project
-          if (FIN_PaymentScheduleDetail[i].getInvoicePaymentSchedule().getInvoice().getProject() != null)
-            FieldProviderFactory.setField(data[i], "PROJECT", FIN_PaymentScheduleDetail[i]
-                .getInvoicePaymentSchedule().getInvoice().getProject().getIdentifier());
-          else
+          fillLine(dateFormat, data[i], FIN_PaymentScheduleDetail[i],
+              FIN_PaymentScheduleDetail[i].getInvoicePaymentSchedule(), false);
+        } else if (FIN_PaymentScheduleDetail[i].getPaymentDetails().getFinPayment() != null) {
+          java.util.List<Invoice> invoices = getInvoicesUsingCredit(FIN_PaymentScheduleDetail[i]
+              .getPaymentDetails().getFinPayment());
+          if (invoices.size() == 1) {
+            FIN_PaymentSchedule ps = getInvoicePaymentSchedule(FIN_PaymentScheduleDetail[i]
+                .getPaymentDetails().getFinPayment());
+            fillLine(dateFormat, data[i], FIN_PaymentScheduleDetail[i], ps, true);
+          } else {
+            // project
             FieldProviderFactory.setField(data[i], "PROJECT", "");
-          // salesPerson
-          if (FIN_PaymentScheduleDetail[i].getInvoicePaymentSchedule().getInvoice()
-              .getSalesRepresentative() != null) {
-            FieldProviderFactory.setField(data[i], "SALES_PERSON", FIN_PaymentScheduleDetail[i]
-                .getInvoicePaymentSchedule().getInvoice().getSalesRepresentative().getIdentifier());
-          } else {
+            // salesPerson
             FieldProviderFactory.setField(data[i], "SALES_PERSON", "");
+            // invoiceNumber.
+            FieldProviderFactory.setField(data[i], "INVOICE_NUMBER", invoices.size() > 1 ? "**"
+                + getInvoicesDocNos(invoices) : "");
+            // payment plan id
+            FieldProviderFactory.setField(data[i], "PAYMENT_PLAN_ID", "");
+            // payment plan yes / no
+            FieldProviderFactory.setField(data[i], "PAYMENT_PLAN_Y_N",
+                invoices.size() != 1 ? "Display:none" : "");
+            // payment plan yes / no
+            FieldProviderFactory.setField(data[i], "NOT_PAYMENT_PLAN_Y_N", invoices.size() > 1 ? ""
+                : "Display:none");
+            // invoiceDate
+            FieldProviderFactory.setField(data[i], "INVOICE_DATE", "");
+            // dueDate.
+            FieldProviderFactory.setField(data[i], "DUE_DATE", "");
+            // plannedDSO
+            FieldProviderFactory.setField(data[i], "PLANNED_DSO", "0");
+            // currentDSO
+            FieldProviderFactory.setField(data[i], "CURRENT_DSO", "0");
+            // daysOverdue
+            FieldProviderFactory.setField(data[i], "OVERDUE", "0");
           }
-          // invoiceNumber
-          FieldProviderFactory.setField(data[i], "INVOICE_NUMBER", FIN_PaymentScheduleDetail[i]
-              .getInvoicePaymentSchedule().getInvoice().getDocumentNo());
-          // payment plan id
-          FieldProviderFactory.setField(data[i], "PAYMENT_PLAN_ID", FIN_PaymentScheduleDetail[i]
-              .getInvoicePaymentSchedule().getId());
-          // payment plan yes / no
-          FieldProviderFactory.setField(data[i], "PAYMENT_PLAN_Y_N", "");
-          // invoiceDate
-          invoicedDate = FIN_PaymentScheduleDetail[i].getInvoicePaymentSchedule().getInvoice()
-              .getInvoiceDate();
-          FieldProviderFactory.setField(data[i], "INVOICE_DATE", dateFormat.format(invoicedDate)
-              .toString());
-          // dueDate
-          FieldProviderFactory
-              .setField(
-                  data[i],
-                  "DUE_DATE",
-                  dateFormat.format(
-                      FIN_PaymentScheduleDetail[i].getInvoicePaymentSchedule().getDueDate())
-                      .toString());
-          // plannedDSO
-          plannedDSO = (FIN_PaymentScheduleDetail[i].getInvoicePaymentSchedule().getDueDate()
-              .getTime() - invoicedDate.getTime())
-              / milisecDayConv;
-          FieldProviderFactory.setField(data[i], "PLANNED_DSO", String.valueOf(plannedDSO));
-          // currentDSO
-          if (FIN_PaymentScheduleDetail[i].getPaymentDetails() != null) {
-            currentDSO = (FIN_PaymentScheduleDetail[i].getPaymentDetails().getFinPayment()
-                .getPaymentDate().getTime() - invoicedDate.getTime())
-                / milisecDayConv;
-          } else {
-            currentTime = System.currentTimeMillis();
-            currentDSO = (currentTime - invoicedDate.getTime()) / milisecDayConv;
-          }
-          FieldProviderFactory.setField(data[i], "CURRENT_DSO", String.valueOf((currentDSO)));
-          // daysOverdue
-          FieldProviderFactory.setField(data[i], "OVERDUE",
-              String.valueOf((currentDSO - plannedDSO)));
         } else {
           // project
           FieldProviderFactory.setField(data[i], "PROJECT", "");
@@ -533,6 +558,8 @@
           FieldProviderFactory.setField(data[i], "PAYMENT_PLAN_ID", "");
           // payment plan yes / no
           FieldProviderFactory.setField(data[i], "PAYMENT_PLAN_Y_N", "Display:none");
+          // payment plan yes / no
+          FieldProviderFactory.setField(data[i], "NOT_PAYMENT_PLAN_Y_N", "Display:none");
           // invoiceDate
           FieldProviderFactory.setField(data[i], "INVOICE_DATE", "");
           // dueDate.
@@ -558,15 +585,22 @@
           convRate = this.getConversionRate(transCurrency, baseCurrency, strConversionDate);
 
           if (convRate != null) {
+            final int stdPrecission = convRate.getToCurrency().getStandardPrecision().intValue();
             if (isReceipt) {
               FieldProviderFactory.setField(data[i], "TRANS_AMOUNT", transAmount.toString());
-              FieldProviderFactory.setField(data[i], "BASE_AMOUNT",
-                  transAmount.multiply(convRate.getMultipleRateBy()).toString());
+              FieldProviderFactory.setField(
+                  data[i],
+                  "BASE_AMOUNT",
+                  transAmount.multiply(convRate.getMultipleRateBy())
+                      .setScale(stdPrecission, BigDecimal.ROUND_HALF_UP).toString());
             } else {
               FieldProviderFactory.setField(data[i], "TRANS_AMOUNT", transAmount.negate()
                   .toString());
-              FieldProviderFactory.setField(data[i], "BASE_AMOUNT",
-                  transAmount.multiply(convRate.getMultipleRateBy()).negate().toString());
+              FieldProviderFactory.setField(
+                  data[i],
+                  "BASE_AMOUNT",
+                  transAmount.multiply(convRate.getMultipleRateBy())
+                      .setScale(stdPrecission, BigDecimal.ROUND_HALF_UP).negate().toString());
             }
           } else {
             FieldProvider[] fp = new FieldProvider[1];
@@ -642,12 +676,20 @@
                 FieldProviderFactory.setField(previousRow, "BASE_AMOUNT", amountSum.negate()
                     .toString());
             } else {
+              final int stdPrecission = previousConvRate.getToCurrency().getStandardPrecision()
+                  .intValue();
               if (previousRow.getField("ISRECEIPT").equalsIgnoreCase("Y"))
-                FieldProviderFactory.setField(previousRow, "BASE_AMOUNT",
-                    amountSum.multiply(previousConvRate.getMultipleRateBy()).toString());
+                FieldProviderFactory.setField(
+                    previousRow,
+                    "BASE_AMOUNT",
+                    amountSum.multiply(previousConvRate.getMultipleRateBy())
+                        .setScale(stdPrecission, BigDecimal.ROUND_HALF_UP).toString());
               else
-                FieldProviderFactory.setField(previousRow, "BASE_AMOUNT",
-                    amountSum.multiply(previousConvRate.getMultipleRateBy()).negate().toString());
+                FieldProviderFactory.setField(
+                    previousRow,
+                    "BASE_AMOUNT",
+                    amountSum.multiply(previousConvRate.getMultipleRateBy())
+                        .setScale(stdPrecission, BigDecimal.ROUND_HALF_UP).negate().toString());
             }
 
             if (strAmountFrom.isEmpty() && strAmountTo.isEmpty()) {
@@ -710,12 +752,20 @@
             FieldProviderFactory
                 .setField(previousRow, "BASE_AMOUNT", amountSum.negate().toString());
         } else {
+          final int stdPrecission = previousConvRate.getToCurrency().getStandardPrecision()
+              .intValue();
           if (previousRow.getField("ISRECEIPT").equalsIgnoreCase("Y"))
-            FieldProviderFactory.setField(previousRow, "BASE_AMOUNT",
-                amountSum.multiply(previousConvRate.getMultipleRateBy()).toString());
+            FieldProviderFactory.setField(
+                previousRow,
+                "BASE_AMOUNT",
+                amountSum.multiply(previousConvRate.getMultipleRateBy())
+                    .setScale(stdPrecission, BigDecimal.ROUND_HALF_UP).toString());
           else
-            FieldProviderFactory.setField(previousRow, "BASE_AMOUNT",
-                amountSum.multiply(previousConvRate.getMultipleRateBy()).negate().toString());
+            FieldProviderFactory.setField(
+                previousRow,
+                "BASE_AMOUNT",
+                amountSum.multiply(previousConvRate.getMultipleRateBy())
+                    .setScale(stdPrecission, BigDecimal.ROUND_HALF_UP).negate().toString());
         }
 
         if (strAmountFrom.isEmpty() && strAmountTo.isEmpty()) {
@@ -743,6 +793,58 @@
     return (FieldProvider[]) groupedData.toArray(new FieldProvider[groupedData.size()]);
   }
 
+  private void fillLine(SimpleDateFormat dateFormat, FieldProvider data,
+      FIN_PaymentScheduleDetail fIN_PaymentScheduleDetail, FIN_PaymentSchedule paymentSchedule,
+      boolean creditPaysInvoice) {
+    Date invoicedDate;
+    long plannedDSO = 0;
+    long currentDSO = 0;
+    long currentTime = 0;
+    // project
+    if (paymentSchedule.getInvoice().getProject() != null)
+      FieldProviderFactory.setField(data, "PROJECT", paymentSchedule.getInvoice().getProject()
+          .getIdentifier());
+    else
+      FieldProviderFactory.setField(data, "PROJECT", "");
+    // salesPerson
+    if (paymentSchedule.getInvoice().getSalesRepresentative() != null) {
+      FieldProviderFactory.setField(data, "SALES_PERSON", paymentSchedule.getInvoice()
+          .getSalesRepresentative().getIdentifier());
+    } else {
+      FieldProviderFactory.setField(data, "SALES_PERSON", "");
+    }
+    // invoiceNumber
+    FieldProviderFactory.setField(data, "INVOICE_NUMBER", (creditPaysInvoice ? "*" : "")
+        + paymentSchedule.getInvoice().getDocumentNo());
+    // payment plan id
+    FieldProviderFactory.setField(data, "PAYMENT_PLAN_ID", paymentSchedule.getId());
+    // payment plan yes / no
+    FieldProviderFactory.setField(data, "PAYMENT_PLAN_Y_N", "");
+    // payment plan yes / no
+    FieldProviderFactory.setField(data, "NOT_PAYMENT_PLAN_Y_N", "Display:none");
+    // invoiceDate
+    invoicedDate = paymentSchedule.getInvoice().getInvoiceDate();
+    FieldProviderFactory.setField(data, "INVOICE_DATE", dateFormat.format(invoicedDate).toString());
+    // dueDate
+    FieldProviderFactory.setField(data, "DUE_DATE", dateFormat.format(paymentSchedule.getDueDate())
+        .toString());
+    // plannedDSO
+    plannedDSO = (paymentSchedule.getDueDate().getTime() - invoicedDate.getTime()) / milisecDayConv;
+    FieldProviderFactory.setField(data, "PLANNED_DSO", String.valueOf(plannedDSO));
+    // currentDSO
+    if (fIN_PaymentScheduleDetail.getPaymentDetails() != null) {
+      currentDSO = (fIN_PaymentScheduleDetail.getPaymentDetails().getFinPayment().getPaymentDate()
+          .getTime() - invoicedDate.getTime())
+          / milisecDayConv;
+    } else {
+      currentTime = System.currentTimeMillis();
+      currentDSO = (currentTime - invoicedDate.getTime()) / milisecDayConv;
+    }
+    FieldProviderFactory.setField(data, "CURRENT_DSO", String.valueOf((currentDSO)));
+    // daysOverdue
+    FieldProviderFactory.setField(data, "OVERDUE", String.valueOf((currentDSO - plannedDSO)));
+  }
+
   public ConversionRate getConversionRate(Currency transCurrency, Currency baseCurrency,
       String conversionDate) {
 
@@ -900,6 +1002,60 @@
     }
   }
 
+  public java.util.List<Invoice> getInvoicesUsingCredit(final FIN_Payment payment) {
+    final StringBuilder sql = new StringBuilder();
+    final java.util.List<Invoice> result = new ArrayList<Invoice>();
+
+    sql.append(" select distinct(pdv.invoicePaymentPlan.invoice.id) ");
+    sql.append(" from FIN_Payment_Credit pc, FIN_Payment p0, ");
+    sql.append("      FIN_Payment p1, FIN_Payment_Detail_V pdv  ");
+    sql.append(" where p0.id=pc.creditPaymentUsed ");
+    sql.append(" and pc.payment=p1.id ");
+    sql.append(" and pdv.payment=p1.id ");
+    sql.append(" and p0.id = '" + payment.getId() + "' ");
+
+    try {
+      OBContext.setAdminMode(true);
+      final Session session = OBDal.getInstance().getSession();
+      final Query query = session.createQuery(sql.toString());
+      for (final Object o : query.list()) {
+        result.add(OBDal.getInstance().get(Invoice.class, (String) o));
+      }
+
+      return result;
+    } finally {
+      OBContext.restorePreviousMode();
+    }
+  }
+
+  public FIN_PaymentSchedule getInvoicePaymentSchedule(FIN_Payment credit_payment) {
+    final StringBuilder sql = new StringBuilder();
+    sql.append(" select ps ");
+    sql.append(" from FIN_Payment_Credit pc, FIN_Payment_Detail_V pdv, ");
+    sql.append(" FIN_Payment_Schedule ps ");
+    sql.append(" where pc.payment = pdv.payment ");
+    sql.append(" and ps.id = pdv.invoicePaymentPlan ");
+    sql.append(" and pc.creditPaymentUsed.id = '" + credit_payment.getId() + "' ");
+
+    try {
+      OBContext.setAdminMode(true);
+      final Session session = OBDal.getInstance().getSession();
+      final Query query = session.createQuery(sql.toString());
+      return (FIN_PaymentSchedule) query.uniqueResult();
+    } finally {
+      OBContext.restorePreviousMode();
+    }
+  }
+
+  public String getInvoicesDocNos(Collection<Invoice> invoices) {
+    final StringBuilder sb = new StringBuilder();
+    for (Invoice i : invoices) {
+      sb.append(i.getDocumentNo());
+      sb.append(", ");
+    }
+    return sb.delete(sb.length() - 2, sb.length()).toString();
+  }
+
   private BusinessPartner getDocumentBusinessPartner(FIN_PaymentScheduleDetail psd) {
     BusinessPartner bp = null;
     if (psd.getInvoicePaymentSchedule() != null) { // Invoice
--- a/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml	Sat Nov 12 15:43:15 2011 +0100
@@ -6,9 +6,9 @@
 		 columnCount="1"
 		 printOrder="Vertical"
 		 orientation="Landscape"
-		 pageWidth="1062"
+		 pageWidth="1385"
 		 pageHeight="595"
-		 columnWidth="1002"
+		 columnWidth="1325"
 		 columnSpacing="0"
 		 leftMargin="30"
 		 rightMargin="30"
@@ -194,6 +194,12 @@
 	<parameter name="OVERDUE_SHOW" isForPrompting="false" class="java.lang.String"/>
 	<parameter name="GROUPCRIT_SHOW" isForPrompting="false" class="java.lang.String"/>
 	<parameter name="ORDCRIT_SHOW" isForPrompting="false" class="java.lang.String"/>
+	<parameter name="ONE_ASTERISK_SHOW" isForPrompting="false" class="java.lang.Boolean">
+		<defaultValueExpression ><![CDATA[new Boolean(false)]]></defaultValueExpression>
+	</parameter>
+	<parameter name="TWO_ASTERISK_SHOW" isForPrompting="false" class="java.lang.Boolean">
+		<defaultValueExpression ><![CDATA[new Boolean(false)]]></defaultValueExpression>
+	</parameter>
 	<queryString><![CDATA[SELECT 'hello' AS BP_GROUP, 'hello' AS BPARTNER, 'hello' AS PROJECT, 'hello' AS PAYMENT, 'hello' AS SALES_PERSON, 1234 AS INVOICE_NUMBER, to_Date('01/01/2010') AS INVOICE_DATE,
        to_Date('01/03/2010') AS DUE_DATE, 1234 AS PLANNED_DSO, 1234 AS CURRENT_DSO, 1234 AS OVERDUE, 1234 AS DAYS_OVERDUE, 1234 AS AMOUNT,
        'hello' AS CURRENCY, 1234 AS BASE_AMOUNT, 'hello' AS BASE_CURRENCY, 'hello' AS PAYMENT_METHOD, 'hello' AS FINANCIAL_ACCOUNT
@@ -219,6 +225,9 @@
 	<field name="FINANCIAL_ACCOUNT" class="java.lang.String"/>
 	<field name="GROUP_CRIT" class="java.lang.String"/>
 	<field name="STATUS" class="java.lang.String"/>
+	<field name="PAYMENT_DESC" class="java.lang.String"/>
+	<field name="PAYMENT_DATE" class="java.util.Date"/>
+	<field name="PAYMENT_DOCNO" class="java.lang.String"/>
 
 	<variable name="SUMSUBTOTALSTATUS" class="java.math.BigDecimal" resetType="Report" calculation="Sum">
 		<variableExpression><![CDATA[$F{BASE_AMOUNT}]]></variableExpression>
@@ -259,7 +268,7 @@
 				<staticText>
 					<reportElement
 						style="Detail_Header"
-						x="507"
+						x="523"
 						y="25"
 						width="65"
 						height="25"
@@ -273,9 +282,9 @@
 				<staticText>
 					<reportElement
 						style="Detail_Header"
-						x="327"
+						x="335"
 						y="25"
-						width="70"
+						width="78"
 						height="25"
 						key="staticText-5"/>
 					<box leftPadding="2"></box>
@@ -287,7 +296,7 @@
 				<staticText>
 					<reportElement
 						style="Detail_Header"
-						x="397"
+						x="413"
 						y="25"
 						width="55"
 						height="25"
@@ -302,7 +311,7 @@
 				<staticText>
 					<reportElement
 						style="Detail_Header"
-						x="452"
+						x="468"
 						y="25"
 						width="55"
 						height="25"
@@ -316,7 +325,7 @@
 				<staticText>
 					<reportElement
 						style="Detail_Header"
-						x="572"
+						x="895"
 						y="25"
 						width="62"
 						height="25"
@@ -330,7 +339,7 @@
 				<staticText>
 					<reportElement
 						style="Detail_Header"
-						x="634"
+						x="957"
 						y="25"
 						width="33"
 						height="25"
@@ -345,7 +354,7 @@
 				<staticText>
 					<reportElement
 						style="Detail_Header"
-						x="667"
+						x="990"
 						y="25"
 						width="33"
 						height="25"
@@ -360,7 +369,7 @@
 				<staticText>
 					<reportElement
 						style="Detail_Header"
-						x="700"
+						x="1023"
 						y="25"
 						width="36"
 						height="25"
@@ -374,7 +383,7 @@
 				<staticText>
 					<reportElement
 						style="Detail_Header"
-						x="876"
+						x="1199"
 						y="25"
 						width="80"
 						height="25"
@@ -389,7 +398,7 @@
 				<staticText>
 					<reportElement
 						style="Detail_Header"
-						x="956"
+						x="1279"
 						y="25"
 						width="46"
 						height="25"
@@ -404,7 +413,7 @@
 				<staticText>
 					<reportElement
 						style="Detail_Header"
-						x="736"
+						x="1059"
 						y="25"
 						width="80"
 						height="25"
@@ -419,7 +428,7 @@
 				<staticText>
 					<reportElement
 						style="Detail_Header"
-						x="816"
+						x="1139"
 						y="25"
 						width="60"
 						height="25"
@@ -477,7 +486,7 @@
 						style="Detail_Header"
 						x="251"
 						y="25"
-						width="76"
+						width="84"
 						height="25"
 						key="staticText-20"/>
 					<box leftPadding="2"></box>
@@ -486,6 +495,34 @@
 					</textElement>
 				<text><![CDATA[Project]]></text>
 				</staticText>
+				<staticText>
+					<reportElement
+						style="Detail_Header"
+						x="588"
+						y="25"
+						width="227"
+						height="25"
+						key="staticText-22"/>
+					<box leftPadding="2"></box>
+					<textElement textAlignment="Left" verticalAlignment="Middle">
+						<font size="8" isBold="false"/>
+					</textElement>
+				<text><![CDATA[Payment Description]]></text>
+				</staticText>
+				<staticText>
+					<reportElement
+						style="Detail_Header"
+						x="815"
+						y="25"
+						width="80"
+						height="25"
+						key="staticText-25"/>
+					<box leftPadding="2"></box>
+					<textElement textAlignment="Left" verticalAlignment="Middle">
+						<font size="8" isBold="false"/>
+					</textElement>
+				<text><![CDATA[Payment Date]]></text>
+				</staticText>
 			</band>
 		</pageHeader>
 		<columnHeader>
@@ -511,7 +548,7 @@
 				<textField isStretchWithOverflow="false" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						style="Report_Footer"
-						x="507"
+						x="523"
 						y="0"
 						width="65"
 						height="25"
@@ -520,14 +557,14 @@
 					<textElement>
 						<font size="8"/>
 					</textElement>
-				<textFieldExpression   class="java.lang.String"><![CDATA[($F{PAYMENT}==null ? " " : $F{PAYMENT})]]></textFieldExpression>
+				<textFieldExpression   class="java.lang.String"><![CDATA[$F{PAYMENT_DOCNO}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="false" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						style="Report_Footer"
-						x="327"
+						x="335"
 						y="0"
-						width="70"
+						width="78"
 						height="25"
 						key="textField-5"/>
 					<box leftPadding="2"></box>
@@ -539,7 +576,7 @@
 				<textField isStretchWithOverflow="false" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						style="Report_Footer"
-						x="397"
+						x="413"
 						y="0"
 						width="55"
 						height="25"
@@ -553,7 +590,7 @@
 				<textField isStretchWithOverflow="false" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						style="Report_Footer"
-						x="452"
+						x="468"
 						y="0"
 						width="55"
 						height="25"
@@ -567,7 +604,7 @@
 				<textField isStretchWithOverflow="false" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						style="Report_Footer"
-						x="572"
+						x="895"
 						y="0"
 						width="62"
 						height="25"
@@ -581,7 +618,7 @@
 				<textField isStretchWithOverflow="false" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						style="Report_Footer"
-						x="634"
+						x="957"
 						y="0"
 						width="33"
 						height="25"
@@ -595,7 +632,7 @@
 				<textField isStretchWithOverflow="false" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						style="Report_Footer"
-						x="667"
+						x="990"
 						y="0"
 						width="33"
 						height="25"
@@ -609,7 +646,7 @@
 				<textField isStretchWithOverflow="false" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						style="Report_Footer"
-						x="700"
+						x="1023"
 						y="0"
 						width="36"
 						height="25"
@@ -623,7 +660,7 @@
 				<textField isStretchWithOverflow="false" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						style="Report_Footer"
-						x="876"
+						x="1199"
 						y="0"
 						width="80"
 						height="25"
@@ -637,7 +674,7 @@
 				<textField isStretchWithOverflow="false" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						style="Report_Footer"
-						x="956"
+						x="1279"
 						y="0"
 						width="46"
 						height="25"
@@ -651,7 +688,7 @@
 				<textField isStretchWithOverflow="false" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						style="Report_Footer"
-						x="736"
+						x="1059"
 						y="0"
 						width="80"
 						height="25"
@@ -665,7 +702,7 @@
 				<textField isStretchWithOverflow="false" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
 					<reportElement
 						style="Report_Footer"
-						x="816"
+						x="1139"
 						y="0"
 						width="60"
 						height="25"
@@ -709,7 +746,7 @@
 						style="Report_Footer"
 						x="251"
 						y="0"
-						width="76"
+						width="84"
 						height="25"
 						key="textField-19"/>
 					<box leftPadding="2"></box>
@@ -718,6 +755,35 @@
 					</textElement>
 				<textFieldExpression   class="java.lang.String"><![CDATA[$F{PROJECT}]]></textFieldExpression>
 				</textField>
+				<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+					<reportElement
+						style="Report_Footer"
+						x="588"
+						y="0"
+						width="227"
+						height="25"
+						key="textField-21"
+						stretchType="RelativeToBandHeight"/>
+					<box leftPadding="2"></box>
+					<textElement>
+						<font size="8"/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[$F{PAYMENT_DESC}]]></textFieldExpression>
+				</textField>
+				<textField isStretchWithOverflow="false" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+					<reportElement
+						style="Report_Footer"
+						x="815"
+						y="0"
+						width="80"
+						height="25"
+						key="textField-22"/>
+					<box leftPadding="2"></box>
+					<textElement>
+						<font size="8"/>
+					</textElement>
+				<textFieldExpression   class="java.util.Date"><![CDATA[$F{PAYMENT_DATE}]]></textFieldExpression>
+				</textField>
 			</band>
 		</detail>
 		<columnFooter>
@@ -728,6 +794,42 @@
 			<band height="0"  isSplitAllowed="true" >
 			</band>
 		</pageFooter>
+		<lastPageFooter>
+			<band height="40"  isSplitAllowed="true" >
+				<staticText>
+					<reportElement
+						style="Report_Footer"
+						x="1"
+						y="1"
+						width="693"
+						height="17"
+						key="staticText-23">
+							<printWhenExpression><![CDATA[$P{ONE_ASTERISK_SHOW}]]></printWhenExpression>
+						</reportElement>
+					<box></box>
+					<textElement>
+						<font size="8"/>
+					</textElement>
+				<text><![CDATA[* Invoice paid using a credit payment]]></text>
+				</staticText>
+				<staticText>
+					<reportElement
+						style="Report_Footer"
+						x="1"
+						y="18"
+						width="693"
+						height="17"
+						key="staticText-24">
+							<printWhenExpression><![CDATA[$P{TWO_ASTERISK_SHOW}]]></printWhenExpression>
+						</reportElement>
+					<box></box>
+					<textElement>
+						<font size="8"/>
+					</textElement>
+				<text><![CDATA[** Several invoices have been paid using the same credit payment]]></text>
+				</staticText>
+			</band>
+		</lastPageFooter>
 		<summary>
 			<band height="0"  isSplitAllowed="true" >
 			</band>
--- a/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportPDF.jrxml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportPDF.jrxml	Sat Nov 12 15:43:15 2011 +0100
@@ -197,6 +197,13 @@
 	<parameter name="PAYMENT_METHOD_SHOW" isForPrompting="false" class="java.lang.String"/>
 	<parameter name="FINANCIAL_ACCOUNT_SHOW" isForPrompting="false" class="java.lang.String"/>
 	<parameter name="CONVERT_CURRENCY_SHOW" isForPrompting="false" class="java.lang.String"/>
+	<parameter name="INCL_PAYMENTUSINGCREDIT" isForPrompting="false" class="java.lang.String"/>
+	<parameter name="ONE_ASTERISK_SHOW" isForPrompting="false" class="java.lang.Boolean">
+		<defaultValueExpression ><![CDATA[new Boolean(false)]]></defaultValueExpression>
+	</parameter>
+	<parameter name="TWO_ASTERISK_SHOW" isForPrompting="false" class="java.lang.Boolean">
+		<defaultValueExpression ><![CDATA[new Boolean(false)]]></defaultValueExpression>
+	</parameter>
 	<queryString><![CDATA[SELECT 'hello' AS BP_GROUP, 'hello' AS BPARTNER, 'hello' AS PROJECT, 'hello' AS PAYMENT, 'hello' AS SALES_PERSON, 1234 AS INVOICE_NUMBER, to_Date('01/01/2010') AS INVOICE_DATE,
        to_Date('01/03/2010') AS DUE_DATE, 1234 AS PLANNED_DSO, 1234 AS CURRENT_DSO, 1234 AS OVERDUE, 1234 AS DAYS_OVERDUE, 1234 AS AMOUNT,
        'hello' AS CURRENCY, 1234 AS BASE_AMOUNT, 'hello' AS BASE_CURRENCY, 'hello' AS PAYMENT_METHOD, 'hello' AS FINANCIAL_ACCOUNT
@@ -385,6 +392,34 @@
 				<staticText>
 					<reportElement
 						style="Report_Footer"
+						x="408"
+						y="20"
+						width="179"
+						height="18"
+						key="staticText-50"/>
+					<box></box>
+					<textElement textAlignment="Right">
+						<font/>
+					</textElement>
+				<text><![CDATA[Include Payments Using Credit:]]></text>
+				</staticText>
+				<textField isStretchWithOverflow="false" isBlankWhenNull="true" evaluationTime="Now" hyperlinkType="None"  hyperlinkTarget="Self" >
+					<reportElement
+						style="Report_Footer"
+						x="593"
+						y="20"
+						width="179"
+						height="18"
+						key="textField-46"/>
+					<box></box>
+					<textElement>
+						<font/>
+					</textElement>
+				<textFieldExpression   class="java.lang.String"><![CDATA[$P{INCL_PAYMENTUSINGCREDIT}.toString()]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement
+						style="Report_Footer"
 						x="11"
 						y="40"
 						width="179"
@@ -1865,6 +1900,42 @@
 			<band height="0"  isSplitAllowed="true" >
 			</band>
 		</pageFooter>
+		<lastPageFooter>
+			<band height="40"  isSplitAllowed="true" >
+				<staticText>
+					<reportElement
+						style="Report_Footer"
+						x="3"
+						y="4"
+						width="693"
+						height="17"
+						key="staticText-51">
+							<printWhenExpression><![CDATA[$P{ONE_ASTERISK_SHOW}]]></printWhenExpression>
+						</reportElement>
+					<box></box>
+					<textElement>
+						<font size="8"/>
+					</textElement>
+				<text><![CDATA[* Invoice paid using a credit payment]]></text>
+				</staticText>
+				<staticText>
+					<reportElement
+						style="Report_Footer"
+						x="3"
+						y="21"
+						width="693"
+						height="17"
+						key="staticText-52">
+							<printWhenExpression><![CDATA[$P{TWO_ASTERISK_SHOW}]]></printWhenExpression>
+						</reportElement>
+					<box></box>
+					<textElement>
+						<font size="8"/>
+					</textElement>
+				<text><![CDATA[** Several invoices have been paid using the same credit payment]]></text>
+				</staticText>
+			</band>
+		</lastPageFooter>
 		<summary>
 			<band height="30"  isSplitAllowed="true" >
 				<staticText>
--- a/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Sat Nov 12 15:43:15 2011 +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.14195]]></VERSION>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.14223]]></VERSION>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <DESCRIPTION><![CDATA[Report displaying sales orders not shipped.]]></DESCRIPTION>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <URL><![CDATA[http://forge.openbravo.com/projects/ordersawaitingdlivery]]></URL>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <TYPE><![CDATA[M]]></TYPE>
@@ -19,7 +19,7 @@
 <!--3A3A943684D64DEF9EC39F588A656848-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION_LABEL><![CDATA[MP5]]></VERSION_LABEL>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--3A3A943684D64DEF9EC39F588A656848--></AD_MODULE>
 
--- a/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sat Nov 12 15:43:15 2011 +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.14195]]></STARTVERSION>
+<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.14223]]></STARTVERSION>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Sat Nov 12 15:43:15 2011 +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.14195]]></VERSION>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION><![CDATA[2.1.14223]]></VERSION>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <DESCRIPTION><![CDATA[Provides data source CRUD functionality using JSON as the data format]]></DESCRIPTION>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <HELP><![CDATA[This module implements the datasource concept. Datasources play a central role in Smartclient applications. The datasource module automatically creates a datasource for each Openbravo entity. In addition custom data source implementations can be defined.]]></HELP>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <URL><![CDATA[http://forge.openbravo.com/projects/datasourceservice]]></URL>
@@ -22,7 +22,7 @@
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <UPDATEINFO><![CDATA[Bug fixing & new development for 3.0]]></UPDATEINFO>
-<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION_LABEL><![CDATA[MP5]]></VERSION_LABEL>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4--></AD_MODULE>
 
--- a/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sat Nov 12 15:43:15 2011 +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.14195]]></STARTVERSION>
+<!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <STARTVERSION><![CDATA[1.1.14223]]></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.14195]]></STARTVERSION>
+<!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <STARTVERSION><![CDATA[2.0.14223]]></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.14195]]></STARTVERSION>
+<!--4FCE95802A854F7E8623AFF7C33D13EE-->  <STARTVERSION><![CDATA[3.0.14223]]></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.14195]]></STARTVERSION>
+<!--54AF8B39C55E4E7496902893ECD82786-->  <STARTVERSION><![CDATA[2.1.14223]]></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.14195]]></STARTVERSION>
+<!--D03C56D8A4E14F45A5466350E05C631F-->  <STARTVERSION><![CDATA[8.1.14223]]></STARTVERSION>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Sat Nov 12 15:43:15 2011 +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.14195]]></VERSION>
+<!--FF8080813129ADA401312CA1222A0005-->  <VERSION><![CDATA[0.1.14223]]></VERSION>
 <!--FF8080813129ADA401312CA1222A0005-->  <DESCRIPTION><![CDATA[Integration with Google APIs]]></DESCRIPTION>
 <!--FF8080813129ADA401312CA1222A0005-->  <TYPE><![CDATA[M]]></TYPE>
 <!--FF8080813129ADA401312CA1222A0005-->  <LICENSE><![CDATA[Licensed under the Openbravo Public License Version 1.1.
@@ -18,7 +18,7 @@
 <!--FF8080813129ADA401312CA1222A0005-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--FF8080813129ADA401312CA1222A0005-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--FF8080813129ADA401312CA1222A0005-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--FF8080813129ADA401312CA1222A0005-->  <VERSION_LABEL><![CDATA[MP5]]></VERSION_LABEL>
+<!--FF8080813129ADA401312CA1222A0005-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--FF8080813129ADA401312CA1222A0005-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--FF8080813129ADA401312CA1222A0005--></AD_MODULE>
 
--- a/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sat Nov 12 15:43:15 2011 +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.14195]]></STARTVERSION>
+<!--FF8080813141B198013141BA0F7D0012-->  <STARTVERSION><![CDATA[0.1.14223]]></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.14195]]></STARTVERSION>
+<!--FF8080813151AEE1013151C4ACE6001B-->  <STARTVERSION><![CDATA[2.1.14223]]></STARTVERSION>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Sat Nov 12 15:43:15 2011 +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.14195]]></VERSION>
+<!--FF8080813141B198013141B86DD70003-->  <VERSION><![CDATA[0.1.14223]]></VERSION>
 <!--FF8080813141B198013141B86DD70003-->  <DESCRIPTION><![CDATA[OpenID Service Integration]]></DESCRIPTION>
 <!--FF8080813141B198013141B86DD70003-->  <TYPE><![CDATA[M]]></TYPE>
 <!--FF8080813141B198013141B86DD70003-->  <LICENSE><![CDATA[Licensed under the Openbravo Public License Version 1.1.
@@ -19,7 +19,7 @@
 <!--FF8080813141B198013141B86DD70003-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--FF8080813141B198013141B86DD70003-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--FF8080813141B198013141B86DD70003-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--FF8080813141B198013141B86DD70003-->  <VERSION_LABEL><![CDATA[MP5]]></VERSION_LABEL>
+<!--FF8080813141B198013141B86DD70003-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--FF8080813141B198013141B86DD70003-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--FF8080813141B198013141B86DD70003--></AD_MODULE>
 
--- a/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sat Nov 12 15:43:15 2011 +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.14195]]></STARTVERSION>
+<!--FF8080813141B198013141B8B21B0006-->  <STARTVERSION><![CDATA[3.0.14223]]></STARTVERSION>
 <!--FF8080813141B198013141B8B21B0006-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080813141B198013141B8B21B0006-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813141B198013141B8B21B0006-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Sat Nov 12 15:43:15 2011 +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.14195]]></VERSION>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION><![CDATA[2.0.14223]]></VERSION>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <DESCRIPTION><![CDATA[Provides a JSON REST webservice for CRUD service requests]]></DESCRIPTION>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <HELP><![CDATA[Provides a JSON REST webservice for CRUD service requests. Both the servlet implementation (receiving HTTP REST requests in JSON) as the backend processing are provided.]]></HELP>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <URL><![CDATA[http://forge.openbravo.com/projects/openbravojsonrest]]></URL>
@@ -22,7 +22,7 @@
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <UPDATEINFO><![CDATA[Bug fixing & new development for 3.0]]></UPDATEINFO>
-<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION_LABEL><![CDATA[MP5]]></VERSION_LABEL>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1--></AD_MODULE>
 
--- a/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sat Nov 12 15:43:15 2011 +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.14195]]></STARTVERSION>
+<!--9E3E7B42DB16405FB794496D309D7044-->  <STARTVERSION><![CDATA[3.0.14223]]></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	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java	Sat Nov 12 15:43:15 2011 +0100
@@ -36,12 +36,17 @@
 import org.openbravo.base.model.ModelProvider;
 import org.openbravo.base.model.Property;
 import org.openbravo.base.model.domaintype.SearchDomainType;
+import org.openbravo.base.model.domaintype.TableDomainType;
 import org.openbravo.base.structure.IdentifierProvider;
 import org.openbravo.base.util.Check;
 import org.openbravo.client.kernel.RequestContext;
 import org.openbravo.dal.core.DalUtil;
 import org.openbravo.dal.core.OBContext;
+import org.openbravo.dal.service.OBDal;
 import org.openbravo.erpCommon.utility.Utility;
+import org.openbravo.model.ad.datamodel.Table;
+import org.openbravo.model.ad.domain.Reference;
+import org.openbravo.model.ad.domain.ReferencedTable;
 import org.openbravo.service.db.DalConnectionProvider;
 
 /**
@@ -398,13 +403,49 @@
   private String buildFieldClause(List<Property> properties, Property property, String fieldName,
       String operator) {
 
+    // special cases:
+    // TableDomainType
+    // TableDirDomainType
+
+    // handle a special case the table reference which shows a tablename in a combo
+    // or uses the display column to display that in the grid
+    Property useProperty = property;
+    String useFieldName = fieldName;
+    if (properties.size() >= 2) {
+      final Property refProperty = properties.get(properties.size() - 2);
+      if (refProperty.getDomainType() instanceof TableDomainType) {
+        // special case table reference itself
+        final boolean isTable = property.getEntity() == ModelProvider.getInstance().getEntity(
+            Table.ENTITY_NAME);
+        if (isTable) {
+          useProperty = property.getEntity().getProperty(Table.PROPERTY_NAME);
+          final int index = fieldName.indexOf(".");
+          useFieldName = fieldName.substring(0, index + 1) + useProperty.getName();
+        } else {
+          // read the reference to get the table reference
+          final Reference reference = OBDal.getInstance().get(Reference.class,
+              refProperty.getDomainType().getReference().getId());
+          for (ReferencedTable referencedTable : reference.getADReferencedTableList()) {
+            if (referencedTable.isActive() && referencedTable.getDisplayedColumn() != null
+                && referencedTable.getDisplayedColumn().isActive()) {
+              useProperty = property.getEntity().getPropertyByColumnName(
+                  referencedTable.getDisplayedColumn().getDBColumnName());
+              final int index = fieldName.indexOf(".");
+              useFieldName = fieldName.substring(0, index + 1) + useProperty.getName();
+              break;
+            }
+          }
+        }
+      }
+    }
+
     String clause = null;
     if (orNesting > 0) {
-      clause = resolveJoins(properties, fieldName);
+      clause = resolveJoins(properties, useFieldName);
     } else if (getMainAlias() != null) {
-      clause = getMainAlias() + "." + fieldName.trim();
+      clause = getMainAlias() + "." + useFieldName.trim();
     } else {
-      clause = fieldName;
+      clause = useFieldName;
     }
 
     // get rid of the identifier and replace it with the real property name
@@ -412,14 +453,14 @@
     // NOTE: the if and else check against the key variable and not the leftwherepart
     // because the key contains the original string (with the _identifier part).
     // Within the if the leftWherePart is used because it contains the join aliases
-    if (fieldName.equals(JsonConstants.IDENTIFIER)
-        || fieldName.endsWith("." + JsonConstants.IDENTIFIER)) {
-      clause = computeLeftWhereClauseForIdentifier(property, fieldName, clause);
-    } else if (!property.isPrimitive()) {
+    if (useFieldName.equals(JsonConstants.IDENTIFIER)
+        || useFieldName.endsWith("." + JsonConstants.IDENTIFIER)) {
+      clause = computeLeftWhereClauseForIdentifier(useProperty, useFieldName, clause);
+    } else if (!useProperty.isPrimitive()) {
       clause = clause + ".id";
     }
 
-    if (ignoreCase(property, operator)) {
+    if (ignoreCase(useProperty, operator)) {
       clause = "upper(" + clause + ")";
     }
     return clause;
--- a/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Sat Nov 12 15:43:15 2011 +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.14195]]></VERSION>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION><![CDATA[2.1.14223]]></VERSION>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <DESCRIPTION><![CDATA[Provides a selector with a suggestion box and popup grid window]]></DESCRIPTION>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <HELP><![CDATA[The Openbravo selector provides new selector functionality which is used inside of existing Openbravo forms. The selector is mainly used for supporting foreign key references in the user interface. The selector combines both suggestion box behavior with a popup grid.]]></HELP>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <URL><![CDATA[http://forge.openbravo.com/projects/selector]]></URL>
@@ -22,7 +22,7 @@
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <UPDATEINFO><![CDATA[Bug fixing & new development for 3.0]]></UPDATEINFO>
-<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION_LABEL><![CDATA[MP5]]></VERSION_LABEL>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--5EB4F15C80684ACA904756BDC12ADBE5--></AD_MODULE>
 
--- a/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sat Nov 12 15:43:15 2011 +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.14195]]></STARTVERSION>
+<!--38825CAED43941D38CA0C78DB04FCFA0-->  <STARTVERSION><![CDATA[8.1.14223]]></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.14195]]></STARTVERSION>
+<!--6DDE7B1A70174242AF82B5022FB89279-->  <STARTVERSION><![CDATA[2.1.14223]]></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.14195]]></STARTVERSION>
+<!--94F9CD2CB5EF4467A67475C786C984A7-->  <STARTVERSION><![CDATA[2.1.14223]]></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.14195]]></STARTVERSION>
+<!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <STARTVERSION><![CDATA[1.1.14223]]></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.14195]]></STARTVERSION>
+<!--C8DAC574B88649D08C9468521B343F12-->  <STARTVERSION><![CDATA[3.0.14223]]></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.14195]]></STARTVERSION>
+<!--F14EB17946BE4724A46F80CB1A47EC70-->  <STARTVERSION><![CDATA[2.1.14223]]></STARTVERSION>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Sat Nov 12 15:43:15 2011 +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.14195]]></VERSION>
+<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION><![CDATA[2.0.14223]]></VERSION>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <DESCRIPTION><![CDATA[Skin module to proper visualization of classic windows inside the MDI interface]]></DESCRIPTION>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <HELP><![CDATA[With this skin module the classic windows styles will display in a way more coherent with the new 3.00 styles]]></HELP>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <URL><![CDATA[www.openbravo.com]]></URL>
@@ -23,7 +23,7 @@
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION_LABEL><![CDATA[MP5]]></VERSION_LABEL>
+<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--96998CBC42744B3DBEE28AC8095C9335--></AD_MODULE>
 
--- a/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sat Nov 12 15:43:15 2011 +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.14195]]></STARTVERSION>
+<!--39BF75AD9AB3453698BF5DE29E727AA9-->  <STARTVERSION><![CDATA[3.0.14223]]></STARTVERSION>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Sat Nov 12 15:43:15 2011 +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.14195]]></VERSION>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION><![CDATA[8.1.14223]]></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>
@@ -22,8 +22,8 @@
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <UPDATEINFO><![CDATA[Bug fixing & new development for 3.0
-Updated to new smartclient 8.1 22-10-2011]]></UPDATEINFO>
-<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION_LABEL><![CDATA[MP5]]></VERSION_LABEL>
+Updated to new smartclient 8.1 04-11-2011]]></UPDATEINFO>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9--></AD_MODULE>
 
--- a/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sat Nov 12 15:43:15 2011 +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.14195]]></STARTVERSION>
+<!--086331E18477496B8AC74D2CFEBD1307-->  <STARTVERSION><![CDATA[3.0.14223]]></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.14195]]></STARTVERSION>
+<!--DC5D4EF450244482BD2B458DAA496333-->  <STARTVERSION><![CDATA[2.1.14223]]></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.14195]]></STARTVERSION>
+<!--F2AF15C0AF5540E393D96BE506E20648-->  <STARTVERSION><![CDATA[1.1.14223]]></STARTVERSION>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_Combined.js	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_Combined.js	Sat Nov 12 15:43:15 2011 +0100
@@ -1,6 +1,6 @@
 /*
  * Isomorphic SmartClient
- * Version SC_SNAPSHOT-2011-10-22 (2011-10-22)
+ * Version SC_SNAPSHOT-2011-11-04 (2011-11-04)
  * Copyright(c) 1998 and beyond Isomorphic Software, Inc. All rights reserved.
  * "SmartClient" is a trademark of Isomorphic Software, Inc.
  *
@@ -12,7 +12,7 @@
 var isc = window.isc ? window.isc : {};if(window.isc&&!window.isc.module_Core){isc.module_Core=1;isc._moduleStart=isc._Core_start=(isc.timestamp?isc.timestamp():new Date().getTime());if(isc._moduleEnd&&(!isc.Log||(isc.Log && isc.Log.logIsDebugEnabled('loadTime')))){isc._pTM={ message:'Core load/parse time: ' + (isc._moduleStart-isc._moduleEnd) + 'ms', category:'loadTime'};
 if(isc.Log && isc.Log.logDebug)isc.Log.logDebug(isc._pTM.message,'loadTime')
 else if(isc._preLog)isc._preLog[isc._preLog.length]=isc._pTM
-else isc._preLog=[isc._pTM]}isc.definingFramework=true;var isc=window.isc?window.isc:{};isc.$d=new Date().getTime();isc.version="SC_SNAPSHOT-2011-10-22/LGPL Deployment";isc.versionNumber="SC_SNAPSHOT-2011-10-22";isc.buildDate="2011-10-22";isc.expirationDate="";isc.licenseType="LGPL";isc.licenseCompany="Isomorphic Software";isc.licenseSerialNumber="ISC_LGPL_NIGHTLY";isc.licensingPage="http://smartclient.com/product/";isc.$41r={SCServer:{present:"false",name:"SmartClient Server",serverOnly:true,isPro:true},Drawing:{present:"false",name:"Drawing Module"},PluginBridges:{present:"true",name:"PluginBridges Module"},RichTextEditor:{present:"true",name:"RichTextEditor Module"},Calendar:{present:"true",name:"Calendar Module"},Analytics:{present:"false",name:"Analytics Module"},Tools:{present:"${includeTools}",name:"Portal and Tools Module"},NetworkPerformance:{present:"false",name:"Network Performance Module"},FileLoader:{present:"false",name:"Network Performance Module"},RealtimeMessaging:{present:"false",name:"RealtimeMessaging Module"},serverCriteria:{present:"false",name:"Server Advanced Filtering",serverOnly:true,isFeature:true},customSQL:{present:"false",name:"SQL Templating",serverOnly:true,isFeature:true},chaining:{present:"false",name:"Transaction Chaining",serverOnly:true,isFeature:true},batchDSGenerator:{present:"false",name:"Batch DS-Generator",serverOnly:true,isFeature:true},batchUploader:{present:"false",name:"Batch Uploader",serverOnly:true,isFeature:true},transactions:{present:"false",name:"Automatic Transaction Management",serverOnly:true,isFeature:true}};isc.canonicalizeModules=function(_1){if(!_1)return null;if(isc.isA.String(_1)){if(_1.indexOf(",")!=-1){_1=_1.split(",");var _2=/^\s+/,_3=/\s+$/;for(var i=0;i<_1.length;i++){_1[i]=_1[i].replace(_2,"").replace(_3,"")}}else _1=[_1]}
+else isc._preLog=[isc._pTM]}isc.definingFramework=true;var isc=window.isc?window.isc:{};isc.$d=new Date().getTime();isc.version="SC_SNAPSHOT-2011-11-04/LGPL Deployment";isc.versionNumber="SC_SNAPSHOT-2011-11-04";isc.buildDate="2011-11-04";isc.expirationDate="";isc.licenseType="LGPL";isc.licenseCompany="Isomorphic Software";isc.licenseSerialNumber="ISC_LGPL_NIGHTLY";isc.licensingPage="http://smartclient.com/product/";isc.$41r={SCServer:{present:"false",name:"SmartClient Server",serverOnly:true,isPro:true},Drawing:{present:"false",name:"Drawing Module"},PluginBridges:{present:"true",name:"PluginBridges Module"},RichTextEditor:{present:"true",name:"RichTextEditor Module"},Calendar:{present:"true",name:"Calendar Module"},Analytics:{present:"false",name:"Analytics Module"},Tools:{present:"${includeTools}",name:"Portal and Tools Module"},NetworkPerformance:{present:"false",name:"Network Performance Module"},FileLoader:{present:"false",name:"Network Performance Module"},RealtimeMessaging:{present:"false",name:"RealtimeMessaging Module"},serverCriteria:{present:"false",name:"Server Advanced Filtering",serverOnly:true,isFeature:true},customSQL:{present:"false",name:"SQL Templating",serverOnly:true,isFeature:true},chaining:{present:"false",name:"Transaction Chaining",serverOnly:true,isFeature:true},batchDSGenerator:{present:"false",name:"Batch DS-Generator",serverOnly:true,isFeature:true},batchUploader:{present:"false",name:"Batch Uploader",serverOnly:true,isFeature:true},transactions:{present:"false",name:"Automatic Transaction Management",serverOnly:true,isFeature:true}};isc.canonicalizeModules=function(_1){if(!_1)return null;if(isc.isA.String(_1)){if(_1.indexOf(",")!=-1){_1=_1.split(",");var _2=/^\s+/,_3=/\s+$/;for(var i=0;i<_1.length;i++){_1[i]=_1[i].replace(_2,"").replace(_3,"")}}else _1=[_1]}
 return _1};isc.hasOptionalModules=function(_1){if(!_1)return true;_1=isc.canonicalizeModules(_1);for(var i=0;i<_1.length;i++)if(!isc.hasOptionalModule(_1[i]))return false;return true};isc.getMissingModules=function(_1){var _2=[];_1=isc.canonicalizeModules(_1);for(var i=0;i<_1.length;i++){var _4=_1[i];if(!isc.hasOptionalModule(_4))_2.add(isc.$41r[_4])}
 return _2};isc.hasOptionalModule=function(_1){var v=isc.$41r[_1];if(!v){if(isc.Log)isc.Log.logWarn("isc.hasOptionalModule - unknown module: "+_1);return false}
 return v.present=="true"||v.present.charAt(0)=="$"};isc.getOptionalModule=function(_1){return isc.$41r[_1]};isc.$a=window.isc_useSimpleNames;if(isc.$a==null)isc.$a=true;if(window.OpenAjax){isc.$b=isc.versionNumber.replace(/[a-zA-Z_]+/,".0");OpenAjax.registerLibrary("SmartClient","http://smartclient.com/SmartClient",isc.$b,{namespacedMode:!isc.$a,iscVersion:isc.version,buildDate:isc.buildDate,licenseType:isc.licenseType,licenseCompany:isc.licenseCompany,licenseSerialNumber:isc.licenseSerialNumber});OpenAjax.registerGlobals("SmartClient",["isc"])}
@@ -3610,7 +3610,8 @@
 ,isc.A.unboundApplyFilter=function isc_Canvas_unboundApplyFilter(_1,_2){var _3=[];if(_1){if(_2){for(var _4=0;_4<_1.length;_4++){if(this.evaluateCriterion(_1[_4],_2)){_3.add(_1[_4])}}}else{_3=_1}}
 return _3}
 ,isc.A.evaluateCriterion=function isc_Canvas_evaluateCriterion(_1,_2){var _3=isc.DataSource.$57z[_2.operator];if(_3==null){isc.logWarn("Attempted to use unknown operator "+_2.operator);return false}
-return _3.condition(_2.value,_1,_2.fieldName,_2,_3,this)}
+var _4=this.getDataSource();return _3.condition(_2.value,_1,_2.fieldName,_2,_3,_4||this)}
+,isc.A.compareValues=function isc_Canvas_compareValues(_1,_2,_3,_4){if(isc.isA.Date(_1)&&isc.isA.Date(_2)){if(_1.logicalDate||_2.logicalDate){return Date.compareLogicalDates(date1,date2)}else{return Date.compareDates(date1,date2)}}else{var _5=_4&&_1.toLowerCase?_1.toLowerCase():_1,_6=_4&&_2.toLowerCase?_2.toLowerCase():_2;if(_5==null&&_6!=null)return 1;if(_5!=null&&_6==null)return-1;return _5>_6?-1:(_5<_6?1:(_5==_6?0:2))}}
 ,isc.A.hiliteRecord=function isc_Canvas_hiliteRecord(_1,_2,_3){if(!_2)return;var _4=_1[this.hiliteMarker];if(_4==null)_4=_1[this.hiliteMarker]=this.$578++;var _5=_2.$58c=_2.$58c||{},_6=_5[_4];if(_6==null)_5[_4]=_3.id;else _5[_4]=[_6,_3.id]}
 ,isc.A.getHiliteCSSText=function isc_Canvas_getHiliteCSSText(_1){var _1=this.getHilite(_1);if(!_1)return;var _2=_1.cssText||"";if(_2==""){if(_1.textColor)_2+="color:"+_1.textColor+";";if(_1.backgroundColor)_2+="background-color:"+_1.backgroundColor+";";if(_2=="")_2==null}
 return _2||_1.style}
@@ -3862,7 +3863,7 @@
 if(this.dataArity=="single"){this.setData(_2)}else{var _4=this.dataPath.split("/");this.setData(_2[_4[_4.length-1]]);if(this.dataArity=="multiple"&&isc.isA.Function(this.deselectAllRecords)){this.deselectAllRecords()}}}
 ,isc.A.selectionComponentCellSelectionChanged=function isc_Canvas_selectionComponentCellSelectionChanged(_1,_2){for(var i=0;i<_2.length;i++){var _4=_2[i],_5=this.selectionComponent.getCellRecord(_4[0],_4[1]);if(_1.cellIsSelected(_5))break;_5=null}
 if(_5){this.$71d=_1.getPrimaryKeys(_5);this.editRecord(_5)}}
-);isc.B._maxIndex=isc.C+179;isc.ClassFactory.defineClass("MathFunction","Class");isc.A=isc.MathFunction;isc.A.$65z={};isc.A=isc.MathFunction;isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.B.push(isc.A.registerFunction=function isc_c_MathFunction_registerFunction(_1){if(!this.$65z[_1.name]){this.$65z[_1.name]=_1}}
+);isc.B._maxIndex=isc.C+180;isc.ClassFactory.defineClass("MathFunction","Class");isc.A=isc.MathFunction;isc.A.$65z={};isc.A=isc.MathFunction;isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.B.push(isc.A.registerFunction=function isc_c_MathFunction_registerFunction(_1){if(!this.$65z[_1.name]){this.$65z[_1.name]=_1}}
 ,isc.A.getRegisteredFunctionNames=function isc_c_MathFunction_getRegisteredFunctionNames(){return isc.getKeys(this.$65z)}
 ,isc.A.getDefaultFunctionNames=function isc_c_MathFunction_getDefaultFunctionNames(){var _1=this.getDefaultFunctions(),_2=_1.makeIndex("name",false);return isc.getKeys(_2)}
 ,isc.A.getRegisteredFunctions=function isc_c_MathFunction_getRegisteredFunctions(){return isc.getValues(this.$65z)}
@@ -4196,7 +4197,7 @@
 isc._moduleEnd=isc._Core_end=(isc.timestamp?isc.timestamp():new Date().getTime());if(isc.Log&&isc.Log.logIsInfoEnabled('loadTime'))isc.Log.logInfo('Core module init time: ' + (isc._moduleEnd-isc._moduleStart) + 'ms','loadTime');delete isc.definingFramework;}else{if(window.isc && isc.Log && isc.Log.logWarn)isc.Log.logWarn("Duplicate load of module 'Core'.");}
 /*
  * Isomorphic SmartClient
- * Version SC_SNAPSHOT-2011-10-22 (2011-10-22)
+ * Version SC_SNAPSHOT-2011-11-04 (2011-11-04)
  * Copyright(c) 1998 and beyond Isomorphic Software, Inc. All rights reserved.
  * "SmartClient" is a trademark of Isomorphic Software, Inc.
  *
@@ -4207,7 +4208,7 @@
 
 /*
  * Isomorphic SmartClient
- * Version SC_SNAPSHOT-2011-10-22 (2011-10-22)
+ * Version SC_SNAPSHOT-2011-11-04 (2011-11-04)
  * Copyright(c) 1998 and beyond Isomorphic Software, Inc. All rights reserved.
  * "SmartClient" is a trademark of Isomorphic Software, Inc.
  *
@@ -5434,7 +5435,7 @@
 );isc.B._maxIndex=isc.C+34;isc.SplitPane.registerStringMethods({paneChanged:"pane"});isc._moduleEnd=isc._Foundation_end=(isc.timestamp?isc.timestamp():new Date().getTime());if(isc.Log&&isc.Log.logIsInfoEnabled('loadTime'))isc.Log.logInfo('Foundation module init time: ' + (isc._moduleEnd-isc._moduleStart) + 'ms','loadTime');delete isc.definingFramework;}else{if(window.isc && isc.Log && isc.Log.logWarn)isc.Log.logWarn("Duplicate load of module 'Foundation'.");}
 /*
  * Isomorphic SmartClient
- * Version SC_SNAPSHOT-2011-10-22 (2011-10-22)
+ * Version SC_SNAPSHOT-2011-11-04 (2011-11-04)
  * Copyright(c) 1998 and beyond Isomorphic Software, Inc. All rights reserved.
  * "SmartClient" is a trademark of Isomorphic Software, Inc.
  *
@@ -5445,7 +5446,7 @@
 
 /*
  * Isomorphic SmartClient
- * Version SC_SNAPSHOT-2011-10-22 (2011-10-22)
+ * Version SC_SNAPSHOT-2011-11-04 (2011-11-04)
  * Copyright(c) 1998 and beyond Isomorphic Software, Inc. All rights reserved.
  * "SmartClient" is a trademark of Isomorphic Software, Inc.
  *
@@ -5838,7 +5839,9 @@
 ,isc.A.apply=function isc_MultiSortDialog_apply(){if(this.optionsGrid.getEditRow()!=null)this.optionsGrid.endEditing();if(!this.validate())return;if(this.callback){var _1=isc.shallowClone(this.getSort());this.fireCallback(this.callback,["sortLevels"],[_1])}
 this.hide();this.markForDestroy()}
 );isc.B._maxIndex=isc.C+10;isc.ClassFactory.defineClass("TabSet","Canvas");isc.A=isc.TabSet.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.overflow="hidden";isc.A.tabProperties={};isc.A.simpleTabBaseStyle="tabButton";isc.A.tabBarPosition=isc.Canvas.TOP;isc.A.tabBarThickness=21;isc.A.selectedTab=0;isc.A.closeTabIcon="[SKIN]/TabSet/close.png";isc.A.closeTabIconSize=16;isc.A.moreTabCount=5;isc.A.moreTabTitle="More";isc.A.moreTabImage="[SKINIMG]/iOS/more.png";isc.A.moreTabDefaults={ariaRole:"tab"};isc.A.moreTabProperties={};isc.A.moreTabPaneProperties={};isc.A.moreTabPaneDefaults={_constructor:"VLayout",width:"100%",height:"100%",setData:function(_1){this.creator.moreTabPaneTable.setData(_1)}};isc.A.moreTabPaneNavBarDefaults={_constructor:"NavigationBar",controls:["titleLabel"],autoParent:"moreTabPane"};isc.A.moreTabPaneTableDefaults={_constructor:"TableView",width:"100%",height:"100%",recordNavigationClick:function(_1){this.creator.$8c(_1.button)},autoParent:"moreTabPane"};isc.A.tabBarControls=["tabScroller","tabPicker"];isc.A.showTabScroller=true;isc.A.showTabPicker=true;isc.A.tabBarControlLayoutConstructor="Layout";isc.A.tabBarControlLayoutDefaults={};isc.A.animateTabScrolling=true;isc.A.scrollerButtonSize=16;isc.A.pickerButtonSize=16;isc.A.skinImgDir="images/TabSet/";isc.A.symmetricScroller=true;isc.A.scrollerSrc="[SKIN]/scroll.gif";isc.A.scrollerHSrc="[SKIN]hscroll.gif";isc.A.scrollerVSrc="[SKIN]vscroll.gif";isc.A.symmetricPickerButton=true;isc.A.pickerButtonSrc="[SKIN]/picker.gif";isc.A.pickerButtonHSrc="[SKIN]hpicker.gif";isc.A.pickerButtonVSrc="[SKIN]vpicker.gif";isc.A.paneContainerConstructor="PaneContainer";isc.A.paneContainerClassName="tabSetContainer";isc.A.paneContainerOverflow=isc.Canvas.AUTO;isc.A.symmetricEdges=true;isc.A.titleEditorDefaults={name:"title",type:"text",showTitle:false};isc.B.push(isc.A.setPaneContainerOverflow=function isc_TabSet_setPaneContainerOverflow(_1){this.paneContainerOverflow=_1;if(this.paneContainer)this.paneContainer.setOverflow(_1)}
-);isc.B._maxIndex=isc.C+1;isc.A=isc.TabSet.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.simpleTabButtonConstructor=isc.Button;isc.A.tabBarConstructor=isc.TabBar;isc.A.disablePaneWithTab=true;isc.A.$537={top:"topEdgeSizes",bottom:"bottomEdgeSizes",left:"leftEdgeSizes",right:"rightEdgeSizes"};isc.A.$538={top:"topEdgeOffsets",bottom:"bottomEdgeOffsets",left:"leftEdgeOffsets",right:"rightEdgeOffsets"};isc.A.namedLocatorChildren=["tabBarControlLayout"];isc.B.push(isc.A.initWidget=function isc_TabSet_initWidget(){this.showEdges=false;this.Super("initWidget",arguments);if(this.tabs==null)this.tabs=[];if(this.tabBarDefaults==null)this.tabBarDefaults={};this.tabProperties=this.tabProperties||this.tabInstanceDefaults||{};var _1=this.tabBarPosition;if(this.tabBarAlign==null){this.tabBarAlign=((_1=="left"||_1=="right")?"top":"left")}
+);isc.B._maxIndex=isc.C+1;isc.defineClass("SimpleTabButton","Button");isc.A=isc.SimpleTabButton.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.B.push(isc.A.setPane=function isc_SimpleTabButton_setPane(_1){this.parentElement.parentElement.updateTab(this,_1)}
+,isc.A.selectTab=function isc_SimpleTabButton_selectTab(){this.parentElement.parentElement.selectTab(this)}
+);isc.B._maxIndex=isc.C+2;isc.A=isc.TabSet.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.simpleTabButtonConstructor=isc.SimpleTabButton;isc.A.tabBarConstructor=isc.TabBar;isc.A.disablePaneWithTab=true;isc.A.$537={top:"topEdgeSizes",bottom:"bottomEdgeSizes",left:"leftEdgeSizes",right:"rightEdgeSizes"};isc.A.$538={top:"topEdgeOffsets",bottom:"bottomEdgeOffsets",left:"leftEdgeOffsets",right:"rightEdgeOffsets"};isc.A.namedLocatorChildren=["tabBarControlLayout"];isc.B.push(isc.A.initWidget=function isc_TabSet_initWidget(){this.showEdges=false;this.Super("initWidget",arguments);if(this.tabs==null)this.tabs=[];if(this.tabBarDefaults==null)this.tabBarDefaults={};this.tabProperties=this.tabProperties||this.tabInstanceDefaults||{};var _1=this.tabBarPosition;if(this.tabBarAlign==null){this.tabBarAlign=((_1=="left"||_1=="right")?"top":"left")}
 if(this.useSimpleTabs){this.tabBarDefaults.buttonConstructor=this.simpleTabButtonConstructor;this.tabProperties.baseStyle=this.simpleTabBaseStyle+_1.substring(0,1).toUpperCase()+_1.substring(1);this.tabProperties.ariaRole="tab"}
 this.makeTabBar();this.makePaneContainer();this.createPanes()}
 ,isc.A.makeTabBar=function isc_TabSet_makeTabBar(){if(this.tabs==null)return;var _1=(this.tabBarPosition==isc.Canvas.LEFT||this.tabBarPosition==isc.Canvas.RIGHT),_2=this.tabBarAlign;var _3=this.tabs.duplicate(),_4;for(var i=0;i<_3.length;i++){for(var j in this.tabProperties){if(_3[i][j]===_4)_3[i][j]=this.tabProperties[j]}}
@@ -5989,7 +5992,7 @@
 );isc.B._maxIndex=isc.C+1;isc.TabSet.registerDupProperties("tabs",["pane"]);isc._moduleEnd=isc._Containers_end=(isc.timestamp?isc.timestamp():new Date().getTime());if(isc.Log&&isc.Log.logIsInfoEnabled('loadTime'))isc.Log.logInfo('Containers module init time: ' + (isc._moduleEnd-isc._moduleStart) + 'ms','loadTime');delete isc.definingFramework;}else{if(window.isc && isc.Log && isc.Log.logWarn)isc.Log.logWarn("Duplicate load of module 'Containers'.");}
 /*
  * Isomorphic SmartClient
- * Version SC_SNAPSHOT-2011-10-22 (2011-10-22)
+ * Version SC_SNAPSHOT-2011-11-04 (2011-11-04)
  * Copyright(c) 1998 and beyond Isomorphic Software, Inc. All rights reserved.
  * "SmartClient" is a trademark of Isomorphic Software, Inc.
  *
@@ -6000,7 +6003,7 @@
 
 /*
  * Isomorphic SmartClient
- * Version SC_SNAPSHOT-2011-10-22 (2011-10-22)
+ * Version SC_SNAPSHOT-2011-11-04 (2011-11-04)
  * Copyright(c) 1998 and beyond Isomorphic Software, Inc. All rights reserved.
  * "SmartClient" is a trademark of Isomorphic Software, Inc.
  *
@@ -6575,12 +6578,13 @@
 );isc.evalBoundary;isc.B.push(isc.A.$80d=function isc_GridRenderer__handleEmbeddedComponentResize(_1,_2,_3){var _4=_1.embeddedPosition;if(_4!=this.$57l){if(_3!=null&&_3!=0)this.markForRedraw('embedded component resized')}else{this.placeEmbeddedComponent(_1)}}
 ,isc.A.updateEmbeddedComponentCoords=function isc_GridRenderer_updateEmbeddedComponentCoords(_1,_2,_3,_4){_1.setProperty("$289",_3)}
 ,isc.A.placeEmbeddedComponent=function isc_GridRenderer_placeEmbeddedComponent(_1){var _2=_1.$289;if(_2==null||_2<this.$252||_2>this.$253){if(_1.isDrawn())_1.clear();return}
-var _3=_1.embeddedRecord,_4=_1.embeddedPosition,_5=_1.$57n,_6=this.getRowTop(_2),_7=_5!=null?this.getColumnLeft(_5):0,_8=(_5!=null&&_5>=0)?this.getColumnWidth(_5):Math.min(this.getInnerWidth()+this.getScrollLeft(),this.$26a.sum());if(_4==this.$57l){var _9=this.getEmbeddedComponentSnapTo(_1,_3,_2,_5),_10=_1.snapEdge||_9;var _11=this.getRowSize(_2),_12=_1._percent_width,_13=_1._percent_height,_14,_15;if(_1.snapOffsetLeft)_8-=_1.snapOffsetLeft;if(isc.isA.String(_12)&&_12.endsWith("%")){_14=Math.round((parseInt(_12)*_8)/100)}
+var _3=_1.embeddedRecord,_4=_1.embeddedPosition,_5=_1.$57n,_6=this.getRowTop(_2),_7=_5!=null?this.getColumnLeft(_5):0,_8=(_5!=null&&_5>=0)?this.getColumnWidth(_5):Math.min(this.getInnerWidth()+this.getScrollLeft(),this.$26a.sum());if(_4==this.$57l){var _9=this.getEmbeddedComponentSnapTo(_1,_3,_2,_5),_10=_1.snapEdge||_9;var _11=this.getRowSize(_2),_12=_1._percent_width,_13=_1._percent_height,_14,_15;var _16=0,_17=_3.$29a;for(var i=0;i<_17.length;i++){var _19=_3.$29a[i];var _20=(_19.embeddedPosition==this.$57l);if(_20)continue;var _21=_19.getVisibleHeight();if(_21>_16){_16=_21}}
+_11-=_16;if(_1.snapOffsetLeft)_8-=_1.snapOffsetLeft;if(isc.isA.String(_12)&&_12.endsWith("%")){_14=Math.round((parseInt(_12)*_8)/100)}
 if(isc.isA.String(_13)&&_13.endsWith("%")){_15=Math.round((parseInt(_13)*_11)/100)}
-var _16=_15!=null?_15:_1.getHeight(),_17=_14!=null?_14:_1.getWidth();if(_15||_14){_1.resizeTo(_14,_15);_1._percent_width=_12;_1._percent_height=_13}
+var _22=_15!=null?_15:_1.getHeight(),_23=_14!=null?_14:_1.getWidth();if(_15||_14){_1.resizeTo(_14,_15);_1._percent_width=_12;_1._percent_height=_13}
 isc.Canvas.snapToEdge([_7,_6,_8,_11],_9,_1,_10)}else{_1.moveTo(_7,_6);_1.setWidth(_8)}
-var _18=this.isDrawn();if(_18&&!_1.isDrawn())_1.draw();var _19=this.isDirty(),_20=this.getRowHeight(_3,_2),_21=!this.isDirty()||_19;if(_21&&(_20!=this.getRowSize(_2))){this.setRowHeight(_2,_20,_3);this.refreshRow(_2)}
-if(_18){if(_4!=this.$57l){var _22=this.getDrawnRowHeight(_2)-_1.getVisibleHeight()-1;_1.moveTo(null,this.getRowTop(_2)+_22)}
+var _24=this.isDrawn();if(_24&&!_1.isDrawn())_1.draw();var _25=this.isDirty(),_26=this.getRowHeight(_3,_2),_27=!this.isDirty()||_25;if(_27&&(_26!=this.getRowSize(_2))){this.setRowHeight(_2,_26,_3);this.refreshRow(_2)}
+if(_24){if(_4!=this.$57l){var _28=this.getDrawnRowHeight(_2)-_1.getVisibleHeight()-1;_1.moveTo(null,this.getRowTop(_2)+_28)}
 if(!_1.isVisible()){if(this.shouldAnimateEmbeddedComponent(_1)){_1.animateShow()}else{_1.show()}}}
 this.updateEmbeddedComponentZIndex(_1)}
 ,isc.A.getEmbeddedComponentSnapTo=function isc_GridRenderer_getEmbeddedComponentSnapTo(_1,_2,_3,_4){if(_1.snapTo!=null)return _1.snapTo;if(_4==null){return"TL"}
@@ -6778,7 +6782,7 @@
 ,isc.A.mouseUp=function isc_GridRenderer_mouseUp(){if(this.$29p())return;var _1=this.getEventRow(),_2=this.getEventColumn();if(!(_1>=0&&_2>=0))return;if(!this.cellIsEnabled(_1,_2))return;var _3=this.getCellRecord(_1,_2);var _4;if(this.cellMouseUp&&(this.cellMouseUp(_3,_1,_2)==false))_4=false;if(this.rowMouseUp&&(this.rowMouseUp(_3,_1,_2)==false))_4=false;if(this.recordMouseUp&&this.recordMouseUp(_1,_2)==false)_4=false;if(_4==false)return _4;this.selectOnMouseUp(_3,_1,_2)}
 ,isc.A.selectOnMouseUp=function isc_GridRenderer_selectOnMouseUp(_1,_2,_3){if(!this.selectionEnabled())return true;if(_2>=0&&_3>=0){this.selection.selectOnMouseUp(this,_2,_3);if(this.$828){if(this.fireSelectionUpdated)this.fireSelectionUpdated();this.$828=null}}}
 ,isc.A.click=function isc_GridRenderer_click(){if(this.$29p())return;var _1=this.getEventRow(),_2=this.getEventColumn();return this.$29y(_1,_2)}
-,isc.A.$29y=function isc_GridRenderer__rowClick(_1,_2){this.$29z=this.$290=null;var _3=this.$29u;if(_1!=_3){if(isc.EH.getX()==this.$723){_1=this.$29u}else{return}}
+,isc.A.$29y=function isc_GridRenderer__rowClick(_1,_2){this.$29z=this.$290=null;var _3=this.$29u;if(_3!=null&&_1!=_3){if(isc.EH.getX()==this.$723){_1=this.$29u}else{return}}
 if(isc.EH.getY()==this.$724){_2=this.$29v}
 if(!(_1>=0&&_2>=0))return;if(!this.cellIsEnabled(_1,_2))return false;this.$29z=_1;var _4=this.getCellRecord(_1,_2),_5;if(!this.$22n(_4,_1,_2))_5=false;if(this.rowClick&&(this.rowClick(_4,_1,_2)==false))
 _5=false;this.$29u=null;return _5}
@@ -10107,7 +10111,7 @@
 );isc.B._maxIndex=isc.C+17;isc._moduleEnd=isc._Grids_end=(isc.timestamp?isc.timestamp():new Date().getTime());if(isc.Log&&isc.Log.logIsInfoEnabled('loadTime'))isc.Log.logInfo('Grids module init time: ' + (isc._moduleEnd-isc._moduleStart) + 'ms','loadTime');delete isc.definingFramework;}else{if(window.isc && isc.Log && isc.Log.logWarn)isc.Log.logWarn("Duplicate load of module 'Grids'.");}
 /*
  * Isomorphic SmartClient
- * Version SC_SNAPSHOT-2011-10-22 (2011-10-22)
+ * Version SC_SNAPSHOT-2011-11-04 (2011-11-04)
  * Copyright(c) 1998 and beyond Isomorphic Software, Inc. All rights reserved.
  * "SmartClient" is a trademark of Isomorphic Software, Inc.
  *
@@ -10118,7 +10122,7 @@
 
 /*
  * Isomorphic SmartClient
- * Version SC_SNAPSHOT-2011-10-22 (2011-10-22)
+ * Version SC_SNAPSHOT-2011-11-04 (2011-11-04)
  * Copyright(c) 1998 and beyond Isomorphic Software, Inc. All rights reserved.
  * "SmartClient" is a trademark of Isomorphic Software, Inc.
  *
@@ -10356,7 +10360,7 @@
 isc.ClassFactory.defineClass("DynamicForm","Canvas","DataBoundComponent");isc.addGlobal("FormLayout",isc.DynamicForm);isc.A=isc.DynamicForm;isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.GET="GET";isc.A.POST="POST";isc.A.NORMAL="normal";isc.A.MULTIPART="multipart";isc.A.NORMAL_ENCODING="application/x-www-form-urlencoded";isc.A.MULTIPART_ENCODING="multipart/form-data";isc.A.$89="$89";isc.A.$9a="$9a";isc.A.$9b="$9b";isc.A.$9c="$9d";isc.A.$9e="$9f";isc.A.$9g="$9g";isc.B.push(isc.A.buildOperatorIndex=function isc_c_DynamicForm_buildOperatorIndex(){var _1=isc.getValues(isc.DataSource.getSearchOperators());_1=_1.sortByProperties(["symbol"],[false],[function(_4,_5,_6){var _2=_4[_5],_3=isc.isA.String(_2)?_2.length:0;return _3}]);this.$85l=_1.makeIndex("symbol",true)}
 ,isc.A.getOperatorIndex=function isc_c_DynamicForm_getOperatorIndex(){return this.$85l}
 );isc.B._maxIndex=isc.C+2;isc.A=isc.DynamicForm.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.flattenItems=false;isc.A.numCols=2;isc.A.fixedColWidths=false;isc.A.fixedRowHeights=false;isc.A.colWidths=null;isc.A.minColWidth=20;isc.A.cellSpacing=0;isc.A.cellPadding=2;isc.A.cellBorder=0;isc.A.defaultRowHeight=22;isc.A.sectionVisibilityMode="multiple";isc.A.allowContentAndChildren=true;isc.A.separateContentInsertion=true;isc.A.$r9=true;isc.A.fieldIdProperty="name";isc.A.titleField="title";isc.A.showDetailFields=true;isc.A.longTextEditorThreshold=255;isc.A.longTextEditorType="textArea";isc.A.titlePrefix="";isc.A.rightTitlePrefix=":&nbsp;";isc.A.titleSuffix="&nbsp;:";isc.A.rightTitleSuffix="";isc.A.titleWidth=100;isc.A.showInlineErrors=true;isc.A.showErrorIcons=true;isc.A.showErrorText=false;isc.A.showErrorStyle=true;isc.A.errorOrientation="left";isc.A.errorItemDefaults={type:"blurb",wrap:true,showIf:function(){return!this.form.showInlineErrors&&this.form.hasErrors()},defaultDynamicValue:function(_1,_2,_3){return _2.getErrorsHTML(_2.getErrors())}};isc.A.errorItemCellStyle="formCellError";isc.A.errorsPreamble="The following errors were found.";isc.A.hiliteRequiredFields=true;isc.A.requiredTitlePrefix="<b>";isc.A.requiredRightTitlePrefix="<b>:&nbsp;";isc.A.requiredTitleSuffix="&nbsp;:</b>";isc.A.requiredRightTitleSuffix="</b>";isc.A.canHover=false;isc.A.itemHoverDelay=500;isc.A.itemHoverStyle="formHover";isc.A.overflow=isc.Canvas.VISIBLE;isc.A.defaultHeight=20;isc.A.validateOnChange=false;isc.A.implicitSaveDelay=2000;isc.A.synchronousValidation=false;isc.A.autoFocus=false;isc.A.selectOnFocus=false;isc.A.canFocus=true;isc.A._useNativeTabIndex=false;isc.A.$kn=false;isc.A.uniqueMatch=true;isc.A.browserSpellCheck=true;isc.A.cancelParamName="org.apache.struts.taglib.html.CANCEL";isc.A.cancelParamValue="cancel";isc.A.action="#";isc.A.method=isc.DynamicForm.POST;isc.A.encoding=isc.DynamicForm.NORMAL_ENCODING;isc.A.writeFormTag=true;isc.A.autoSendTargetFieldName="__target__";isc.A.useNativeSelectItems=false;isc.A.hideUsingDisplayNone=isc.Browser.isMoz&&isc.Browser.isMac;isc.A.operator="and";isc.A.nestedEditorType="NestedEditorItem";isc.A.nestedListEditorType="NestedListEditorItem";isc.A.canDropItems=false;isc.A.canAddColumns=true;isc.B.push(isc.A.hasInherentHeight=function isc_DynamicForm_hasInherentHeight(){if(this.inherentHeight!=null)return this.inherentHeight;return(this.overflow==isc.Canvas.VISIBLE||this.overflow==isc.Canvas.CLIP_H)}
-);isc.B._maxIndex=isc.C+1;isc.A=isc.DynamicForm.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.$9i="upload";isc.A.$9j="mutex";isc.A.$9k=["name","editorType","readOnlyEditorType","type","valueMap","defaultValue","showTitle","left","top","width","height"];isc.A.dataArity="single";isc.A.$refPropName="__ref";isc.A.$70l="/";isc.A.$9l="form";isc.A.$9m="$9n";isc.A.$9o="$9p";isc.A.$9q="absolute";isc.A.$9r="showIf";isc.A.$9s="item,value,form,values";isc.A.$9t="</FORM>";isc.A.$9u="tablePolicy";isc.A.$9v="<COL WIDTH=";isc.A.$9w=(isc.Browser.isIE?"<TR STYLE='position:absolute'>":"<TR>");isc.A.$9y=(isc.Browser.isSafari?"</div></TD>":"</TD>");isc.A.$5u="<TD>";isc.A.$5v="</TD>";isc.A.$5s="<TR>";isc.A.$5t="</TR>";isc.A.$9z="<br>";isc.A.$90="</TABLE></FORM>";isc.A.$91=["<INPUT TYPE=HIDDEN NAME='",,"' VALUE='",,"'>"];isc.A.titleHeight=15;isc.A.$92="height:";isc.A.$93="width:";isc.A.$11j="max-width:";isc.A.$94="max-height:";isc.A.$92="height:";isc.A.$95="<NOBR>";isc.A.$96="</td></tr></TABLE>";isc.A.$97="</DIV>";isc.A.$98="</TD>";isc.A.$99=["<TD ",," CLASS='",,"' ALIGN='",,"' VALIGN='",,"'",,,">"];isc.A.$10a=["<DIV style='overflow:hidden;text-overflow:ellipsis;",,,,"'>"];isc.A.$63z="$428";isc.A.$10c=["<FORM ","ID","=",,," METHOD=",," ACTION='",,"' ENCTYPE=",,,,," ONSUBMIT='return ",,".$10d()' ONRESET='",,".resetValues(); return false;'",(isc.Browser.isSafari?" STYLE='display:inline;'":null)," STYLE='margin-bottom:0px;'>"];isc.A.$10e=" STYLE='position:absolute;left:0px;top:0px;'";isc.A.$10f=" TARGET='";isc.A.$10g=["<TABLE role='presentation' ID='",,"' ","WIDTH=",," CELLSPACING=",," CELLPADDING=",," BORDER=",,(isc.Browser.isMoz?"><TBODY>":">")];isc.A.$10h="table";isc.A.formSubmitFailedWarning="Form was unable to be submitted. The most likely cause for this is an "+"invalid value in an upload field.";isc.A.$10i="requiredIf";isc.A.$842="required";isc.A.$10j="Enter";isc.B.push(isc.A.initWidget=function isc_DynamicForm_initWidget(){if(isc.$cv)arguments.$cw=this;if(!isc.DynamicForm.$85l)isc.DynamicForm.buildOperatorIndex();this.setColWidths(this.colWidths);this.Super("initWidget",arguments);if(this.showComplexFieldsRecursively)this.showComplexFields=true;if(this.fields&&this.items==null)this.items=this.fields;if(this.defaultItems!=null&&this.items==null){this.items=[];for(var i=0;i<this.defaultItems.length;i++){this.items[i]=isc.addProperties({},this.defaultItems[i])}}
+);isc.B._maxIndex=isc.C+1;isc.A=isc.DynamicForm.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.$9i="upload";isc.A.$9j="mutex";isc.A.$9k=["name","editorType","readOnlyEditorType","type","valueMap","defaultValue","showTitle","left","top","width","height"];isc.A.dataArity="single";isc.A.$refPropName="__ref";isc.A.$70l="/";isc.A.$9l="form";isc.A.$9m="$9n";isc.A.$9o="$9p";isc.A.$9q="absolute";isc.A.$9r="showIf";isc.A.$9s="item,value,form,values";isc.A.$9t="</FORM>";isc.A.$9u="tablePolicy";isc.A.$9v="<COL WIDTH=";isc.A.$9w=(isc.Browser.isIE?"<TR STYLE='position:absolute'>":"<TR>");isc.A.$9y=(isc.Browser.isSafari?"</div></TD>":"</TD>");isc.A.$5u="<TD>";isc.A.$5v="</TD>";isc.A.$5s="<TR>";isc.A.$5t="</TR>";isc.A.$9z="<br>";isc.A.$90="</TABLE></FORM>";isc.A.$91=["<INPUT TYPE=HIDDEN NAME='",,"' VALUE='",,"'>"];isc.A.titleHeight=15;isc.A.$92="height:";isc.A.$93="width:";isc.A.$11j="max-width:";isc.A.$94="max-height:";isc.A.$92="height:";isc.A.$95="<NOBR>";isc.A.$96="</td></tr></TABLE>";isc.A.$97="</DIV>";isc.A.$98="</TD>";isc.A.$99=["<TD ",," CLASS='",,"' ALIGN='",,"' VALIGN='",,"'",,,">"];isc.A.$10a=["<DIV style='overflow:hidden;text-overflow:ellipsis;",,,,"'>"];isc.A.$63z="$428";isc.A.$10c=["<FORM ","ID","=",,," METHOD=",," ACTION='",,"' ENCTYPE=",,,,," ONSUBMIT='return ",,".$10d()' ONRESET='",,".resetValues(); return false;'",(isc.Browser.isSafari?" STYLE='display:inline;'":null)," STYLE='margin-bottom:0px;'>"];isc.A.$10e=" STYLE='position:absolute;left:0px;top:0px;'";isc.A.$10f=" TARGET='";isc.A.$10g=["<TABLE role='presentation' ID='",,"' ","WIDTH=",," CELLSPACING=",," CELLPADDING=",," BORDER=",,(isc.Browser.isMoz?"><TBODY>":">")];isc.A.$10h="table";isc.A.formSubmitFailedWarning="Form was unable to be submitted. The most likely cause for this is an "+"invalid value in an upload field.";isc.A.$10i="requiredIf";isc.A.$842="required";isc.A.$10j="Enter";isc.A.$118={"Arrow_Up":true,"Arrow_Down":true,"Arrow_Right":true,"Arrow_Left":true,"Page_Up":true,"Page_Down":true,"Home":true,"End":true,"Backspace":true,"Delete":true,"Tab":true};isc.B.push(isc.A.initWidget=function isc_DynamicForm_initWidget(){if(isc.$cv)arguments.$cw=this;if(!isc.DynamicForm.$85l)isc.DynamicForm.buildOperatorIndex();this.setColWidths(this.colWidths);this.Super("initWidget",arguments);if(this.showComplexFieldsRecursively)this.showComplexFields=true;if(this.fields&&this.items==null)this.items=this.fields;if(this.defaultItems!=null&&this.items==null){this.items=[];for(var i=0;i<this.defaultItems.length;i++){this.items[i]=isc.addProperties({},this.defaultItems[i])}}
 if(this.values==null)this.values={};if(this.action!=isc.DynamicForm.getPrototype().action&&this.action!=null&&!isc.isA.emptyString(this.action))
 {this.setAction(this.action)}
 if(!this.dataSource){var _2=this.items||[];for(var i=0;i<_2.length;i++){if(_2[i]==null)continue;if(this.dataPath||_2[i].dataPath){this.$834=isc.shallowClone(_2);break}}}
@@ -10795,9 +10799,12 @@
 ,isc.A.handleKeyPress=function isc_DynamicForm_handleKeyPress(_1,_2){if(_1.keyName==this.$10j){if(this.saveOnEnter){var _3=this.getFocusSubItem();if(isc.isA.TextItem(_3))this.submit()}}
 if(_1.characterValue!=null&&_1.characterValue!=0&&(_1.keyName!="Escape"))
 {return isc.EventHandler.STOP_BUBBLING}
-if(!this.$118){this.$118={"Arrow_Up":true,"Arrow_Down":true,"Arrow_Right":true,"Arrow_Left":true,"Page_Up":true,"Page_Down":true,"Home":true,"End":true,"Backspace":true,"Delete":true,"Tab":true}}
 if(this.$118[_1.keyName]&&_1.keyTarget!=this){return isc.EventHandler.STOP_BUBBLING}
 return this.Super("handleKeyPress",arguments)}
+,isc.A.handleKeyDown=function isc_DynamicForm_handleKeyDown(_1,_2){var _3
+if(this.convertToMethod("keyDown")){_3=this.keyDown(_1,_2)}
+var _4=isc.EH.getKey();if(_3!=false&&this.$118[_4]){return isc.EH.STOP_BUBBLING}
+return _3}
 ,isc.A.itemHoverHTML=function isc_DynamicForm_itemHoverHTML(_1){if(_1.implementsPromptNatively)return null;var _2=_1.prompt;if(!_2&&_1.parentItem)_2=this.itemHoverHTML(_1.parentItem)
 return _2}
 ,isc.A.titleHoverHTML=function isc_DynamicForm_titleHoverHTML(_1){if(_1.prompt)return _1.prompt;if(this.shouldClipTitle(_1))return _1.getTitle()}
@@ -10852,7 +10859,7 @@
 ,isc.A.getSelectionChain=function isc_DynamicForm_getSelectionChain(){if(!this.selectionComponent)return[];var _1=[];var _2=this;while(_2.selectionComponent){_1.add(_2.selectionComponent);_2=_2.selectionComponent}
 var _3=[];for(var i=_1.length-1;i>=0;i--){_3.add(_1[i].getRecordIndex(_1[i].getSelectedRecord()))}
 return _3}
-);isc.B._maxIndex=isc.C+229;isc.A=isc.DynamicForm;isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.defaultFieldType="text";isc.A.$12a="link";isc.A.$gx="text";isc.A.$12b="select";isc.A.$12c="checkbox";isc.A.$12d="staticText";isc.A.$g2="boolean";isc.A.$12e="binary";isc.A.$12f="blob";isc.A.$52w="multifile";isc.A.$12g="multiupload";isc.A.$9i="upload";isc.A.$52x="file";isc.A.$51x="base64Binary";isc.A.$12h="enum";isc.A.$12i="CycleItem";isc.A.$12j="selectOther";isc.A.$12k="relation";isc.A.$67f="NestedEditorItem";isc.A.$67g="NestedListEditorItem";isc.A.$677="imageFile";isc.A.$678="ViewFileItem";isc.A.$77j="section";isc.A.$77k="SectionItem";isc.A.$77l="button";isc.A.$77m="ButtonItem";isc.A.$450="id";isc.A.$refPropName="__ref";isc.B.push(isc.A.getEditorType=function isc_c_DynamicForm_getEditorType(_1,_2){if(_1._constructor==isc.FormItem.Class)_1._constructor=null;var _3=_2.getDataSource();var _4=this.canEditField(_1,_2),_5=this.defaultFieldType,_6=(_4==false&&_1.readOnlyEditorType)||_1.editorType||_1.formItemType||_1._constructor||_1.type||_5;if((_4==false&&_1.readOnlyEditorType)||_1.editorType||_1.formItemType||_1._constructor)
+);isc.B._maxIndex=isc.C+230;isc.A=isc.DynamicForm;isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.defaultFieldType="text";isc.A.$12a="link";isc.A.$gx="text";isc.A.$12b="select";isc.A.$12c="checkbox";isc.A.$12d="staticText";isc.A.$g2="boolean";isc.A.$12e="binary";isc.A.$12f="blob";isc.A.$52w="multifile";isc.A.$12g="multiupload";isc.A.$9i="upload";isc.A.$52x="file";isc.A.$51x="base64Binary";isc.A.$12h="enum";isc.A.$12i="CycleItem";isc.A.$12j="selectOther";isc.A.$12k="relation";isc.A.$67f="NestedEditorItem";isc.A.$67g="NestedListEditorItem";isc.A.$677="imageFile";isc.A.$678="ViewFileItem";isc.A.$77j="section";isc.A.$77k="SectionItem";isc.A.$77l="button";isc.A.$77m="ButtonItem";isc.A.$450="id";isc.A.$refPropName="__ref";isc.B.push(isc.A.getEditorType=function isc_c_DynamicForm_getEditorType(_1,_2){if(_1._constructor==isc.FormItem.Class)_1._constructor=null;var _3=_2.getDataSource();var _4=this.canEditField(_1,_2),_5=this.defaultFieldType,_6=(_4==false&&_1.readOnlyEditorType)||_1.editorType||_1.formItemType||_1._constructor||_1.type||_5;if((_4==false&&_1.readOnlyEditorType)||_1.editorType||_1.formItemType||_1._constructor)
 {return _6}
 if(_6==this.$12a){if(!this.canEditField(_1,_2))_6=this.$12a;else _6=this.$gx}else if(!_4){if(_6==this.$12e||_6==this.$52x||_6==this.$677)
 _6=this.$678;else if(_6!=this.$77j&&_6!=this.$77k&&_6!=this.$77l&&_6!=this.$77m)
@@ -11473,7 +11480,7 @@
 ,isc.A.getCriteriaFieldName=function isc_FormItem_getCriteriaFieldName(){return this.criteriaField||this.includeFrom||this.getFieldName()}
 ,isc.A.getCriteriaValue=function isc_FormItem_getCriteriaValue(){return this.getValue()}
 ,isc.A.hasAdvancedCriteria=function isc_FormItem_hasAdvancedCriteria(){return this._value!=null&&this.operator!=null||this.$85m()}
-,isc.A.$85m=function isc_FormItem__shouldAllowExpressions(){var _1=this.allowExpressions;if(_1==null)_1=this.form.allowExpressions;return _1}
+,isc.A.$85m=function isc_FormItem__shouldAllowExpressions(){var _1=isc.isA.TextItem(this)||isc.isA.TextAreaItem(this)||isc.isA.CanvasItem(this)||isc.isA.ContainerItem(this)||isc.isA.DateItem(this);if(!_1)return false;_1=this.allowExpressions;if(_1==null)_1=this.form.allowExpressions;return _1}
 ,isc.A.getOperator=function isc_FormItem_getOperator(_1){if(this.operator){var _2=this.operator}else{var _3=this.getType();if(this.valueMap||this.optionDataSource||isc.SimpleType.inheritsFrom(_3,"enum")||isc.SimpleType.inheritsFrom(_3,"boolean")||isc.SimpleType.inheritsFrom(_3,"float")||isc.SimpleType.inheritsFrom(_3,"integer"))
 {_2="equals"}else{if(_1==null)_1="substring";_2=isc.DataSource.getCriteriaOperator(null,_1)}}
 return _2}
@@ -11640,11 +11647,11 @@
 if(!_1){if(this.parentItem!=null)_1=this.parentItem.isDisabled();else{_1=this.form.isDisabled();if(!_1&&this.containerWidget!=this.form)_1=this.containerWidget.isDisabled()}}
 return _1}
 ,isc.A.enable=function isc_FormItem_enable(){this.setDisabled(false)}
-,isc.A.disable=function isc_FormItem_disable(){this.setDisabled(true)}
+);isc.evalBoundary;isc.B.push(isc.A.disable=function isc_FormItem_disable(){this.setDisabled(true)}
 ,isc.A.$176=function isc_FormItem__setElementEnabled(_1){if(this.hasDataElement()){var _2=this.getDataElement();if(_2){_2.disabled=!_1;_2.tabIndex=this.$154();if(this.useDisabledEventMask()){var _3=this.$43b();if(_3&&(!_3.getAttribute||_3.getAttribute("isDisabledEventMask")!="true"))
 {_3=null}
 if(_1&&_3){isc.Element.clear(_3)}else if(!_1&&!_3){isc.Element.insertAdjacentHTML(_2,"beforeBegin",this.$148())}}}}else if(this.$kk()){var _2=this.getFocusElement();if(_2)_2.tabIndex=this.$154()}}
-);isc.evalBoundary;isc.B.push(isc.A.$177=function isc_FormItem__setIconsEnabled(){if(this.showPickerIcon){var _1=this.getPickerIcon();this.setIconEnabled(_1)}
+,isc.A.$177=function isc_FormItem__setIconsEnabled(){if(this.showPickerIcon){var _1=this.getPickerIcon();this.setIconEnabled(_1)}
 if(!this.icons||this.icons.length<1)return;for(var i=0;i<this.icons.length;i++){this.setIconEnabled(this.icons[i])}}
 ,isc.A.iconIsDisabled=function isc_FormItem_iconIsDisabled(_1){_1=this.getIcon(_1);if(!_1)return;if(this.containerWidget&&this.containerWidget.isDisabled())return true;if(_1.neverDisable)return false;return this.isDisabled()}
 ,isc.A.$kk=function isc_FormItem__canFocus(){if(this.canFocus!=null)return this.canFocus;return this.hasDataElement()}
@@ -11776,32 +11783,43 @@
 ,isc.A.editClick=function isc_FormItem_editClick(){var _1=this.getTitlePageLeft(),_2=this.getVisibleTitleWidth(),_3,_4,_5,_6;_4=this.getTitlePageTop();_6=this.getTitleVisibleHeight();_5=this.getVisibleHeight();_3=(_6==_5)?_4:_4+((_6-_5)/2);isc.EditContext.manageTitleEditor(this,_1,_2,_3,null)}
 ,isc.A.parseValueExpressions=function isc_FormItem_parseValueExpressions(_1,_2){var _3=this.getType(),_4=(isc.SimpleType.inheritsFrom(_3,"integer")||isc.SimpleType.inheritsFrom(_3,"float")||isc.SimpleType.inheritsFrom(_3,"date")),_5=isc.DynamicForm.getOperatorIndex(),_6=isc.getKeys(_5),_7={operator:"and",criteria:[]},_8=_7.criteria,_9=[],_10=this.$85m(),_11=isc.DS.get(this.form.expressionDataSource||this.form.dataSource);if(!_1)_1=this.getValue();if(!_1)return;if(!isc.isA.String(_1))_1+="";var _12=this.getOperator();if(_12)_6.add(_12);var _13=_11?_11.getSearchOperator(_12):{id:_12};var _14=_13.caseInsensitive;if(_4&&_1.contains(" and ")){_9=_1.split(" and ")}else if(_4&&_1.contains(" or ")){_9=_1.split(" or ");_7.operator="or"}else if(_1.contains("...")){_9=_1.split("...");if(_9.length==2){var _15=_5["..."],_16;if(_15)_16=(_14?_15.find("caseInsensitive",true):_15[0]);var _17=_11?_11.getField(_2):null;if(_17&&isc.SimpleType.inheritsFrom(_17.type,"date")){_9[0]=new Date(Date.parse(_9[0]));_9[0].logicalDate=true;_9[1]=new Date(Date.parse(_9[1]));_9[1].logicalDate=true}else if(_17&&_17.type=="text"){if(!_9[1].endsWith(this.$87p)){_9[1]+=this.$87p}}
 return{fieldName:_2,operator:_16.ID,start:_9[0],end:_9[1]}}}else{_9=[_1]}
-var _18=[" and "," or ","..."];for(var i=0;i<_9.length;i++){var _20=_9[i],_21={fieldName:_2}
-_17=_11?_11.getField(_2):null,_22=(_17?_17&&isc.SimpleType.inheritsFrom(_17.type,"date"):false);for(var _23 in _5){if(!_23)continue;var _24=_5[_23],_25=false,_26;if(_23=="=="&&isc.isA.String(_20)&&_20.startsWith("=")&&!_20.startsWith("==")&&!_20.startsWith("=("))
-{_25=true}
-if(_24&&_24.length){_26=_24.find("caseInsensitive",_14)||_24[0]}
-if(!_26||!_26.symbol||_18.contains(_26.symbol))continue;if(_6.contains(_26.symbol)&&((isc.isA.String(_20)&&_20.startsWith(_26.symbol))||_25))
-{_20=_20.substring(_26.symbol.length-(_25?1:0));if(_26.closingSymbol){if(_20.endsWith(_26.closingSymbol)){_20=_20.substring(0,_20.length-_26.closingSymbol.length)}}
+var _18=[" and "," or "];for(var i=0;i<_9.length;i++){var _20=_9[i],_21={fieldName:_2}
+_17=_11?_11.getField(_2):null,_22=(_17?_17&&isc.SimpleType.inheritsFrom(_17.type,"date"):false),_23=false;for(var _24 in _5){if(!_24)continue;var _25=_5[_24],_26=false,_27;if(_24=="=="&&isc.isA.String(_20)&&_20.startsWith("=")&&!_20.startsWith("==")&&!_20.startsWith("=("))
+{_26=true}
+if(_25&&_25.length){_27=_25.find("caseInsensitive",_14)||_25[0]}
+if(!_27||!_27.symbol||_18.contains(_27.symbol))continue;if(_6.contains(_27.symbol)&&((isc.isA.String(_20)&&(_20.startsWith(_27.symbol)||(_27.symbol=="..."&&_20.contains(_27.symbol))))||_26))
+{_23=true;if(_20.startsWith(_27.symbol)){_20=_20.substring(_27.symbol.length-(_26?1:0))}
+if(_27.closingSymbol){if(_20.endsWith(_27.closingSymbol)){_20=_20.substring(0,_20.length-_27.closingSymbol.length)}}
+if(_20.contains("...")){var _28=_20.split("...");if(_28.length==2){var _15=_5["..."],_16;if(_15)_16=(_14?_15.find("caseInsensitive",true):_15[0]);var _17=_11?_11.getField(_2):null;if(_17&&isc.SimpleType.inheritsFrom(_17.type,"date")){_28[0]=new Date(Date.parse(_28[0]));_28[0].logicalDate=true;_28[1]=new Date(Date.parse(_28[1]));_28[1].logicalDate=true}else if(_17&&_17.type=="text"){if(!_28[1].endsWith(this.$87p)){_28[1]+=this.$87p}}
+_7.criteria.add({fieldName:_2,operator:_16.ID,start:_28[0],end:_28[1]});continue}}
 if(_22){_20=new Date(Date.parse(_20));_20.logicalDate=true}
-_21.operator=_26.ID;if(_26.processValue){_20=_26.processValue(_20,_11)}
-if(_26.wildCard&&isc.isA.String(_20)&&_20.contains(_26.wildCard)){var _27=_20.split(_26.wildCard),_28;if(_27.length>1){for(var _29=0;_29<_27.length;_29++){var _30=_27[_29];if(!_30||_30.length==0)continue;_28={fieldName:_2,value:_30};var _31=_29>0,_32=_27.length-1>_29;if(_31&&_32){_28.operator=_14?"iContains":"contains"}else if(_31){_28.operator=_14?"iEndsWith":"endsWith"}else if(_32){_28.operator=_14?"iStartsWith":"startsWith"}
-_7.criteria.add(_28)}
-this.$877=true;_21.operator=null}}else{if(_26.valueType!="none")_21.value=_20}
+_21.operator=_27.ID;if(_27.processValue){_20=_27.processValue(_20,_11)}
+if(_27.wildCard&&isc.isA.String(_20)&&_20.contains(_27.wildCard)){var _29=_20.split(_27.wildCard),_30;if(_29.length>1){for(var _31=0;_31<_29.length;_31++){var _32=_29[_31];if(!_32||_32.length==0)continue;_30={fieldName:_2,value:_32};var _33=_31>0,_34=_29.length-1>_31;if(_33&&_34){_30.operator=_14?"iContains":"contains"}else if(_33){_30.operator=_14?"iEndsWith":"endsWith"}else if(_34){_30.operator=_14?"iStartsWith":"startsWith"}
+_7.criteria.add(_30)}
+this.$877=true;_21.operator=null}}else{if(_27.valueType!="none")_21.value=_20}
 break}}
+if(!_23){_21.operator=_12;_21.value=_20}
 if(_21.operator)_7.criteria.add(_21)}
 if(_7.criteria.length==1)_7=_7.criteria[0];if(_7.criteria&&_7.criteria.length==0)_7=null;return _7}
-,isc.A.buildValueExpressions=function isc_FormItem_buildValueExpressions(_1){var _2=_1,_3=" "+_2.operator+" ",_4=[],_5="",_6=isc.DS.get(this.form.expressionDataSource||this.form.dataSource);var _7=isc.DynamicForm.getOperatorIndex(),_8=isc.getKeys(_7),_9=this.validOperators;if(!_9){_9=[];for(var j=0;j<_8.length;j++){var _11=_7[_8[j]];_9.addList(_11.getProperty("ID"))}}
-var _12=this.getOperator();if(_12)_9.add(_12);var _13=_6?_6.getSearchOperator(_12):{id:_12};var _14=_13.caseInsensitive,_15=false,_16;if(!_2.criteria){var _17=[_2];_2={criteria:_17}}
-var _18=["startsWith","iStartsWith","contains","iContains","endsWith","iEndsWith"];if(this.useWildCardsByDefault&&this.type=="text"&&(_2.criteria.length>1||(_2.criteria.length==1&&_18.contains(_2.criteria[0].operator)&&_2.criteria[0].value&&_2.criteria[0].value.startsWith("=")&&!_2.criteria[0].value.startsWith("==")&&!_2.criteria[0].value.startsWith("=("))||this.$877))
-{_15=true;var _11=_7["=="];var _19=_11.find({"ID":"equals"});_16=_19.wildCard;_3=""}
-for(var i=0;i<_2.criteria.length;i++){var _21=_2.criteria[i],_22=_21.operator,_23=_21.value,_24=_6?_6.getField(_21.fieldName):null;for(var j=0;j<_8.length;j++){var _11=_7[_8[j]];var _25=_11.find({"ID":_22});if(_25){_22=_25;break}}
-if(isc.isA.String(_22)){this.logWarn("Unknown filter-expression operator: '"+_22+"'")}else if(_15){if(_22.ID=="contains"||_22.ID=="iContains"){if(_4[_4.length-1]!=_16)_4.add(_16);_4.add(_21.value);_4.add(_16)}else if(_22.ID=="startsWith"||_22.ID=="iStartsWith"){_4.add(_21.value);_4.add(_16)}else if(_22.ID=="endsWith"||_22.ID=="iEndsWith"){if(_4[_4.length-1]!=_16)_4.add(_16);_4.add(_21.value)}}else if(_22.ID==_12){_4.add(_21.value)}else if(_22.ID=="betweenInclusive"||_22.ID=="iBetweenInclusive"){_3="...";var _26=_21.end;if(_24&&_24.type=="text"){if(_26&&_26.endsWith(this.$87p)){_26=_26.replace(this.$87p,"")}}
-_4.addList([_21.start,_26])}else if(_22.ID=="isNull"||_22.ID=="notNull"){_4.add(_22.symbol)}else if(_9.contains(_22.ID)){var _27=_22;if(isc.isAn.Array(_23))_23=_23.join(_22.valueSeparator);if(_27.ID!=_13){_23=(_27&&_27.symbol?_27.symbol:"")+_23;if(_27.closingSymbol)_23+=_27.closingSymbol}
-_4.add(_23)}else if(_22.ID.startsWith("i")){var _28=_22.ID.substring(1),_29=_28.charAt(0);_28=_29.toLowerCase()+_28.substring(1)
-if(_9.contains(_28)){var _30=_8.find("ID",_28);if(_30.ID!=_13){_23=(_27&&_27.symbol?_27.symbol:"")+_23;if(_27.closingSymbol)_23+=_27.closingSymbol}
-_4.add(_23)}}}
-if(_15)_4.addAt("=",0);_5=_4.join((_4.length>1?_3:""));delete this.$877;return _5.length>0?_5:null}
-);isc.B._maxIndex=isc.C+417;isc.FormItem.registerStringMethods({showIf:"item,value,form,values",defaultDynamicValue:"item,form,values",focus:"form,item",blur:"form,item",editorEnter:"form,item,value",editorExit:"form,item,value",click:"form,item",doubleClick:"form,item",iconClick:"form,item,icon",iconKeyPress:"keyName,character,form,item,icon",change:"form,item,value,oldValue",changed:"form,item,value",transformInput:"form,item,value,oldValue",cellClick:"form,item",cellDoubleClick:"form,item",titleClick:"form,item",titleDoubleClick:"form,item",mouseMove:"form,item",mouseOver:"form,item",mouseOut:"form,item",titleMove:"form,item",titleOver:"form,item",titleOut:"form,item",itemHover:"item,form",titleHover:"item,form",keyPress:"item, form, keyName, characterValue",keyDown:"item,form,keyName",keyUp:"item,form,keyName",getValueIcon:"value",formSaved:"request,response,data",formatValue:"value,record,form,item",formatEditorValue:"value,record,form,item",parseEditorValue:"value,form,item"});isc.FormItem.getPrototype().toString=function(){return"["+this.Class+" ID:"+this.ID+(this.name!=null?" name:"+this.name:"")+"]"};isc.ClassFactory.defineClass("FormItemFactory");isc.A=isc.FormItemFactory;isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.$gx="text";isc.A.$18n="Item";isc.A.$18o="TextareaItem";isc.A.$679="TextAreaItem";isc.A.$68a="DatetimeItem";isc.A.$68b="DateTimeItem";isc.A.$18p={};isc.B.push(isc.A.getItemClassName=function isc_c_FormItemFactory_getItemClassName(_1,_2,_3,_4){if(_2==null)_2=_1.editorType||_1.formItemType||_1.type;if(isc.isA.String(_2)){var _5=_2.toLowerCase();if(_5.contains(isc.DynamicForm.$12b)){if(_5=="selectother"||_5=="selectotheritem"){_5="select";if(!_4)_1.isSelectOther=true}
+,isc.A.flattenExpressionCriteria=function isc_FormItem_flattenExpressionCriteria(_1){var _2=[];for(var i=0;i<_1.length;i++){var _4=_1[i];if(!_4.criteria){_2.add(_4)}else{_2.addList(this.flattenExpressionCriteria(_4.criteria))}}
+return _2}
+,isc.A.buildValueExpressions=function isc_FormItem_buildValueExpressions(_1){var _2=_1,_3=isc.shallowClone(_2),_4=" "+_3.operator+" ",_5=[_4],_6=[],_7="",_8=isc.DS.get(this.form.expressionDataSource||this.form.dataSource);if(_2.criteria){_3.criteria=this.flattenExpressionCriteria(_2.criteria)}
+var _9=isc.DynamicForm.getOperatorIndex(),_10=isc.getKeys(_9),_11=this.validOperators;if(!_11){_11=[];for(var j=0;j<_10.length;j++){var _13=_9[_10[j]];_11.addList(_13.getProperty("ID"))}}
+var _14=this.getOperator();if(_14)_11.add(_14);var _15=_8?_8.getSearchOperator(_14):{id:_14};var _16=_15.caseInsensitive,_17=false,_18;if(!_3.criteria){var _19=[_3];_3={criteria:_19}}
+var _20=["startsWith","iStartsWith","contains","iContains","endsWith","iEndsWith"];if(this.useWildCardsByDefault&&this.type=="text"&&(_3.criteria.length>1||(_3.criteria.length==1&&_20.contains(_3.criteria[0].operator)&&_3.criteria[0].value&&_3.criteria[0].value.startsWith("=")&&!_3.criteria[0].value.startsWith("==")&&!_3.criteria[0].value.startsWith("=("))||this.$877))
+{_17=true;var _13=_9["=="];var _21=_13.find({"ID":"equals"});_18=_21.wildCard;conjunctive=""}
+var _22=0;for(var i=0;i<_3.criteria.length;i++){var _24=_3.criteria[i],_25=_24.operator,_26=_24.value,_27=_8?_8.getField(_24.fieldName):null;for(var j=0;j<_10.length;j++){var _13=_9[_10[j]];var _28=_13.find({"ID":_25});if(_28){_25=_28;break}}
+if(i>0){_5.add(_4)}
+if(isc.isA.String(_25)){this.logWarn("Unknown filter-expression operator: '"+_25+"'")}else if(_17){if(_25.ID=="contains"||_25.ID=="iContains"){if(_6[_6.length-1]!=_18)_6.add(_18);_6.add(_24.value);_6.add(_18)}else if(_25.ID=="startsWith"||_25.ID=="iStartsWith"){_6.add(_24.value);_6.add(_18)}else if(_25.ID=="endsWith"||_25.ID=="iEndsWith"){if(_6[_6.length-1]!=_18)_6.add(_18);_6.add(_24.value)}}else if(_25.ID==_14){_6.add(_24.value)}else if(_25.ID=="betweenInclusive"||_25.ID=="iBetweenInclusive"){if(_3.criteria.length>1)_5.addAt(_25.symbol,_22);else _5[_22]=_25.symbol
+_22++;var _29=_24.end;if(_27&&_27.type=="text"){if(_29&&_29.endsWith(this.$87p)){_29=_29.replace(this.$87p,"")}}
+_6.addList([_24.start,_29])}else if(_25.ID=="isNull"||_25.ID=="notNull"){_6.add(_25.symbol)}else if(_11.contains(_25.ID)){var _30=_25;if(isc.isAn.Array(_26))_26=_26.join(_25.valueSeparator);if(_30.ID!=_15){_26=(_30&&_30.symbol?_30.symbol:"")+_26;if(_30.closingSymbol)_26+=_30.closingSymbol}
+_6.add(_26)}else if(_25.ID.startsWith("i")){var _31=_25.ID.substring(1),_32=_31.charAt(0);_31=_32.toLowerCase()+_31.substring(1)
+if(_11.contains(_31)){var _33=_10.find("ID",_31);if(_33.ID!=_15){_26=(_30&&_30.symbol?_30.symbol:"")+_26;if(_30.closingSymbol)_26+=_30.closingSymbol}
+_6.add(_26)}}
+_22++}
+if(_17)_6.addAt("=",0);if(_5.length>1){for(var i=0;i<_6.length;i++){_7+=_6[i];if(i<_6.length-1)_7+=_5[i]}}else{_7=_6.join((_6.length>1?_5[0]:""))}
+delete this.$877;return _7.length>0?_7:null}
+);isc.B._maxIndex=isc.C+418;isc.FormItem.registerStringMethods({showIf:"item,value,form,values",defaultDynamicValue:"item,form,values",focus:"form,item",blur:"form,item",editorEnter:"form,item,value",editorExit:"form,item,value",click:"form,item",doubleClick:"form,item",iconClick:"form,item,icon",iconKeyPress:"keyName,character,form,item,icon",change:"form,item,value,oldValue",changed:"form,item,value",transformInput:"form,item,value,oldValue",cellClick:"form,item",cellDoubleClick:"form,item",titleClick:"form,item",titleDoubleClick:"form,item",mouseMove:"form,item",mouseOver:"form,item",mouseOut:"form,item",titleMove:"form,item",titleOver:"form,item",titleOut:"form,item",itemHover:"item,form",titleHover:"item,form",keyPress:"item, form, keyName, characterValue",keyDown:"item,form,keyName",keyUp:"item,form,keyName",getValueIcon:"value",formSaved:"request,response,data",formatValue:"value,record,form,item",formatEditorValue:"value,record,form,item",parseEditorValue:"value,form,item"});isc.FormItem.getPrototype().toString=function(){return"["+this.Class+" ID:"+this.ID+(this.name!=null?" name:"+this.name:"")+"]"};isc.ClassFactory.defineClass("FormItemFactory");isc.A=isc.FormItemFactory;isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.$gx="text";isc.A.$18n="Item";isc.A.$18o="TextareaItem";isc.A.$679="TextAreaItem";isc.A.$68a="DatetimeItem";isc.A.$68b="DateTimeItem";isc.A.$18p={};isc.B.push(isc.A.getItemClassName=function isc_c_FormItemFactory_getItemClassName(_1,_2,_3,_4){if(_2==null)_2=_1.editorType||_1.formItemType||_1.type;if(isc.isA.String(_2)){var _5=_2.toLowerCase();if(_5.contains(isc.DynamicForm.$12b)){if(_5=="selectother"||_5=="selectotheritem"){_5="select";if(!_4)_1.isSelectOther=true}
 if(_5=="select"||_5=="selectitem"){_3=_1.form||_3;var _6=(!isc.ListGrid||(_1.multiple&&_1.multipleAppearance=="grid")||(_3?_3.useNativeSelectItems:false));if(_6)_2="NativeSelectItem"
 else _2="SelectItem"}}
 if(_5==isc.DynamicForm.$52w)_2="MultiFileItem";else if(_5==isc.DynamicForm.$12g)_2="MultiUploadItem";else if(_5==isc.DynamicForm.$51x.toLowerCase())_2="SOAPUploadItem"}
@@ -12161,7 +12179,8 @@
 return this.Super("handleClick",arguments)}
 ,isc.A.handleDoubleClick=function isc_ButtonItem_handleDoubleClick(){if(this.editingOn){if(isc.VisualBuilder&&isc.VisualBuilder.titleEditEvent=="doubleClick")this.editClick();return false}
 return this.Super("handleDoubleClick",arguments)}
-);isc.B._maxIndex=isc.C+7;if(isc.ListGrid){isc.ClassFactory.defineInterface("PickList");isc.ClassFactory.defineClass("PickListMenu","ScrollingMenu");isc.A=isc.PickListMenu;isc.A.$51t={};isc.A.pickListCacheLimit=50;isc.A=isc.PickListMenu.getPrototype();isc.A.useAllDataSourceFields=false;isc.A.tabIndex=-1;isc.A.canResizeFields=false;isc.A.canFreezeFields=false;isc.A.styleName="pickListMenu";isc.A.bodyStyleName="pickListMenuBody";isc.A.normalCellHeight=16;isc.A=isc.PickListMenu.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.$19e="background-color:";isc.A.$19f="color:";isc.B.push(isc.A.getValueIcon=function isc_PickListMenu_getValueIcon(_1,_2,_3){var _4=this.formItem;var _5=_4&&!_4.suppressValueIcons&&(_4.valueIcons!=null||_4.getValueIcon!=null);if(_5){var _6=_4.getValueFieldName(),_7=_4.valueIconField||_4.getDisplayFieldName()||_6;if(this.getFieldName(_1)==_7){return _4.$144(_3[_6])}}
+,isc.A.$85m=function isc_ButtonItem__shouldAllowExpressions(){return false}
+);isc.B._maxIndex=isc.C+8;if(isc.ListGrid){isc.ClassFactory.defineInterface("PickList");isc.ClassFactory.defineClass("PickListMenu","ScrollingMenu");isc.A=isc.PickListMenu;isc.A.$51t={};isc.A.pickListCacheLimit=50;isc.A=isc.PickListMenu.getPrototype();isc.A.useAllDataSourceFields=false;isc.A.tabIndex=-1;isc.A.canResizeFields=false;isc.A.canFreezeFields=false;isc.A.styleName="pickListMenu";isc.A.bodyStyleName="pickListMenuBody";isc.A.normalCellHeight=16;isc.A=isc.PickListMenu.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.$19e="background-color:";isc.A.$19f="color:";isc.B.push(isc.A.getValueIcon=function isc_PickListMenu_getValueIcon(_1,_2,_3){var _4=this.formItem;var _5=_4&&!_4.suppressValueIcons&&(_4.valueIcons!=null||_4.getValueIcon!=null);if(_5){var _6=_4.getValueFieldName(),_7=_4.valueIconField||_4.getDisplayFieldName()||_6;if(this.getFieldName(_1)==_7){return _4.$144(_3[_6])}}
 return this.Super("getValueIcon",arguments)}
 ,isc.A.recordClick=function isc_PickListMenu_recordClick(_1,_2,_3,_4,_5,_6,_7){if(!this.allowMultiSelect)this.hide();if(_2!=null)this.itemClick(_2)}
 ,isc.A.headerClick=function isc_PickListMenu_headerClick(_1,_2){var _3=this.Super("headerClick",arguments);var _4=this.getField(_1);if(this.isCheckboxField(_4)&&this.allowMultiSelect){this.multiSelectChanged()}
@@ -12423,7 +12442,8 @@
 ,isc.A.advanceValue=function isc_CycleItem_advanceValue(){var _1=this.getValueMap();if(isc.isA.Object(_1)&&!isc.isA.Array(_1)){_1=isc.getKeys(_1)}
 if(_1==null||_1.length<2){this.logInfo("CycleItem is non interactive as there are no options for this item.");return}
 var _2=this.getValue(),_3=_1.indexOf(_2);if(_3==_1.length-1)_3=-1;var _4=_1[_3+1];if(!this.compareValues(_4,this._value)){var _5=this.mapValueToDisplay(_4);this.setElementValue(_5,_4);if(isc.Canvas.ariaEnabled())this.setAriaState("checked",!!_4);this.$10y(_4)}}
-);isc.B._maxIndex=isc.C+4;isc.defineClass("CheckboxItem","CycleItem");isc.A=isc.CheckboxItem;isc.A.trueFalseValueMap=[true,false];isc.A.trueFalseNullValueMap=[true,false,null];isc.A=isc.CheckboxItem.getPrototype();isc.A.textBoxStyle="labelAnchor";isc.A.showLabel=true;isc.A.height=20;isc.A.requiredTitlePrefix="<b>";isc.A.requiredTitleSuffix="</b>";isc.A.valueIconLeftPadding=4;isc.A.valueIconRightPadding=3;isc.A.showValueIconOver=true;isc.A.showValueIconFocused=true;isc.A.showValueIconDown=true;isc.A.showValueIconDisabled=true;isc.A.checkedImage="[SKINIMG]/DynamicForm/checked.gif";isc.A.uncheckedImage="[SKINIMG]/DynamicForm/unchecked.gif";isc.A.partialSelectedImage="[SKINIMG]/DynamicForm/partialcheck.gif";isc.A.unsetImage="[SKINIMG]/DynamicForm/unsetcheck.gif";isc.A.valueIconWidth=13;isc.A.valueIconHeight=13;isc.A=isc.CheckboxItem.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.allowEmptyValue=false;isc.A.$18q="true";isc.A.$18r="false";isc.A.emptyValueKey="**NULL**";isc.A.$13u="Over";isc.A.$13v="Down";isc.A.$13w="Disabled";isc.A.$20a="height:";isc.A.$ph="px";isc.B.push(isc.A.getValueMap=function isc_CheckboxItem_getValueMap(){if(this.$20b)return this.$20b;var _1=this.Super("getValueMap",arguments);if(_1!=null){var _2=false,_3=isc.isAn.Object(_1);if(isc.isAn.Array(_1)){_3=false;if(_1.length!=2){_1=null}else{var _4=_1.indexOf(this.$18r);if(_4!=-1)_1[_4]=false;var _5=_1.indexOf(this.$18q);if(_5!=-1)_1[_5]=true;if(!((_1[0]&&!_1[1])||(!_1[0]&&_1[1]))){this.logInfo("Checkbox item created with valueMap:"+_1+"which has no explicit true/false display values. Mapping the first value to true and the second to false.");var _6={};_6[_1[0]]=true;_6[_1[1]]=false;this.valueMap=_1=_6;_3=true}else{_2=true}}}
+,isc.A.$85m=function isc_CycleItem__shouldAllowExpressions(){return false}
+);isc.B._maxIndex=isc.C+5;isc.defineClass("CheckboxItem","CycleItem");isc.A=isc.CheckboxItem;isc.A.trueFalseValueMap=[true,false];isc.A.trueFalseNullValueMap=[true,false,null];isc.A=isc.CheckboxItem.getPrototype();isc.A.textBoxStyle="labelAnchor";isc.A.showLabel=true;isc.A.height=20;isc.A.requiredTitlePrefix="<b>";isc.A.requiredTitleSuffix="</b>";isc.A.valueIconLeftPadding=4;isc.A.valueIconRightPadding=3;isc.A.showValueIconOver=true;isc.A.showValueIconFocused=true;isc.A.showValueIconDown=true;isc.A.showValueIconDisabled=true;isc.A.checkedImage="[SKINIMG]/DynamicForm/checked.gif";isc.A.uncheckedImage="[SKINIMG]/DynamicForm/unchecked.gif";isc.A.partialSelectedImage="[SKINIMG]/DynamicForm/partialcheck.gif";isc.A.unsetImage="[SKINIMG]/DynamicForm/unsetcheck.gif";isc.A.valueIconWidth=13;isc.A.valueIconHeight=13;isc.A=isc.CheckboxItem.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.allowEmptyValue=false;isc.A.$18q="true";isc.A.$18r="false";isc.A.emptyValueKey="**NULL**";isc.A.$13u="Over";isc.A.$13v="Down";isc.A.$13w="Disabled";isc.A.$20a="height:";isc.A.$ph="px";isc.B.push(isc.A.getValueMap=function isc_CheckboxItem_getValueMap(){if(this.$20b)return this.$20b;var _1=this.Super("getValueMap",arguments);if(_1!=null){var _2=false,_3=isc.isAn.Object(_1);if(isc.isAn.Array(_1)){_3=false;if(_1.length!=2){_1=null}else{var _4=_1.indexOf(this.$18r);if(_4!=-1)_1[_4]=false;var _5=_1.indexOf(this.$18q);if(_5!=-1)_1[_5]=true;if(!((_1[0]&&!_1[1])||(!_1[0]&&_1[1]))){this.logInfo("Checkbox item created with valueMap:"+_1+"which has no explicit true/false display values. Mapping the first value to true and the second to false.");var _6={};_6[_1[0]]=true;_6[_1[1]]=false;this.valueMap=_1=_6;_3=true}else{_2=true}}}
 if(_3){var _7=[],_8=[],_9;for(var _10 in _1){if(_7.length==2){_9=true;break}
 var _11=_1[_10];if(_10==this.$18r)_10=false;else if(_10==this.$18q)_10=true;if(_11==this.$18r){_11=_1[_10]=false}else if(_11==this.$18q){_11=_1[_10]=true}
 _8[_8.length]=_10;_7[_7.length]=_11}
@@ -12444,7 +12464,8 @@
 ,isc.A.getTextBoxHeight=function isc_CheckboxItem_getTextBoxHeight(){return null}
 ,isc.A.getTextBoxCellCSS=function isc_CheckboxItem_getTextBoxCellCSS(){var _1=isc.Canvas.$42a;var _2=this.invokeSuper(isc.CheckboxItem,"getTextBoxHeight");if(_2&&isc.isA.Number(_2))
 _1+=this.$20a+_2+this.$ph;return _1}
-);isc.B._maxIndex=isc.C+11;isc.ClassFactory.defineClass("NativeCheckboxItem","FormItem");isc.A=isc.NativeCheckboxItem.getPrototype();isc.A.textBoxStyle="labelAnchor";isc.A.implementsPromptNatively=isc.screenReader;isc.A.$183="CHECKBOX";isc.A.$125=true;isc.A.showLabel=true;isc.A.$16b={onclick:isc.FormItem.$12y};isc.A=isc.NativeCheckboxItem.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.$20c=["<TABLE role='presentation' CELLSPACING=0 CELLPADDING=0 BORDER=0><TR>","<TD WIDTH=20><INPUT TYPE=",," NAME=",," ID=",,,,,,," handleNativeEvents=false ",,,," TABINDEX=",,(isc.Browser.isMoz?" STYLE='-moz-user-focus:":null),,"></TD>",,"</TR></TABLE>"];isc.A.$20d=["<TD CLASS='",,"' ALIGN=LEFT",,,,," style='",,"'>",,"</TD>"];isc.A.$20e=["<A HREF='javascript:void ",,".boxTitleClick()' ONMOUSEOVER='window.status = \"",,"\"; return true' ONMOUSEOUT='window.status = \"\"; return true' CLASS='",,"' title=\"",,"\">",,"</A>"];isc.B.push(isc.A.getInnerWidth=function isc_NativeCheckboxItem_getInnerWidth(_1,_2,_3,_4){if(!this.showLabel||this.showValueIconOnly){return 20}
+,isc.A.$85m=function isc_CheckboxItem__shouldAllowExpressions(){return false}
+);isc.B._maxIndex=isc.C+12;isc.ClassFactory.defineClass("NativeCheckboxItem","FormItem");isc.A=isc.NativeCheckboxItem.getPrototype();isc.A.textBoxStyle="labelAnchor";isc.A.implementsPromptNatively=isc.screenReader;isc.A.$183="CHECKBOX";isc.A.$125=true;isc.A.showLabel=true;isc.A.$16b={onclick:isc.FormItem.$12y};isc.A=isc.NativeCheckboxItem.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.$20c=["<TABLE role='presentation' CELLSPACING=0 CELLPADDING=0 BORDER=0><TR>","<TD WIDTH=20><INPUT TYPE=",," NAME=",," ID=",,,,,,," handleNativeEvents=false ",,,," TABINDEX=",,(isc.Browser.isMoz?" STYLE='-moz-user-focus:":null),,"></TD>",,"</TR></TABLE>"];isc.A.$20d=["<TD CLASS='",,"' ALIGN=LEFT",,,,," style='",,"'>",,"</TD>"];isc.A.$20e=["<A HREF='javascript:void ",,".boxTitleClick()' ONMOUSEOVER='window.status = \"",,"\"; return true' ONMOUSEOUT='window.status = \"\"; return true' CLASS='",,"' title=\"",,"\">",,"</A>"];isc.B.push(isc.A.getInnerWidth=function isc_NativeCheckboxItem_getInnerWidth(_1,_2,_3,_4){if(!this.showLabel||this.showValueIconOnly){return 20}
 return this.invokeSuper(isc.NativeCheckboxItem,"getInnerWidth",_1,_2,_3,_4)}
 ,isc.A.getElementHTML=function isc_NativeCheckboxItem_getElementHTML(_1){var _2=this.form.getID(),_3=this.getItemID(),_4=this.$20c,_5=this.getAnchorTitle();_4[2]=this.$183;_4[4]=this.getElementName();_4[6]=this.getDataElementId();_4[7]=this.$155();if(this.value!=null){_4[8]=" VALUE='";_4[9]=this.value;_4[10]="'";if(this.containerWidget&&this.containerWidget.isPrinting){if(_1==this.value)_4[10]+=" CHECKED='true'"}}else{_4[8]=null;_4[9]=null;_4[10]=null}
 if(this.isDisabled())_4[11]=" DISABLED";else _4[11]=null;if(this.implementsPromptNatively){if(this.prompt!=null){_4[13]=" TITLE='";_4[14]=this.prompt;_4[15]="'"}else{_4[13]=_4[14]=_4[15]=null}}
@@ -12484,7 +12505,8 @@
 ,isc.A.collapseSection=function isc_SectionItem_collapseSection(){this.form.$101(this);if(this.itemIds==null){if(this.items==null||this.$20h){this.logWarn("collapseSection with no sectionItem.itemIds");return}}else{for(var i=0;i<this.itemIds.length;i++){var _2=this.itemIds[i],_3=this.form.getItem(_2);if(_3==null){this.logWarn("collapseSection: no such item: "+_2);continue}
 if(_3.showIf!=null)_3.$20g=_3.showIf;_3.hide()}}
 this.canvas.setExpanded(false);this.sectionExpanded=false;this.form.$10m=true}
-);isc.B._maxIndex=isc.C+13;isc.ClassFactory.defineClass("HiddenItem","FormItem");isc.A=isc.HiddenItem.getPrototype();isc.A.showTitle=false;isc.A.cellStyle=null;isc.A.width=0;isc.A.height=0;isc.A.colSpan=0;isc.A.rowSpan=0;isc.A.$125=true;isc.A.canFocus=false;isc.A=isc.HiddenItem.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.B.push(isc.A.isEditable=function isc_HiddenItem_isEditable(){return false}
+,isc.A.$85m=function isc_SectionItem__shouldAllowExpressions(){return false}
+);isc.B._maxIndex=isc.C+14;isc.ClassFactory.defineClass("HiddenItem","FormItem");isc.A=isc.HiddenItem.getPrototype();isc.A.showTitle=false;isc.A.cellStyle=null;isc.A.width=0;isc.A.height=0;isc.A.colSpan=0;isc.A.rowSpan=0;isc.A.$125=true;isc.A.canFocus=false;isc.A=isc.HiddenItem.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.B.push(isc.A.isEditable=function isc_HiddenItem_isEditable(){return false}
 ,isc.A.getInnerHTML=function isc_HiddenItem_getInnerHTML(_1){var _2=isc.StringBuffer.concat("<INPUT ID='",this.getDataElementId(),"' TYPE=HIDDEN NAME=",this.getElementName(),">");return _2.toString()}
 ,isc.A.getRowSpan=function isc_HiddenItem_getRowSpan(){return 0}
 ,isc.A.getColSpan=function isc_HiddenItem_getColSpan(){return 0}
@@ -12644,7 +12666,8 @@
 ,isc.A.getPickerData=function isc_DateItem_getPickerData(){var _1=this.getValue();if(_1!=null&&isc.isA.Date(_1))return _1;return this.getDefaultChooserDate()}
 ,isc.A.getDefaultChooserDate=function isc_DateItem_getDefaultChooserDate(){return this.defaultChooserDate}
 ,isc.A.propertyChanged=function isc_DateItem_propertyChanged(_1){if(_1=="useTextField"||_1=="useMask")this.setItems()}
-);isc.B._maxIndex=isc.C+44}
+,isc.A.$85m=function isc_DateItem__shouldAllowExpressions(){if(this.useTextField){return this.Super("$85m",arguments)}else{return false}}
+);isc.B._maxIndex=isc.C+45}
 if(isc.ListGrid){isc.defineClass("DateTimeItem","DateItem");isc.A=isc.DateTimeItem.getPrototype();isc.A.useTextField=true;isc.A.showTime=true}
 isc.ClassFactory.defineClass("SpacerItem","FormItem");isc.A=isc.SpacerItem.getPrototype();isc.A.shouldSaveValue=false;isc.A.showTitle=false;isc.A.width=20;isc.A.height=20;isc.A.showHint=false;isc.A.showIcons=false;isc.A=isc.SpacerItem.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.B.push(isc.A.isEditable=function isc_SpacerItem_isEditable(){return false}
 ,isc.A.getElementHTML=function isc_SpacerItem_getElementHTML(_1){return isc.Canvas.spacerHTML(this.width,this.height)}
@@ -12742,7 +12765,8 @@
 return this.Super("setElementValue",arguments)}
 this.logInfo("Attempting to set the value for an upload form item. This is disallowed "+"for security reasons - returning the current value of the form item");return this.getElementValue()}
 ,isc.A.refreshDisplayValue=function isc_UploadItem_refreshDisplayValue(){}
-);isc.B._maxIndex=isc.C+9;if(isc.Browser.isSafari){isc.A=isc.UploadItem.getPrototype();isc.A.colSpan="*";isc.A.startRow=true;isc.A.endRow=true;isc.A.width=300}
+,isc.A.$85m=function isc_UploadItem__shouldAllowExpressions(){return false}
+);isc.B._maxIndex=isc.C+10;if(isc.Browser.isSafari){isc.A=isc.UploadItem.getPrototype();isc.A.colSpan="*";isc.A.startRow=true;isc.A.endRow=true;isc.A.width=300}
 isc.defineClass("ComboBoxItem","TextItem","PickList");isc.A=isc.ComboBoxItem.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.autoSizePickList=true;isc.A.showPickerIcon=true;isc.A.pickerIconWidth=15;isc.A.pickerIconSrc="[SKIN]/DynamicForm/ComboBoxItem_PickButton_icon.gif";isc.A.pickerIconProperties={tabIndex:-1,showOver:true};isc.A.modalPickList=false;isc.A.showPickListOnKeypress=true;isc.A.$20s="Arrow_Up";isc.A.$20t="Arrow_Down";isc.A.$20u="Page_Up";isc.A.$20v="Page_Down";isc.A.$20w="Escape";isc.A.$10j="Enter";isc.A.$jf="Tab";isc.A.addUnknownValues=true;isc.A.filterDisplayValue=true;isc.A.autoFetchData=false;isc.B.push(isc.A.drawn=function isc_ComboBoxItem_drawn(_1,_2,_3,_4){this.invokeSuper(isc.ComboBoxItem,"drawn",_1,_2,_3,_4);if(this.autoFetchData&&this.$19m()){this.filterWithValue=false;this.fetchData(null,null,true)}}
 ,isc.A.pickListShown=function isc_ComboBoxItem_pickListShown(){if(this.pickList.isVisible()){this.$20x=this.ns.Page.setEvent("mouseDown",this,null,"$20y")}}
 ,isc.A.$20y=function isc_ComboBoxItem__clickOutside(){var _1=this.pickList;if(!_1||!_1.isVisible())return;var _2=isc.EH.lastEvent.target;if(!_1.contains(_2,true))_1.hide();if(!this.$43l){this.$43l=this.ns.Page.setEvent("mouseUp",this,isc.Page.FIRE_ONCE,"$20z")}
@@ -12855,7 +12879,8 @@
 delete this.$66x}
 if(this.getDisplayFieldName()!=null){var _6;_6=this.$19o(_1,true);if(_6!=null)_1=_6}
 return this.invokeSuper(isc.ComboBoxItem,"mapDisplayToValue",_1,_2,_3,_4)}
-);isc.B._maxIndex=isc.C+48;isc.ComboBoxItem.registerStringMethods({dataArrived:"startRow,endRow,data",getPickListFilterCriteria:""});isc.ClassFactory.defineClass("FileItem","CanvasItem");isc.A=isc.FileItem.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.shouldSaveValue=true;isc.B.push(isc.A.$18y=function isc_FileItem__createCanvas(){this.canvas=isc.DynamicForm.create({autoDraw:false,_redrawWithParent:false,redrawOnResize:false,canSubmit:true,action:this.action,targetItem:this,getSaveOperationType:function(){if(this.targetItem&&this.targetItem.form)
+,isc.A.$85m=function isc_ComboBoxItem__shouldAllowExpressions(){return false}
+);isc.B._maxIndex=isc.C+49;isc.ComboBoxItem.registerStringMethods({dataArrived:"startRow,endRow,data",getPickListFilterCriteria:""});isc.ClassFactory.defineClass("FileItem","CanvasItem");isc.A=isc.FileItem.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.shouldSaveValue=true;isc.B.push(isc.A.$18y=function isc_FileItem__createCanvas(){this.canvas=isc.DynamicForm.create({autoDraw:false,_redrawWithParent:false,redrawOnResize:false,canSubmit:true,action:this.action,targetItem:this,getSaveOperationType:function(){if(this.targetItem&&this.targetItem.form)
 return this.targetItem.form.getSaveOperationType();return this.Super("getSaveOperationType",arguments)},items:[{targetItem:this,type:"upload",width:this.width,height:this.height,name:this.getFieldName(),showTitle:false,saveValue:function(_1,_2,_3,_4){this.Super("saveValue",arguments);this.targetItem.saveValue(_1,_2,_3,_4)}},{name:"_transaction",type:"HiddenItem"}]});this.containerWidget.addChild(this.canvas)}
 ,isc.A.getValue=function isc_FileItem_getValue(){return this.canvas.getValue(this.getFieldName())}
 ,isc.A.setValue=function isc_FileItem_setValue(_1){if(_1==null||isc.isA.emptyString(_1)){this.canvas.setValue(this.getFieldName(),_1);return this.Super("setValue",arguments)}else{this.logWarn("Cannot programmatically set the value of an upload field due to security restraints");return}}
@@ -12863,7 +12888,8 @@
 this.Super("setWidth",arguments)}
 ,isc.A.setHeight=function isc_FileItem_setHeight(_1){if(this.canvas){this.canvas.items[0].setHeight(_1)}
 this.Super("setHeight",arguments)}
-);isc.B._maxIndex=isc.C+5;if(isc.ListGrid){isc.ClassFactory.defineClass("RelationItem","CanvasItem");isc.A=isc.RelationItem.getPrototype();isc.A.canvasConstructor="ListGrid";isc.A.canvasDefaults={canEdit:true};isc.A.pickerConstructor="RelationPicker";isc.A.showEditButton=true;isc.A.editButtonDefaults={click:"item.showPicker(!form.saveOperationIsAdd(), icon)",prompt:"Edit new/selected item"};isc.A.showRemoveButton=true;isc.A.removeButtonDefaults={src:"[SKIN]DynamicForm/Remove_icon.gif",click:"item.removeSelectedData()",prompt:"Remove selected item"};isc.A.canEditWithNoMasterRecord=false;isc.A=isc.RelationItem.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.B.push(isc.A.init=function isc_RelationItem_init(){this.disabled=!this.canEditWithNoMasterRecord;this.Super("init",arguments);if(!this.pickerDefaults)this.pickerDefaults={};isc.addProperties(this.pickerDefaults,{dataSource:this.dataSource});if(this.showEditButton)this.editButton=this.addIcon(this.editButtonDefaults);if(this.showRemoveButton)this.removeButton=this.addIcon(this.removeButtonDefaults)}
+,isc.A.$85m=function isc_FileItem__shouldAllowExpressions(){return false}
+);isc.B._maxIndex=isc.C+6;if(isc.ListGrid){isc.ClassFactory.defineClass("RelationItem","CanvasItem");isc.A=isc.RelationItem.getPrototype();isc.A.canvasConstructor="ListGrid";isc.A.canvasDefaults={canEdit:true};isc.A.pickerConstructor="RelationPicker";isc.A.showEditButton=true;isc.A.editButtonDefaults={click:"item.showPicker(!form.saveOperationIsAdd(), icon)",prompt:"Edit new/selected item"};isc.A.showRemoveButton=true;isc.A.removeButtonDefaults={src:"[SKIN]DynamicForm/Remove_icon.gif",click:"item.removeSelectedData()",prompt:"Remove selected item"};isc.A.canEditWithNoMasterRecord=false;isc.A=isc.RelationItem.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.B.push(isc.A.init=function isc_RelationItem_init(){this.disabled=!this.canEditWithNoMasterRecord;this.Super("init",arguments);if(!this.pickerDefaults)this.pickerDefaults={};isc.addProperties(this.pickerDefaults,{dataSource:this.dataSource});if(this.showEditButton)this.editButton=this.addIcon(this.editButtonDefaults);if(this.showRemoveButton)this.removeButton=this.addIcon(this.removeButtonDefaults)}
 ,isc.A.getPickerData=function isc_RelationItem_getPickerData(){var _1=this.canvas.getSelectedRecord();if(_1)return _1;return this.getDataSource().getForeignKeysByRelation(this.form.getValues(),this.form.dataSource)}
 ,isc.A.showPicker=function isc_RelationItem_showPicker(_1,_2,_3,_4){this.Super("showPicker",arguments);var _5={};if(!this.form.saveOperationIsAdd())
 _5=this.getDataSource().getForeignKeysByRelation(this.form.getValues(),this.form.dataSource);this.picker.setForeignKeyValues(_5)}
@@ -12872,7 +12898,8 @@
 ,isc.A.setValue=function isc_RelationItem_setValue(){this.delayCall("filterRelation")}
 ,isc.A.filterRelation=function isc_RelationItem_filterRelation(){var _1=this.form.getValues();if(this.form.saveOperationIsAdd()){this.canvas.setData([]);this.setDisabled(!this.canEditWithNoMasterRecord)}else{this.canvas.filterData(this.getDataSource().getForeignKeysByRelation(_1,this.form.dataSource));this.enable()}
 if(this.picker)this.picker.clearData()}
-);isc.B._maxIndex=isc.C+7;isc.defineClass("RelationPicker","VLayout");isc.A=isc.RelationPicker.getPrototype();isc.A.className="dialogBackground";isc.A=isc.RelationPicker.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.creatorName="picker";isc.B.push(isc.A.initWidget=function isc_RelationPicker_initWidget(){this.Super("initWidget",arguments);this.addAutoChild("editor",{dataSource:this.dataSource},"DynamicForm");this.addAutoChild("toolbar",{membersMargin:2},"HLayout");this.addAutoChild("saveButton",{title:"Save",click:"this.picker.editor.saveData(this.picker.getID()+'.hide()')"},"AutoFitButton",this.toolbar);this.addAutoChild("clearButton",{title:"Clear",click:"this.picker.clearData();"},"AutoFitButton",this.toolbar);this.addAutoChild("cancelButton",{title:"Cancel",click:"this.picker.hide();this.picker.clearData()"},"AutoFitButton",this.toolbar)}
+,isc.A.$85m=function isc_RelationItem__shouldAllowExpressions(){return false}
+);isc.B._maxIndex=isc.C+8;isc.defineClass("RelationPicker","VLayout");isc.A=isc.RelationPicker.getPrototype();isc.A.className="dialogBackground";isc.A=isc.RelationPicker.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.creatorName="picker";isc.B.push(isc.A.initWidget=function isc_RelationPicker_initWidget(){this.Super("initWidget",arguments);this.addAutoChild("editor",{dataSource:this.dataSource},"DynamicForm");this.addAutoChild("toolbar",{membersMargin:2},"HLayout");this.addAutoChild("saveButton",{title:"Save",click:"this.picker.editor.saveData(this.picker.getID()+'.hide()')"},"AutoFitButton",this.toolbar);this.addAutoChild("clearButton",{title:"Clear",click:"this.picker.clearData();"},"AutoFitButton",this.toolbar);this.addAutoChild("cancelButton",{title:"Cancel",click:"this.picker.hide();this.picker.clearData()"},"AutoFitButton",this.toolbar)}
 ,isc.A.hide=function isc_RelationPicker_hide(){this.Super("hide",arguments);this.hideClickMask()}
 ,isc.A.setData=function isc_RelationPicker_setData(_1){this.editor.setData(_1)}
 ,isc.A.getData=function isc_RelationPicker_getData(){return this.editor.getValues()}
@@ -12940,7 +12967,8 @@
 this.setValue(this.defaultValue)}
 ,isc.A.fileUploaded=function isc_DialogUploadItem_fileUploaded(_1,_2){var _3=_2.data;var _4={};_4[_3.primaryKey]=_3.file_filename;this.setValueMap(_4);this.setValue(_3.primaryKey)}
 ,isc.A.destroy=function isc_DialogUploadItem_destroy(){this.Super("destroy");if(this.picker)this.picker.destroy()}
-);isc.B._maxIndex=isc.C+7;isc.defineClass("DialogUploadPicker","MultiFilePicker");isc.A=isc.DialogUploadPicker.getPrototype();isc.A.maxUploadFields=1;isc.A.uploadWithoutPKButtonName="Upload";isc.A.uploadWithPKButtonName="Upload";isc.A.showUploadRemoveButton=false;isc.A.uploadWithoutPK=true}
+,isc.A.$85m=function isc_DialogUploadItem__shouldAllowExpressions(){return false}
+);isc.B._maxIndex=isc.C+8;isc.defineClass("DialogUploadPicker","MultiFilePicker");isc.A=isc.DialogUploadPicker.getPrototype();isc.A.maxUploadFields=1;isc.A.uploadWithoutPKButtonName="Upload";isc.A.uploadWithPKButtonName="Upload";isc.A.showUploadRemoveButton=false;isc.A.uploadWithoutPK=true}
 if(isc.ListGrid){isc.ClassFactory.defineClass("SOAPUploadItem","DialogUploadItem");isc.A=isc.SOAPUploadItem.getPrototype();isc.A.dataSource="sessionFiles"}isc.ClassFactory.defineClass("SpinnerItem","TextItem");isc.A=isc.SpinnerItem;isc.A.INCREASE_ICON={width:16,height:9,src:"[SKIN]/DynamicForm/Spinner_increase_icon.png",name:"increase",showOver:true,imgOnly:true,hspace:0};isc.A.DECREASE_ICON={width:16,height:9,src:"[SKIN]/DynamicForm/Spinner_decrease_icon.png",name:"decrease",showOver:true,imgOnly:true,hspace:0};isc.A=isc.SpinnerItem.getPrototype();isc.A.changeOnKeypress=false;isc.A.canTabToIcons=false;isc.A.height=18;isc.A.step=1;isc.A=isc.SpinnerItem.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.B.push(isc.A.init=function isc_SpinnerItem_init(){this.Super("init",arguments);var _1=this.step;if(_1!=null&&!isc.isA.Number(_1)){_1=parseFloat(_1);if(!isc.isA.Number(_1))_1=1;this.step=_1}}
 ,isc.A.$14v=function isc_SpinnerItem__setUpIcons(){if(this.icons==null)this.icons=[];var _1=isc.addProperties({},isc.SpinnerItem.INCREASE_ICON),_2=isc.addProperties({},isc.SpinnerItem.DECREASE_ICON);this.icons.addListAt([_1,_2],0);this.Super("$14v",arguments)}
 ,isc.A.getIconsHTML=function isc_SpinnerItem_getIconsHTML(){if(!this.showIcons)return"";var _1=isc.SB.create();if(!this.$204){var _2="<TD tabIndex=-1"+(isc.Browser.isIE?" style='font-size:0px'":"")+">",_3={},_4=this.$16l(_3),_5=this.$16m(_3);this.$204=["<TABLE role='presentation' STYLE='vertical-align:",_4,";margin-top:",_5,";margin-bottom:",_5,";display:inline;' BORDER=0 CELLPADDING=0 CELLSPACING=0><TR>",_2,this.getIconHTML(this.icons[0]),"<TD></TR><TR>",_2,this.getIconHTML(this.icons[1]),"</TD></TR></TABLE>"]}else{this.$204[8]=this.getIconHTML(this.icons[0]);this.$204[11]=this.getIconHTML(this.icons[1])}
@@ -12979,7 +13007,8 @@
 ,isc.A.setMinValue=function isc_SliderItem_setMinValue(_1){this.canvas.setMinValue(_1)}
 ,isc.A.setMaxValue=function isc_SliderItem_setMaxValue(_1){this.canvas.setMaxValue(_1)}
 ,isc.A.setNumValues=function isc_SliderItem_setNumValues(_1){this.canvas.setNumValues(_1)}
-);isc.B._maxIndex=isc.C+9;isc.ClassFactory.defineClass("ColorItem","TextItem");isc.A=isc.ColorItem.getPrototype();isc.A.changeOnBlur=true;isc.A.changeOnKeypress=false;isc.A.pickerConstructor="ColorPicker";isc.A.pickerDefaults={colorSelected:function(_1,_2){this.callingFormItem.pickerColorSelected(_1,_2)}};isc.A.showPickerIcon=true;isc.A.pickerIconWidth=18;isc.A.pickerIconHeight=18;isc.A.pickerIconSrc="[SKIN]/DynamicForm/ColorPicker_icon.png";isc.A.pickerIconProperties={prompt:"Click to select a new color",showOver:false};isc.A.defaultPickerMode="simple";isc.A.allowComplexMode=true;isc.A.supportsTransparency=false;isc.A.browserSpellCheck=false;isc.A=isc.ColorItem.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.B.push(isc.A.init=function isc_ColorItem_init(){this.pickerDefaults.defaultPickMode=this.defaultPickerMode;this.pickerDefaults.allowComplexMode=this.allowComplexMode;this.pickerDefaults.supportsTransparency=this.supportsTransparency;this.Super("init",arguments)}
+,isc.A.$85m=function isc_SliderItem__shouldAllowExpressions(){return false}
+);isc.B._maxIndex=isc.C+10;isc.ClassFactory.defineClass("ColorItem","TextItem");isc.A=isc.ColorItem.getPrototype();isc.A.changeOnBlur=true;isc.A.changeOnKeypress=false;isc.A.pickerConstructor="ColorPicker";isc.A.pickerDefaults={colorSelected:function(_1,_2){this.callingFormItem.pickerColorSelected(_1,_2)}};isc.A.showPickerIcon=true;isc.A.pickerIconWidth=18;isc.A.pickerIconHeight=18;isc.A.pickerIconSrc="[SKIN]/DynamicForm/ColorPicker_icon.png";isc.A.pickerIconProperties={prompt:"Click to select a new color",showOver:false};isc.A.defaultPickerMode="simple";isc.A.allowComplexMode=true;isc.A.supportsTransparency=false;isc.A.browserSpellCheck=false;isc.A=isc.ColorItem.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.B.push(isc.A.init=function isc_ColorItem_init(){this.pickerDefaults.defaultPickMode=this.defaultPickerMode;this.pickerDefaults.allowComplexMode=this.allowComplexMode;this.pickerDefaults.supportsTransparency=this.supportsTransparency;this.Super("init",arguments)}
 ,isc.A.updateValue=function isc_ColorItem_updateValue(){var _1=this._value,_2=this.getElementValue();_2=this.mapDisplayToValue(_2);if(_2==this._value)return;if(_2!=null&&!isc.isA.color(_2)){this.setElementValue(_1);return}
 this.Super("updateValue",arguments);if(this.showPickerIcon&&this._value!=_1){this.setIconBackgroundColor(this.getPickerIcon(),this._value)}}
 ,isc.A.getDefaultValue=function isc_ColorItem_getDefaultValue(){var _1=this.Super("getDefaultValue",arguments);if(_1&&!isc.isA.color(_1)){this.logWarn("Default value:"+_1+" is not a valid color identifier."+" Ignoring this default.");_1=this.defaultValue=null}
@@ -12989,7 +13018,8 @@
 ,isc.A.pickerColorSelected=function isc_ColorItem_pickerColorSelected(_1,_2){if(!this.mask){_1=this.mapValueToDisplay(_1)}
 this.setElementValue(_1);this.updateValue()}
 ,isc.A.setValue=function isc_ColorItem_setValue(_1){this.Super("setValue",arguments);this.setIconBackgroundColor(this.getPickerIcon(),this._value)}
-);isc.B._maxIndex=isc.C+6;if(isc.ListGrid){isc.ClassFactory.defineClass("PickTreeItem","CanvasItem");isc.A=isc.PickTreeItem;isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.B.push(isc.A.$21j=function isc_c_PickTreeItem__itemSelected(_1){return this.canvasItem.$21j(_1)}
+,isc.A.$85m=function isc_ColorItem__shouldAllowExpressions(){return false}
+);isc.B._maxIndex=isc.C+7;if(isc.ListGrid){isc.ClassFactory.defineClass("PickTreeItem","CanvasItem");isc.A=isc.PickTreeItem;isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.B.push(isc.A.$21j=function isc_c_PickTreeItem__itemSelected(_1){return this.canvasItem.$21j(_1)}
 ,isc.A.$21k=function isc_c_PickTreeItem__getButtonTitle(){var _1=this.getSelectedItem();if(_1==null){var _2=this.canvasItem,_3=this.canvasItem.getValue();if(_3!=null)return _2.mapValueToDisplay(_3)}
 return this.Super("getTitle",arguments)}
 ,isc.A.$21l=function isc_c_PickTreeItem__treeDataLoaded(){var _1=this.canvasItem;_1.setValue(_1.getValue())}
@@ -13013,7 +13043,8 @@
 ,isc.A.fetchData=function isc_PickTreeItem_fetchData(){var _1=this.getOptionDataSource();if(_1==null){this.logWarn("fetchData() called on pickTree item with no option data source. Ignoring.");return}
 var _2=this.canvas.getTree();if(!_2||!_2.invalidateCache){return}
 _2.invalidateCache()}
-);isc.B._maxIndex=isc.C+14;isc.defineClass("IPickTreeItem","PickTreeItem");isc.A=isc.IPickTreeItem.getPrototype();isc.A.buttonConstructor="ITreeMenuButton"}
+,isc.A.$85m=function isc_PickTreeItem__shouldAllowExpressions(){return false}
+);isc.B._maxIndex=isc.C+15;isc.defineClass("IPickTreeItem","PickTreeItem");isc.A=isc.IPickTreeItem.getPrototype();isc.A.buttonConstructor="ITreeMenuButton"}
 isc.ClassFactory.defineClass("PopUpTextAreaItem","StaticTextItem");isc.A=isc.PopUpTextAreaItem.getPrototype();isc.A.canFocus=true;isc.A.wrap=false;isc.A.width=150;isc.A.clipValue=true;isc.A.popUpOnEnter=false;isc.A.popUpOnAnyClick=true;isc.A.textAreaWidth=100;isc.A.textAreaHeight=100;isc.A.iconOnly=false;isc.A.popUpIconSrc="[SKIN]/DynamicForm/PopUpTextAreaEditor_icon.gif";isc.A.popUpIconWidth=20;isc.A.popUpIconHeight=20;isc.A.iconVAlign=isc.Canvas.CENTER;isc.A=isc.PopUpTextAreaItem.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.B.push(isc.A.$14v=function isc_PopUpTextAreaItem__setUpIcons(){if(this.icons==null)this.icons=[];var _1={name:"popUpIcon",src:this.popUpIconSrc,showOver:false,width:this.popUpIconWidth,height:this.popUpIconHeight,click:this.$43p};this.icons.addAt(_1,0);this.Super("$14v",arguments)}
 ,isc.A.$43p=function isc_PopUpTextAreaItem__popUpIconClick(_1,_2,_3){if(_2.popUpOnAnyClick||_2.isDisabled())return;_2.showPopUp(true)}
 ,isc.A.handleCellClick=function isc_PopUpTextAreaItem_handleCellClick(){if(this.Super("handleCellClick")==false)return false;if(this.popUpOnAnyClick&&!this.isDisabled())this.showPopUp(true)}
@@ -13351,7 +13382,8 @@
 this.addAutoChild("editor",_2);this.canvas=this.editor}
 ,isc.A.setValue=function isc_NestedEditorItem_setValue(_1){this.editor.setValues(_1)}
 ,isc.A.updateValue=function isc_NestedEditorItem_updateValue(_1){this.$10y(_1)}
-);isc.B._maxIndex=isc.C+5;isc.ClassFactory.defineClass("NestedListEditorItem","CanvasItem");isc.A=isc.NestedListEditorItem.getPrototype();isc.A.shouldSaveValue=true;isc.A.editorConstructor="ListEditor";isc.A.editorDefaults={inlineEdit:false,height:155,saveRecord:function(){if(!this.form.validate())return false;var _1=this.form.getValues();this.showList();if(this.inlineEdit){this.grid.setEditValues(this.grid.getEditRow(),_1)}else{if(this.form.saveOperationType=="add"){this.grid.addData(_1)}else{isc.addProperties(this.currentRecord,_1);this.grid.markForRedraw()}
+,isc.A.$85m=function isc_NestedEditorItem__shouldAllowExpressions(){return false}
+);isc.B._maxIndex=isc.C+6;isc.ClassFactory.defineClass("NestedListEditorItem","CanvasItem");isc.A=isc.NestedListEditorItem.getPrototype();isc.A.shouldSaveValue=true;isc.A.editorConstructor="ListEditor";isc.A.editorDefaults={inlineEdit:false,height:155,saveRecord:function(){if(!this.form.validate())return false;var _1=this.form.getValues();this.showList();if(this.inlineEdit){this.grid.setEditValues(this.grid.getEditRow(),_1)}else{if(this.form.saveOperationType=="add"){this.grid.addData(_1)}else{isc.addProperties(this.currentRecord,_1);this.grid.markForRedraw()}
 if(!this.inlineEdit){this.form.clearValues()}
 this.creator.updateValue(this.grid.data)}
 return true}};isc.A=isc.NestedListEditorItem.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.B.push(isc.A.init=function isc_NestedListEditorItem_init(){this.$67h();this.Super("init",arguments)}
@@ -13361,7 +13393,8 @@
 this.addAutoChild("editor",_2);this.canvas=this.editor}
 ,isc.A.updateValue=function isc_NestedListEditorItem_updateValue(_1){this.editor.setData(_1);this.$10y(_1)}
 ,isc.A.setValue=function isc_NestedListEditorItem_setValue(_1){this.editor.setData(_1);this.Super("setValue",arguments)}
-);isc.B._maxIndex=isc.C+5;isc.ClassFactory.defineClass("ViewFileItem","CanvasItem");isc.A=isc.ViewFileItem.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.shouldSaveValue=false;isc.A.colSpan="*";isc.A.height=20;isc.A.width="*";isc.A.overflow="visible";isc.A.canvasDefaults={_constructor:"Canvas",height:10,width:"100%"};isc.B.push(isc.A.isEditable=function isc_ViewFileItem_isEditable(){return false}
+,isc.A.$85m=function isc_NestedListEditorItem__shouldAllowExpressions(){return false}
+);isc.B._maxIndex=isc.C+6;isc.ClassFactory.defineClass("ViewFileItem","CanvasItem");isc.A=isc.ViewFileItem.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.shouldSaveValue=false;isc.A.colSpan="*";isc.A.height=20;isc.A.width="*";isc.A.overflow="visible";isc.A.canvasDefaults={_constructor:"Canvas",height:10,width:"100%"};isc.B.push(isc.A.isEditable=function isc_ViewFileItem_isEditable(){return false}
 ,isc.A.init=function isc_ViewFileItem_init(){this.addAutoChild("canvas");this.Super('init',arguments)}
 ,isc.A.setValue=function isc_ViewFileItem_setValue(_1){var _2=this.form,_3=_2.getValues();if(this.type=="imageFile"&&this.showFileInline!=false){this.canvas.setHeight("*");this.canvas.setWidth("*");this.canvas.setContents(this.getImageHTML()||"&nbsp;")}else{if(this.showFileInline==true){this.logWarn("setValue(): Unsupported field-type for showFileInline: "+this.type)}
 this.canvas.setHeight(20);this.canvas.setWidth("*");this.canvas.setContents(this.getViewDownloadHTML(_1,_3)||"&nbsp;")}
@@ -13371,7 +13404,8 @@
 _4=_1[_3];return _4}
 ,isc.A.viewFile=function isc_ViewFileItem_viewFile(){isc.DS.get(this.form.dataSource).viewFile(this.form.getValues(),this.name)}
 ,isc.A.downloadFile=function isc_ViewFileItem_downloadFile(){isc.DS.get(this.form.dataSource).downloadFile(this.form.getValues(),this.name)}
-);isc.B._maxIndex=isc.C+7;isc.defineClass("PanelHeader","ImgSectionHeader");isc.A=isc.PanelHeader.getPrototype();isc.A.width="100%";isc.A.height=22;isc.A.baseStyle="sectionHeader";isc.A=isc.PanelHeader.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.showSelectedIcon=false;isc.A.showRollOverIcon=false;isc.A.showDisabledIcon=false;isc.A.showDownIcon=false;isc.A.showFocusedIcon=false;isc.B.push(isc.A.initWidget=function isc_PanelHeader_initWidget(){this.setPanelTitleFromCanvas()}
+,isc.A.$85m=function isc_ViewFileItem__shouldAllowExpressions(){return false}
+);isc.B._maxIndex=isc.C+8;isc.defineClass("PanelHeader","ImgSectionHeader");isc.A=isc.PanelHeader.getPrototype();isc.A.width="100%";isc.A.height=22;isc.A.baseStyle="sectionHeader";isc.A=isc.PanelHeader.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.showSelectedIcon=false;isc.A.showRollOverIcon=false;isc.A.showDisabledIcon=false;isc.A.showDownIcon=false;isc.A.showFocusedIcon=false;isc.B.push(isc.A.initWidget=function isc_PanelHeader_initWidget(){this.setPanelTitleFromCanvas()}
 ,isc.A.setPanelTitleFromCanvas=function isc_PanelHeader_setPanelTitleFromCanvas(){if(this.canvas){if(this.canvas.title)this.title=this.canvas.title;if(this.canvas.icon)this.icon=this.canvas.icon}}
 );isc.B._maxIndex=isc.C+2;isc.PanelHeader.registerStringMethods({iconClick:""});isc.A=isc.Canvas.getPrototype();isc.B=isc._allFuncs;isc.C=isc.B._maxIndex;isc.D=isc._funcClasses;isc.D[isc.C]=isc.A.Class;isc.A.panelHeaderDefaults={_constructor:"PanelHeader"};isc.A.panelHeaderProperties={};isc.A.panelHeaderPlacement="peer";isc.B.push(isc.A.setupPanelHeader=function isc_Canvas_setupPanelHeader(){if(!this.showPanelHeader)return;this.panelHeader=this.createAutoChild("panelHeader",{canvas:this,snapTo:"T"});if(isc.isA.Layout(this))this.panelHeaderPlacement="member";else this.panelHeaderPlacement="peer";this.panelHeaderPlacement="peer";if(this.panelHeaderPlacement=="member"){this.addMember(this.panelHeader,0)}
 else if(this.panelHeaderPlacement=="peer"){this.addPeer(this.panelHeader);this.panelHeader.moveAbove(this);this.$wi(this.panelHeader,isc.Canvas.TOP)}
@@ -13625,7 +13659,7 @@
 );isc.B._maxIndex=isc.C+4;isc._moduleEnd=isc._Forms_end=(isc.timestamp?isc.timestamp():new Date().getTime());if(isc.Log&&isc.Log.logIsInfoEnabled('loadTime'))isc.Log.logInfo('Forms module init time: ' + (isc._moduleEnd-isc._moduleStart) + 'ms','loadTime');delete isc.definingFramework;}else{if(window.isc && isc.Log && isc.Log.logWarn)isc.Log.logWarn("Duplicate load of module 'Forms'.");}
 /*
  * Isomorphic SmartClient
- * Version SC_SNAPSHOT-2011-10-22 (2011-10-22)
+ * Version SC_SNAPSHOT-2011-11-04 (2011-11-04)
  * Copyright(c) 1998 and beyond Isomorphic Software, Inc. All rights reserved.
  * "SmartClient" is a trademark of Isomorphic Software, Inc.
  *
@@ -13636,7 +13670,7 @@
 
 /*
  * Isomorphic SmartClient
- * Version SC_SNAPSHOT-2011-10-22 (2011-10-22)
+ * Version SC_SNAPSHOT-2011-11-04 (2011-11-04)
  * Copyright(c) 1998 and beyond Isomorphic Software, Inc. All rights reserved.
  * "SmartClient" is a trademark of Isomorphic Software, Inc.
  *
@@ -14606,9 +14640,7 @@
 return-1};var _54=function(_62,_63,_64){var _55=_63.value;var _56=_62.value;if(isc.isA.Number(_55))_55=""+_55;if(isc.isA.Number(_56))_56=""+_56;if(!isc.isA.String(_55)||!isc.isA.String(_56))return-1;if(_64.caseInsensitive){_55=_55.toLowerCase();_56=_56.toLowerCase()}
 if(_62.fieldName==_63.fieldName&&_62.value==_63.value&&!_64.equals)
 {return 0}
-if(_64.equals){if((_55==_56&&!_64.negate)||(_55!=_56&&_64.negate))
-{return 0}
-return-1}
+if(_64.equals){return(_55==_56?0:-1)}
 if(_64.startsWith&&!_64.negate&&_56.length>_55.length&&isc.startsWith(_56,_55))
 {return 1}
 if(_64.startsWith&&_64.negate&&_55.length>_56.length&&isc.startsWith(_55,_56))
@@ -16870,7 +16902,7 @@
 isc._moduleEnd=isc._DataBinding_end=(isc.timestamp?isc.timestamp():new Date().getTime());if(isc.Log&&isc.Log.logIsInfoEnabled('loadTime'))isc.Log.logInfo('DataBinding module init time: ' + (isc._moduleEnd-isc._moduleStart) + 'ms','loadTime');delete isc.definingFramework;}else{if(window.isc && isc.Log && isc.Log.logWarn)isc.Log.logWarn("Duplicate load of module 'DataBinding'.");}
 /*
  * Isomorphic SmartClient
- * Version SC_SNAPSHOT-2011-10-22 (2011-10-22)
+ * Version SC_SNAPSHOT-2011-11-04 (2011-11-04)
  * Copyright(c) 1998 and beyond Isomorphic Software, Inc. All rights reserved.
  * "SmartClient" is a trademark of Isomorphic Software, Inc.
  *
@@ -16881,7 +16913,7 @@
 
 /*
  * Isomorphic SmartClient
- * Version SC_SNAPSHOT-2011-10-22 (2011-10-22)
+ * Version SC_SNAPSHOT-2011-11-04 (2011-11-04)
  * Copyright(c) 1998 and beyond Isomorphic Software, Inc. All rights reserved.
  * "SmartClient" is a trademark of Isomorphic Software, Inc.
  *
@@ -17331,7 +17363,7 @@
 );isc.B._maxIndex=isc.C+46;isc.Calendar.registerStringMethods({getDayBodyHTML:"date,events,calendar,rowNum,colNum",getDayHeaderHTML:"date,events,calendar,rowNum,colNum",dayBodyClick:"date,events,calendar,rowNum,colNum",dayHeaderClick:"date,events,calendar,rowNum,colNum",eventClick:"event,viewName",eventChanged:"event",eventMoved:"newDate,event",eventResized:"newDate,event",backgroundClick:"startDate,endDate",backgroundMouseUp:"startDate"});isc.A=isc.DaySchedule;isc.A.$53o=[{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""},{label:"",day1:"",day2:"",day3:"",day4:"",day5:"",day6:"",day7:""}];isc.AutoTest.customizeCalendar();isc._moduleEnd=isc._Calendar_end=(isc.timestamp?isc.timestamp():new Date().getTime());if(isc.Log&&isc.Log.logIsInfoEnabled('loadTime'))isc.Log.logInfo('Calendar module init time: ' + (isc._moduleEnd-isc._moduleStart) + 'ms','loadTime');delete isc.definingFramework;}else{if(window.isc && isc.Log && isc.Log.logWarn)isc.Log.logWarn("Duplicate load of module 'Calendar'.");}
 /*
  * Isomorphic SmartClient
- * Version SC_SNAPSHOT-2011-10-22 (2011-10-22)
+ * Version SC_SNAPSHOT-2011-11-04 (2011-11-04)
  * Copyright(c) 1998 and beyond Isomorphic Software, Inc. All rights reserved.
  * "SmartClient" is a trademark of Isomorphic Software, Inc.
  *
@@ -17342,7 +17374,7 @@
 
 /*
  * Isomorphic SmartClient
- * Version SC_SNAPSHOT-2011-10-22 (2011-10-22)
+ * Version SC_SNAPSHOT-2011-11-04 (2011-11-04)
  * Copyright(c) 1998 and beyond Isomorphic Software, Inc. All rights reserved.
  * "SmartClient" is a trademark of Isomorphic Software, Inc.
  *
@@ -17414,7 +17446,7 @@
 );isc.B._maxIndex=isc.C+3;isc._moduleEnd=isc._PluginBridges_end=(isc.timestamp?isc.timestamp():new Date().getTime());if(isc.Log&&isc.Log.logIsInfoEnabled('loadTime'))isc.Log.logInfo('PluginBridges module init time: ' + (isc._moduleEnd-isc._moduleStart) + 'ms','loadTime');delete isc.definingFramework;}else{if(window.isc && isc.Log && isc.Log.logWarn)isc.Log.logWarn("Duplicate load of module 'PluginBridges'.");}
 /*
  * Isomorphic SmartClient
- * Version SC_SNAPSHOT-2011-10-22 (2011-10-22)
+ * Version SC_SNAPSHOT-2011-11-04 (2011-11-04)
  * Copyright(c) 1998 and beyond Isomorphic Software, Inc. All rights reserved.
  * "SmartClient" is a trademark of Isomorphic Software, Inc.
  *
@@ -17425,7 +17457,7 @@
 
 /*
  * Isomorphic SmartClient
- * Version SC_SNAPSHOT-2011-10-22 (2011-10-22)
+ * Version SC_SNAPSHOT-2011-11-04 (2011-11-04)
  * Copyright(c) 1998 and beyond Isomorphic Software, Inc. All rights reserved.
  * "SmartClient" is a trademark of Isomorphic Software, Inc.
  *
@@ -17648,7 +17680,7 @@
 );isc.B._maxIndex=isc.C+6;isc._moduleEnd=isc._RichTextEditor_end=(isc.timestamp?isc.timestamp():new Date().getTime());if(isc.Log&&isc.Log.logIsInfoEnabled('loadTime'))isc.Log.logInfo('RichTextEditor module init time: ' + (isc._moduleEnd-isc._moduleStart) + 'ms','loadTime');delete isc.definingFramework;}else{if(window.isc && isc.Log && isc.Log.logWarn)isc.Log.logWarn("Duplicate load of module 'RichTextEditor'.");}
 /*
  * Isomorphic SmartClient
- * Version SC_SNAPSHOT-2011-10-22 (2011-10-22)
+ * Version SC_SNAPSHOT-2011-11-04 (2011-11-04)
  * Copyright(c) 1998 and beyond Isomorphic Software, Inc. All rights reserved.
  * "SmartClient" is a trademark of Isomorphic Software, Inc.
  *
--- a/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_History.js	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/isomorphic/ISC_History.js	Sat Nov 12 15:43:15 2011 +0100
@@ -1,6 +1,6 @@
 /*
  * Isomorphic SmartClient
- * Version SC_SNAPSHOT-2011-10-22 (2011-10-22)
+ * Version SC_SNAPSHOT-2011-11-04 (2011-11-04)
  * Copyright(c) 1998 and beyond Isomorphic Software, Inc. All rights reserved.
  * "SmartClient" is a trademark of Isomorphic Software, Inc.
  *
@@ -12,7 +12,7 @@
 var isc = window.isc ? window.isc : {};if(window.isc&&!window.isc.module_History){isc.module_History=1;isc._moduleStart=isc._History_start=(isc.timestamp?isc.timestamp():new Date().getTime());if(isc._moduleEnd&&(!isc.Log||(isc.Log && isc.Log.logIsDebugEnabled('loadTime')))){isc._pTM={ message:'History load/parse time: ' + (isc._moduleStart-isc._moduleEnd) + 'ms', category:'loadTime'};
 if(isc.Log && isc.Log.logDebug)isc.Log.logDebug(isc._pTM.message,'loadTime')
 else if(isc._preLog)isc._preLog[isc._preLog.length]=isc._pTM
-else isc._preLog=[isc._pTM]}isc.definingFramework=true;var isc=window.isc?window.isc:{};isc.$d=new Date().getTime();isc.version="SC_SNAPSHOT-2011-10-22/LGPL Deployment";isc.versionNumber="SC_SNAPSHOT-2011-10-22";isc.buildDate="2011-10-22";isc.expirationDate="";isc.licenseType="LGPL";isc.licenseCompany="Isomorphic Software";isc.licenseSerialNumber="ISC_LGPL_NIGHTLY";isc.licensingPage="http://smartclient.com/product/";isc.$41r={SCServer:{present:"false",name:"SmartClient Server",serverOnly:true,isPro:true},Drawing:{present:"false",name:"Drawing Module"},PluginBridges:{present:"true",name:"PluginBridges Module"},RichTextEditor:{present:"true",name:"RichTextEditor Module"},Calendar:{present:"true",name:"Calendar Module"},Analytics:{present:"false",name:"Analytics Module"},Tools:{present:"${includeTools}",name:"Portal and Tools Module"},NetworkPerformance:{present:"false",name:"Network Performance Module"},FileLoader:{present:"false",name:"Network Performance Module"},RealtimeMessaging:{present:"false",name:"RealtimeMessaging Module"},serverCriteria:{present:"false",name:"Server Advanced Filtering",serverOnly:true,isFeature:true},customSQL:{present:"false",name:"SQL Templating",serverOnly:true,isFeature:true},chaining:{present:"false",name:"Transaction Chaining",serverOnly:true,isFeature:true},batchDSGenerator:{present:"false",name:"Batch DS-Generator",serverOnly:true,isFeature:true},batchUploader:{present:"false",name:"Batch Uploader",serverOnly:true,isFeature:true},transactions:{present:"false",name:"Automatic Transaction Management",serverOnly:true,isFeature:true}};isc.canonicalizeModules=function(_1){if(!_1)return null;if(isc.isA.String(_1)){if(_1.indexOf(",")!=-1){_1=_1.split(",");var _2=/^\s+/,_3=/\s+$/;for(var i=0;i<_1.length;i++){_1[i]=_1[i].replace(_2,"").replace(_3,"")}}else _1=[_1]}
+else isc._preLog=[isc._pTM]}isc.definingFramework=true;var isc=window.isc?window.isc:{};isc.$d=new Date().getTime();isc.version="SC_SNAPSHOT-2011-11-04/LGPL Deployment";isc.versionNumber="SC_SNAPSHOT-2011-11-04";isc.buildDate="2011-11-04";isc.expirationDate="";isc.licenseType="LGPL";isc.licenseCompany="Isomorphic Software";isc.licenseSerialNumber="ISC_LGPL_NIGHTLY";isc.licensingPage="http://smartclient.com/product/";isc.$41r={SCServer:{present:"false",name:"SmartClient Server",serverOnly:true,isPro:true},Drawing:{present:"false",name:"Drawing Module"},PluginBridges:{present:"true",name:"PluginBridges Module"},RichTextEditor:{present:"true",name:"RichTextEditor Module"},Calendar:{present:"true",name:"Calendar Module"},Analytics:{present:"false",name:"Analytics Module"},Tools:{present:"${includeTools}",name:"Portal and Tools Module"},NetworkPerformance:{present:"false",name:"Network Performance Module"},FileLoader:{present:"false",name:"Network Performance Module"},RealtimeMessaging:{present:"false",name:"RealtimeMessaging Module"},serverCriteria:{present:"false",name:"Server Advanced Filtering",serverOnly:true,isFeature:true},customSQL:{present:"false",name:"SQL Templating",serverOnly:true,isFeature:true},chaining:{present:"false",name:"Transaction Chaining",serverOnly:true,isFeature:true},batchDSGenerator:{present:"false",name:"Batch DS-Generator",serverOnly:true,isFeature:true},batchUploader:{present:"false",name:"Batch Uploader",serverOnly:true,isFeature:true},transactions:{present:"false",name:"Automatic Transaction Management",serverOnly:true,isFeature:true}};isc.canonicalizeModules=function(_1){if(!_1)return null;if(isc.isA.String(_1)){if(_1.indexOf(",")!=-1){_1=_1.split(",");var _2=/^\s+/,_3=/\s+$/;for(var i=0;i<_1.length;i++){_1[i]=_1[i].replace(_2,"").replace(_3,"")}}else _1=[_1]}
 return _1};isc.hasOptionalModules=function(_1){if(!_1)return true;_1=isc.canonicalizeModules(_1);for(var i=0;i<_1.length;i++)if(!isc.hasOptionalModule(_1[i]))return false;return true};isc.getMissingModules=function(_1){var _2=[];_1=isc.canonicalizeModules(_1);for(var i=0;i<_1.length;i++){var _4=_1[i];if(!isc.hasOptionalModule(_4))_2.add(isc.$41r[_4])}
 return _2};isc.hasOptionalModule=function(_1){var v=isc.$41r[_1];if(!v){if(isc.Log)isc.Log.logWarn("isc.hasOptionalModule - unknown module: "+_1);return false}
 return v.present=="true"||v.present.charAt(0)=="$"};isc.getOptionalModule=function(_1){return isc.$41r[_1]};isc.$a=window.isc_useSimpleNames;if(isc.$a==null)isc.$a=true;if(window.OpenAjax){isc.$b=isc.versionNumber.replace(/[a-zA-Z_]+/,".0");OpenAjax.registerLibrary("SmartClient","http://smartclient.com/SmartClient",isc.$b,{namespacedMode:!isc.$a,iscVersion:isc.version,buildDate:isc.buildDate,licenseType:isc.licenseType,licenseCompany:isc.licenseCompany,licenseSerialNumber:isc.licenseSerialNumber});OpenAjax.registerGlobals("SmartClient",["isc"])}
@@ -57,7 +57,7 @@
 this.$ab=_1;this.logDebug("history callback: "+_1);if(isc.Class&&this.isAString(_2)){isc.Class.fireCallback(_2,["id","data"],[_1,_3])}else{_2=isc.addProperties({},_2);_2.args=[_1,_3];this.fireSimpleCallback(_2)}}});isc.History.$z();isc._moduleEnd=isc._History_end=(isc.timestamp?isc.timestamp():new Date().getTime());if(isc.Log&&isc.Log.logIsInfoEnabled('loadTime'))isc.Log.logInfo('History module init time: ' + (isc._moduleEnd-isc._moduleStart) + 'ms','loadTime');delete isc.definingFramework;}else{if(window.isc && isc.Log && isc.Log.logWarn)isc.Log.logWarn("Duplicate load of module 'History'.");}
 /*
  * Isomorphic SmartClient
- * Version SC_SNAPSHOT-2011-10-22 (2011-10-22)
+ * Version SC_SNAPSHOT-2011-11-04 (2011-11-04)
  * Copyright(c) 1998 and beyond Isomorphic Software, Inc. All rights reserved.
  * "SmartClient" is a trademark of Isomorphic Software, Inc.
  *
--- a/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js	Sat Nov 12 15:43:15 2011 +0100
@@ -33,11 +33,6 @@
 
 isc.Canvas.addProperties({
   
-  // workaround for this issue:
-  // http://forums.smartclient.com/showthread.php?p=75007#post75007
-  // https://issues.openbravo.com/view.php?id=18841
-  cancelNativeScrollOnKeyDown: false,
-  
   // make sure that the datasources are also destroyed
   _original_destroy: isc.Canvas.getPrototype().destroy,
   destroy: function() {
@@ -105,7 +100,7 @@
   // this is a copy of the FormItem.parseValueExpressions to support
   // and/or logic for enum and text fields
   parseOBValueExpressions: function(value, fieldName) {
-    var type = this.getType(),
+    var type = this.getType(), i,
       isValidLogicType = (isc.SimpleType.inheritsFrom(type, 'enum') ||
           isc.SimpleType.inheritsFrom(type, 'text') ||
           isc.SimpleType.inheritsFrom(type, 'integer') ||
@@ -114,216 +109,242 @@
       ),
       opIndex = isc.DynamicForm.getOperatorIndex(),
       validOps = isc.getKeys(opIndex),
-      result = { operator: 'and', criteria: [], fieldName: fieldName},
+      result = { operator: "and", criteria: [] },
       crit = result.criteria,
-      valueParts = [], i,
-      ds = isc.DS.get(this.form.expressionDataSource || this.form.dataSource),
-      defOpName, defOp, insensitive, field, skipTheseOps,
-      valuePart, subCrit, isDateField, useDefaultOperator, opKey, key,
-      operator, operators, op, ops, wildCard,
-      parts, partCrit, part, partIndex,
-      hasPrefix, hasSuffix;
-    
+      valueParts = [],
+      allowEx = true,
+      ds = isc.DS.get(this.form.expressionDataSource || this.form.dataSource)
+    ;
+  
     if (!value) {
       value = this.getValue();
     }
     if (!value) {
       return;
     }
-    
+  
     if (!isc.isA.String(value)) {
-      value += '';
+      value += "";
     }
     
-    defOpName = this.getOperator();
+    var tempOps, tempOp;
+    
+    var defOpName = this.getOperator();
     if (defOpName) {
       validOps.add(defOpName);
     }
+  
+    var defOp = ds ? ds.getSearchOperator(defOpName) : { id: defOpName };
     
-    defOp = ds ? ds.getSearchOperator(defOpName) : { id: defOpName };
-    
-    insensitive = defOp.caseInsensitive;
-    
-    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('...');
+    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 (valueParts.length === 2) {
-            var tempOps = opIndex['...'],
-                tempOp;
-    
+            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;
                 }
             }
-    
+  
             return { fieldName: fieldName, operator: tempOp.ID, 
                 start: valueParts[0], end: valueParts[1] };
         }
     } else {
         valueParts = [value];
     }
-    
-    skipTheseOps = [ ' and ', ' or ', '...' ];
-    
-    for (i = 0; i < valueParts.length; i++) {
-        valuePart = valueParts[i];
-        subCrit = { fieldName: fieldName };
+  
+    var skipTheseOps = [ " and ", " or " ];
+  
+    for (i = 0; i<valueParts.length; i++) {
+        var key, valuePart = valueParts[i],
+            subCrit = { fieldName: fieldName };
+            
         field = ds ? ds.getField(fieldName) : null;
-        isDateField = (field ? field && isc.SimpleType.inheritsFrom(field.type, 'date') : false);
-    
-        useDefaultOperator = true;
-        for (opKey in opIndex) {
-          if (opIndex.hasOwnProperty(opKey)) {
-            if (!opKey) {
-              continue;
-            }
-            
-            operators = opIndex[opKey];
-  
-            if (operators && operators.length) {
-                operator = operators.find('caseInsensitive', insensitive) || operators[0];
-            }
-    
-            if (!operator || !operator.symbol || skipTheseOps.contains(operator.symbol)) {
-              continue;
-            }
-            if (validOps.contains(operator.symbol) && 
-                      (isc.isA.String(valuePart) && valuePart.startsWith(operator.symbol))) {
-              useDefaultOperator = false;
-              break;
-            }
-          }
-        }
-        if (useDefaultOperator) {
-          valuePart = defOp.symbol + valuePart;
-        }
+        var isDateField = (field ? field && isc.SimpleType.inheritsFrom(field.type, "date") : false),
+          valueHasExpression = false;
         
         for (key in opIndex) {
           if (opIndex.hasOwnProperty(key)) {
-    
             if (!key) {
               continue;
             }
-    
-            ops = opIndex[key];
-            wildCard = false;
-    
-            if (key === '==' && isc.isA.String(valuePart) && valuePart.startsWith('=') && 
-                    !valuePart.startsWith('==') && !valuePart.startsWith('=(')) 
+  
+            var ops = opIndex[key],
+                wildCard = false,
+                op
+            ;
+  
+            if (key === "==" && isc.isA.String(valuePart) && valuePart.startsWith("=") && 
+                    !valuePart.startsWith("==") && !valuePart.startsWith("=(")) 
             {
-              wildCard = true;
+                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)) {
               continue;
             }
             
             if (validOps.contains(op.symbol) && (
-                  (isc.isA.String(valuePart) && valuePart.startsWith(op.symbol)) 
-                  || wildCard))
+                    (isc.isA.String(valuePart) && (valuePart.startsWith(op.symbol) || 
+                        
+                        (op.symbol === "..." && valuePart.contains(op.symbol)))
+                    ) 
+                    || wildCard))
             {
-              valuePart = valuePart.substring(op.symbol.length - (wildCard ? 1 : 0));
-              if (op.closingSymbol) {
-                // this is a containing operator (inSet, notInSet), with opening and 
-                // closing symbols...  check that the value endsWith the correct 
-                // closing symbol and strip it off - op.processValue() will split 
-                // the string for us later
-                if (valuePart.endsWith(op.closingSymbol)) {
-                    valuePart = valuePart.substring(0, valuePart.length - op.closingSymbol.length);
+                valueHasExpression = true;
+            
+                if (valuePart.startsWith(op.symbol)) {
+                    valuePart = valuePart.substring(op.symbol.length - (wildCard ? 1 : 0));
                 }
-              }
   
-              if (isDateField) {
-                valuePart = new Date(Date.parse(valuePart));
-                valuePart.logicalDate = true;
-              }
+                if (op.closingSymbol) {
+                    // this is a containing operator (inSet, notInSet), with opening and 
+                    // closing symbols...  check that the value endsWith the correct 
+                    // closing symbol and strip it off - op.processValue() will split 
+                    // the string for us later
+                    if (valuePart.endsWith(op.closingSymbol)) {
+                        valuePart = valuePart.substring(0, valuePart.length - op.closingSymbol.length);
+                    }
+                }
   
-              subCrit.operator = op.ID;
+                if (valuePart.contains("...")) {
+                    // allow range operators as well as conjunctives
+                    var rangeValueParts = valuePart.split("...");
+                    if (rangeValueParts.length === 2) {
+                        tempOps = opIndex["..."];
   
-              if (op.processValue) {
-                valuePart = op.processValue(valuePart, ds);
-              }
+                        if (tempOps) {
+                          tempOp = (insensitive ? tempOps.find("caseInsensitive", true) : tempOps[0]);
+                        }
   
-              if (op.wildCard && isc.isA.String(valuePart) && valuePart.contains(op.wildCard)) {
-                // this is an operator that supports wildCards (equals, notEquals)...
-                
-                parts = valuePart.split(op.wildCard);
+                        field = ds ? ds.getField(fieldName) : null;
   
-                if (parts.length > 1) {
-                  for (partIndex=0; partIndex<parts.length; partIndex++) {
-                    part = parts[partIndex];
+                        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") {
+                            
+                            if (!rangeValueParts[1].endsWith(this._betweenInclusiveEndCrit)) {
+                                rangeValueParts[1] += this._betweenInclusiveEndCrit;
+                            }
+                        }
   
-                    if (!part || part.length === 0) {
-                      continue;
+                        result.criteria.add({ fieldName: fieldName, operator: tempOp.ID, 
+                            start: rangeValueParts[0], end: rangeValueParts[1] 
+                        });
+  
+                        continue;
                     }
+                }
   
-                    partCrit = { fieldName: fieldName, value: part };
+                if (isDateField) {
+                    valuePart = new Date(Date.parse(valuePart));
+                    valuePart.logicalDate = true;
+                }
   
-                    hasPrefix = partIndex > 0;
-                    hasSuffix = parts.length - 1 > partIndex;
+                subCrit.operator = op.ID;
   
-                    if (hasPrefix && hasSuffix) {
-                      // this is a contains criteria
-                      partCrit.operator = insensitive ? 'iContains' : 'contains';
-                    } else if (hasPrefix) {
-                      // this is an endsWith criteria
-                      partCrit.operator = insensitive ? 'iEndsWith' : 'endsWith';
-                    } else if (hasSuffix) {
-                      // this is a startsWith criteria
-                      partCrit.operator = insensitive ? 'iStartsWith' : 'startsWith';
+                if (op.processValue) {
+                    valuePart = op.processValue(valuePart, ds);
+                }
+  
+                if (op.wildCard && isc.isA.String(valuePart) && valuePart.contains(op.wildCard)) {
+                    // this is an operator that supports wildCards (equals, notEquals)...
+                    
+                    parts = valuePart.split(op.wildCard);
+  
+                    if (parts.length > 1) {
+                        for (partIndex=0; partIndex<parts.length; partIndex++) {
+                            part = parts[partIndex];
+  
+                            if (!part || part.length === 0) {
+                              continue;
+                            }
+  
+                            partCrit = { fieldName: fieldName, value: part };
+  
+                            var hasPrefix = partIndex > 0,
+                                hasSuffix = parts.length - 1 > partIndex
+                            ;
+  
+                            if (hasPrefix && hasSuffix) {
+                                // this is a contains criteria
+                                partCrit.operator = insensitive ? "iContains" : "contains";
+                            } else if (hasPrefix) {
+                                // this is an endsWith criteria
+                                partCrit.operator = insensitive ? "iEndsWith" : "endsWith";
+                            } else if (hasSuffix) {
+                                // this is a startsWith criteria
+                                partCrit.operator = insensitive ? "iStartsWith" : "startsWith";
+                            }
+  
+                            result.criteria.add(partCrit);
+                        }
+  
+                        // we'll include a check for this attribute when rebuilding the 
+                        // value later
+                        this._lastValueHadWildCards = true;
+  
+                        // clear out the sub-crit's operator - this will prevent it being
+                        // added to the result criteria below (we've already added 
+                        // everything we need above
+                        subCrit.operator = null;
                     }
+                } else {
+                    // set the value if one is required for the op
+                    if (op.valueType !== "none") {
+                      subCrit.value = valuePart;
+                    }
+                }
   
-                    result.criteria.add(partCrit);
-                  }
-  
-                  // clear out the sub-crit's operator - this will prevent it being
-                  // added to the result criteria below (we've already added 
-                  // everything we need above
-                  subCrit.operator = null;
-                }
-            } else {
-              // set the value if one is required for the op
-              if (op.valueType !== 'none') {
-                subCrit.value = valuePart;
-              }
+                break;
             }
-  
-            break;
           }
         }
-      }
-      if (subCrit.operator) {
-        result.criteria.add(subCrit);
-      }
+        if (!valueHasExpression) {
+            // this was a straight expression like "10"
+            subCrit.operator = defOpName;
+            subCrit.value = valuePart;
+        }
+        if (subCrit.operator) {
+          result.criteria.add(subCrit);
+        }
     }
+  //  this.logWarn("Parsed expression:" + value + " to criterion:" + this.echo(result));
     if (result.criteria.length === 1) {
       result = result.criteria[0];
     }
     if (result.criteria && result.criteria.length === 0) {
       result = null;
     }
-    
+  
     return result;
   },
 
@@ -656,17 +677,6 @@
 // between accent or non-accent words
 isc.DataSource.addProperties({
   
-  // workaround for this issue:
-  // http://forums.smartclient.com/showthread.php?p=75186#post75186
-  // https://issues.openbravo.com/view.php?id=18841
-  compareAdvancedCriteria: function(newCriterion, oldCriterion) {
-    // simple check...
-    if (newCriterion === oldCriterion) {
-      return 0;
-    }
-    return 1;
-  },
-  
   _fieldMatchesFilter: isc.DataSource.getPrototype().fieldMatchesFilter,
   fieldMatchesFilter: function(fieldValue, filterValue, requestProperties) {
     if (fieldValue && typeof fieldValue === 'string') {
--- a/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Sat Nov 12 15:43:15 2011 +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.14195]]></VERSION>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION><![CDATA[3.0.14223]]></VERSION>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <DESCRIPTION><![CDATA[Pre-configured collection of standard ERP roles]]></DESCRIPTION>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <HELP><![CDATA[This dataset contains the following roles with their access to corresponding Openbravo entities - windows, reports, actions.
 * Employee - Any person of the enterprise
@@ -27,7 +27,7 @@
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
-<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION_LABEL><![CDATA[MP5]]></VERSION_LABEL>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61--></AD_MODULE>
 
--- a/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sat Nov 12 15:43:15 2011 +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.14195]]></STARTVERSION>
+<!--148A000EE9A04A3CA653B1296A00B8E6-->  <STARTVERSION><![CDATA[3.0.14223]]></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.14195]]></STARTVERSION>
+<!--30F966407A6F4E15965821BAEE34D25B-->  <STARTVERSION><![CDATA[3.0.14223]]></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.14195]]></STARTVERSION>
+<!--F93CE30003B24F8F8886510B0065EECC-->  <STARTVERSION><![CDATA[1.1.14223]]></STARTVERSION>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <DEPENDANT_MODULE_NAME><![CDATA[Orders Awaiting Delivery]]></DEPENDANT_MODULE_NAME>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Sat Nov 12 15:43:15 2011 +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.14195]]></VERSION>
+<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION><![CDATA[2.1.14223]]></VERSION>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <DESCRIPTION><![CDATA[Openbravo 3.0 Framework]]></DESCRIPTION>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <HELP><![CDATA[Contains all the components required to run the Openbravo 3.0 framework]]></HELP>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <URL><![CDATA[http://forge.openbravo.com/projects/openbravov30framework]]></URL>
@@ -24,7 +24,7 @@
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <UPDATEINFO><![CDATA[minor bugfix release to include latest client.application 2.0.1, client.myob 2.0.2 and client.kernel 2.0.1]]></UPDATEINFO>
-<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION_LABEL><![CDATA[MP5]]></VERSION_LABEL>
+<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--7E48CDD73B7E493A8BED4F7253E7C989--></AD_MODULE>
 
--- a/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sat Nov 12 15:43:15 2011 +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.14195]]></STARTVERSION>
+<!--01E1BCCEC9114DE0960538DF34E30E6F-->  <STARTVERSION><![CDATA[2.1.14223]]></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.14195]]></STARTVERSION>
+<!--025B181F63CA47B48A920F6983242390-->  <STARTVERSION><![CDATA[3.0.14223]]></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.14195]]></STARTVERSION>
+<!--054B4FEAF919478AA3FF27098A46D1D6-->  <STARTVERSION><![CDATA[2.1.14223]]></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.14195]]></STARTVERSION>
+<!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <STARTVERSION><![CDATA[1.0.14223]]></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.14195]]></STARTVERSION>
+<!--224754C3EF674C93B0D468F47BAAB824-->  <STARTVERSION><![CDATA[2.1.14223]]></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.14195]]></STARTVERSION>
+<!--5B72D24032DD4879A950194139D961B6-->  <STARTVERSION><![CDATA[2.1.14223]]></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.14195]]></STARTVERSION>
+<!--8730CA6A4224439D82E0DD31B3806E36-->  <STARTVERSION><![CDATA[1.0.14223]]></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.14195]]></STARTVERSION>
+<!--98C47FF058F8413B8A2B26036061446E-->  <STARTVERSION><![CDATA[8.1.14223]]></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.14195]]></STARTVERSION>
+<!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <STARTVERSION><![CDATA[2.0.14223]]></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.14195]]></STARTVERSION>
+<!--A9CB99330AF34944877F889DD8A0AB3C-->  <STARTVERSION><![CDATA[2.1.14223]]></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.14195]]></STARTVERSION>
+<!--E72A053A403C4A98A189C105B850ADB0-->  <STARTVERSION><![CDATA[1.1.14223]]></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.14195]]></STARTVERSION>
+<!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <STARTVERSION><![CDATA[2.0.14223]]></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	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Sat Nov 12 15:43:15 2011 +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.14195]]></VERSION>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION><![CDATA[3.0.14223]]></VERSION>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <DESCRIPTION><![CDATA[Openbravo 3.0 distribution template]]></DESCRIPTION>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <HELP><![CDATA[Openbravo 3.0 is a collection (distribution) of modules. This template is a container of all the modules and configuration changes that compose Openbravo 3.0.]]></HELP>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <URL><![CDATA[http://forge.openbravo.com/projects/vthree]]></URL>
@@ -20,7 +20,7 @@
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
-<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION_LABEL><![CDATA[MP5]]></VERSION_LABEL>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--0138E7A89B5E4DC3932462252801FFBC--></AD_MODULE>
 
--- a/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Sat Nov 12 15:43:15 2011 +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.14195]]></STARTVERSION>
+<!--4D11E3A70650475381139522373CD191-->  <STARTVERSION><![CDATA[2.1.14223]]></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.14195]]></STARTVERSION>
+<!--52CE523C40634C47A99C6EBBD9C3125C-->  <STARTVERSION><![CDATA[3.0.14223]]></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.14195]]></STARTVERSION>
+<!--60834727BB114764ACEF019F40A34562-->  <STARTVERSION><![CDATA[1.1.14223]]></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.14195]]></STARTVERSION>
+<!--8418885E97D643138B6D907671351E3D-->  <STARTVERSION><![CDATA[3.0.14223]]></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.14195]]></STARTVERSION>
+<!--A32F3279B3374FC0A6CFEA2368BB7053-->  <STARTVERSION><![CDATA[3.0.14223]]></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.14195]]></STARTVERSION>
+<!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <STARTVERSION><![CDATA[3.0.14223]]></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.14195]]></STARTVERSION>
+<!--FF8080813189932B013189B45B59003A-->  <STARTVERSION><![CDATA[0.1.14223]]></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.14195]]></STARTVERSION>
+<!--FF8080813189932B013189B4C00F003D-->  <STARTVERSION><![CDATA[0.1.14223]]></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.14195]]></STARTVERSION>
+<!--FF8081812E2F6F3C012E2F750109001C-->  <STARTVERSION><![CDATA[0.0.14223]]></STARTVERSION>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <DEPENDANT_MODULE_NAME><![CDATA[Widgets Collection]]></DEPENDANT_MODULE_NAME>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/model/tables/FIN_PAYMENT_CREDIT.xml	Sat Nov 12 15:43:15 2011 +0100
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+  <database name="TABLE FIN_PAYMENT_CREDIT">
+    <table name="FIN_PAYMENT_CREDIT" primaryKey="FIN_PAYMENT_CREDIT_KEY">
+      <column name="FIN_PAYMENT_CREDIT_ID" primaryKey="true" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
+        <default><![CDATA[SYSDATE]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
+        <default><![CDATA[SYSDATE]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="ISACTIVE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[Y]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="FIN_PAYMENT_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="FIN_PAYMENT_ID_USED" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AMOUNT" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false">
+        <default><![CDATA[0]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="C_CURRENCY_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <foreign-key foreignTable="AD_CLIENT" name="FIN_CR_AD_CLIENT_PAYMENTS">
+        <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="FIN_CR_AD_ORG_PAYMENTS">
+        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="C_CURRENCY" name="FIN_CR_C_CURRENCY_PAYMENTS">
+        <reference local="C_CURRENCY_ID" foreign="C_CURRENCY_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="FIN_PAYMENT" name="FIN_CR_FIN_PAYMENT">
+        <reference local="FIN_PAYMENT_ID" foreign="FIN_PAYMENT_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="FIN_PAYMENT" name="FIN_CR_FIN_PAYMENT_USED">
+        <reference local="FIN_PAYMENT_ID_USED" foreign="FIN_PAYMENT_ID"/>
+      </foreign-key>
+      <check name="FIN_CR_PAYMENT_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
+    </table>
+  </database>
--- a/src-db/database/sourcedata/AD_COLUMN.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Sat Nov 12 15:43:15 2011 +0100
@@ -267000,6 +267000,421 @@
 <!--ACD6E6D9F125445C97E22C05EBA0A346-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
 <!--ACD6E6D9F125445C97E22C05EBA0A346--></AD_COLUMN>
 
+<!--ADFF06FF43CABA83E040007F01012F39--><AD_COLUMN>
+<!--ADFF06FF43CABA83E040007F01012F39-->  <AD_COLUMN_ID><![CDATA[ADFF06FF43CABA83E040007F01012F39]]></AD_COLUMN_ID>
+<!--ADFF06FF43CABA83E040007F01012F39-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--ADFF06FF43CABA83E040007F01012F39-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--ADFF06FF43CABA83E040007F01012F39-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--ADFF06FF43CABA83E040007F01012F39-->  <NAME><![CDATA[FIN_Payment_Credit_ID]]></NAME>
+<!--ADFF06FF43CABA83E040007F01012F39-->  <DESCRIPTION><![CDATA[Unique identifier for a FIN Payment Credit]]></DESCRIPTION>
+<!--ADFF06FF43CABA83E040007F01012F39-->  <HELP><![CDATA[Tracks the places where the credit payment has been used]]></HELP>
+<!--ADFF06FF43CABA83E040007F01012F39-->  <COLUMNNAME><![CDATA[FIN_Payment_Credit_ID]]></COLUMNNAME>
+<!--ADFF06FF43CABA83E040007F01012F39-->  <AD_TABLE_ID><![CDATA[FF80818132AF937F0132AF9E94FF0013]]></AD_TABLE_ID>
+<!--ADFF06FF43CABA83E040007F01012F39-->  <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
+<!--ADFF06FF43CABA83E040007F01012F39-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--ADFF06FF43CABA83E040007F01012F39-->  <ISKEY><![CDATA[Y]]></ISKEY>
+<!--ADFF06FF43CABA83E040007F01012F39-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--ADFF06FF43CABA83E040007F01012F39-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--ADFF06FF43CABA83E040007F01012F39-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--ADFF06FF43CABA83E040007F01012F39-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--ADFF06FF43CABA83E040007F01012F39-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--ADFF06FF43CABA83E040007F01012F39-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--ADFF06FF43CABA83E040007F01012F39-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--ADFF06FF43CABA83E040007F01012F39-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--ADFF06FF43CABA83E040007F01012F39-->  <AD_ELEMENT_ID><![CDATA[ADFF07B10A7856DCE040007F01012F40]]></AD_ELEMENT_ID>
+<!--ADFF06FF43CABA83E040007F01012F39-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--ADFF06FF43CABA83E040007F01012F39-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--ADFF06FF43CABA83E040007F01012F39-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--ADFF06FF43CABA83E040007F01012F39-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--ADFF06FF43CABA83E040007F01012F39-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--ADFF06FF43CABA83E040007F01012F39-->  <POSITION><![CDATA[1]]></POSITION>
+<!--ADFF06FF43CABA83E040007F01012F39-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--ADFF06FF43CABA83E040007F01012F39-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--ADFF06FF43CABA83E040007F01012F39-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--ADFF06FF43CABA83E040007F01012F39-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--ADFF06FF43CABA83E040007F01012F39--></AD_COLUMN>
+
+<!--ADFF06FF43CBBA83E040007F01012F39--><AD_COLUMN>
+<!--ADFF06FF43CBBA83E040007F01012F39-->  <AD_COLUMN_ID><![CDATA[ADFF06FF43CBBA83E040007F01012F39]]></AD_COLUMN_ID>
+<!--ADFF06FF43CBBA83E040007F01012F39-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--ADFF06FF43CBBA83E040007F01012F39-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--ADFF06FF43CBBA83E040007F01012F39-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--ADFF06FF43CBBA83E040007F01012F39-->  <NAME><![CDATA[Client]]></NAME>
+<!--ADFF06FF43CBBA83E040007F01012F39-->  <DESCRIPTION><![CDATA[Client for this installation.]]></DESCRIPTION>
+<!--ADFF06FF43CBBA83E040007F01012F39-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
+<!--ADFF06FF43CBBA83E040007F01012F39-->  <COLUMNNAME><![CDATA[AD_Client_ID]]></COLUMNNAME>
+<!--ADFF06FF43CBBA83E040007F01012F39-->  <AD_TABLE_ID><![CDATA[FF80818132AF937F0132AF9E94FF0013]]></AD_TABLE_ID>
+<!--ADFF06FF43CBBA83E040007F01012F39-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--ADFF06FF43CBBA83E040007F01012F39-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--ADFF06FF43CBBA83E040007F01012F39-->  <DEFAULTVALUE><![CDATA[@AD_CLIENT_ID@]]></DEFAULTVALUE>
+<!--ADFF06FF43CBBA83E040007F01012F39-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--ADFF06FF43CBBA83E040007F01012F39-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--ADFF06FF43CBBA83E040007F01012F39-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--ADFF06FF43CBBA83E040007F01012F39-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--ADFF06FF43CBBA83E040007F01012F39-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--ADFF06FF43CBBA83E040007F01012F39-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--ADFF06FF43CBBA83E040007F01012F39-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--ADFF06FF43CBBA83E040007F01012F39-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--ADFF06FF43CBBA83E040007F01012F39-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--ADFF06FF43CBBA83E040007F01012F39-->  <AD_ELEMENT_ID><![CDATA[102]]></AD_ELEMENT_ID>
+<!--ADFF06FF43CBBA83E040007F01012F39-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--ADFF06FF43CBBA83E040007F01012F39-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--ADFF06FF43CBBA83E040007F01012F39-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--ADFF06FF43CBBA83E040007F01012F39-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--ADFF06FF43CBBA83E040007F01012F39-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--ADFF06FF43CBBA83E040007F01012F39-->  <POSITION><![CDATA[2]]></POSITION>
+<!--ADFF06FF43CBBA83E040007F01012F39-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--ADFF06FF43CBBA83E040007F01012F39-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--ADFF06FF43CBBA83E040007F01012F39-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--ADFF06FF43CBBA83E040007F01012F39-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--ADFF06FF43CBBA83E040007F01012F39--></AD_COLUMN>
+
+<!--ADFF06FF43CCBA83E040007F01012F39--><AD_COLUMN>
+<!--ADFF06FF43CCBA83E040007F01012F39-->  <AD_COLUMN_ID><![CDATA[ADFF06FF43CCBA83E040007F01012F39]]></AD_COLUMN_ID>
+<!--ADFF06FF43CCBA83E040007F01012F39-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--ADFF06FF43CCBA83E040007F01012F39-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--ADFF06FF43CCBA83E040007F01012F39-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--ADFF06FF43CCBA83E040007F01012F39-->  <NAME><![CDATA[Organization]]></NAME>
+<!--ADFF06FF43CCBA83E040007F01012F39-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
+<!--ADFF06FF43CCBA83E040007F01012F39-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
+<!--ADFF06FF43CCBA83E040007F01012F39-->  <COLUMNNAME><![CDATA[AD_Org_ID]]></COLUMNNAME>
+<!--ADFF06FF43CCBA83E040007F01012F39-->  <AD_TABLE_ID><![CDATA[FF80818132AF937F0132AF9E94FF0013]]></AD_TABLE_ID>
+<!--ADFF06FF43CCBA83E040007F01012F39-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--ADFF06FF43CCBA83E040007F01012F39-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--ADFF06FF43CCBA83E040007F01012F39-->  <DEFAULTVALUE><![CDATA[@AD_ORG_ID@]]></DEFAULTVALUE>
+<!--ADFF06FF43CCBA83E040007F01012F39-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--ADFF06FF43CCBA83E040007F01012F39-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--ADFF06FF43CCBA83E040007F01012F39-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--ADFF06FF43CCBA83E040007F01012F39-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--ADFF06FF43CCBA83E040007F01012F39-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--ADFF06FF43CCBA83E040007F01012F39-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--ADFF06FF43CCBA83E040007F01012F39-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--ADFF06FF43CCBA83E040007F01012F39-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--ADFF06FF43CCBA83E040007F01012F39-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--ADFF06FF43CCBA83E040007F01012F39-->  <AD_ELEMENT_ID><![CDATA[113]]></AD_ELEMENT_ID>
+<!--ADFF06FF43CCBA83E040007F01012F39-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--ADFF06FF43CCBA83E040007F01012F39-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--ADFF06FF43CCBA83E040007F01012F39-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--ADFF06FF43CCBA83E040007F01012F39-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--ADFF06FF43CCBA83E040007F01012F39-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--ADFF06FF43CCBA83E040007F01012F39-->  <POSITION><![CDATA[3]]></POSITION>
+<!--ADFF06FF43CCBA83E040007F01012F39-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--ADFF06FF43CCBA83E040007F01012F39-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--ADFF06FF43CCBA83E040007F01012F39-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--ADFF06FF43CCBA83E040007F01012F39-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--ADFF06FF43CCBA83E040007F01012F39--></AD_COLUMN>
+
+<!--ADFF06FF43CDBA83E040007F01012F39--><AD_COLUMN>
+<!--ADFF06FF43CDBA83E040007F01012F39-->  <AD_COLUMN_ID><![CDATA[ADFF06FF43CDBA83E040007F01012F39]]></AD_COLUMN_ID>
+<!--ADFF06FF43CDBA83E040007F01012F39-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--ADFF06FF43CDBA83E040007F01012F39-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--ADFF06FF43CDBA83E040007F01012F39-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--ADFF06FF43CDBA83E040007F01012F39-->  <NAME><![CDATA[Creation Date]]></NAME>
+<!--ADFF06FF43CDBA83E040007F01012F39-->  <DESCRIPTION><![CDATA[The date that this record is completed.]]></DESCRIPTION>
+<!--ADFF06FF43CDBA83E040007F01012F39-->  <HELP><![CDATA[The Created field indicates the date that this record was created.]]></HELP>
+<!--ADFF06FF43CDBA83E040007F01012F39-->  <COLUMNNAME><![CDATA[Created]]></COLUMNNAME>
+<!--ADFF06FF43CDBA83E040007F01012F39-->  <AD_TABLE_ID><![CDATA[FF80818132AF937F0132AF9E94FF0013]]></AD_TABLE_ID>
+<!--ADFF06FF43CDBA83E040007F01012F39-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
+<!--ADFF06FF43CDBA83E040007F01012F39-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--ADFF06FF43CDBA83E040007F01012F39-->  <DEFAULTVALUE><![CDATA[SYSDATE]]></DEFAULTVALUE>
+<!--ADFF06FF43CDBA83E040007F01012F39-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--ADFF06FF43CDBA83E040007F01012F39-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--ADFF06FF43CDBA83E040007F01012F39-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--ADFF06FF43CDBA83E040007F01012F39-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--ADFF06FF43CDBA83E040007F01012F39-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--ADFF06FF43CDBA83E040007F01012F39-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--ADFF06FF43CDBA83E040007F01012F39-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--ADFF06FF43CDBA83E040007F01012F39-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--ADFF06FF43CDBA83E040007F01012F39-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--ADFF06FF43CDBA83E040007F01012F39-->  <AD_ELEMENT_ID><![CDATA[245]]></AD_ELEMENT_ID>
+<!--ADFF06FF43CDBA83E040007F01012F39-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--ADFF06FF43CDBA83E040007F01012F39-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--ADFF06FF43CDBA83E040007F01012F39-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--ADFF06FF43CDBA83E040007F01012F39-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--ADFF06FF43CDBA83E040007F01012F39-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--ADFF06FF43CDBA83E040007F01012F39-->  <POSITION><![CDATA[4]]></POSITION>
+<!--ADFF06FF43CDBA83E040007F01012F39-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--ADFF06FF43CDBA83E040007F01012F39-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--ADFF06FF43CDBA83E040007F01012F39-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--ADFF06FF43CDBA83E040007F01012F39-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--ADFF06FF43CDBA83E040007F01012F39--></AD_COLUMN>
+
+<!--ADFF06FF43CEBA83E040007F01012F39--><AD_COLUMN>
+<!--ADFF06FF43CEBA83E040007F01012F39-->  <AD_COLUMN_ID><![CDATA[ADFF06FF43CEBA83E040007F01012F39]]></AD_COLUMN_ID>
+<!--ADFF06FF43CEBA83E040007F01012F39-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--ADFF06FF43CEBA83E040007F01012F39-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--ADFF06FF43CEBA83E040007F01012F39-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--ADFF06FF43CEBA83E040007F01012F39-->  <NAME><![CDATA[Created By]]></NAME>
+<!--ADFF06FF43CEBA83E040007F01012F39-->  <DESCRIPTION><![CDATA[User who created this records]]></DESCRIPTION>
+<!--ADFF06FF43CEBA83E040007F01012F39-->  <HELP><![CDATA[The Created By field indicates the user who created this record.]]></HELP>
+<!--ADFF06FF43CEBA83E040007F01012F39-->  <COLUMNNAME><![CDATA[Createdby]]></COLUMNNAME>
+<!--ADFF06FF43CEBA83E040007F01012F39-->  <AD_TABLE_ID><![CDATA[FF80818132AF937F0132AF9E94FF0013]]></AD_TABLE_ID>
+<!--ADFF06FF43CEBA83E040007F01012F39-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--ADFF06FF43CEBA83E040007F01012F39-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--ADFF06FF43CEBA83E040007F01012F39-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--ADFF06FF43CEBA83E040007F01012F39-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--ADFF06FF43CEBA83E040007F01012F39-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--ADFF06FF43CEBA83E040007F01012F39-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--ADFF06FF43CEBA83E040007F01012F39-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--ADFF06FF43CEBA83E040007F01012F39-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--ADFF06FF43CEBA83E040007F01012F39-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--ADFF06FF43CEBA83E040007F01012F39-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--ADFF06FF43CEBA83E040007F01012F39-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--ADFF06FF43CEBA83E040007F01012F39-->  <AD_ELEMENT_ID><![CDATA[246]]></AD_ELEMENT_ID>
+<!--ADFF06FF43CEBA83E040007F01012F39-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--ADFF06FF43CEBA83E040007F01012F39-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--ADFF06FF43CEBA83E040007F01012F39-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--ADFF06FF43CEBA83E040007F01012F39-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--ADFF06FF43CEBA83E040007F01012F39-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--ADFF06FF43CEBA83E040007F01012F39-->  <POSITION><![CDATA[5]]></POSITION>
+<!--ADFF06FF43CEBA83E040007F01012F39-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--ADFF06FF43CEBA83E040007F01012F39-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--ADFF06FF43CEBA83E040007F01012F39-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--ADFF06FF43CEBA83E040007F01012F39-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--ADFF06FF43CEBA83E040007F01012F39--></AD_COLUMN>
+
+<!--ADFF06FF43CFBA83E040007F01012F39--><AD_COLUMN>
+<!--ADFF06FF43CFBA83E040007F01012F39-->  <AD_COLUMN_ID><![CDATA[ADFF06FF43CFBA83E040007F01012F39]]></AD_COLUMN_ID>
+<!--ADFF06FF43CFBA83E040007F01012F39-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--ADFF06FF43CFBA83E040007F01012F39-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--ADFF06FF43CFBA83E040007F01012F39-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--ADFF06FF43CFBA83E040007F01012F39-->  <NAME><![CDATA[Updated]]></NAME>
+<!--ADFF06FF43CFBA83E040007F01012F39-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--ADFF06FF43CFBA83E040007F01012F39-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
+<!--ADFF06FF43CFBA83E040007F01012F39-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
+<!--ADFF06FF43CFBA83E040007F01012F39-->  <AD_TABLE_ID><![CDATA[FF80818132AF937F0132AF9E94FF0013]]></AD_TABLE_ID>
+<!--ADFF06FF43CFBA83E040007F01012F39-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
+<!--ADFF06FF43CFBA83E040007F01012F39-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--ADFF06FF43CFBA83E040007F01012F39-->  <DEFAULTVALUE><![CDATA[SYSDATE]]></DEFAULTVALUE>
+<!--ADFF06FF43CFBA83E040007F01012F39-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--ADFF06FF43CFBA83E040007F01012F39-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--ADFF06FF43CFBA83E040007F01012F39-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--ADFF06FF43CFBA83E040007F01012F39-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--ADFF06FF43CFBA83E040007F01012F39-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--ADFF06FF43CFBA83E040007F01012F39-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--ADFF06FF43CFBA83E040007F01012F39-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--ADFF06FF43CFBA83E040007F01012F39-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--ADFF06FF43CFBA83E040007F01012F39-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--ADFF06FF43CFBA83E040007F01012F39-->  <AD_ELEMENT_ID><![CDATA[607]]></AD_ELEMENT_ID>
+<!--ADFF06FF43CFBA83E040007F01012F39-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--ADFF06FF43CFBA83E040007F01012F39-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--ADFF06FF43CFBA83E040007F01012F39-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--ADFF06FF43CFBA83E040007F01012F39-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--ADFF06FF43CFBA83E040007F01012F39-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--ADFF06FF43CFBA83E040007F01012F39-->  <POSITION><![CDATA[6]]></POSITION>
+<!--ADFF06FF43CFBA83E040007F01012F39-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--ADFF06FF43CFBA83E040007F01012F39-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--ADFF06FF43CFBA83E040007F01012F39-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--ADFF06FF43CFBA83E040007F01012F39-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--ADFF06FF43CFBA83E040007F01012F39--></AD_COLUMN>
+
+<!--ADFF06FF43D0BA83E040007F01012F39--><AD_COLUMN>
+<!--ADFF06FF43D0BA83E040007F01012F39-->  <AD_COLUMN_ID><![CDATA[ADFF06FF43D0BA83E040007F01012F39]]></AD_COLUMN_ID>
+<!--ADFF06FF43D0BA83E040007F01012F39-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--ADFF06FF43D0BA83E040007F01012F39-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--ADFF06FF43D0BA83E040007F01012F39-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--ADFF06FF43D0BA83E040007F01012F39-->  <NAME><![CDATA[Updated By]]></NAME>
+<!--ADFF06FF43D0BA83E040007F01012F39-->  <DESCRIPTION><![CDATA[User who updated this records]]></DESCRIPTION>
+<!--ADFF06FF43D0BA83E040007F01012F39-->  <HELP><![CDATA[The Updated By field indicates the user who updated this record.]]></HELP>
+<!--ADFF06FF43D0BA83E040007F01012F39-->  <COLUMNNAME><![CDATA[Updatedby]]></COLUMNNAME>
+<!--ADFF06FF43D0BA83E040007F01012F39-->  <AD_TABLE_ID><![CDATA[FF80818132AF937F0132AF9E94FF0013]]></AD_TABLE_ID>
+<!--ADFF06FF43D0BA83E040007F01012F39-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--ADFF06FF43D0BA83E040007F01012F39-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--ADFF06FF43D0BA83E040007F01012F39-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--ADFF06FF43D0BA83E040007F01012F39-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--ADFF06FF43D0BA83E040007F01012F39-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--ADFF06FF43D0BA83E040007F01012F39-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--ADFF06FF43D0BA83E040007F01012F39-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--ADFF06FF43D0BA83E040007F01012F39-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--ADFF06FF43D0BA83E040007F01012F39-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--ADFF06FF43D0BA83E040007F01012F39-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--ADFF06FF43D0BA83E040007F01012F39-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--ADFF06FF43D0BA83E040007F01012F39-->  <AD_ELEMENT_ID><![CDATA[608]]></AD_ELEMENT_ID>
+<!--ADFF06FF43D0BA83E040007F01012F39-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--ADFF06FF43D0BA83E040007F01012F39-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--ADFF06FF43D0BA83E040007F01012F39-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--ADFF06FF43D0BA83E040007F01012F39-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--ADFF06FF43D0BA83E040007F01012F39-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--ADFF06FF43D0BA83E040007F01012F39-->  <POSITION><![CDATA[7]]></POSITION>
+<!--ADFF06FF43D0BA83E040007F01012F39-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--ADFF06FF43D0BA83E040007F01012F39-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--ADFF06FF43D0BA83E040007F01012F39-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--ADFF06FF43D0BA83E040007F01012F39-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--ADFF06FF43D0BA83E040007F01012F39--></AD_COLUMN>
+
+<!--ADFF06FF43D1BA83E040007F01012F39--><AD_COLUMN>
+<!--ADFF06FF43D1BA83E040007F01012F39-->  <AD_COLUMN_ID><![CDATA[ADFF06FF43D1BA83E040007F01012F39]]></AD_COLUMN_ID>
+<!--ADFF06FF43D1BA83E040007F01012F39-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--ADFF06FF43D1BA83E040007F01012F39-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--ADFF06FF43D1BA83E040007F01012F39-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--ADFF06FF43D1BA83E040007F01012F39-->  <NAME><![CDATA[Active]]></NAME>
+<!--ADFF06FF43D1BA83E040007F01012F39-->  <DESCRIPTION><![CDATA[A flag indicating whether this record is available for use or de-activated.]]></DESCRIPTION>
+<!--ADFF06FF43D1BA83E040007F01012F39-->  <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>
+<!--ADFF06FF43D1BA83E040007F01012F39-->  <COLUMNNAME><![CDATA[Isactive]]></COLUMNNAME>
+<!--ADFF06FF43D1BA83E040007F01012F39-->  <AD_TABLE_ID><![CDATA[FF80818132AF937F0132AF9E94FF0013]]></AD_TABLE_ID>
+<!--ADFF06FF43D1BA83E040007F01012F39-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--ADFF06FF43D1BA83E040007F01012F39-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--ADFF06FF43D1BA83E040007F01012F39-->  <DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE>
+<!--ADFF06FF43D1BA83E040007F01012F39-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--ADFF06FF43D1BA83E040007F01012F39-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--ADFF06FF43D1BA83E040007F01012F39-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--ADFF06FF43D1BA83E040007F01012F39-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--ADFF06FF43D1BA83E040007F01012F39-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--ADFF06FF43D1BA83E040007F01012F39-->  <SEQNO><![CDATA[80]]></SEQNO>
+<!--ADFF06FF43D1BA83E040007F01012F39-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--ADFF06FF43D1BA83E040007F01012F39-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--ADFF06FF43D1BA83E040007F01012F39-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--ADFF06FF43D1BA83E040007F01012F39-->  <AD_ELEMENT_ID><![CDATA[348]]></AD_ELEMENT_ID>
+<!--ADFF06FF43D1BA83E040007F01012F39-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--ADFF06FF43D1BA83E040007F01012F39-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--ADFF06FF43D1BA83E040007F01012F39-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--ADFF06FF43D1BA83E040007F01012F39-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--ADFF06FF43D1BA83E040007F01012F39-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--ADFF06FF43D1BA83E040007F01012F39-->  <POSITION><![CDATA[8]]></POSITION>
+<!--ADFF06FF43D1BA83E040007F01012F39-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--ADFF06FF43D1BA83E040007F01012F39-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--ADFF06FF43D1BA83E040007F01012F39-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--ADFF06FF43D1BA83E040007F01012F39-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--ADFF06FF43D1BA83E040007F01012F39--></AD_COLUMN>
+
+<!--ADFF06FF43D2BA83E040007F01012F39--><AD_COLUMN>
+<!--ADFF06FF43D2BA83E040007F01012F39-->  <AD_COLUMN_ID><![CDATA[ADFF06FF43D2BA83E040007F01012F39]]></AD_COLUMN_ID>
+<!--ADFF06FF43D2BA83E040007F01012F39-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--ADFF06FF43D2BA83E040007F01012F39-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--ADFF06FF43D2BA83E040007F01012F39-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--ADFF06FF43D2BA83E040007F01012F39-->  <NAME><![CDATA[Payment]]></NAME>
+<!--ADFF06FF43D2BA83E040007F01012F39-->  <DESCRIPTION><![CDATA[Payment event]]></DESCRIPTION>
+<!--ADFF06FF43D2BA83E040007F01012F39-->  <HELP><![CDATA[Payment event]]></HELP>
+<!--ADFF06FF43D2BA83E040007F01012F39-->  <COLUMNNAME><![CDATA[FIN_Payment_ID]]></COLUMNNAME>
+<!--ADFF06FF43D2BA83E040007F01012F39-->  <AD_TABLE_ID><![CDATA[FF80818132AF937F0132AF9E94FF0013]]></AD_TABLE_ID>
+<!--ADFF06FF43D2BA83E040007F01012F39-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--ADFF06FF43D2BA83E040007F01012F39-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--ADFF06FF43D2BA83E040007F01012F39-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--ADFF06FF43D2BA83E040007F01012F39-->  <ISPARENT><![CDATA[Y]]></ISPARENT>
+<!--ADFF06FF43D2BA83E040007F01012F39-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--ADFF06FF43D2BA83E040007F01012F39-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--ADFF06FF43D2BA83E040007F01012F39-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
+<!--ADFF06FF43D2BA83E040007F01012F39-->  <SEQNO><![CDATA[90]]></SEQNO>
+<!--ADFF06FF43D2BA83E040007F01012F39-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--ADFF06FF43D2BA83E040007F01012F39-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--ADFF06FF43D2BA83E040007F01012F39-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--ADFF06FF43D2BA83E040007F01012F39-->  <AD_ELEMENT_ID><![CDATA[7891269C83EA655DE040007F010155CE]]></AD_ELEMENT_ID>
+<!--ADFF06FF43D2BA83E040007F01012F39-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--ADFF06FF43D2BA83E040007F01012F39-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--ADFF06FF43D2BA83E040007F01012F39-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--ADFF06FF43D2BA83E040007F01012F39-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--ADFF06FF43D2BA83E040007F01012F39-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--ADFF06FF43D2BA83E040007F01012F39-->  <POSITION><![CDATA[9]]></POSITION>
+<!--ADFF06FF43D2BA83E040007F01012F39-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--ADFF06FF43D2BA83E040007F01012F39-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--ADFF06FF43D2BA83E040007F01012F39-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--ADFF06FF43D2BA83E040007F01012F39-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--ADFF06FF43D2BA83E040007F01012F39--></AD_COLUMN>
+
+<!--ADFF06FF43D4BA83E040007F01012F39--><AD_COLUMN>
+<!--ADFF06FF43D4BA83E040007F01012F39-->  <AD_COLUMN_ID><![CDATA[ADFF06FF43D4BA83E040007F01012F39]]></AD_COLUMN_ID>
+<!--ADFF06FF43D4BA83E040007F01012F39-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--ADFF06FF43D4BA83E040007F01012F39-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--ADFF06FF43D4BA83E040007F01012F39-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--ADFF06FF43D4BA83E040007F01012F39-->  <NAME><![CDATA[Amount]]></NAME>
+<!--ADFF06FF43D4BA83E040007F01012F39-->  <COLUMNNAME><![CDATA[Amount]]></COLUMNNAME>
+<!--ADFF06FF43D4BA83E040007F01012F39-->  <AD_TABLE_ID><![CDATA[FF80818132AF937F0132AF9E94FF0013]]></AD_TABLE_ID>
+<!--ADFF06FF43D4BA83E040007F01012F39-->  <AD_REFERENCE_ID><![CDATA[22]]></AD_REFERENCE_ID>
+<!--ADFF06FF43D4BA83E040007F01012F39-->  <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--ADFF06FF43D4BA83E040007F01012F39-->  <DEFAULTVALUE><![CDATA[0]]></DEFAULTVALUE>
+<!--ADFF06FF43D4BA83E040007F01012F39-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--ADFF06FF43D4BA83E040007F01012F39-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--ADFF06FF43D4BA83E040007F01012F39-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--ADFF06FF43D4BA83E040007F01012F39-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--ADFF06FF43D4BA83E040007F01012F39-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
+<!--ADFF06FF43D4BA83E040007F01012F39-->  <SEQNO><![CDATA[110]]></SEQNO>
+<!--ADFF06FF43D4BA83E040007F01012F39-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--ADFF06FF43D4BA83E040007F01012F39-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--ADFF06FF43D4BA83E040007F01012F39-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--ADFF06FF43D4BA83E040007F01012F39-->  <AD_ELEMENT_ID><![CDATA[7890366979712CEFE040007F01013334]]></AD_ELEMENT_ID>
+<!--ADFF06FF43D4BA83E040007F01012F39-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--ADFF06FF43D4BA83E040007F01012F39-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--ADFF06FF43D4BA83E040007F01012F39-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--ADFF06FF43D4BA83E040007F01012F39-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--ADFF06FF43D4BA83E040007F01012F39-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--ADFF06FF43D4BA83E040007F01012F39-->  <POSITION><![CDATA[12]]></POSITION>
+<!--ADFF06FF43D4BA83E040007F01012F39-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--ADFF06FF43D4BA83E040007F01012F39-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--ADFF06FF43D4BA83E040007F01012F39-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--ADFF06FF43D4BA83E040007F01012F39-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--ADFF06FF43D4BA83E040007F01012F39--></AD_COLUMN>
+
+<!--ADFF06FF43D7BA83E040007F01012F39--><AD_COLUMN>
+<!--ADFF06FF43D7BA83E040007F01012F39-->  <AD_COLUMN_ID><![CDATA[ADFF06FF43D7BA83E040007F01012F39]]></AD_COLUMN_ID>
+<!--ADFF06FF43D7BA83E040007F01012F39-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--ADFF06FF43D7BA83E040007F01012F39-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--ADFF06FF43D7BA83E040007F01012F39-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--ADFF06FF43D7BA83E040007F01012F39-->  <NAME><![CDATA[Currency]]></NAME>
+<!--ADFF06FF43D7BA83E040007F01012F39-->  <DESCRIPTION><![CDATA[An accepted medium of monetary exchange that may vary across countries.]]></DESCRIPTION>
+<!--ADFF06FF43D7BA83E040007F01012F39-->  <HELP><![CDATA[Indicates the currency to be used when processing this document.]]></HELP>
+<!--ADFF06FF43D7BA83E040007F01012F39-->  <COLUMNNAME><![CDATA[C_Currency_ID]]></COLUMNNAME>
+<!--ADFF06FF43D7BA83E040007F01012F39-->  <AD_TABLE_ID><![CDATA[FF80818132AF937F0132AF9E94FF0013]]></AD_TABLE_ID>
+<!--ADFF06FF43D7BA83E040007F01012F39-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--ADFF06FF43D7BA83E040007F01012F39-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--ADFF06FF43D7BA83E040007F01012F39-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--ADFF06FF43D7BA83E040007F01012F39-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--ADFF06FF43D7BA83E040007F01012F39-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--ADFF06FF43D7BA83E040007F01012F39-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--ADFF06FF43D7BA83E040007F01012F39-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--ADFF06FF43D7BA83E040007F01012F39-->  <SEQNO><![CDATA[140]]></SEQNO>
+<!--ADFF06FF43D7BA83E040007F01012F39-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--ADFF06FF43D7BA83E040007F01012F39-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--ADFF06FF43D7BA83E040007F01012F39-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--ADFF06FF43D7BA83E040007F01012F39-->  <AD_ELEMENT_ID><![CDATA[193]]></AD_ELEMENT_ID>
+<!--ADFF06FF43D7BA83E040007F01012F39-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--ADFF06FF43D7BA83E040007F01012F39-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--ADFF06FF43D7BA83E040007F01012F39-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--ADFF06FF43D7BA83E040007F01012F39-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--ADFF06FF43D7BA83E040007F01012F39-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--ADFF06FF43D7BA83E040007F01012F39-->  <POSITION><![CDATA[13]]></POSITION>
+<!--ADFF06FF43D7BA83E040007F01012F39-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--ADFF06FF43D7BA83E040007F01012F39-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--ADFF06FF43D7BA83E040007F01012F39-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--ADFF06FF43D7BA83E040007F01012F39-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--ADFF06FF43D7BA83E040007F01012F39--></AD_COLUMN>
+
+<!--ADFFC3EEE6118D7AE040007F01013D8C--><AD_COLUMN>
+<!--ADFFC3EEE6118D7AE040007F01013D8C-->  <AD_COLUMN_ID><![CDATA[ADFFC3EEE6118D7AE040007F01013D8C]]></AD_COLUMN_ID>
+<!--ADFFC3EEE6118D7AE040007F01013D8C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--ADFFC3EEE6118D7AE040007F01013D8C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--ADFFC3EEE6118D7AE040007F01013D8C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--ADFFC3EEE6118D7AE040007F01013D8C-->  <NAME><![CDATA[Credit Payment Used]]></NAME>
+<!--ADFFC3EEE6118D7AE040007F01013D8C-->  <DESCRIPTION><![CDATA[Represents the credit payment that has been used]]></DESCRIPTION>
+<!--ADFFC3EEE6118D7AE040007F01013D8C-->  <HELP><![CDATA[Represents the credit payment that has been used]]></HELP>
+<!--ADFFC3EEE6118D7AE040007F01013D8C-->  <COLUMNNAME><![CDATA[FIN_Payment_Id_Used]]></COLUMNNAME>
+<!--ADFFC3EEE6118D7AE040007F01013D8C-->  <AD_TABLE_ID><![CDATA[FF80818132AF937F0132AF9E94FF0013]]></AD_TABLE_ID>
+<!--ADFFC3EEE6118D7AE040007F01013D8C-->  <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID>
+<!--ADFFC3EEE6118D7AE040007F01013D8C-->  <AD_REFERENCE_VALUE_ID><![CDATA[5E77652CBFEB4F03A3A0629642D024DD]]></AD_REFERENCE_VALUE_ID>
+<!--ADFFC3EEE6118D7AE040007F01013D8C-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--ADFFC3EEE6118D7AE040007F01013D8C-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--ADFFC3EEE6118D7AE040007F01013D8C-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--ADFFC3EEE6118D7AE040007F01013D8C-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--ADFFC3EEE6118D7AE040007F01013D8C-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--ADFFC3EEE6118D7AE040007F01013D8C-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--ADFFC3EEE6118D7AE040007F01013D8C-->  <SEQNO><![CDATA[100]]></SEQNO>
+<!--ADFFC3EEE6118D7AE040007F01013D8C-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--ADFFC3EEE6118D7AE040007F01013D8C-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--ADFFC3EEE6118D7AE040007F01013D8C-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--ADFFC3EEE6118D7AE040007F01013D8C-->  <AD_ELEMENT_ID><![CDATA[ADFFC3B26CB61D04E040007F01013D82]]></AD_ELEMENT_ID>
+<!--ADFFC3EEE6118D7AE040007F01013D8C-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--ADFFC3EEE6118D7AE040007F01013D8C-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--ADFFC3EEE6118D7AE040007F01013D8C-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--ADFFC3EEE6118D7AE040007F01013D8C-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--ADFFC3EEE6118D7AE040007F01013D8C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--ADFFC3EEE6118D7AE040007F01013D8C-->  <POSITION><![CDATA[10]]></POSITION>
+<!--ADFFC3EEE6118D7AE040007F01013D8C-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--ADFFC3EEE6118D7AE040007F01013D8C-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--ADFFC3EEE6118D7AE040007F01013D8C-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--ADFFC3EEE6118D7AE040007F01013D8C-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--ADFFC3EEE6118D7AE040007F01013D8C--></AD_COLUMN>
+
 <!--AE3FB28F95334421BB3DFAAA5B85307A--><AD_COLUMN>
 <!--AE3FB28F95334421BB3DFAAA5B85307A-->  <AD_COLUMN_ID><![CDATA[AE3FB28F95334421BB3DFAAA5B85307A]]></AD_COLUMN_ID>
 <!--AE3FB28F95334421BB3DFAAA5B85307A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_DATASET_TABLE.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/src-db/database/sourcedata/AD_DATASET_TABLE.xml	Sat Nov 12 15:43:15 2011 +0100
@@ -5573,6 +5573,20 @@
 <!--F07A2963B9D94573802CFC9E8EB1945E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--F07A2963B9D94573802CFC9E8EB1945E--></AD_DATASET_TABLE>
 
+<!--F15D91BC7A8743DC9F5F72541F5E3FDD--><AD_DATASET_TABLE>
+<!--F15D91BC7A8743DC9F5F72541F5E3FDD-->  <AD_DATASET_TABLE_ID><![CDATA[F15D91BC7A8743DC9F5F72541F5E3FDD]]></AD_DATASET_TABLE_ID>
+<!--F15D91BC7A8743DC9F5F72541F5E3FDD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F15D91BC7A8743DC9F5F72541F5E3FDD-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F15D91BC7A8743DC9F5F72541F5E3FDD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F15D91BC7A8743DC9F5F72541F5E3FDD-->  <AD_DATASET_ID><![CDATA[D81C5C810AEF47C690E4F688ABC8AAC8]]></AD_DATASET_ID>
+<!--F15D91BC7A8743DC9F5F72541F5E3FDD-->  <AD_TABLE_ID><![CDATA[FF808181308EA42301308FB5F7BC0049]]></AD_TABLE_ID>
+<!--F15D91BC7A8743DC9F5F72541F5E3FDD-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
+<!--F15D91BC7A8743DC9F5F72541F5E3FDD-->  <WHERECLAUSE><![CDATA[client.id=:ClientID]]></WHERECLAUSE>
+<!--F15D91BC7A8743DC9F5F72541F5E3FDD-->  <EXCLUDEAUDITINFO><![CDATA[N]]></EXCLUDEAUDITINFO>
+<!--F15D91BC7A8743DC9F5F72541F5E3FDD-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
+<!--F15D91BC7A8743DC9F5F72541F5E3FDD-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--F15D91BC7A8743DC9F5F72541F5E3FDD--></AD_DATASET_TABLE>
+
 <!--F20434BE96E111DDBFA8001B388C61A4--><AD_DATASET_TABLE>
 <!--F20434BE96E111DDBFA8001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[F20434BE96E111DDBFA8001B388C61A4]]></AD_DATASET_TABLE_ID>
 <!--F20434BE96E111DDBFA8001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml	Sat Nov 12 15:43:15 2011 +0100
@@ -25091,6 +25091,32 @@
 <!--AD9A07DFFE5541AF8B891693459BB6B5-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--AD9A07DFFE5541AF8B891693459BB6B5--></AD_ELEMENT>
 
+<!--ADFF07B10A7856DCE040007F01012F40--><AD_ELEMENT>
+<!--ADFF07B10A7856DCE040007F01012F40-->  <AD_ELEMENT_ID><![CDATA[ADFF07B10A7856DCE040007F01012F40]]></AD_ELEMENT_ID>
+<!--ADFF07B10A7856DCE040007F01012F40-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--ADFF07B10A7856DCE040007F01012F40-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--ADFF07B10A7856DCE040007F01012F40-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--ADFF07B10A7856DCE040007F01012F40-->  <COLUMNNAME><![CDATA[FIN_Payment_Credit_ID]]></COLUMNNAME>
+<!--ADFF07B10A7856DCE040007F01012F40-->  <NAME><![CDATA[FIN Payment Credit]]></NAME>
+<!--ADFF07B10A7856DCE040007F01012F40-->  <PRINTNAME><![CDATA[FIN Payment Credit]]></PRINTNAME>
+<!--ADFF07B10A7856DCE040007F01012F40-->  <DESCRIPTION><![CDATA[Unique identifier for a FIN Payment Credit]]></DESCRIPTION>
+<!--ADFF07B10A7856DCE040007F01012F40-->  <HELP><![CDATA[Tracks the places where the credit payment has been used]]></HELP>
+<!--ADFF07B10A7856DCE040007F01012F40-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--ADFF07B10A7856DCE040007F01012F40--></AD_ELEMENT>
+
+<!--ADFFC3B26CB61D04E040007F01013D82--><AD_ELEMENT>
+<!--ADFFC3B26CB61D04E040007F01013D82-->  <AD_ELEMENT_ID><![CDATA[ADFFC3B26CB61D04E040007F01013D82]]></AD_ELEMENT_ID>
+<!--ADFFC3B26CB61D04E040007F01013D82-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--ADFFC3B26CB61D04E040007F01013D82-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--ADFFC3B26CB61D04E040007F01013D82-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--ADFFC3B26CB61D04E040007F01013D82-->  <COLUMNNAME><![CDATA[FIN_Payment_Id_Used]]></COLUMNNAME>
+<!--ADFFC3B26CB61D04E040007F01013D82-->  <NAME><![CDATA[Credit Payment Used]]></NAME>
+<!--ADFFC3B26CB61D04E040007F01013D82-->  <PRINTNAME><![CDATA[Credit Payment Used]]></PRINTNAME>
+<!--ADFFC3B26CB61D04E040007F01013D82-->  <DESCRIPTION><![CDATA[Represents the credit payment that has been used]]></DESCRIPTION>
+<!--ADFFC3B26CB61D04E040007F01013D82-->  <HELP><![CDATA[Represents the credit payment that has been used]]></HELP>
+<!--ADFFC3B26CB61D04E040007F01013D82-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--ADFFC3B26CB61D04E040007F01013D82--></AD_ELEMENT>
+
 <!--AF7A8ABE9B6711DDA4130016D4C601F7--><AD_ELEMENT>
 <!--AF7A8ABE9B6711DDA4130016D4C601F7-->  <AD_ELEMENT_ID><![CDATA[AF7A8ABE9B6711DDA4130016D4C601F7]]></AD_ELEMENT_ID>
 <!--AF7A8ABE9B6711DDA4130016D4C601F7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_FIELD.xml	Thu Nov 10 16:42:19 2011 +0000
+++ b/src-db/database/sourcedata/AD_FIELD.xml	Sat Nov 12 15:43:15 2011 +0100
@@ -190149,6 +190149,418 @@
 <!--AD44BF4F571E4D5BA903DE7AE04CCBBD-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
 <!--AD44BF4F571E4D5BA903DE7AE04CCBBD--></AD_FIELD>
 
+<!--ADFEA61356F9FF0CE040007F01013508--><AD_FIELD>
+<!--ADFEA61356F9FF0CE040007F01013508-->  <AD_FIELD_ID><![CDATA[ADFEA61356F9FF0CE040007F01013508]]></AD_FIELD_ID>
+<!--ADFEA61356F9FF0CE040007F01013508-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--ADFEA61356F9FF0CE040007F01013508-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--ADFEA61356F9FF0CE040007F01013508-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--ADFEA61356F9FF0CE040007F01013508-->  <NAME><![CDATA[FIN_Payment_Credit_ID]]></NAME>
+<!--ADFEA61356F9FF0CE040007F01013508-->  <DESCRIPTION><![CDATA[Unique identifier for a FIN Payment Credit]]></DESCRIPTION>
+<!--ADFEA61356F9FF0CE040007F01013508-->  <HELP><![CDATA[Tracks the places where the credit payment has been used]]></HELP>
+<!--ADFEA61356F9FF0CE040007F01013508-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--ADFEA61356F9FF0CE040007F01013508-->  <AD_TAB_ID><![CDATA[FF80818132AFC4050132AFC7F94A000A]]></AD_TAB_ID>
+<!--ADFEA61356F9FF0CE040007F01013508-->  <AD_COLUMN_ID><![CDATA[ADFF06FF43CABA83E040007F01012F39]]></AD_COLUMN_ID>
+<!--ADFEA61356F9FF0CE040007F01013508-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--ADFEA61356F9FF0CE040007F01013508-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--ADFEA61356F9FF0CE040007F01013508-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--ADFEA61356F9FF0CE040007F01013508-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--ADFEA61356F9FF0CE040007F01013508-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--ADFEA61356F9FF0CE040007F01013508-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--ADFEA61356F9FF0CE040007F01013508-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--ADFEA61356F9FF0CE040007F01013508-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--ADFEA61356F9FF0CE040007F01013508-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--ADFEA61356F9FF0CE040007F01013508-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--ADFEA61356F9FF0CE040007F01013508-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--ADFEA61356F9FF0CE040007F01013508-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--ADFEA61356F9FF0CE040007F01013508--></AD_FIELD>
+
+<!--ADFEA61356FBFF0CE040007F01013508--><AD_FIELD>
+<!--ADFEA61356FBFF0CE040007F01013508-->  <AD_FIELD_ID><![CDATA[ADFEA61356FBFF0CE040007F01013508]]></AD_FIELD_ID>
+<!--ADFEA61356FBFF0CE040007F01013508-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--ADFEA61356FBFF0CE040007F01013508-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--ADFEA61356FBFF0CE040007F01013508-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--ADFEA61356FBFF0CE040007F01013508-->  <NAME><![CDATA[Client]]></NAME>
+<!--ADFEA61356FBFF0CE040007F01013508-->  <DESCRIPTION><![CDATA[Client for this installation.]]></DESCRIPTION>
+<!--ADFEA61356FBFF0CE040007F01013508-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
+<!--ADFEA61356FBFF0CE040007F01013508-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--ADFEA61356FBFF0CE040007F01013508-->  <AD_TAB_ID><![CDATA[FF80818132AFC4050132AFC7F94A000A]]></AD_TAB_ID>
+<!--ADFEA61356FBFF0CE040007F01013508-->  <AD_COLUMN_ID><![CDATA[ADFF06FF43CBBA83E040007F01012F39]]></AD_COLUMN_ID>
+<!--ADFEA61356FBFF0CE040007F01013508-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--ADFEA61356FBFF0CE040007F01013508-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--ADFEA61356FBFF0CE040007F01013508-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--ADFEA61356FBFF0CE040007F01013508-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--ADFEA61356FBFF0CE040007F01013508-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--ADFEA61356FBFF0CE040007F01013508-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--ADFEA61356FBFF0CE040007F01013508-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--ADFEA61356FBFF0CE040007F01013508-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--ADFEA61356FBFF0CE040007F01013508-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--ADFEA61356FBFF0CE040007F01013508-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--ADFEA61356FBFF0CE040007F01013508-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--ADFEA61356FBFF0CE040007F01013508-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--ADFEA61356FBFF0CE040007F01013508--></AD_FIELD>
+
+<!--ADFEA61356FDFF0CE040007F01013508--><AD_FIELD>
+<!--ADFEA61356FDFF0CE040007F01013508-->  <AD_FIELD_ID><![CDATA[ADFEA61356FDFF0CE040007F01013508]]></AD_FIELD_ID>
+<!--ADFEA61356FDFF0CE040007F01013508-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--ADFEA61356FDFF0CE040007F01013508-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--ADFEA61356FDFF0CE040007F01013508-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--ADFEA61356FDFF0CE040007F01013508-->  <NAME><![CDATA[Organization]]></NAME>
+<!--ADFEA61356FDFF0CE040007F01013508-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
+<!--ADFEA61356FDFF0CE040007F01013508-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
+<!--ADFEA61356FDFF0CE040007F01013508-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--ADFEA61356FDFF0CE040007F01013508-->  <AD_TAB_ID><![CDATA[FF80818132AFC4050132AFC7F94A000A]]></AD_TAB_ID>
+<!--ADFEA61356FDFF0CE040007F01013508-->  <AD_COLUMN_ID><![CDATA[ADFF06FF43CCBA83E040007F01012F39]]></AD_COLUMN_ID>
+<!--ADFEA61356FDFF0CE040007F01013508-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--ADFEA61356FDFF0CE040007F01013508-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--ADFEA61356FDFF0CE040007F01013508-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--ADFEA61356FDFF0CE040007F01013508-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--ADFEA61356FDFF0CE040007F01013508-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--ADFEA61356FDFF0CE040007F01013508-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--ADFEA61356FDFF0CE040007F01013508-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--ADFEA61356FDFF0CE040007F01013508-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--ADFEA61356FDFF0CE040007F01013508-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--ADFEA61356FDFF0CE040007F01013508-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--ADFEA61356FDFF0CE040007F01013508-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--ADFEA61356FDFF0CE040007F01013508-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--ADFEA61356FDFF0CE040007F01013508-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--ADFEA61356FDFF0CE040007F01013508--></AD_FIELD>
+
+<!--ADFEA61356FFFF0CE040007F01013508--><AD_FIELD>
+<!--ADFEA61356FFFF0CE040007F01013508-->  <AD_FIELD_ID><![CDATA[ADFEA61356FFFF0CE040007F01013508]]></AD_FIELD_ID>
+<!--ADFEA61356FFFF0CE040007F01013508-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--ADFEA61356FFFF0CE040007F01013508-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--ADFEA61356FFFF0CE040007F01013508-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--ADFEA61356FFFF0CE040007F01013508-->  <NAME><![CDATA[Active]]></NAME>
+<!--ADFEA61356FFFF0CE040007F01013508-->  <DESCRIPTION><![CDATA[A flag indicating whether this record is available for use or de-activated.]]></DESCRIPTION>
+<!--ADFEA61356FFFF0CE040007F01013508-->  <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>
+<!--ADFEA61356FFFF0CE040007F01013508-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--ADFEA61356FFFF0CE040007F01013508-->  <AD_TAB_ID><![CDATA[FF80818132AFC4050132AFC7F94A000A]]></AD_TAB_ID>
+<!--ADFEA61356FFFF0CE040007F01013508-->  <AD_COLUMN_ID><![CDATA[ADFF06FF43D1BA83E040007F01012F39]]></AD_COLUMN_ID>
+<!--ADFEA61356FFFF0CE040007F01013508-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--ADFEA61356FFFF0CE040007F01013508-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--ADFEA61356FFFF0CE040007F01013508-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--ADFEA61356FFFF0CE040007F01013508-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--ADFEA61356FFFF0CE040007F01013508-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--ADFEA61356FFFF0CE040007F01013508-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--ADFEA61356FFFF0CE040007F01013508-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--ADFEA61356FFFF0CE040007F01013508-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--ADFEA61356FFFF0CE040007F01013508-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--ADFEA61356FFFF0CE040007F01013508-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--ADFEA61356FFFF0CE040007F01013508-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--ADFEA61356FFFF0CE040007F01013508-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--ADFEA61356FFFF0CE040007F01013508-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--ADFEA61356FFFF0CE040007F01013508--></AD_FIELD>
+
+<!--ADFEA6135701FF0CE040007F01013508--><AD_FIELD>
+<!--ADFEA6135701FF0CE040007F01013508-->  <AD_FIELD_ID><![CDATA[ADFEA6135701FF0CE040007F01013508]]></AD_FIELD_ID>
+<!--ADFEA6135701FF0CE040007F01013508-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--ADFEA6135701FF0CE040007F01013508-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--ADFEA6135701FF0CE040007F01013508-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--ADFEA6135701FF0CE040007F01013508-->  <NAME><![CDATA[Payment]]></NAME>
+<!--ADFEA6135701FF0CE040007F01013508-->  <DESCRIPTION><![CDATA[Payment event]]></DESCRIPTION>
+<!--ADFEA6135701FF0CE040007F01013508-->  <HELP><![CDATA[Payment event]]></HELP>
+<!--ADFEA6135701FF0CE040007F01013508-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--ADFEA6135701FF0CE040007F01013508-->  <AD_TAB_ID><![CDATA[FF80818132AFC4050132AFC7F94A000A]]></AD_TAB_ID>
+<!--ADFEA6135701FF0CE040007F01013508-->  <AD_COLUMN_ID><![CDATA[ADFF06FF43D2BA83E040007F01012F39]]></AD_COLUMN_ID>
+<!--ADFEA6135701FF0CE040007F01013508-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--ADFEA6135701FF0CE040007F01013508-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--ADFEA6135701FF0CE040007F01013508-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--ADFEA6135701FF0CE040007F01013508-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--ADFEA6135701FF0CE040007F01013508-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--ADFEA6135701FF0CE040007F01013508-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--ADFEA6135701FF0CE040007F01013508-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--ADFEA6135701FF0CE040007F01013508-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--ADFEA6135701FF0CE040007F01013508-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--ADFEA6135701FF0CE040007F01013508-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--ADFEA6135701FF0CE040007F01013508-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--ADFEA6135701FF0CE040007F01013508-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--ADFEA6135701FF0CE040007F01013508-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--ADFEA6135701FF0CE040007F01013508--></AD_FIELD>
+
+<!--ADFEA6135705FF0CE040007F01013508--><AD_FIELD>
+<!--ADFEA6135705FF0CE040007F01013508-->  <AD_FIELD_ID><![CDATA[ADFEA6135705FF0CE040007F01013508]]></AD_FIELD_ID>
+<!--ADFEA6135705FF0CE040007F01013508-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--ADFEA6135705FF0CE040007F01013508-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--ADFEA6135705FF0CE040007F01013508-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--ADFEA6135705FF0CE040007F01013508-->  <NAME><![CDATA[Amount]]></NAME>
+<!--ADFEA6135705FF0CE040007F01013508-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--ADFEA6135705FF0CE040007F01013508-->  <AD_TAB_ID><![CDATA[FF80818132AFC4050132AFC7F94A000A]]></AD_TAB_ID>
+<!--ADFEA6135705FF0CE040007F01013508-->  <AD_COLUMN_ID><![CDATA[ADFF06FF43D4BA83E040007F01012F39]]></AD_COLUMN_ID>
+<!--ADFEA6135705FF0CE040007F01013508-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--ADFEA6135705FF0CE040007F01013508-->  <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
+<!--ADFEA6135705FF0CE040007F01013508-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--ADFEA6135705FF0CE040007F01013508-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--ADFEA6135705FF0CE040007F01013508-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--ADFEA6135705FF0CE040007F01013508-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--ADFEA6135705FF0CE040007F01013508-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--ADFEA6135705FF0CE040007F01013508-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--ADFEA6135705FF0CE040007F01013508-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--ADFEA6135705FF0CE040007F01013508-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--ADFEA6135705FF0CE040007F01013508-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--ADFEA6135705FF0CE040007F01013508-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--ADFEA6135705FF0CE040007F01013508-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--ADFEA6135705FF0CE040007F01013508--></AD_FIELD>
+
+<!--ADFEA6135707FF0CE040007F01013508--><AD_FIELD>
+<!--ADFEA6135707FF0CE040007F01013508-->  <AD_FIELD_ID><![CDATA[ADFEA6135707FF0CE040007F01013508]]></AD_FIELD_ID>
+<!--ADFEA6135707FF0CE040007F01013508-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--ADFEA6135707FF0CE040007F01013508-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--ADFEA6135707FF0CE040007F01013508-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--ADFEA6135707FF0CE040007F01013508-->  <NAME><![CDATA[Currency]]></NAME>
+<!--ADFEA6135707FF0CE040007F01013508-->  <DESCRIPTION><![CDATA[An accepted medium of monetary exchange that may vary across countries.]]></DESCRIPTION>
+<!--ADFEA6135707FF0CE040007F01013508-->  <HELP><![CDATA[Indicates the currency to be used when processing this document.]]></HELP>
+<!--ADFEA6135707FF0CE040007F01013508-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--ADFEA6135707FF0CE040007F01013508-->  <AD_TAB_ID><![CDATA[FF80818132AFC4050132AFC7F94A000A]]></AD_TAB_ID>
+<!--ADFEA6135707FF0CE040007F01013508-->  <AD_COLUMN_ID><![CDATA[ADFF06FF43D7BA83E040007F01012F39]]></AD_COLUMN_ID>
+<!--ADFEA6135707FF0CE040007F01013508-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--ADFEA6135707FF0CE040007F01013508-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--ADFEA6135707FF0CE040007F01013508-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--ADFEA6135707FF0CE040007F01013508-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--ADFEA6135707FF0CE040007F01013508-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--ADFEA6135707FF0CE040007F01013508-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--ADFEA6135707FF0CE040007F01013508-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--ADFEA6135707FF0CE040007F01013508-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--ADFEA6135707FF0CE040007F01013508-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]>&