[reconciliation refactor] Added initial window with still not proper data
authorDavid Baz Fayos <david.baz@openbravo.com>
Fri, 08 Aug 2014 14:36:05 +0200
changeset 24461 34989cb7876e
parent 24224 415f64b18378
child 24462 085f916e4693
[reconciliation refactor] Added initial window with still not proper data
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_WINDOW.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PROCESS.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_REF_WINDOW.xml
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/APRMApplicationProvider.java
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/MatchStatementActionHandler.java
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/hqlinjections/MatchStatementTransformer.java
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-matchStatement.js
src-db/database/sourcedata/AD_FIELD.xml
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml	Fri Aug 08 11:14:59 2014 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml	Fri Aug 08 14:36:05 2014 +0200
@@ -2212,6 +2212,42 @@
 <!--4AE64134057846AFB053090561EA31D2-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--4AE64134057846AFB053090561EA31D2--></AD_COLUMN>
 
+<!--4B7A211B9950467485608172B5D053F9--><AD_COLUMN>
+<!--4B7A211B9950467485608172B5D053F9-->  <AD_COLUMN_ID><![CDATA[4B7A211B9950467485608172B5D053F9]]></AD_COLUMN_ID>
+<!--4B7A211B9950467485608172B5D053F9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4B7A211B9950467485608172B5D053F9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4B7A211B9950467485608172B5D053F9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4B7A211B9950467485608172B5D053F9-->  <NAME><![CDATA[Matching Type]]></NAME>
+<!--4B7A211B9950467485608172B5D053F9-->  <DESCRIPTION><![CDATA[Type of matching for the given line]]></DESCRIPTION>
+<!--4B7A211B9950467485608172B5D053F9-->  <HELP><![CDATA[Type of matching for the given line]]></HELP>
+<!--4B7A211B9950467485608172B5D053F9-->  <COLUMNNAME><![CDATA[matchingtype]]></COLUMNNAME>
+<!--4B7A211B9950467485608172B5D053F9-->  <AD_TABLE_ID><![CDATA[BC21981DCF0846338D631887BEDFE7FA]]></AD_TABLE_ID>
+<!--4B7A211B9950467485608172B5D053F9-->  <AD_REFERENCE_ID><![CDATA[17]]></AD_REFERENCE_ID>
+<!--4B7A211B9950467485608172B5D053F9-->  <AD_REFERENCE_VALUE_ID><![CDATA[BCABCED4983A4ECB814A6D142593ACEA]]></AD_REFERENCE_VALUE_ID>
+<!--4B7A211B9950467485608172B5D053F9-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--4B7A211B9950467485608172B5D053F9-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--4B7A211B9950467485608172B5D053F9-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--4B7A211B9950467485608172B5D053F9-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--4B7A211B9950467485608172B5D053F9-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--4B7A211B9950467485608172B5D053F9-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--4B7A211B9950467485608172B5D053F9-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--4B7A211B9950467485608172B5D053F9-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--4B7A211B9950467485608172B5D053F9-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--4B7A211B9950467485608172B5D053F9-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--4B7A211B9950467485608172B5D053F9-->  <AD_ELEMENT_ID><![CDATA[8189F49FFECE6E56E040007F01003E83]]></AD_ELEMENT_ID>
+<!--4B7A211B9950467485608172B5D053F9-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--4B7A211B9950467485608172B5D053F9-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--4B7A211B9950467485608172B5D053F9-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--4B7A211B9950467485608172B5D053F9-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--4B7A211B9950467485608172B5D053F9-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--4B7A211B9950467485608172B5D053F9-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--4B7A211B9950467485608172B5D053F9-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--4B7A211B9950467485608172B5D053F9-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--4B7A211B9950467485608172B5D053F9-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--4B7A211B9950467485608172B5D053F9-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--4B7A211B9950467485608172B5D053F9-->  <ENTITY_ALIAS><![CDATA[bsl.matchingtype]]></ENTITY_ALIAS>
+<!--4B7A211B9950467485608172B5D053F9--></AD_COLUMN>
+
 <!--4B98FCB4357B49DA9DB7D79FD28838AF--><AD_COLUMN>
 <!--4B98FCB4357B49DA9DB7D79FD28838AF-->  <AD_COLUMN_ID><![CDATA[4B98FCB4357B49DA9DB7D79FD28838AF]]></AD_COLUMN_ID>
 <!--4B98FCB4357B49DA9DB7D79FD28838AF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -3520,6 +3556,41 @@
 <!--78A3367822B35459E040007F01012510-->  <EM_OBUIAPP_PROCESS_ID><![CDATA[9BED7889E1034FE68BD85D5D16857320]]></EM_OBUIAPP_PROCESS_ID>
 <!--78A3367822B35459E040007F01012510--></AD_COLUMN>
 
+<!--7C947F020859452883746030218158E0--><AD_COLUMN>
+<!--7C947F020859452883746030218158E0-->  <AD_COLUMN_ID><![CDATA[7C947F020859452883746030218158E0]]></AD_COLUMN_ID>
+<!--7C947F020859452883746030218158E0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7C947F020859452883746030218158E0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7C947F020859452883746030218158E0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7C947F020859452883746030218158E0-->  <NAME><![CDATA[Reference No.]]></NAME>
+<!--7C947F020859452883746030218158E0-->  <DESCRIPTION><![CDATA[The number for a specific reference.]]></DESCRIPTION>
+<!--7C947F020859452883746030218158E0-->  <HELP><![CDATA[The reference number can be printed on orders and invoices to allow your business partner to faster identify your records.]]></HELP>
+<!--7C947F020859452883746030218158E0-->  <COLUMNNAME><![CDATA[referenceNo]]></COLUMNNAME>
+<!--7C947F020859452883746030218158E0-->  <AD_TABLE_ID><![CDATA[BC21981DCF0846338D631887BEDFE7FA]]></AD_TABLE_ID>
+<!--7C947F020859452883746030218158E0-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--7C947F020859452883746030218158E0-->  <FIELDLENGTH><![CDATA[30]]></FIELDLENGTH>
+<!--7C947F020859452883746030218158E0-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7C947F020859452883746030218158E0-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7C947F020859452883746030218158E0-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--7C947F020859452883746030218158E0-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--7C947F020859452883746030218158E0-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
+<!--7C947F020859452883746030218158E0-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--7C947F020859452883746030218158E0-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7C947F020859452883746030218158E0-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7C947F020859452883746030218158E0-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7C947F020859452883746030218158E0-->  <AD_ELEMENT_ID><![CDATA[540]]></AD_ELEMENT_ID>
+<!--7C947F020859452883746030218158E0-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7C947F020859452883746030218158E0-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7C947F020859452883746030218158E0-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7C947F020859452883746030218158E0-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7C947F020859452883746030218158E0-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--7C947F020859452883746030218158E0-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7C947F020859452883746030218158E0-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--7C947F020859452883746030218158E0-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--7C947F020859452883746030218158E0-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--7C947F020859452883746030218158E0-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--7C947F020859452883746030218158E0-->  <ENTITY_ALIAS><![CDATA[bsl.referenceNo]]></ENTITY_ALIAS>
+<!--7C947F020859452883746030218158E0--></AD_COLUMN>
+
 <!--7CBC01AEEA28472AA5A73CAB6ECAE824--><AD_COLUMN>
 <!--7CBC01AEEA28472AA5A73CAB6ECAE824-->  <AD_COLUMN_ID><![CDATA[7CBC01AEEA28472AA5A73CAB6ECAE824]]></AD_COLUMN_ID>
 <!--7CBC01AEEA28472AA5A73CAB6ECAE824-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -6040,6 +6111,41 @@
 <!--973EC2D699E948979150D33750F5D35D-->  <EM_OBUIAPP_PROCESS_ID><![CDATA[8D0D32CC819E449D9A08E0459B482963]]></EM_OBUIAPP_PROCESS_ID>
 <!--973EC2D699E948979150D33750F5D35D--></AD_COLUMN>
 
+<!--996C9CE70A9241C1AECF8970F4C32B93--><AD_COLUMN>
+<!--996C9CE70A9241C1AECF8970F4C32B93-->  <AD_COLUMN_ID><![CDATA[996C9CE70A9241C1AECF8970F4C32B93]]></AD_COLUMN_ID>
+<!--996C9CE70A9241C1AECF8970F4C32B93-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--996C9CE70A9241C1AECF8970F4C32B93-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--996C9CE70A9241C1AECF8970F4C32B93-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--996C9CE70A9241C1AECF8970F4C32B93-->  <NAME><![CDATA[Business Partner]]></NAME>
+<!--996C9CE70A9241C1AECF8970F4C32B93-->  <DESCRIPTION><![CDATA[Anyone who takes part in daily business operations by acting as a customer, employee, etc.]]></DESCRIPTION>
+<!--996C9CE70A9241C1AECF8970F4C32B93-->  <HELP><![CDATA[A Business Partner is anyone with whom you transact.  This can include a customer, vendor, employee or any combination of these.]]></HELP>
+<!--996C9CE70A9241C1AECF8970F4C32B93-->  <COLUMNNAME><![CDATA[businessPartner]]></COLUMNNAME>
+<!--996C9CE70A9241C1AECF8970F4C32B93-->  <AD_TABLE_ID><![CDATA[BC21981DCF0846338D631887BEDFE7FA]]></AD_TABLE_ID>
+<!--996C9CE70A9241C1AECF8970F4C32B93-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--996C9CE70A9241C1AECF8970F4C32B93-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--996C9CE70A9241C1AECF8970F4C32B93-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--996C9CE70A9241C1AECF8970F4C32B93-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--996C9CE70A9241C1AECF8970F4C32B93-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--996C9CE70A9241C1AECF8970F4C32B93-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--996C9CE70A9241C1AECF8970F4C32B93-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--996C9CE70A9241C1AECF8970F4C32B93-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--996C9CE70A9241C1AECF8970F4C32B93-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--996C9CE70A9241C1AECF8970F4C32B93-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--996C9CE70A9241C1AECF8970F4C32B93-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--996C9CE70A9241C1AECF8970F4C32B93-->  <AD_ELEMENT_ID><![CDATA[187]]></AD_ELEMENT_ID>
+<!--996C9CE70A9241C1AECF8970F4C32B93-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--996C9CE70A9241C1AECF8970F4C32B93-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--996C9CE70A9241C1AECF8970F4C32B93-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--996C9CE70A9241C1AECF8970F4C32B93-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--996C9CE70A9241C1AECF8970F4C32B93-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--996C9CE70A9241C1AECF8970F4C32B93-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--996C9CE70A9241C1AECF8970F4C32B93-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--996C9CE70A9241C1AECF8970F4C32B93-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--996C9CE70A9241C1AECF8970F4C32B93-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--996C9CE70A9241C1AECF8970F4C32B93-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--996C9CE70A9241C1AECF8970F4C32B93-->  <ENTITY_ALIAS><![CDATA[COALESCE(bsl.businessPartner.name, bsl.bpartnername)]]></ENTITY_ALIAS>
+<!--996C9CE70A9241C1AECF8970F4C32B93--></AD_COLUMN>
+
 <!--9B79431378824521850D2764C348755B--><AD_COLUMN>
 <!--9B79431378824521850D2764C348755B-->  <AD_COLUMN_ID><![CDATA[9B79431378824521850D2764C348755B]]></AD_COLUMN_ID>
 <!--9B79431378824521850D2764C348755B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -6439,7 +6545,6 @@
 <!--A04179EAC69DF848E040007F01004523-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--A04179EAC69DF848E040007F01004523-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
 <!--A04179EAC69DF848E040007F01004523-->  <AD_ELEMENT_ID><![CDATA[A0417A0E924BCA28E040007F01003C18]]></AD_ELEMENT_ID>
-<!--A04179EAC69DF848E040007F01004523-->  <AD_PROCESS_ID><![CDATA[C125EA7C85234D8B89FEA511FCCD2E9E]]></AD_PROCESS_ID>
 <!--A04179EAC69DF848E040007F01004523-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--A04179EAC69DF848E040007F01004523-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--A04179EAC69DF848E040007F01004523-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
@@ -6451,6 +6556,7 @@
 <!--A04179EAC69DF848E040007F01004523-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
 <!--A04179EAC69DF848E040007F01004523-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
 <!--A04179EAC69DF848E040007F01004523-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--A04179EAC69DF848E040007F01004523-->  <EM_OBUIAPP_PROCESS_ID><![CDATA[86F0B1EBE2BC48E3ACF458768D14CC99]]></EM_OBUIAPP_PROCESS_ID>
 <!--A04179EAC69DF848E040007F01004523--></AD_COLUMN>
 
 <!--A04179EAC69EF848E040007F01004523--><AD_COLUMN>
@@ -8690,6 +8796,41 @@
 <!--B88ABA24445C463A86300BBF6B6DE296-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--B88ABA24445C463A86300BBF6B6DE296--></AD_COLUMN>
 
+<!--B8A0E2E81E294B2AB10F4325BD4B563C--><AD_COLUMN>
+<!--B8A0E2E81E294B2AB10F4325BD4B563C-->  <AD_COLUMN_ID><![CDATA[B8A0E2E81E294B2AB10F4325BD4B563C]]></AD_COLUMN_ID>
+<!--B8A0E2E81E294B2AB10F4325BD4B563C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B8A0E2E81E294B2AB10F4325BD4B563C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B8A0E2E81E294B2AB10F4325BD4B563C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B8A0E2E81E294B2AB10F4325BD4B563C-->  <NAME><![CDATA[Transaction Date]]></NAME>
+<!--B8A0E2E81E294B2AB10F4325BD4B563C-->  <DESCRIPTION><![CDATA[The date that a specified transaction is entered into the application.]]></DESCRIPTION>
+<!--B8A0E2E81E294B2AB10F4325BD4B563C-->  <HELP><![CDATA[The Transaction Date indicates the date of the transaction.]]></HELP>
+<!--B8A0E2E81E294B2AB10F4325BD4B563C-->  <COLUMNNAME><![CDATA[transactionDate]]></COLUMNNAME>
+<!--B8A0E2E81E294B2AB10F4325BD4B563C-->  <AD_TABLE_ID><![CDATA[BC21981DCF0846338D631887BEDFE7FA]]></AD_TABLE_ID>
+<!--B8A0E2E81E294B2AB10F4325BD4B563C-->  <AD_REFERENCE_ID><![CDATA[15]]></AD_REFERENCE_ID>
+<!--B8A0E2E81E294B2AB10F4325BD4B563C-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--B8A0E2E81E294B2AB10F4325BD4B563C-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--B8A0E2E81E294B2AB10F4325BD4B563C-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--B8A0E2E81E294B2AB10F4325BD4B563C-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--B8A0E2E81E294B2AB10F4325BD4B563C-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--B8A0E2E81E294B2AB10F4325BD4B563C-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--B8A0E2E81E294B2AB10F4325BD4B563C-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--B8A0E2E81E294B2AB10F4325BD4B563C-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--B8A0E2E81E294B2AB10F4325BD4B563C-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--B8A0E2E81E294B2AB10F4325BD4B563C-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--B8A0E2E81E294B2AB10F4325BD4B563C-->  <AD_ELEMENT_ID><![CDATA[1297]]></AD_ELEMENT_ID>
+<!--B8A0E2E81E294B2AB10F4325BD4B563C-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--B8A0E2E81E294B2AB10F4325BD4B563C-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--B8A0E2E81E294B2AB10F4325BD4B563C-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--B8A0E2E81E294B2AB10F4325BD4B563C-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--B8A0E2E81E294B2AB10F4325BD4B563C-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--B8A0E2E81E294B2AB10F4325BD4B563C-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--B8A0E2E81E294B2AB10F4325BD4B563C-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--B8A0E2E81E294B2AB10F4325BD4B563C-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--B8A0E2E81E294B2AB10F4325BD4B563C-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--B8A0E2E81E294B2AB10F4325BD4B563C-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--B8A0E2E81E294B2AB10F4325BD4B563C-->  <ENTITY_ALIAS><![CDATA[bsl.transactionDate]]></ENTITY_ALIAS>
+<!--B8A0E2E81E294B2AB10F4325BD4B563C--></AD_COLUMN>
+
 <!--B9DAC6015F8F4F94965030A72199BC55--><AD_COLUMN>
 <!--B9DAC6015F8F4F94965030A72199BC55-->  <AD_COLUMN_ID><![CDATA[B9DAC6015F8F4F94965030A72199BC55]]></AD_COLUMN_ID>
 <!--B9DAC6015F8F4F94965030A72199BC55-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -9220,6 +9361,39 @@
 <!--C4248185C139416FA0B6E1F11E4B3B29-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--C4248185C139416FA0B6E1F11E4B3B29--></AD_COLUMN>
 
+<!--C9FD369BECE545828033CC49CAB85D9D--><AD_COLUMN>
+<!--C9FD369BECE545828033CC49CAB85D9D-->  <AD_COLUMN_ID><![CDATA[C9FD369BECE545828033CC49CAB85D9D]]></AD_COLUMN_ID>
+<!--C9FD369BECE545828033CC49CAB85D9D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C9FD369BECE545828033CC49CAB85D9D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C9FD369BECE545828033CC49CAB85D9D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C9FD369BECE545828033CC49CAB85D9D-->  <NAME><![CDATA[id]]></NAME>
+<!--C9FD369BECE545828033CC49CAB85D9D-->  <COLUMNNAME><![CDATA[id]]></COLUMNNAME>
+<!--C9FD369BECE545828033CC49CAB85D9D-->  <AD_TABLE_ID><![CDATA[BC21981DCF0846338D631887BEDFE7FA]]></AD_TABLE_ID>
+<!--C9FD369BECE545828033CC49CAB85D9D-->  <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
+<!--C9FD369BECE545828033CC49CAB85D9D-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--C9FD369BECE545828033CC49CAB85D9D-->  <ISKEY><![CDATA[Y]]></ISKEY>
+<!--C9FD369BECE545828033CC49CAB85D9D-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--C9FD369BECE545828033CC49CAB85D9D-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--C9FD369BECE545828033CC49CAB85D9D-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--C9FD369BECE545828033CC49CAB85D9D-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--C9FD369BECE545828033CC49CAB85D9D-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--C9FD369BECE545828033CC49CAB85D9D-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--C9FD369BECE545828033CC49CAB85D9D-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--C9FD369BECE545828033CC49CAB85D9D-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--C9FD369BECE545828033CC49CAB85D9D-->  <AD_ELEMENT_ID><![CDATA[C581AB086E0141EEAA2EEAA8605BD8F0]]></AD_ELEMENT_ID>
+<!--C9FD369BECE545828033CC49CAB85D9D-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--C9FD369BECE545828033CC49CAB85D9D-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--C9FD369BECE545828033CC49CAB85D9D-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--C9FD369BECE545828033CC49CAB85D9D-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--C9FD369BECE545828033CC49CAB85D9D-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--C9FD369BECE545828033CC49CAB85D9D-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--C9FD369BECE545828033CC49CAB85D9D-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--C9FD369BECE545828033CC49CAB85D9D-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--C9FD369BECE545828033CC49CAB85D9D-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--C9FD369BECE545828033CC49CAB85D9D-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--C9FD369BECE545828033CC49CAB85D9D-->  <ENTITY_ALIAS><![CDATA[bsl.id]]></ENTITY_ALIAS>
+<!--C9FD369BECE545828033CC49CAB85D9D--></AD_COLUMN>
+
 <!--CBAF582C3F674FEEB1D38C2A10E03E2F--><AD_COLUMN>
 <!--CBAF582C3F674FEEB1D38C2A10E03E2F-->  <AD_COLUMN_ID><![CDATA[CBAF582C3F674FEEB1D38C2A10E03E2F]]></AD_COLUMN_ID>
 <!--CBAF582C3F674FEEB1D38C2A10E03E2F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -9706,6 +9880,41 @@
 <!--EA4E28B26B6A4157830C4D2C09F93DCB-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--EA4E28B26B6A4157830C4D2C09F93DCB--></AD_COLUMN>
 
+<!--EB274794018B468497657840626CEA1E--><AD_COLUMN>
+<!--EB274794018B468497657840626CEA1E-->  <AD_COLUMN_ID><![CDATA[EB274794018B468497657840626CEA1E]]></AD_COLUMN_ID>
+<!--EB274794018B468497657840626CEA1E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--EB274794018B468497657840626CEA1E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--EB274794018B468497657840626CEA1E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--EB274794018B468497657840626CEA1E-->  <NAME><![CDATA[cramount]]></NAME>
+<!--EB274794018B468497657840626CEA1E-->  <DESCRIPTION><![CDATA[Amount credited. Reflects amount IN]]></DESCRIPTION>
+<!--EB274794018B468497657840626CEA1E-->  <HELP><![CDATA[Amount credited. Reflects amount IN]]></HELP>
+<!--EB274794018B468497657840626CEA1E-->  <COLUMNNAME><![CDATA[cramount]]></COLUMNNAME>
+<!--EB274794018B468497657840626CEA1E-->  <AD_TABLE_ID><![CDATA[BC21981DCF0846338D631887BEDFE7FA]]></AD_TABLE_ID>
+<!--EB274794018B468497657840626CEA1E-->  <AD_REFERENCE_ID><![CDATA[12]]></AD_REFERENCE_ID>
+<!--EB274794018B468497657840626CEA1E-->  <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--EB274794018B468497657840626CEA1E-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--EB274794018B468497657840626CEA1E-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--EB274794018B468497657840626CEA1E-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--EB274794018B468497657840626CEA1E-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--EB274794018B468497657840626CEA1E-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--EB274794018B468497657840626CEA1E-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--EB274794018B468497657840626CEA1E-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--EB274794018B468497657840626CEA1E-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--EB274794018B468497657840626CEA1E-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--EB274794018B468497657840626CEA1E-->  <AD_ELEMENT_ID><![CDATA[8189F49FFECB6E56E040007F01003E83]]></AD_ELEMENT_ID>
+<!--EB274794018B468497657840626CEA1E-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--EB274794018B468497657840626CEA1E-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--EB274794018B468497657840626CEA1E-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--EB274794018B468497657840626CEA1E-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--EB274794018B468497657840626CEA1E-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--EB274794018B468497657840626CEA1E-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--EB274794018B468497657840626CEA1E-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--EB274794018B468497657840626CEA1E-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--EB274794018B468497657840626CEA1E-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--EB274794018B468497657840626CEA1E-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--EB274794018B468497657840626CEA1E-->  <ENTITY_ALIAS><![CDATA[bsl.cramount]]></ENTITY_ALIAS>
+<!--EB274794018B468497657840626CEA1E--></AD_COLUMN>
+
 <!--EBF40746D2584CCC991B1F592C3A5DB9--><AD_COLUMN>
 <!--EBF40746D2584CCC991B1F592C3A5DB9-->  <AD_COLUMN_ID><![CDATA[EBF40746D2584CCC991B1F592C3A5DB9]]></AD_COLUMN_ID>
 <!--EBF40746D2584CCC991B1F592C3A5DB9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -10132,6 +10341,39 @@
 <!--FDE1E0795CDC4A00AC9D587E0D98D319-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--FDE1E0795CDC4A00AC9D587E0D98D319--></AD_COLUMN>
 
+<!--FE24DEE7950D47A68BD883DF1F7BA506--><AD_COLUMN>
+<!--FE24DEE7950D47A68BD883DF1F7BA506-->  <AD_COLUMN_ID><![CDATA[FE24DEE7950D47A68BD883DF1F7BA506]]></AD_COLUMN_ID>
+<!--FE24DEE7950D47A68BD883DF1F7BA506-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FE24DEE7950D47A68BD883DF1F7BA506-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FE24DEE7950D47A68BD883DF1F7BA506-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FE24DEE7950D47A68BD883DF1F7BA506-->  <NAME><![CDATA[Affinity]]></NAME>
+<!--FE24DEE7950D47A68BD883DF1F7BA506-->  <COLUMNNAME><![CDATA[affinity]]></COLUMNNAME>
+<!--FE24DEE7950D47A68BD883DF1F7BA506-->  <AD_TABLE_ID><![CDATA[BC21981DCF0846338D631887BEDFE7FA]]></AD_TABLE_ID>
+<!--FE24DEE7950D47A68BD883DF1F7BA506-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--FE24DEE7950D47A68BD883DF1F7BA506-->  <FIELDLENGTH><![CDATA[2]]></FIELDLENGTH>
+<!--FE24DEE7950D47A68BD883DF1F7BA506-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--FE24DEE7950D47A68BD883DF1F7BA506-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--FE24DEE7950D47A68BD883DF1F7BA506-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--FE24DEE7950D47A68BD883DF1F7BA506-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--FE24DEE7950D47A68BD883DF1F7BA506-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--FE24DEE7950D47A68BD883DF1F7BA506-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--FE24DEE7950D47A68BD883DF1F7BA506-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--FE24DEE7950D47A68BD883DF1F7BA506-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--FE24DEE7950D47A68BD883DF1F7BA506-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--FE24DEE7950D47A68BD883DF1F7BA506-->  <AD_ELEMENT_ID><![CDATA[829F6BFDD7254498B88C1BEFD397BFE3]]></AD_ELEMENT_ID>
+<!--FE24DEE7950D47A68BD883DF1F7BA506-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--FE24DEE7950D47A68BD883DF1F7BA506-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--FE24DEE7950D47A68BD883DF1F7BA506-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--FE24DEE7950D47A68BD883DF1F7BA506-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--FE24DEE7950D47A68BD883DF1F7BA506-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--FE24DEE7950D47A68BD883DF1F7BA506-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--FE24DEE7950D47A68BD883DF1F7BA506-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--FE24DEE7950D47A68BD883DF1F7BA506-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--FE24DEE7950D47A68BD883DF1F7BA506-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--FE24DEE7950D47A68BD883DF1F7BA506-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--FE24DEE7950D47A68BD883DF1F7BA506-->  <ENTITY_ALIAS><![CDATA[bsl.matchingtype]]></ENTITY_ALIAS>
+<!--FE24DEE7950D47A68BD883DF1F7BA506--></AD_COLUMN>
+
 <!--FEB149D92A0E4F9E9532F0F78A16B0A8--><AD_COLUMN>
 <!--FEB149D92A0E4F9E9532F0F78A16B0A8-->  <AD_COLUMN_ID><![CDATA[FEB149D92A0E4F9E9532F0F78A16B0A8]]></AD_COLUMN_ID>
 <!--FEB149D92A0E4F9E9532F0F78A16B0A8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml	Fri Aug 08 11:14:59 2014 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml	Fri Aug 08 14:36:05 2014 +0200
@@ -469,6 +469,18 @@
 <!--81E4345FE2154B34848477D34F5355EA-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--81E4345FE2154B34848477D34F5355EA--></AD_ELEMENT>
 
+<!--829F6BFDD7254498B88C1BEFD397BFE3--><AD_ELEMENT>
+<!--829F6BFDD7254498B88C1BEFD397BFE3-->  <AD_ELEMENT_ID><![CDATA[829F6BFDD7254498B88C1BEFD397BFE3]]></AD_ELEMENT_ID>
+<!--829F6BFDD7254498B88C1BEFD397BFE3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--829F6BFDD7254498B88C1BEFD397BFE3-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--829F6BFDD7254498B88C1BEFD397BFE3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--829F6BFDD7254498B88C1BEFD397BFE3-->  <COLUMNNAME><![CDATA[affinity]]></COLUMNNAME>
+<!--829F6BFDD7254498B88C1BEFD397BFE3-->  <NAME><![CDATA[Affinity]]></NAME>
+<!--829F6BFDD7254498B88C1BEFD397BFE3-->  <PRINTNAME><![CDATA[Affinity]]></PRINTNAME>
+<!--829F6BFDD7254498B88C1BEFD397BFE3-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--829F6BFDD7254498B88C1BEFD397BFE3-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--829F6BFDD7254498B88C1BEFD397BFE3--></AD_ELEMENT>
+
 <!--82EFB8E4045B19C9E040007F01003778--><AD_ELEMENT>
 <!--82EFB8E4045B19C9E040007F01003778-->  <AD_ELEMENT_ID><![CDATA[82EFB8E4045B19C9E040007F01003778]]></AD_ELEMENT_ID>
 <!--82EFB8E4045B19C9E040007F01003778-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -616,6 +628,18 @@
 <!--87AA1068F10742CAE040007F010011D5-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--87AA1068F10742CAE040007F010011D5--></AD_ELEMENT>
 
+<!--88E9727DAC364BA38FFE37BC8B9BF698--><AD_ELEMENT>
+<!--88E9727DAC364BA38FFE37BC8B9BF698-->  <AD_ELEMENT_ID><![CDATA[88E9727DAC364BA38FFE37BC8B9BF698]]></AD_ELEMENT_ID>
+<!--88E9727DAC364BA38FFE37BC8B9BF698-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--88E9727DAC364BA38FFE37BC8B9BF698-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--88E9727DAC364BA38FFE37BC8B9BF698-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--88E9727DAC364BA38FFE37BC8B9BF698-->  <COLUMNNAME><![CDATA[match_statement]]></COLUMNNAME>
+<!--88E9727DAC364BA38FFE37BC8B9BF698-->  <NAME><![CDATA[Match Statement]]></NAME>
+<!--88E9727DAC364BA38FFE37BC8B9BF698-->  <PRINTNAME><![CDATA[Match Statement]]></PRINTNAME>
+<!--88E9727DAC364BA38FFE37BC8B9BF698-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--88E9727DAC364BA38FFE37BC8B9BF698-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--88E9727DAC364BA38FFE37BC8B9BF698--></AD_ELEMENT>
+
 <!--8B4372E6182C902CE040007F01000EB9--><AD_ELEMENT>
 <!--8B4372E6182C902CE040007F01000EB9-->  <AD_ELEMENT_ID><![CDATA[8B4372E6182C902CE040007F01000EB9]]></AD_ELEMENT_ID>
 <!--8B4372E6182C902CE040007F01000EB9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -715,8 +739,8 @@
 <!--A0417A0E924BCA28E040007F01003C18-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A0417A0E924BCA28E040007F01003C18-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A0417A0E924BCA28E040007F01003C18-->  <COLUMNNAME><![CDATA[EM_APRM_MatchTransactions]]></COLUMNNAME>
-<!--A0417A0E924BCA28E040007F01003C18-->  <NAME><![CDATA[EM_APRM_MatchTransactions]]></NAME>
-<!--A0417A0E924BCA28E040007F01003C18-->  <PRINTNAME><![CDATA[EM_APRM_MatchTransactions]]></PRINTNAME>
+<!--A0417A0E924BCA28E040007F01003C18-->  <NAME><![CDATA[Match Statement]]></NAME>
+<!--A0417A0E924BCA28E040007F01003C18-->  <PRINTNAME><![CDATA[Match Statement]]></PRINTNAME>
 <!--A0417A0E924BCA28E040007F01003C18-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--A0417A0E924BCA28E040007F01003C18-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--A0417A0E924BCA28E040007F01003C18--></AD_ELEMENT>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml	Fri Aug 08 11:14:59 2014 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml	Fri Aug 08 14:36:05 2014 +0200
@@ -1066,6 +1066,34 @@
 <!--1065705985A540BFB37026D396243878-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--1065705985A540BFB37026D396243878--></AD_FIELD>
 
+<!--10F24EF51B8149EC9F9E86CE9BE97BD2--><AD_FIELD>
+<!--10F24EF51B8149EC9F9E86CE9BE97BD2-->  <AD_FIELD_ID><![CDATA[10F24EF51B8149EC9F9E86CE9BE97BD2]]></AD_FIELD_ID>
+<!--10F24EF51B8149EC9F9E86CE9BE97BD2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--10F24EF51B8149EC9F9E86CE9BE97BD2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--10F24EF51B8149EC9F9E86CE9BE97BD2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--10F24EF51B8149EC9F9E86CE9BE97BD2-->  <NAME><![CDATA[Business Partner]]></NAME>
+<!--10F24EF51B8149EC9F9E86CE9BE97BD2-->  <DESCRIPTION><![CDATA[Anyone who takes part in daily business operations by acting as a customer, employee, etc.]]></DESCRIPTION>
+<!--10F24EF51B8149EC9F9E86CE9BE97BD2-->  <HELP><![CDATA[A Business Partner is anyone with whom you transact.  This can include a customer, vendor, employee or any combination of these.]]></HELP>
+<!--10F24EF51B8149EC9F9E86CE9BE97BD2-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--10F24EF51B8149EC9F9E86CE9BE97BD2-->  <AD_TAB_ID><![CDATA[ED54A4E24196476596955286D403461E]]></AD_TAB_ID>
+<!--10F24EF51B8149EC9F9E86CE9BE97BD2-->  <AD_COLUMN_ID><![CDATA[996C9CE70A9241C1AECF8970F4C32B93]]></AD_COLUMN_ID>
+<!--10F24EF51B8149EC9F9E86CE9BE97BD2-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--10F24EF51B8149EC9F9E86CE9BE97BD2-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--10F24EF51B8149EC9F9E86CE9BE97BD2-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
+<!--10F24EF51B8149EC9F9E86CE9BE97BD2-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--10F24EF51B8149EC9F9E86CE9BE97BD2-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--10F24EF51B8149EC9F9E86CE9BE97BD2-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--10F24EF51B8149EC9F9E86CE9BE97BD2-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--10F24EF51B8149EC9F9E86CE9BE97BD2-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--10F24EF51B8149EC9F9E86CE9BE97BD2-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--10F24EF51B8149EC9F9E86CE9BE97BD2-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--10F24EF51B8149EC9F9E86CE9BE97BD2-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--10F24EF51B8149EC9F9E86CE9BE97BD2-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--10F24EF51B8149EC9F9E86CE9BE97BD2-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--10F24EF51B8149EC9F9E86CE9BE97BD2-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--10F24EF51B8149EC9F9E86CE9BE97BD2-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--10F24EF51B8149EC9F9E86CE9BE97BD2--></AD_FIELD>
+
 <!--1106ED7C155243B38D6B1EC8E44B75B2--><AD_FIELD>
 <!--1106ED7C155243B38D6B1EC8E44B75B2-->  <AD_FIELD_ID><![CDATA[1106ED7C155243B38D6B1EC8E44B75B2]]></AD_FIELD_ID>
 <!--1106ED7C155243B38D6B1EC8E44B75B2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -5167,6 +5195,33 @@
 <!--4DABC37C5C4E4BA9AB404A6BCA2D8BCE-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--4DABC37C5C4E4BA9AB404A6BCA2D8BCE--></AD_FIELD>
 
+<!--4DCD2F2B15C64284AA12ED67E7DA0365--><AD_FIELD>
+<!--4DCD2F2B15C64284AA12ED67E7DA0365-->  <AD_FIELD_ID><![CDATA[4DCD2F2B15C64284AA12ED67E7DA0365]]></AD_FIELD_ID>
+<!--4DCD2F2B15C64284AA12ED67E7DA0365-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4DCD2F2B15C64284AA12ED67E7DA0365-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4DCD2F2B15C64284AA12ED67E7DA0365-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4DCD2F2B15C64284AA12ED67E7DA0365-->  <NAME><![CDATA[Affinity]]></NAME>
+<!--4DCD2F2B15C64284AA12ED67E7DA0365-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--4DCD2F2B15C64284AA12ED67E7DA0365-->  <AD_TAB_ID><![CDATA[ED54A4E24196476596955286D403461E]]></AD_TAB_ID>
+<!--4DCD2F2B15C64284AA12ED67E7DA0365-->  <AD_COLUMN_ID><![CDATA[FE24DEE7950D47A68BD883DF1F7BA506]]></AD_COLUMN_ID>
+<!--4DCD2F2B15C64284AA12ED67E7DA0365-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--4DCD2F2B15C64284AA12ED67E7DA0365-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--4DCD2F2B15C64284AA12ED67E7DA0365-->  <DISPLAYLENGTH><![CDATA[2]]></DISPLAYLENGTH>
+<!--4DCD2F2B15C64284AA12ED67E7DA0365-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--4DCD2F2B15C64284AA12ED67E7DA0365-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--4DCD2F2B15C64284AA12ED67E7DA0365-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--4DCD2F2B15C64284AA12ED67E7DA0365-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--4DCD2F2B15C64284AA12ED67E7DA0365-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--4DCD2F2B15C64284AA12ED67E7DA0365-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4DCD2F2B15C64284AA12ED67E7DA0365-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--4DCD2F2B15C64284AA12ED67E7DA0365-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--4DCD2F2B15C64284AA12ED67E7DA0365-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--4DCD2F2B15C64284AA12ED67E7DA0365-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--4DCD2F2B15C64284AA12ED67E7DA0365-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--4DCD2F2B15C64284AA12ED67E7DA0365-->  <CLIENTCLASS><![CDATA[OBLevelImg {"valuesList":["NO", "dummy1", "AP", "dummy3", "AU"]}]]></CLIENTCLASS>
+<!--4DCD2F2B15C64284AA12ED67E7DA0365-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--4DCD2F2B15C64284AA12ED67E7DA0365--></AD_FIELD>
+
 <!--4E60FF57D4C84DBCA32B28F23534AE33--><AD_FIELD>
 <!--4E60FF57D4C84DBCA32B28F23534AE33-->  <AD_FIELD_ID><![CDATA[4E60FF57D4C84DBCA32B28F23534AE33]]></AD_FIELD_ID>
 <!--4E60FF57D4C84DBCA32B28F23534AE33-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -6899,6 +6954,32 @@
 <!--65BCA534FAC848298C8F156505618CDF-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--65BCA534FAC848298C8F156505618CDF--></AD_FIELD>
 
+<!--660FAFE856174CFDAA44B3894271282F--><AD_FIELD>
+<!--660FAFE856174CFDAA44B3894271282F-->  <AD_FIELD_ID><![CDATA[660FAFE856174CFDAA44B3894271282F]]></AD_FIELD_ID>
+<!--660FAFE856174CFDAA44B3894271282F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--660FAFE856174CFDAA44B3894271282F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--660FAFE856174CFDAA44B3894271282F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--660FAFE856174CFDAA44B3894271282F-->  <NAME><![CDATA[id]]></NAME>
+<!--660FAFE856174CFDAA44B3894271282F-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--660FAFE856174CFDAA44B3894271282F-->  <AD_TAB_ID><![CDATA[ED54A4E24196476596955286D403461E]]></AD_TAB_ID>
+<!--660FAFE856174CFDAA44B3894271282F-->  <AD_COLUMN_ID><![CDATA[C9FD369BECE545828033CC49CAB85D9D]]></AD_COLUMN_ID>
+<!--660FAFE856174CFDAA44B3894271282F-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--660FAFE856174CFDAA44B3894271282F-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--660FAFE856174CFDAA44B3894271282F-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
+<!--660FAFE856174CFDAA44B3894271282F-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--660FAFE856174CFDAA44B3894271282F-->  <SEQNO><![CDATA[999]]></SEQNO>
+<!--660FAFE856174CFDAA44B3894271282F-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--660FAFE856174CFDAA44B3894271282F-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--660FAFE856174CFDAA44B3894271282F-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--660FAFE856174CFDAA44B3894271282F-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--660FAFE856174CFDAA44B3894271282F-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--660FAFE856174CFDAA44B3894271282F-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--660FAFE856174CFDAA44B3894271282F-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--660FAFE856174CFDAA44B3894271282F-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--660FAFE856174CFDAA44B3894271282F-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--660FAFE856174CFDAA44B3894271282F-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--660FAFE856174CFDAA44B3894271282F--></AD_FIELD>
+
 <!--662B721002DF4D81B1EFFD9C6CBF8BBA--><AD_FIELD>
 <!--662B721002DF4D81B1EFFD9C6CBF8BBA-->  <AD_FIELD_ID><![CDATA[662B721002DF4D81B1EFFD9C6CBF8BBA]]></AD_FIELD_ID>
 <!--662B721002DF4D81B1EFFD9C6CBF8BBA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -11600,6 +11681,34 @@
 <!--87E68614F614EAFEE040007F010044AA-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--87E68614F614EAFEE040007F010044AA--></AD_FIELD>
 
+<!--890F1847CD8B44659C808CDCDAC14A01--><AD_FIELD>
+<!--890F1847CD8B44659C808CDCDAC14A01-->  <AD_FIELD_ID><![CDATA[890F1847CD8B44659C808CDCDAC14A01]]></AD_FIELD_ID>
+<!--890F1847CD8B44659C808CDCDAC14A01-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--890F1847CD8B44659C808CDCDAC14A01-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--890F1847CD8B44659C808CDCDAC14A01-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--890F1847CD8B44659C808CDCDAC14A01-->  <NAME><![CDATA[Transaction Date]]></NAME>
+<!--890F1847CD8B44659C808CDCDAC14A01-->  <DESCRIPTION><![CDATA[The date that a specified transaction is entered into the application.]]></DESCRIPTION>
+<!--890F1847CD8B44659C808CDCDAC14A01-->  <HELP><![CDATA[The Transaction Date indicates the date of the transaction.]]></HELP>
+<!--890F1847CD8B44659C808CDCDAC14A01-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--890F1847CD8B44659C808CDCDAC14A01-->  <AD_TAB_ID><![CDATA[ED54A4E24196476596955286D403461E]]></AD_TAB_ID>
+<!--890F1847CD8B44659C808CDCDAC14A01-->  <AD_COLUMN_ID><![CDATA[B8A0E2E81E294B2AB10F4325BD4B563C]]></AD_COLUMN_ID>
+<!--890F1847CD8B44659C808CDCDAC14A01-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--890F1847CD8B44659C808CDCDAC14A01-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--890F1847CD8B44659C808CDCDAC14A01-->  <DISPLAYLENGTH><![CDATA[4019]]></DISPLAYLENGTH>
+<!--890F1847CD8B44659C808CDCDAC14A01-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--890F1847CD8B44659C808CDCDAC14A01-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--890F1847CD8B44659C808CDCDAC14A01-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--890F1847CD8B44659C808CDCDAC14A01-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--890F1847CD8B44659C808CDCDAC14A01-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--890F1847CD8B44659C808CDCDAC14A01-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--890F1847CD8B44659C808CDCDAC14A01-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--890F1847CD8B44659C808CDCDAC14A01-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--890F1847CD8B44659C808CDCDAC14A01-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--890F1847CD8B44659C808CDCDAC14A01-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--890F1847CD8B44659C808CDCDAC14A01-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--890F1847CD8B44659C808CDCDAC14A01-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--890F1847CD8B44659C808CDCDAC14A01--></AD_FIELD>
+
 <!--897F23D8C4A94CDBA1E18A1950A6D8F7--><AD_FIELD>
 <!--897F23D8C4A94CDBA1E18A1950A6D8F7-->  <AD_FIELD_ID><![CDATA[897F23D8C4A94CDBA1E18A1950A6D8F7]]></AD_FIELD_ID>
 <!--897F23D8C4A94CDBA1E18A1950A6D8F7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -14788,6 +14897,34 @@
 <!--AA33525387124B91BA305A6C3F314574-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--AA33525387124B91BA305A6C3F314574--></AD_FIELD>
 
+<!--AAAD380DFF204F098FE659A2D170E659--><AD_FIELD>
+<!--AAAD380DFF204F098FE659A2D170E659-->  <AD_FIELD_ID><![CDATA[AAAD380DFF204F098FE659A2D170E659]]></AD_FIELD_ID>
+<!--AAAD380DFF204F098FE659A2D170E659-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--AAAD380DFF204F098FE659A2D170E659-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--AAAD380DFF204F098FE659A2D170E659-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--AAAD380DFF204F098FE659A2D170E659-->  <NAME><![CDATA[Amount IN]]></NAME>
+<!--AAAD380DFF204F098FE659A2D170E659-->  <DESCRIPTION><![CDATA[Amount credited. Reflects amount IN]]></DESCRIPTION>
+<!--AAAD380DFF204F098FE659A2D170E659-->  <HELP><![CDATA[Amount credited. Reflects amount IN]]></HELP>
+<!--AAAD380DFF204F098FE659A2D170E659-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--AAAD380DFF204F098FE659A2D170E659-->  <AD_TAB_ID><![CDATA[ED54A4E24196476596955286D403461E]]></AD_TAB_ID>
+<!--AAAD380DFF204F098FE659A2D170E659-->  <AD_COLUMN_ID><![CDATA[EB274794018B468497657840626CEA1E]]></AD_COLUMN_ID>
+<!--AAAD380DFF204F098FE659A2D170E659-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--AAAD380DFF204F098FE659A2D170E659-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--AAAD380DFF204F098FE659A2D170E659-->  <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
+<!--AAAD380DFF204F098FE659A2D170E659-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--AAAD380DFF204F098FE659A2D170E659-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--AAAD380DFF204F098FE659A2D170E659-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--AAAD380DFF204F098FE659A2D170E659-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--AAAD380DFF204F098FE659A2D170E659-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--AAAD380DFF204F098FE659A2D170E659-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--AAAD380DFF204F098FE659A2D170E659-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--AAAD380DFF204F098FE659A2D170E659-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--AAAD380DFF204F098FE659A2D170E659-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--AAAD380DFF204F098FE659A2D170E659-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--AAAD380DFF204F098FE659A2D170E659-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--AAAD380DFF204F098FE659A2D170E659-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--AAAD380DFF204F098FE659A2D170E659--></AD_FIELD>
+
 <!--AB09B9E786D44E64ACEB7084B02F2AD0--><AD_FIELD>
 <!--AB09B9E786D44E64ACEB7084B02F2AD0-->  <AD_FIELD_ID><![CDATA[AB09B9E786D44E64ACEB7084B02F2AD0]]></AD_FIELD_ID>
 <!--AB09B9E786D44E64ACEB7084B02F2AD0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -18771,6 +18908,34 @@
 <!--D713EA6B98544AE2B2B52F2E23E18E88-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--D713EA6B98544AE2B2B52F2E23E18E88--></AD_FIELD>
 
+<!--D736E8D5452842B3AC9111E2855E0FEF--><AD_FIELD>
+<!--D736E8D5452842B3AC9111E2855E0FEF-->  <AD_FIELD_ID><![CDATA[D736E8D5452842B3AC9111E2855E0FEF]]></AD_FIELD_ID>
+<!--D736E8D5452842B3AC9111E2855E0FEF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D736E8D5452842B3AC9111E2855E0FEF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D736E8D5452842B3AC9111E2855E0FEF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D736E8D5452842B3AC9111E2855E0FEF-->  <NAME><![CDATA[Reference No.]]></NAME>
+<!--D736E8D5452842B3AC9111E2855E0FEF-->  <DESCRIPTION><![CDATA[The number for a specific reference.]]></DESCRIPTION>
+<!--D736E8D5452842B3AC9111E2855E0FEF-->  <HELP><![CDATA[The reference number can be printed on orders and invoices to allow your business partner to faster identify your records.]]></HELP>
+<!--D736E8D5452842B3AC9111E2855E0FEF-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--D736E8D5452842B3AC9111E2855E0FEF-->  <AD_TAB_ID><![CDATA[ED54A4E24196476596955286D403461E]]></AD_TAB_ID>
+<!--D736E8D5452842B3AC9111E2855E0FEF-->  <AD_COLUMN_ID><![CDATA[7C947F020859452883746030218158E0]]></AD_COLUMN_ID>
+<!--D736E8D5452842B3AC9111E2855E0FEF-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--D736E8D5452842B3AC9111E2855E0FEF-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--D736E8D5452842B3AC9111E2855E0FEF-->  <DISPLAYLENGTH><![CDATA[30]]></DISPLAYLENGTH>
+<!--D736E8D5452842B3AC9111E2855E0FEF-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--D736E8D5452842B3AC9111E2855E0FEF-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--D736E8D5452842B3AC9111E2855E0FEF-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--D736E8D5452842B3AC9111E2855E0FEF-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--D736E8D5452842B3AC9111E2855E0FEF-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--D736E8D5452842B3AC9111E2855E0FEF-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--D736E8D5452842B3AC9111E2855E0FEF-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--D736E8D5452842B3AC9111E2855E0FEF-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--D736E8D5452842B3AC9111E2855E0FEF-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--D736E8D5452842B3AC9111E2855E0FEF-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--D736E8D5452842B3AC9111E2855E0FEF-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--D736E8D5452842B3AC9111E2855E0FEF-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--D736E8D5452842B3AC9111E2855E0FEF--></AD_FIELD>
+
 <!--D75020C6BCC34E84ACDB10F8C95983AF--><AD_FIELD>
 <!--D75020C6BCC34E84ACDB10F8C95983AF-->  <AD_FIELD_ID><![CDATA[D75020C6BCC34E84ACDB10F8C95983AF]]></AD_FIELD_ID>
 <!--D75020C6BCC34E84ACDB10F8C95983AF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -20568,6 +20733,34 @@
 <!--F62469397EEC4E4F9725C7856EACADA8-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--F62469397EEC4E4F9725C7856EACADA8--></AD_FIELD>
 
+<!--F67B5E4ABF37485D902492EE904B782D--><AD_FIELD>
+<!--F67B5E4ABF37485D902492EE904B782D-->  <AD_FIELD_ID><![CDATA[F67B5E4ABF37485D902492EE904B782D]]></AD_FIELD_ID>
+<!--F67B5E4ABF37485D902492EE904B782D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F67B5E4ABF37485D902492EE904B782D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F67B5E4ABF37485D902492EE904B782D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F67B5E4ABF37485D902492EE904B782D-->  <NAME><![CDATA[Matching Type]]></NAME>
+<!--F67B5E4ABF37485D902492EE904B782D-->  <DESCRIPTION><![CDATA[Type of matching for the given line]]></DESCRIPTION>
+<!--F67B5E4ABF37485D902492EE904B782D-->  <HELP><![CDATA[Type of matching for the given line]]></HELP>
+<!--F67B5E4ABF37485D902492EE904B782D-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--F67B5E4ABF37485D902492EE904B782D-->  <AD_TAB_ID><![CDATA[ED54A4E24196476596955286D403461E]]></AD_TAB_ID>
+<!--F67B5E4ABF37485D902492EE904B782D-->  <AD_COLUMN_ID><![CDATA[4B7A211B9950467485608172B5D053F9]]></AD_COLUMN_ID>
+<!--F67B5E4ABF37485D902492EE904B782D-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--F67B5E4ABF37485D902492EE904B782D-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--F67B5E4ABF37485D902492EE904B782D-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
+<!--F67B5E4ABF37485D902492EE904B782D-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--F67B5E4ABF37485D902492EE904B782D-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--F67B5E4ABF37485D902492EE904B782D-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--F67B5E4ABF37485D902492EE904B782D-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--F67B5E4ABF37485D902492EE904B782D-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--F67B5E4ABF37485D902492EE904B782D-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--F67B5E4ABF37485D902492EE904B782D-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--F67B5E4ABF37485D902492EE904B782D-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--F67B5E4ABF37485D902492EE904B782D-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--F67B5E4ABF37485D902492EE904B782D-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--F67B5E4ABF37485D902492EE904B782D-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--F67B5E4ABF37485D902492EE904B782D-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--F67B5E4ABF37485D902492EE904B782D--></AD_FIELD>
+
 <!--F695E5866E87472295BBBBD11ACD61E9--><AD_FIELD>
 <!--F695E5866E87472295BBBBD11ACD61E9-->  <AD_FIELD_ID><![CDATA[F695E5866E87472295BBBBD11ACD61E9]]></AD_FIELD_ID>
 <!--F695E5866E87472295BBBBD11ACD61E9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml	Fri Aug 08 11:14:59 2014 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml	Fri Aug 08 14:36:05 2014 +0200
@@ -84,6 +84,18 @@
 <!--23AB7A87FF4E462197629E461B9F033C-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
 <!--23AB7A87FF4E462197629E461B9F033C--></AD_REFERENCE>
 
+<!--2EE1D209314A4BEB8B0416B8486FFC86--><AD_REFERENCE>
+<!--2EE1D209314A4BEB8B0416B8486FFC86-->  <AD_REFERENCE_ID><![CDATA[2EE1D209314A4BEB8B0416B8486FFC86]]></AD_REFERENCE_ID>
+<!--2EE1D209314A4BEB8B0416B8486FFC86-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2EE1D209314A4BEB8B0416B8486FFC86-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2EE1D209314A4BEB8B0416B8486FFC86-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2EE1D209314A4BEB8B0416B8486FFC86-->  <NAME><![CDATA[Match Statement P&E]]></NAME>
+<!--2EE1D209314A4BEB8B0416B8486FFC86-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--2EE1D209314A4BEB8B0416B8486FFC86-->  <ISBASEREFERENCE><![CDATA[N]]></ISBASEREFERENCE>
+<!--2EE1D209314A4BEB8B0416B8486FFC86-->  <PARENTREFERENCE_ID><![CDATA[FF80818132D8F0F30132D9BC395D0038]]></PARENTREFERENCE_ID>
+<!--2EE1D209314A4BEB8B0416B8486FFC86-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
+<!--2EE1D209314A4BEB8B0416B8486FFC86--></AD_REFERENCE>
+
 <!--414E5DD3A1304C7781FB856A6872F428--><AD_REFERENCE>
 <!--414E5DD3A1304C7781FB856A6872F428-->  <AD_REFERENCE_ID><![CDATA[414E5DD3A1304C7781FB856A6872F428]]></AD_REFERENCE_ID>
 <!--414E5DD3A1304C7781FB856A6872F428-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml	Fri Aug 08 11:14:59 2014 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml	Fri Aug 08 14:36:05 2014 +0200
@@ -821,6 +821,37 @@
 <!--EB0E0C5A58344F7FA345097E7365CD22-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
 <!--EB0E0C5A58344F7FA345097E7365CD22--></AD_TAB>
 
+<!--ED54A4E24196476596955286D403461E--><AD_TAB>
+<!--ED54A4E24196476596955286D403461E-->  <AD_TAB_ID><![CDATA[ED54A4E24196476596955286D403461E]]></AD_TAB_ID>
+<!--ED54A4E24196476596955286D403461E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--ED54A4E24196476596955286D403461E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--ED54A4E24196476596955286D403461E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--ED54A4E24196476596955286D403461E-->  <NAME><![CDATA[Match Statement]]></NAME>
+<!--ED54A4E24196476596955286D403461E-->  <DESCRIPTION><![CDATA[Grid for match statements]]></DESCRIPTION>
+<!--ED54A4E24196476596955286D403461E-->  <HELP><![CDATA[Grid for match statements]]></HELP>
+<!--ED54A4E24196476596955286D403461E-->  <AD_TABLE_ID><![CDATA[BC21981DCF0846338D631887BEDFE7FA]]></AD_TABLE_ID>
+<!--ED54A4E24196476596955286D403461E-->  <AD_WINDOW_ID><![CDATA[E34AE40786684EBB81E9F8A55BE33DCE]]></AD_WINDOW_ID>
+<!--ED54A4E24196476596955286D403461E-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--ED54A4E24196476596955286D403461E-->  <TABLEVEL><![CDATA[0]]></TABLEVEL>
+<!--ED54A4E24196476596955286D403461E-->  <ISSINGLEROW><![CDATA[N]]></ISSINGLEROW>
+<!--ED54A4E24196476596955286D403461E-->  <ISINFOTAB><![CDATA[N]]></ISINFOTAB>
+<!--ED54A4E24196476596955286D403461E-->  <ISTRANSLATIONTAB><![CDATA[N]]></ISTRANSLATIONTAB>
+<!--ED54A4E24196476596955286D403461E-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--ED54A4E24196476596955286D403461E-->  <HASTREE><![CDATA[N]]></HASTREE>
+<!--ED54A4E24196476596955286D403461E-->  <PROCESSING><![CDATA[N]]></PROCESSING>
+<!--ED54A4E24196476596955286D403461E-->  <IMPORTFIELDS><![CDATA[N]]></IMPORTFIELDS>
+<!--ED54A4E24196476596955286D403461E-->  <ISSORTTAB><![CDATA[N]]></ISSORTTAB>
+<!--ED54A4E24196476596955286D403461E-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--ED54A4E24196476596955286D403461E-->  <UIPATTERN><![CDATA[RO]]></UIPATTERN>
+<!--ED54A4E24196476596955286D403461E-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--ED54A4E24196476596955286D403461E-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
+<!--ED54A4E24196476596955286D403461E-->  <ISREADONLYTREE><![CDATA[N]]></ISREADONLYTREE>
+<!--ED54A4E24196476596955286D403461E-->  <ISSHOWTREENODEICONS><![CDATA[Y]]></ISSHOWTREENODEICONS>
+<!--ED54A4E24196476596955286D403461E-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--ED54A4E24196476596955286D403461E-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
+<!--ED54A4E24196476596955286D403461E-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
+<!--ED54A4E24196476596955286D403461E--></AD_TAB>
+
 <!--F6C2283A21314407BBBB23FF14B85ED4--><AD_TAB>
 <!--F6C2283A21314407BBBB23FF14B85ED4-->  <AD_TAB_ID><![CDATA[F6C2283A21314407BBBB23FF14B85ED4]]></AD_TAB_ID>
 <!--F6C2283A21314407BBBB23FF14B85ED4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml	Fri Aug 08 11:14:59 2014 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml	Fri Aug 08 14:36:05 2014 +0200
@@ -181,6 +181,33 @@
 <!--864A35C8FCD548B0AD1D69C89BBA6118-->  <ENTITY_ALIAS><![CDATA[psd]]></ENTITY_ALIAS>
 <!--864A35C8FCD548B0AD1D69C89BBA6118--></AD_TABLE>
 
+<!--BC21981DCF0846338D631887BEDFE7FA--><AD_TABLE>
+<!--BC21981DCF0846338D631887BEDFE7FA-->  <AD_TABLE_ID><![CDATA[BC21981DCF0846338D631887BEDFE7FA]]></AD_TABLE_ID>
+<!--BC21981DCF0846338D631887BEDFE7FA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BC21981DCF0846338D631887BEDFE7FA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BC21981DCF0846338D631887BEDFE7FA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BC21981DCF0846338D631887BEDFE7FA-->  <NAME><![CDATA[aprm_matchstatement]]></NAME>
+<!--BC21981DCF0846338D631887BEDFE7FA-->  <TABLENAME><![CDATA[aprm_matchstatement]]></TABLENAME>
+<!--BC21981DCF0846338D631887BEDFE7FA-->  <ISVIEW><![CDATA[N]]></ISVIEW>
+<!--BC21981DCF0846338D631887BEDFE7FA-->  <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
+<!--BC21981DCF0846338D631887BEDFE7FA-->  <AD_WINDOW_ID><![CDATA[E34AE40786684EBB81E9F8A55BE33DCE]]></AD_WINDOW_ID>
+<!--BC21981DCF0846338D631887BEDFE7FA-->  <ISSECURITYENABLED><![CDATA[N]]></ISSECURITYENABLED>
+<!--BC21981DCF0846338D631887BEDFE7FA-->  <ISDELETEABLE><![CDATA[Y]]></ISDELETEABLE>
+<!--BC21981DCF0846338D631887BEDFE7FA-->  <ISHIGHVOLUME><![CDATA[N]]></ISHIGHVOLUME>
+<!--BC21981DCF0846338D631887BEDFE7FA-->  <IMPORTTABLE><![CDATA[N]]></IMPORTTABLE>
+<!--BC21981DCF0846338D631887BEDFE7FA-->  <ISCHANGELOG><![CDATA[N]]></ISCHANGELOG>
+<!--BC21981DCF0846338D631887BEDFE7FA-->  <ISDEFAULTACCT><![CDATA[N]]></ISDEFAULTACCT>
+<!--BC21981DCF0846338D631887BEDFE7FA-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--BC21981DCF0846338D631887BEDFE7FA-->  <AD_PACKAGE_ID><![CDATA[AC33B2262748414A816510545755435A]]></AD_PACKAGE_ID>
+<!--BC21981DCF0846338D631887BEDFE7FA-->  <DATAORIGINTYPE><![CDATA[HQL]]></DATAORIGINTYPE>
+<!--BC21981DCF0846338D631887BEDFE7FA-->  <ISTREE><![CDATA[N]]></ISTREE>
+<!--BC21981DCF0846338D631887BEDFE7FA-->  <HQLQUERY><![CDATA[select bsl.transactionDate as transactionDate, COALESCE(bsl.businessPartner.name, bsl.bpartnername) as businessPartner, bsl.referenceNo as referenceNo, bsl.cramount as cramount, bsl.matchingtype as affinity, bsl.matchingtype as matchingtype, bsl.id as id
+from FIN_BankStatementLine as bsl
+where @additional_filters@
+and @whereClause@]]></HQLQUERY>
+<!--BC21981DCF0846338D631887BEDFE7FA-->  <ENTITY_ALIAS><![CDATA[bsl]]></ENTITY_ALIAS>
+<!--BC21981DCF0846338D631887BEDFE7FA--></AD_TABLE>
+
 <!--DC814AB3BC84486CA5411131724BC95A--><AD_TABLE>
 <!--DC814AB3BC84486CA5411131724BC95A-->  <AD_TABLE_ID><![CDATA[DC814AB3BC84486CA5411131724BC95A]]></AD_TABLE_ID>
 <!--DC814AB3BC84486CA5411131724BC95A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_WINDOW.xml	Fri Aug 08 11:14:59 2014 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_WINDOW.xml	Fri Aug 08 14:36:05 2014 +0200
@@ -148,6 +148,23 @@
 <!--D636C2D5C8B94735A2C532267C4E68B0-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--D636C2D5C8B94735A2C532267C4E68B0--></AD_WINDOW>
 
+<!--E34AE40786684EBB81E9F8A55BE33DCE--><AD_WINDOW>
+<!--E34AE40786684EBB81E9F8A55BE33DCE-->  <AD_WINDOW_ID><![CDATA[E34AE40786684EBB81E9F8A55BE33DCE]]></AD_WINDOW_ID>
+<!--E34AE40786684EBB81E9F8A55BE33DCE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E34AE40786684EBB81E9F8A55BE33DCE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E34AE40786684EBB81E9F8A55BE33DCE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E34AE40786684EBB81E9F8A55BE33DCE-->  <NAME><![CDATA[Match Statement P&E]]></NAME>
+<!--E34AE40786684EBB81E9F8A55BE33DCE-->  <DESCRIPTION><![CDATA[Grid for match statements]]></DESCRIPTION>
+<!--E34AE40786684EBB81E9F8A55BE33DCE-->  <HELP><![CDATA[Grid for match statements]]></HELP>
+<!--E34AE40786684EBB81E9F8A55BE33DCE-->  <WINDOWTYPE><![CDATA[OBUIAPP_PickAndExecute]]></WINDOWTYPE>
+<!--E34AE40786684EBB81E9F8A55BE33DCE-->  <ISSOTRX><![CDATA[Y]]></ISSOTRX>
+<!--E34AE40786684EBB81E9F8A55BE33DCE-->  <PROCESSING><![CDATA[N]]></PROCESSING>
+<!--E34AE40786684EBB81E9F8A55BE33DCE-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
+<!--E34AE40786684EBB81E9F8A55BE33DCE-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--E34AE40786684EBB81E9F8A55BE33DCE-->  <ISTHREADSAFE><![CDATA[N]]></ISTHREADSAFE>
+<!--E34AE40786684EBB81E9F8A55BE33DCE-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
+<!--E34AE40786684EBB81E9F8A55BE33DCE--></AD_WINDOW>
+
 <!--EB6621E5513F41449E77D68C58C3C409--><AD_WINDOW>
 <!--EB6621E5513F41449E77D68C58C3C409-->  <AD_WINDOW_ID><![CDATA[EB6621E5513F41449E77D68C58C3C409]]></AD_WINDOW_ID>
 <!--EB6621E5513F41449E77D68C58C3C409-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml	Fri Aug 08 11:14:59 2014 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml	Fri Aug 08 14:36:05 2014 +0200
@@ -360,6 +360,29 @@
 <!--4C09892656344AB1ACF988D57D84B96B-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
 <!--4C09892656344AB1ACF988D57D84B96B--></OBUIAPP_PARAMETER>
 
+<!--4EDC18E376BB4EEB937AE1F1EF4EB8B1--><OBUIAPP_PARAMETER>
+<!--4EDC18E376BB4EEB937AE1F1EF4EB8B1-->  <OBUIAPP_PARAMETER_ID><![CDATA[4EDC18E376BB4EEB937AE1F1EF4EB8B1]]></OBUIAPP_PARAMETER_ID>
+<!--4EDC18E376BB4EEB937AE1F1EF4EB8B1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4EDC18E376BB4EEB937AE1F1EF4EB8B1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4EDC18E376BB4EEB937AE1F1EF4EB8B1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4EDC18E376BB4EEB937AE1F1EF4EB8B1-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--4EDC18E376BB4EEB937AE1F1EF4EB8B1-->  <NAME><![CDATA[Match Statement]]></NAME>
+<!--4EDC18E376BB4EEB937AE1F1EF4EB8B1-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--4EDC18E376BB4EEB937AE1F1EF4EB8B1-->  <AD_REFERENCE_ID><![CDATA[FF80818132D8F0F30132D9BC395D0038]]></AD_REFERENCE_ID>
+<!--4EDC18E376BB4EEB937AE1F1EF4EB8B1-->  <AD_REFERENCE_VALUE_ID><![CDATA[2EE1D209314A4BEB8B0416B8486FFC86]]></AD_REFERENCE_VALUE_ID>
+<!--4EDC18E376BB4EEB937AE1F1EF4EB8B1-->  <COLUMNNAME><![CDATA[match_statement]]></COLUMNNAME>
+<!--4EDC18E376BB4EEB937AE1F1EF4EB8B1-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--4EDC18E376BB4EEB937AE1F1EF4EB8B1-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
+<!--4EDC18E376BB4EEB937AE1F1EF4EB8B1-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--4EDC18E376BB4EEB937AE1F1EF4EB8B1-->  <AD_ELEMENT_ID><![CDATA[88E9727DAC364BA38FFE37BC8B9BF698]]></AD_ELEMENT_ID>
+<!--4EDC18E376BB4EEB937AE1F1EF4EB8B1-->  <ISFIXED><![CDATA[N]]></ISFIXED>
+<!--4EDC18E376BB4EEB937AE1F1EF4EB8B1-->  <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE>
+<!--4EDC18E376BB4EEB937AE1F1EF4EB8B1-->  <OBUIAPP_PROCESS_ID><![CDATA[86F0B1EBE2BC48E3ACF458768D14CC99]]></OBUIAPP_PROCESS_ID>
+<!--4EDC18E376BB4EEB937AE1F1EF4EB8B1-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
+<!--4EDC18E376BB4EEB937AE1F1EF4EB8B1-->  <DISPLAYEDROWS><![CDATA[8]]></DISPLAYEDROWS>
+<!--4EDC18E376BB4EEB937AE1F1EF4EB8B1-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
+<!--4EDC18E376BB4EEB937AE1F1EF4EB8B1--></OBUIAPP_PARAMETER>
+
 <!--52BD390363394BE980D0A55AFC4CDBB9--><OBUIAPP_PARAMETER>
 <!--52BD390363394BE980D0A55AFC4CDBB9-->  <OBUIAPP_PARAMETER_ID><![CDATA[52BD390363394BE980D0A55AFC4CDBB9]]></OBUIAPP_PARAMETER_ID>
 <!--52BD390363394BE980D0A55AFC4CDBB9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PROCESS.xml	Fri Aug 08 11:14:59 2014 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PROCESS.xml	Fri Aug 08 14:36:05 2014 +0200
@@ -36,6 +36,28 @@
 <!--6F87442DF7BC43AB8A666BDED2F7D64E-->  <ISCANADDRECORDSTOSELECTOR><![CDATA[N]]></ISCANADDRECORDSTOSELECTOR>
 <!--6F87442DF7BC43AB8A666BDED2F7D64E--></OBUIAPP_PROCESS>
 
+<!--86F0B1EBE2BC48E3ACF458768D14CC99--><OBUIAPP_PROCESS>
+<!--86F0B1EBE2BC48E3ACF458768D14CC99-->  <OBUIAPP_PROCESS_ID><![CDATA[86F0B1EBE2BC48E3ACF458768D14CC99]]></OBUIAPP_PROCESS_ID>
+<!--86F0B1EBE2BC48E3ACF458768D14CC99-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--86F0B1EBE2BC48E3ACF458768D14CC99-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--86F0B1EBE2BC48E3ACF458768D14CC99-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--86F0B1EBE2BC48E3ACF458768D14CC99-->  <VALUE><![CDATA[Match Statement]]></VALUE>
+<!--86F0B1EBE2BC48E3ACF458768D14CC99-->  <NAME><![CDATA[Match Statement]]></NAME>
+<!--86F0B1EBE2BC48E3ACF458768D14CC99-->  <DESCRIPTION><![CDATA[Match statements for bank statement lines against payments / GL items]]></DESCRIPTION>
+<!--86F0B1EBE2BC48E3ACF458768D14CC99-->  <HELP><![CDATA[Match statements for bank statement lines against payments / GL items]]></HELP>
+<!--86F0B1EBE2BC48E3ACF458768D14CC99-->  <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
+<!--86F0B1EBE2BC48E3ACF458768D14CC99-->  <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.actionHandler.MatchStatementActionHandler]]></CLASSNAME>
+<!--86F0B1EBE2BC48E3ACF458768D14CC99-->  <ISBACKGROUND><![CDATA[N]]></ISBACKGROUND>
+<!--86F0B1EBE2BC48E3ACF458768D14CC99-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--86F0B1EBE2BC48E3ACF458768D14CC99-->  <UIPATTERN><![CDATA[OBUIAPP_PickAndExecute]]></UIPATTERN>
+<!--86F0B1EBE2BC48E3ACF458768D14CC99-->  <ISMULTIRECORD><![CDATA[N]]></ISMULTIRECORD>
+<!--86F0B1EBE2BC48E3ACF458768D14CC99-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
+<!--86F0B1EBE2BC48E3ACF458768D14CC99-->  <CLIENTSIDEVALIDATION><![CDATA[OB.APRM.MatchStatement.onProcess]]></CLIENTSIDEVALIDATION>
+<!--86F0B1EBE2BC48E3ACF458768D14CC99-->  <ISGRIDLEGACY><![CDATA[N]]></ISGRIDLEGACY>
+<!--86F0B1EBE2BC48E3ACF458768D14CC99-->  <ON_LOAD_FUNCTION><![CDATA[OB.APRM.MatchStatement.onLoad]]></ON_LOAD_FUNCTION>
+<!--86F0B1EBE2BC48E3ACF458768D14CC99-->  <ISCANADDRECORDSTOSELECTOR><![CDATA[N]]></ISCANADDRECORDSTOSELECTOR>
+<!--86F0B1EBE2BC48E3ACF458768D14CC99--></OBUIAPP_PROCESS>
+
 <!--8D0D32CC819E449D9A08E0459B482963--><OBUIAPP_PROCESS>
 <!--8D0D32CC819E449D9A08E0459B482963-->  <OBUIAPP_PROCESS_ID><![CDATA[8D0D32CC819E449D9A08E0459B482963]]></OBUIAPP_PROCESS_ID>
 <!--8D0D32CC819E449D9A08E0459B482963-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_REF_WINDOW.xml	Fri Aug 08 11:14:59 2014 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_REF_WINDOW.xml	Fri Aug 08 14:36:05 2014 +0200
@@ -18,6 +18,15 @@
 <!--0B6086CBCBFC4D0881B619A8E886DC91-->  <AD_WINDOW_ID><![CDATA[17BE11F1C49547048F9D29E6C95BB67E]]></AD_WINDOW_ID>
 <!--0B6086CBCBFC4D0881B619A8E886DC91--></OBUIAPP_REF_WINDOW>
 
+<!--4EC9B48D988F4058B9A7D1D629FB712B--><OBUIAPP_REF_WINDOW>
+<!--4EC9B48D988F4058B9A7D1D629FB712B-->  <OBUIAPP_REF_WINDOW_ID><![CDATA[4EC9B48D988F4058B9A7D1D629FB712B]]></OBUIAPP_REF_WINDOW_ID>
+<!--4EC9B48D988F4058B9A7D1D629FB712B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4EC9B48D988F4058B9A7D1D629FB712B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4EC9B48D988F4058B9A7D1D629FB712B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4EC9B48D988F4058B9A7D1D629FB712B-->  <AD_REFERENCE_ID><![CDATA[2EE1D209314A4BEB8B0416B8486FFC86]]></AD_REFERENCE_ID>
+<!--4EC9B48D988F4058B9A7D1D629FB712B-->  <AD_WINDOW_ID><![CDATA[E34AE40786684EBB81E9F8A55BE33DCE]]></AD_WINDOW_ID>
+<!--4EC9B48D988F4058B9A7D1D629FB712B--></OBUIAPP_REF_WINDOW>
+
 <!--6F4B972A4EF541EC9CD107A71BE205FA--><OBUIAPP_REF_WINDOW>
 <!--6F4B972A4EF541EC9CD107A71BE205FA-->  <OBUIAPP_REF_WINDOW_ID><![CDATA[6F4B972A4EF541EC9CD107A71BE205FA]]></OBUIAPP_REF_WINDOW_ID>
 <!--6F4B972A4EF541EC9CD107A71BE205FA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/APRMApplicationProvider.java	Fri Aug 08 11:14:59 2014 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/APRMApplicationProvider.java	Fri Aug 08 14:36:05 2014 +0200
@@ -42,6 +42,8 @@
         "web/org.openbravo.advpaymentmngt/js/ob-aprm-utilities.js", true));
     globalResources.add(createStaticResource(
         "web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js", true));
+    globalResources.add(createStaticResource(
+        "web/org.openbravo.advpaymentmngt/js/ob-aprm-matchStatement.js", true));
     return globalResources;
   }
 }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/MatchStatementActionHandler.java	Fri Aug 08 14:36:05 2014 +0200
@@ -0,0 +1,61 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2014 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+ */
+package org.openbravo.advpaymentmngt.actionHandler;
+
+import java.util.Map;
+
+import org.codehaus.jettison.json.JSONObject;
+import org.openbravo.client.application.process.BaseProcessActionHandler;
+import org.openbravo.dal.core.OBContext;
+import org.openbravo.dal.service.OBDal;
+import org.openbravo.erpCommon.utility.OBMessageUtils;
+import org.openbravo.service.db.DbUtility;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class MatchStatementActionHandler extends BaseProcessActionHandler {
+  final private static Logger log = LoggerFactory.getLogger(AddPaymentActionHandler.class);
+
+  @Override
+  protected JSONObject doExecute(Map<String, Object> parameters, String content) {
+    JSONObject jsonResponse = new JSONObject();
+    OBContext.setAdminMode(true);
+    try {
+
+    } catch (Exception e) {
+      OBDal.getInstance().rollbackAndClose();
+      log.error("Exception handling the match statement", e);
+
+      try {
+        jsonResponse = new JSONObject();
+        Throwable ex = DbUtility.getUnderlyingSQLException(e);
+        String message = OBMessageUtils.translateError(ex.getMessage()).getMessage();
+        JSONObject errorMessage = new JSONObject();
+        errorMessage.put("severity", "error");
+        errorMessage.put("text", message);
+        jsonResponse.put("message", errorMessage);
+
+      } catch (Exception ignore) {
+      }
+    } finally {
+      OBContext.restorePreviousMode();
+    }
+    return jsonResponse;
+  }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/hqlinjections/MatchStatementTransformer.java	Fri Aug 08 14:36:05 2014 +0200
@@ -0,0 +1,105 @@
+/*
+ *************************************************************************
+ * 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) 2014 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s):  ______________________________________.
+ *************************************************************************
+ */
+
+package org.openbravo.advpaymentmngt.hqlinjections;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.ServletException;
+
+import org.openbravo.advpaymentmngt.dao.MatchTransactionDao;
+import org.openbravo.advpaymentmngt.dao.TransactionsDao;
+import org.openbravo.base.provider.OBConfigFileProvider;
+import org.openbravo.base.secureApp.VariablesSecureApp;
+import org.openbravo.client.kernel.ComponentProvider;
+import org.openbravo.dal.core.OBContext;
+import org.openbravo.dal.service.OBDal;
+import org.openbravo.database.ConnectionProvider;
+import org.openbravo.database.ConnectionProviderImpl;
+import org.openbravo.exception.PoolNotFoundException;
+import org.openbravo.model.financialmgmt.payment.FIN_BankStatementLine;
+import org.openbravo.model.financialmgmt.payment.FIN_FinancialAccount;
+import org.openbravo.model.financialmgmt.payment.FIN_Reconciliation;
+import org.openbravo.service.datasource.hql.HqlQueryTransformer;
+import org.openbravo.service.db.DalConnectionProvider;
+
+@ComponentProvider.Qualifier("BC21981DCF0846338D631887BEDFE7FA")
+public class MatchStatementTransformer extends HqlQueryTransformer {
+  final static String RDBMS = new DalConnectionProvider(false).getRDBMS();
+  final static String TABLE_ID = "BC21981DCF0846338D631887BEDFE7FA";
+
+  @Override
+  public String transformHqlQuery(String _hqlQuery, Map<String, String> requestParameters,
+      Map<String, Object> queryNamedParameters) {
+    StringBuffer whereClause = getWhereClause(requestParameters);
+    // @FIN_Financial_Account.id@
+    String transformedHql = _hqlQuery.replace("@whereClause@", whereClause.toString());
+    return transformedHql;
+  }
+
+  private StringBuffer getWhereClause(Map<String, String> requestParameters) {
+    StringBuffer selectClause = new StringBuffer();
+    selectClause.append("1 in (1)");
+    final String financialAccountId = requestParameters.get("@FIN_Financial_Account.id@");
+    if (financialAccountId != null) {
+      VariablesSecureApp vars = new VariablesSecureApp(OBContext.getOBContext().getUser().getId(),
+          OBContext.getOBContext().getCurrentClient().getId(), OBContext.getOBContext()
+              .getCurrentOrganization().getId(), OBContext.getOBContext().getRole().getId());
+
+      FIN_Reconciliation reconciliation = TransactionsDao.getLastReconciliation(OBDal.getInstance()
+          .get(FIN_FinancialAccount.class, financialAccountId), "N");
+
+      // TODO:
+      // * Handle runingReconciliations
+      // * Handle mixedLines
+      if (reconciliation == null) {
+        try {
+          // TODO: It doesn't work
+          reconciliation = MatchTransactionDao.addNewReconciliation(getConnectionProviderMy(),
+              vars, financialAccountId);
+        } catch (ServletException e) {
+          // TODO: Handle exception
+          // e.printStackTrace();
+        }
+      } else {
+        // final String tabId = "";
+        // TODO: get the proper tabId
+        // updateReconciliation(reconciliation.getId(), financialAccountId, tabId, false);
+      }
+      if (reconciliation != null) {
+        final String reconciliationId = reconciliation.getId();
+        List<FIN_BankStatementLine> bankLines = MatchTransactionDao.getMatchingBankStatementLines(
+            financialAccountId, reconciliationId, "ALL", "Y");
+        System.out.println(bankLines);
+      }
+    }
+    return selectClause;
+  }
+
+  private static ConnectionProvider getConnectionProviderMy() {
+    try {
+      final String propFile = OBConfigFileProvider.getInstance().getFileLocation();
+      final ConnectionProvider conn = new ConnectionProviderImpl(propFile + "/Openbravo.properties");
+      return conn;
+    } catch (PoolNotFoundException e) {
+      throw new IllegalStateException(e);
+    }
+  }
+}
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-matchStatement.js	Fri Aug 08 14:36:05 2014 +0200
@@ -0,0 +1,30 @@
+/*
+ *************************************************************************
+ * 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) 2014 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s):  ______________________________________.
+ ************************************************************************
+ */
+
+OB.APRM.MatchStatement = {};
+
+
+OB.APRM.MatchStatement.onLoad = function (view) {
+
+};
+
+
+OB.APRM.MatchStatement.onProcess = function (view, actionHandlerCall) {
+
+};
\ No newline at end of file
--- a/src-db/database/sourcedata/AD_FIELD.xml	Fri Aug 08 11:14:59 2014 +0200
+++ b/src-db/database/sourcedata/AD_FIELD.xml	Fri Aug 08 14:36:05 2014 +0200
@@ -35323,6 +35323,7 @@
 <!--2770-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--2770-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--2770-->  <ISSHOWNINSTATUSBAR><![CDATA[Y]]></ISSHOWNINSTATUSBAR>
+<!--2770-->  <CLIENTCLASS><![CDATA[OBLevelImg {"valuesList":["dummy1", "100", "dummy2", "dummy3", "103"]}]]></CLIENTCLASS>
 <!--2770-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--2770--></AD_FIELD>