[reconciliation refactor] improvements in candidates datasource
authorVíctor Martínez Romanos <victor.martinez@openbravo.com>
Wed, 20 Aug 2014 12:48:37 +0200
changeset 24535 4de927700c67
parent 24534 537f6b84fe96
child 24536 ac71cca0bfca
[reconciliation refactor] improvements in candidates datasource
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_REF_LIST.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/algorithm/StandardMatchingCandidatesAlgorithm.java
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/APRMConstants.java
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_CandidateRecord.java
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml	Wed Aug 20 11:13:32 2014 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml	Wed Aug 20 12:48:37 2014 +0200
@@ -1404,40 +1404,6 @@
 <!--2B609CEE0C4E4DFBA000FFAFBC24917F-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--2B609CEE0C4E4DFBA000FFAFBC24917F--></AD_COLUMN>
 
-<!--2C2036AF22A84DD29AFE7E42BFF5C88E--><AD_COLUMN>
-<!--2C2036AF22A84DD29AFE7E42BFF5C88E-->  <AD_COLUMN_ID><![CDATA[2C2036AF22A84DD29AFE7E42BFF5C88E]]></AD_COLUMN_ID>
-<!--2C2036AF22A84DD29AFE7E42BFF5C88E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--2C2036AF22A84DD29AFE7E42BFF5C88E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--2C2036AF22A84DD29AFE7E42BFF5C88E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--2C2036AF22A84DD29AFE7E42BFF5C88E-->  <NAME><![CDATA[Updated By]]></NAME>
-<!--2C2036AF22A84DD29AFE7E42BFF5C88E-->  <DESCRIPTION><![CDATA[User who updated this records]]></DESCRIPTION>
-<!--2C2036AF22A84DD29AFE7E42BFF5C88E-->  <HELP><![CDATA[The Updated By field indicates the user who updated this record.]]></HELP>
-<!--2C2036AF22A84DD29AFE7E42BFF5C88E-->  <COLUMNNAME><![CDATA[updatedby]]></COLUMNNAME>
-<!--2C2036AF22A84DD29AFE7E42BFF5C88E-->  <AD_TABLE_ID><![CDATA[85DA470A6BB3479E955D88C136EEC8A3]]></AD_TABLE_ID>
-<!--2C2036AF22A84DD29AFE7E42BFF5C88E-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
-<!--2C2036AF22A84DD29AFE7E42BFF5C88E-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
-<!--2C2036AF22A84DD29AFE7E42BFF5C88E-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--2C2036AF22A84DD29AFE7E42BFF5C88E-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--2C2036AF22A84DD29AFE7E42BFF5C88E-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--2C2036AF22A84DD29AFE7E42BFF5C88E-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--2C2036AF22A84DD29AFE7E42BFF5C88E-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--2C2036AF22A84DD29AFE7E42BFF5C88E-->  <SEQNO><![CDATA[50]]></SEQNO>
-<!--2C2036AF22A84DD29AFE7E42BFF5C88E-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--2C2036AF22A84DD29AFE7E42BFF5C88E-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--2C2036AF22A84DD29AFE7E42BFF5C88E-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--2C2036AF22A84DD29AFE7E42BFF5C88E-->  <AD_ELEMENT_ID><![CDATA[608]]></AD_ELEMENT_ID>
-<!--2C2036AF22A84DD29AFE7E42BFF5C88E-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--2C2036AF22A84DD29AFE7E42BFF5C88E-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--2C2036AF22A84DD29AFE7E42BFF5C88E-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--2C2036AF22A84DD29AFE7E42BFF5C88E-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--2C2036AF22A84DD29AFE7E42BFF5C88E-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--2C2036AF22A84DD29AFE7E42BFF5C88E-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--2C2036AF22A84DD29AFE7E42BFF5C88E-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--2C2036AF22A84DD29AFE7E42BFF5C88E-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--2C2036AF22A84DD29AFE7E42BFF5C88E-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--2C2036AF22A84DD29AFE7E42BFF5C88E-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--2C2036AF22A84DD29AFE7E42BFF5C88E--></AD_COLUMN>
-
 <!--2DC02F74DA62406AACF3C3911C2AD807--><AD_COLUMN>
 <!--2DC02F74DA62406AACF3C3911C2AD807-->  <AD_COLUMN_ID><![CDATA[2DC02F74DA62406AACF3C3911C2AD807]]></AD_COLUMN_ID>
 <!--2DC02F74DA62406AACF3C3911C2AD807-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1508,40 +1474,6 @@
 <!--31820F9EAD6B48489FC3875553CB6ED7-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--31820F9EAD6B48489FC3875553CB6ED7--></AD_COLUMN>
 
-<!--32595588E533456BBCCCEA2F2B2235C1--><AD_COLUMN>
-<!--32595588E533456BBCCCEA2F2B2235C1-->  <AD_COLUMN_ID><![CDATA[32595588E533456BBCCCEA2F2B2235C1]]></AD_COLUMN_ID>
-<!--32595588E533456BBCCCEA2F2B2235C1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--32595588E533456BBCCCEA2F2B2235C1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--32595588E533456BBCCCEA2F2B2235C1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--32595588E533456BBCCCEA2F2B2235C1-->  <NAME><![CDATA[Organization]]></NAME>
-<!--32595588E533456BBCCCEA2F2B2235C1-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
-<!--32595588E533456BBCCCEA2F2B2235C1-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
-<!--32595588E533456BBCCCEA2F2B2235C1-->  <COLUMNNAME><![CDATA[ad_org_id]]></COLUMNNAME>
-<!--32595588E533456BBCCCEA2F2B2235C1-->  <AD_TABLE_ID><![CDATA[85DA470A6BB3479E955D88C136EEC8A3]]></AD_TABLE_ID>
-<!--32595588E533456BBCCCEA2F2B2235C1-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
-<!--32595588E533456BBCCCEA2F2B2235C1-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
-<!--32595588E533456BBCCCEA2F2B2235C1-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--32595588E533456BBCCCEA2F2B2235C1-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--32595588E533456BBCCCEA2F2B2235C1-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--32595588E533456BBCCCEA2F2B2235C1-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--32595588E533456BBCCCEA2F2B2235C1-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--32595588E533456BBCCCEA2F2B2235C1-->  <SEQNO><![CDATA[40]]></SEQNO>
-<!--32595588E533456BBCCCEA2F2B2235C1-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--32595588E533456BBCCCEA2F2B2235C1-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--32595588E533456BBCCCEA2F2B2235C1-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--32595588E533456BBCCCEA2F2B2235C1-->  <AD_ELEMENT_ID><![CDATA[113]]></AD_ELEMENT_ID>
-<!--32595588E533456BBCCCEA2F2B2235C1-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--32595588E533456BBCCCEA2F2B2235C1-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--32595588E533456BBCCCEA2F2B2235C1-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--32595588E533456BBCCCEA2F2B2235C1-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--32595588E533456BBCCCEA2F2B2235C1-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--32595588E533456BBCCCEA2F2B2235C1-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--32595588E533456BBCCCEA2F2B2235C1-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--32595588E533456BBCCCEA2F2B2235C1-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--32595588E533456BBCCCEA2F2B2235C1-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--32595588E533456BBCCCEA2F2B2235C1-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--32595588E533456BBCCCEA2F2B2235C1--></AD_COLUMN>
-
 <!--3441F879B5DA4DB4BFAC1B8C5DEBF970--><AD_COLUMN>
 <!--3441F879B5DA4DB4BFAC1B8C5DEBF970-->  <AD_COLUMN_ID><![CDATA[3441F879B5DA4DB4BFAC1B8C5DEBF970]]></AD_COLUMN_ID>
 <!--3441F879B5DA4DB4BFAC1B8C5DEBF970-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1577,6 +1509,40 @@
 <!--3441F879B5DA4DB4BFAC1B8C5DEBF970-->  <ENTITY_ALIAS><![CDATA['0']]></ENTITY_ALIAS>
 <!--3441F879B5DA4DB4BFAC1B8C5DEBF970--></AD_COLUMN>
 
+<!--34555BD1C6784070B62F8BCE984E2AED--><AD_COLUMN>
+<!--34555BD1C6784070B62F8BCE984E2AED-->  <AD_COLUMN_ID><![CDATA[34555BD1C6784070B62F8BCE984E2AED]]></AD_COLUMN_ID>
+<!--34555BD1C6784070B62F8BCE984E2AED-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--34555BD1C6784070B62F8BCE984E2AED-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--34555BD1C6784070B62F8BCE984E2AED-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--34555BD1C6784070B62F8BCE984E2AED-->  <NAME><![CDATA[Reference]]></NAME>
+<!--34555BD1C6784070B62F8BCE984E2AED-->  <DESCRIPTION><![CDATA[The number for a specific reference.]]></DESCRIPTION>
+<!--34555BD1C6784070B62F8BCE984E2AED-->  <HELP><![CDATA[The reference number can be printed on orders and invoices to allow your business partner to faster identify your records.]]></HELP>
+<!--34555BD1C6784070B62F8BCE984E2AED-->  <COLUMNNAME><![CDATA[Reference]]></COLUMNNAME>
+<!--34555BD1C6784070B62F8BCE984E2AED-->  <AD_TABLE_ID><![CDATA[85DA470A6BB3479E955D88C136EEC8A3]]></AD_TABLE_ID>
+<!--34555BD1C6784070B62F8BCE984E2AED-->  <AD_REFERENCE_ID><![CDATA[14]]></AD_REFERENCE_ID>
+<!--34555BD1C6784070B62F8BCE984E2AED-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--34555BD1C6784070B62F8BCE984E2AED-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--34555BD1C6784070B62F8BCE984E2AED-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--34555BD1C6784070B62F8BCE984E2AED-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--34555BD1C6784070B62F8BCE984E2AED-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--34555BD1C6784070B62F8BCE984E2AED-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
+<!--34555BD1C6784070B62F8BCE984E2AED-->  <SEQNO><![CDATA[150]]></SEQNO>
+<!--34555BD1C6784070B62F8BCE984E2AED-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--34555BD1C6784070B62F8BCE984E2AED-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--34555BD1C6784070B62F8BCE984E2AED-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--34555BD1C6784070B62F8BCE984E2AED-->  <AD_ELEMENT_ID><![CDATA[540]]></AD_ELEMENT_ID>
+<!--34555BD1C6784070B62F8BCE984E2AED-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--34555BD1C6784070B62F8BCE984E2AED-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--34555BD1C6784070B62F8BCE984E2AED-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--34555BD1C6784070B62F8BCE984E2AED-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--34555BD1C6784070B62F8BCE984E2AED-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--34555BD1C6784070B62F8BCE984E2AED-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--34555BD1C6784070B62F8BCE984E2AED-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--34555BD1C6784070B62F8BCE984E2AED-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--34555BD1C6784070B62F8BCE984E2AED-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--34555BD1C6784070B62F8BCE984E2AED-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--34555BD1C6784070B62F8BCE984E2AED--></AD_COLUMN>
+
 <!--35605F6EE878473E9ACCB9196452A4A6--><AD_COLUMN>
 <!--35605F6EE878473E9ACCB9196452A4A6-->  <AD_COLUMN_ID><![CDATA[35605F6EE878473E9ACCB9196452A4A6]]></AD_COLUMN_ID>
 <!--35605F6EE878473E9ACCB9196452A4A6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2631,6 +2597,39 @@
 <!--528EE4D486444C08A1CE90CAA066BA48-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--528EE4D486444C08A1CE90CAA066BA48--></AD_COLUMN>
 
+<!--55D50ACE30704F47B3D9C5F9779BF991--><AD_COLUMN>
+<!--55D50ACE30704F47B3D9C5F9779BF991-->  <AD_COLUMN_ID><![CDATA[55D50ACE30704F47B3D9C5F9779BF991]]></AD_COLUMN_ID>
+<!--55D50ACE30704F47B3D9C5F9779BF991-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--55D50ACE30704F47B3D9C5F9779BF991-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--55D50ACE30704F47B3D9C5F9779BF991-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--55D50ACE30704F47B3D9C5F9779BF991-->  <NAME><![CDATA[MatchType]]></NAME>
+<!--55D50ACE30704F47B3D9C5F9779BF991-->  <COLUMNNAME><![CDATA[MatchType]]></COLUMNNAME>
+<!--55D50ACE30704F47B3D9C5F9779BF991-->  <AD_TABLE_ID><![CDATA[85DA470A6BB3479E955D88C136EEC8A3]]></AD_TABLE_ID>
+<!--55D50ACE30704F47B3D9C5F9779BF991-->  <AD_REFERENCE_ID><![CDATA[17]]></AD_REFERENCE_ID>
+<!--55D50ACE30704F47B3D9C5F9779BF991-->  <AD_REFERENCE_VALUE_ID><![CDATA[125FEBA3F9E841FF928C2D13F33540EC]]></AD_REFERENCE_VALUE_ID>
+<!--55D50ACE30704F47B3D9C5F9779BF991-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--55D50ACE30704F47B3D9C5F9779BF991-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--55D50ACE30704F47B3D9C5F9779BF991-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--55D50ACE30704F47B3D9C5F9779BF991-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--55D50ACE30704F47B3D9C5F9779BF991-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--55D50ACE30704F47B3D9C5F9779BF991-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--55D50ACE30704F47B3D9C5F9779BF991-->  <SEQNO><![CDATA[140]]></SEQNO>
+<!--55D50ACE30704F47B3D9C5F9779BF991-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--55D50ACE30704F47B3D9C5F9779BF991-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--55D50ACE30704F47B3D9C5F9779BF991-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--55D50ACE30704F47B3D9C5F9779BF991-->  <AD_ELEMENT_ID><![CDATA[832E0DB3A4C84BAD81707C70D6ECECF7]]></AD_ELEMENT_ID>
+<!--55D50ACE30704F47B3D9C5F9779BF991-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--55D50ACE30704F47B3D9C5F9779BF991-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--55D50ACE30704F47B3D9C5F9779BF991-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--55D50ACE30704F47B3D9C5F9779BF991-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--55D50ACE30704F47B3D9C5F9779BF991-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--55D50ACE30704F47B3D9C5F9779BF991-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--55D50ACE30704F47B3D9C5F9779BF991-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--55D50ACE30704F47B3D9C5F9779BF991-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--55D50ACE30704F47B3D9C5F9779BF991-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--55D50ACE30704F47B3D9C5F9779BF991-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--55D50ACE30704F47B3D9C5F9779BF991--></AD_COLUMN>
+
 <!--562395ACED3B4C2CB4F31FB3F412529A--><AD_COLUMN>
 <!--562395ACED3B4C2CB4F31FB3F412529A-->  <AD_COLUMN_ID><![CDATA[562395ACED3B4C2CB4F31FB3F412529A]]></AD_COLUMN_ID>
 <!--562395ACED3B4C2CB4F31FB3F412529A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2733,6 +2732,39 @@
 <!--57D5BC1D263243128DCD16E2836AE3E1-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--57D5BC1D263243128DCD16E2836AE3E1--></AD_COLUMN>
 
+<!--58DA4A28792442CDB8A2E3871FAC2AAA--><AD_COLUMN>
+<!--58DA4A28792442CDB8A2E3871FAC2AAA-->  <AD_COLUMN_ID><![CDATA[58DA4A28792442CDB8A2E3871FAC2AAA]]></AD_COLUMN_ID>
+<!--58DA4A28792442CDB8A2E3871FAC2AAA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--58DA4A28792442CDB8A2E3871FAC2AAA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--58DA4A28792442CDB8A2E3871FAC2AAA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--58DA4A28792442CDB8A2E3871FAC2AAA-->  <NAME><![CDATA[MatchedDoc]]></NAME>
+<!--58DA4A28792442CDB8A2E3871FAC2AAA-->  <COLUMNNAME><![CDATA[MatchedDoc]]></COLUMNNAME>
+<!--58DA4A28792442CDB8A2E3871FAC2AAA-->  <AD_TABLE_ID><![CDATA[85DA470A6BB3479E955D88C136EEC8A3]]></AD_TABLE_ID>
+<!--58DA4A28792442CDB8A2E3871FAC2AAA-->  <AD_REFERENCE_ID><![CDATA[17]]></AD_REFERENCE_ID>
+<!--58DA4A28792442CDB8A2E3871FAC2AAA-->  <AD_REFERENCE_VALUE_ID><![CDATA[10536BBE003041DDBE293C619E336D4B]]></AD_REFERENCE_VALUE_ID>
+<!--58DA4A28792442CDB8A2E3871FAC2AAA-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--58DA4A28792442CDB8A2E3871FAC2AAA-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--58DA4A28792442CDB8A2E3871FAC2AAA-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--58DA4A28792442CDB8A2E3871FAC2AAA-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--58DA4A28792442CDB8A2E3871FAC2AAA-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--58DA4A28792442CDB8A2E3871FAC2AAA-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
+<!--58DA4A28792442CDB8A2E3871FAC2AAA-->  <SEQNO><![CDATA[130]]></SEQNO>
+<!--58DA4A28792442CDB8A2E3871FAC2AAA-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--58DA4A28792442CDB8A2E3871FAC2AAA-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--58DA4A28792442CDB8A2E3871FAC2AAA-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--58DA4A28792442CDB8A2E3871FAC2AAA-->  <AD_ELEMENT_ID><![CDATA[C2AA8534BC0B42FCB7C9D9957E37BF1E]]></AD_ELEMENT_ID>
+<!--58DA4A28792442CDB8A2E3871FAC2AAA-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--58DA4A28792442CDB8A2E3871FAC2AAA-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--58DA4A28792442CDB8A2E3871FAC2AAA-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--58DA4A28792442CDB8A2E3871FAC2AAA-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--58DA4A28792442CDB8A2E3871FAC2AAA-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--58DA4A28792442CDB8A2E3871FAC2AAA-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--58DA4A28792442CDB8A2E3871FAC2AAA-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--58DA4A28792442CDB8A2E3871FAC2AAA-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--58DA4A28792442CDB8A2E3871FAC2AAA-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--58DA4A28792442CDB8A2E3871FAC2AAA-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--58DA4A28792442CDB8A2E3871FAC2AAA--></AD_COLUMN>
+
 <!--5961F18CC4934FCCA8AB18B2B3AFC960--><AD_COLUMN>
 <!--5961F18CC4934FCCA8AB18B2B3AFC960-->  <AD_COLUMN_ID><![CDATA[5961F18CC4934FCCA8AB18B2B3AFC960]]></AD_COLUMN_ID>
 <!--5961F18CC4934FCCA8AB18B2B3AFC960-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -3226,40 +3258,6 @@
 <!--670423B76C554A6C957A58F1DA4A6D98-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--670423B76C554A6C957A58F1DA4A6D98--></AD_COLUMN>
 
-<!--680E210AB84542E483FF770F9B14B0B9--><AD_COLUMN>
-<!--680E210AB84542E483FF770F9B14B0B9-->  <AD_COLUMN_ID><![CDATA[680E210AB84542E483FF770F9B14B0B9]]></AD_COLUMN_ID>
-<!--680E210AB84542E483FF770F9B14B0B9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--680E210AB84542E483FF770F9B14B0B9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--680E210AB84542E483FF770F9B14B0B9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--680E210AB84542E483FF770F9B14B0B9-->  <NAME><![CDATA[Created By]]></NAME>
-<!--680E210AB84542E483FF770F9B14B0B9-->  <DESCRIPTION><![CDATA[User who created this records]]></DESCRIPTION>
-<!--680E210AB84542E483FF770F9B14B0B9-->  <HELP><![CDATA[The Created By field indicates the user who created this record.]]></HELP>
-<!--680E210AB84542E483FF770F9B14B0B9-->  <COLUMNNAME><![CDATA[createdby]]></COLUMNNAME>
-<!--680E210AB84542E483FF770F9B14B0B9-->  <AD_TABLE_ID><![CDATA[85DA470A6BB3479E955D88C136EEC8A3]]></AD_TABLE_ID>
-<!--680E210AB84542E483FF770F9B14B0B9-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
-<!--680E210AB84542E483FF770F9B14B0B9-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
-<!--680E210AB84542E483FF770F9B14B0B9-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--680E210AB84542E483FF770F9B14B0B9-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--680E210AB84542E483FF770F9B14B0B9-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--680E210AB84542E483FF770F9B14B0B9-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--680E210AB84542E483FF770F9B14B0B9-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--680E210AB84542E483FF770F9B14B0B9-->  <SEQNO><![CDATA[60]]></SEQNO>
-<!--680E210AB84542E483FF770F9B14B0B9-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--680E210AB84542E483FF770F9B14B0B9-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--680E210AB84542E483FF770F9B14B0B9-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--680E210AB84542E483FF770F9B14B0B9-->  <AD_ELEMENT_ID><![CDATA[246]]></AD_ELEMENT_ID>
-<!--680E210AB84542E483FF770F9B14B0B9-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--680E210AB84542E483FF770F9B14B0B9-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--680E210AB84542E483FF770F9B14B0B9-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--680E210AB84542E483FF770F9B14B0B9-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--680E210AB84542E483FF770F9B14B0B9-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--680E210AB84542E483FF770F9B14B0B9-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--680E210AB84542E483FF770F9B14B0B9-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--680E210AB84542E483FF770F9B14B0B9-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--680E210AB84542E483FF770F9B14B0B9-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--680E210AB84542E483FF770F9B14B0B9-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--680E210AB84542E483FF770F9B14B0B9--></AD_COLUMN>
-
 <!--68C853FD393C4620A3947EC34C416B9A--><AD_COLUMN>
 <!--68C853FD393C4620A3947EC34C416B9A-->  <AD_COLUMN_ID><![CDATA[68C853FD393C4620A3947EC34C416B9A]]></AD_COLUMN_ID>
 <!--68C853FD393C4620A3947EC34C416B9A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -3722,76 +3720,6 @@
 <!--76C4D6CDF96B4CB5B80967475AA3D2A9-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--76C4D6CDF96B4CB5B80967475AA3D2A9--></AD_COLUMN>
 
-<!--77A46591A67E4CE491C01F33865C87FB--><AD_COLUMN>
-<!--77A46591A67E4CE491C01F33865C87FB-->  <AD_COLUMN_ID><![CDATA[77A46591A67E4CE491C01F33865C87FB]]></AD_COLUMN_ID>
-<!--77A46591A67E4CE491C01F33865C87FB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--77A46591A67E4CE491C01F33865C87FB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--77A46591A67E4CE491C01F33865C87FB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--77A46591A67E4CE491C01F33865C87FB-->  <NAME><![CDATA[Active]]></NAME>
-<!--77A46591A67E4CE491C01F33865C87FB-->  <DESCRIPTION><![CDATA[A flag indicating whether this record is available for use or de-activated.]]></DESCRIPTION>
-<!--77A46591A67E4CE491C01F33865C87FB-->  <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>
-<!--77A46591A67E4CE491C01F33865C87FB-->  <COLUMNNAME><![CDATA[isactive]]></COLUMNNAME>
-<!--77A46591A67E4CE491C01F33865C87FB-->  <AD_TABLE_ID><![CDATA[85DA470A6BB3479E955D88C136EEC8A3]]></AD_TABLE_ID>
-<!--77A46591A67E4CE491C01F33865C87FB-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
-<!--77A46591A67E4CE491C01F33865C87FB-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
-<!--77A46591A67E4CE491C01F33865C87FB-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--77A46591A67E4CE491C01F33865C87FB-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--77A46591A67E4CE491C01F33865C87FB-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--77A46591A67E4CE491C01F33865C87FB-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--77A46591A67E4CE491C01F33865C87FB-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--77A46591A67E4CE491C01F33865C87FB-->  <SEQNO><![CDATA[90]]></SEQNO>
-<!--77A46591A67E4CE491C01F33865C87FB-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--77A46591A67E4CE491C01F33865C87FB-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--77A46591A67E4CE491C01F33865C87FB-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--77A46591A67E4CE491C01F33865C87FB-->  <AD_ELEMENT_ID><![CDATA[348]]></AD_ELEMENT_ID>
-<!--77A46591A67E4CE491C01F33865C87FB-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--77A46591A67E4CE491C01F33865C87FB-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--77A46591A67E4CE491C01F33865C87FB-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--77A46591A67E4CE491C01F33865C87FB-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--77A46591A67E4CE491C01F33865C87FB-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--77A46591A67E4CE491C01F33865C87FB-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--77A46591A67E4CE491C01F33865C87FB-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--77A46591A67E4CE491C01F33865C87FB-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--77A46591A67E4CE491C01F33865C87FB-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--77A46591A67E4CE491C01F33865C87FB-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--77A46591A67E4CE491C01F33865C87FB--></AD_COLUMN>
-
-<!--78918F4C85454FD5AA4D8FBC818F73D2--><AD_COLUMN>
-<!--78918F4C85454FD5AA4D8FBC818F73D2-->  <AD_COLUMN_ID><![CDATA[78918F4C85454FD5AA4D8FBC818F73D2]]></AD_COLUMN_ID>
-<!--78918F4C85454FD5AA4D8FBC818F73D2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--78918F4C85454FD5AA4D8FBC818F73D2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--78918F4C85454FD5AA4D8FBC818F73D2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--78918F4C85454FD5AA4D8FBC818F73D2-->  <NAME><![CDATA[Client]]></NAME>
-<!--78918F4C85454FD5AA4D8FBC818F73D2-->  <DESCRIPTION><![CDATA[Client for this installation.]]></DESCRIPTION>
-<!--78918F4C85454FD5AA4D8FBC818F73D2-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
-<!--78918F4C85454FD5AA4D8FBC818F73D2-->  <COLUMNNAME><![CDATA[ad_client_id]]></COLUMNNAME>
-<!--78918F4C85454FD5AA4D8FBC818F73D2-->  <AD_TABLE_ID><![CDATA[85DA470A6BB3479E955D88C136EEC8A3]]></AD_TABLE_ID>
-<!--78918F4C85454FD5AA4D8FBC818F73D2-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
-<!--78918F4C85454FD5AA4D8FBC818F73D2-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
-<!--78918F4C85454FD5AA4D8FBC818F73D2-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--78918F4C85454FD5AA4D8FBC818F73D2-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--78918F4C85454FD5AA4D8FBC818F73D2-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--78918F4C85454FD5AA4D8FBC818F73D2-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--78918F4C85454FD5AA4D8FBC818F73D2-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--78918F4C85454FD5AA4D8FBC818F73D2-->  <SEQNO><![CDATA[30]]></SEQNO>
-<!--78918F4C85454FD5AA4D8FBC818F73D2-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--78918F4C85454FD5AA4D8FBC818F73D2-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--78918F4C85454FD5AA4D8FBC818F73D2-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--78918F4C85454FD5AA4D8FBC818F73D2-->  <AD_ELEMENT_ID><![CDATA[102]]></AD_ELEMENT_ID>
-<!--78918F4C85454FD5AA4D8FBC818F73D2-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--78918F4C85454FD5AA4D8FBC818F73D2-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--78918F4C85454FD5AA4D8FBC818F73D2-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--78918F4C85454FD5AA4D8FBC818F73D2-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--78918F4C85454FD5AA4D8FBC818F73D2-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--78918F4C85454FD5AA4D8FBC818F73D2-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--78918F4C85454FD5AA4D8FBC818F73D2-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--78918F4C85454FD5AA4D8FBC818F73D2-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--78918F4C85454FD5AA4D8FBC818F73D2-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--78918F4C85454FD5AA4D8FBC818F73D2-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--78918F4C85454FD5AA4D8FBC818F73D2--></AD_COLUMN>
-
 <!--78A3367822B35459E040007F01012510--><AD_COLUMN>
 <!--78A3367822B35459E040007F01012510-->  <AD_COLUMN_ID><![CDATA[78A3367822B35459E040007F01012510]]></AD_COLUMN_ID>
 <!--78A3367822B35459E040007F01012510-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -9207,40 +9135,6 @@
 <!--B8A0E2E81E294B2AB10F4325BD4B563C-->  <ENTITY_ALIAS><![CDATA[bsl.transactionDate]]></ENTITY_ALIAS>
 <!--B8A0E2E81E294B2AB10F4325BD4B563C--></AD_COLUMN>
 
-<!--B8F092DDA9504050ACF1F6C1D1ED8B43--><AD_COLUMN>
-<!--B8F092DDA9504050ACF1F6C1D1ED8B43-->  <AD_COLUMN_ID><![CDATA[B8F092DDA9504050ACF1F6C1D1ED8B43]]></AD_COLUMN_ID>
-<!--B8F092DDA9504050ACF1F6C1D1ED8B43-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--B8F092DDA9504050ACF1F6C1D1ED8B43-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--B8F092DDA9504050ACF1F6C1D1ED8B43-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--B8F092DDA9504050ACF1F6C1D1ED8B43-->  <NAME><![CDATA[Updated]]></NAME>
-<!--B8F092DDA9504050ACF1F6C1D1ED8B43-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
-<!--B8F092DDA9504050ACF1F6C1D1ED8B43-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
-<!--B8F092DDA9504050ACF1F6C1D1ED8B43-->  <COLUMNNAME><![CDATA[updated]]></COLUMNNAME>
-<!--B8F092DDA9504050ACF1F6C1D1ED8B43-->  <AD_TABLE_ID><![CDATA[85DA470A6BB3479E955D88C136EEC8A3]]></AD_TABLE_ID>
-<!--B8F092DDA9504050ACF1F6C1D1ED8B43-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
-<!--B8F092DDA9504050ACF1F6C1D1ED8B43-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
-<!--B8F092DDA9504050ACF1F6C1D1ED8B43-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--B8F092DDA9504050ACF1F6C1D1ED8B43-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--B8F092DDA9504050ACF1F6C1D1ED8B43-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--B8F092DDA9504050ACF1F6C1D1ED8B43-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--B8F092DDA9504050ACF1F6C1D1ED8B43-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--B8F092DDA9504050ACF1F6C1D1ED8B43-->  <SEQNO><![CDATA[80]]></SEQNO>
-<!--B8F092DDA9504050ACF1F6C1D1ED8B43-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--B8F092DDA9504050ACF1F6C1D1ED8B43-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--B8F092DDA9504050ACF1F6C1D1ED8B43-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--B8F092DDA9504050ACF1F6C1D1ED8B43-->  <AD_ELEMENT_ID><![CDATA[607]]></AD_ELEMENT_ID>
-<!--B8F092DDA9504050ACF1F6C1D1ED8B43-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--B8F092DDA9504050ACF1F6C1D1ED8B43-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--B8F092DDA9504050ACF1F6C1D1ED8B43-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--B8F092DDA9504050ACF1F6C1D1ED8B43-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--B8F092DDA9504050ACF1F6C1D1ED8B43-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--B8F092DDA9504050ACF1F6C1D1ED8B43-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--B8F092DDA9504050ACF1F6C1D1ED8B43-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--B8F092DDA9504050ACF1F6C1D1ED8B43-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--B8F092DDA9504050ACF1F6C1D1ED8B43-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--B8F092DDA9504050ACF1F6C1D1ED8B43-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--B8F092DDA9504050ACF1F6C1D1ED8B43--></AD_COLUMN>
-
 <!--B9DAC6015F8F4F94965030A72199BC55--><AD_COLUMN>
 <!--B9DAC6015F8F4F94965030A72199BC55-->  <AD_COLUMN_ID><![CDATA[B9DAC6015F8F4F94965030A72199BC55]]></AD_COLUMN_ID>
 <!--B9DAC6015F8F4F94965030A72199BC55-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -9771,40 +9665,6 @@
 <!--C4248185C139416FA0B6E1F11E4B3B29-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--C4248185C139416FA0B6E1F11E4B3B29--></AD_COLUMN>
 
-<!--C823C7E947264B9F938A53B36E4067CF--><AD_COLUMN>
-<!--C823C7E947264B9F938A53B36E4067CF-->  <AD_COLUMN_ID><![CDATA[C823C7E947264B9F938A53B36E4067CF]]></AD_COLUMN_ID>
-<!--C823C7E947264B9F938A53B36E4067CF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--C823C7E947264B9F938A53B36E4067CF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--C823C7E947264B9F938A53B36E4067CF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--C823C7E947264B9F938A53B36E4067CF-->  <NAME><![CDATA[Creation Date]]></NAME>
-<!--C823C7E947264B9F938A53B36E4067CF-->  <DESCRIPTION><![CDATA[The date that this record is completed.]]></DESCRIPTION>
-<!--C823C7E947264B9F938A53B36E4067CF-->  <HELP><![CDATA[The Created field indicates the date that this record was created.]]></HELP>
-<!--C823C7E947264B9F938A53B36E4067CF-->  <COLUMNNAME><![CDATA[created]]></COLUMNNAME>
-<!--C823C7E947264B9F938A53B36E4067CF-->  <AD_TABLE_ID><![CDATA[85DA470A6BB3479E955D88C136EEC8A3]]></AD_TABLE_ID>
-<!--C823C7E947264B9F938A53B36E4067CF-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
-<!--C823C7E947264B9F938A53B36E4067CF-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
-<!--C823C7E947264B9F938A53B36E4067CF-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--C823C7E947264B9F938A53B36E4067CF-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--C823C7E947264B9F938A53B36E4067CF-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--C823C7E947264B9F938A53B36E4067CF-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--C823C7E947264B9F938A53B36E4067CF-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--C823C7E947264B9F938A53B36E4067CF-->  <SEQNO><![CDATA[70]]></SEQNO>
-<!--C823C7E947264B9F938A53B36E4067CF-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--C823C7E947264B9F938A53B36E4067CF-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--C823C7E947264B9F938A53B36E4067CF-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--C823C7E947264B9F938A53B36E4067CF-->  <AD_ELEMENT_ID><![CDATA[245]]></AD_ELEMENT_ID>
-<!--C823C7E947264B9F938A53B36E4067CF-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--C823C7E947264B9F938A53B36E4067CF-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--C823C7E947264B9F938A53B36E4067CF-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--C823C7E947264B9F938A53B36E4067CF-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--C823C7E947264B9F938A53B36E4067CF-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--C823C7E947264B9F938A53B36E4067CF-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--C823C7E947264B9F938A53B36E4067CF-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--C823C7E947264B9F938A53B36E4067CF-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--C823C7E947264B9F938A53B36E4067CF-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--C823C7E947264B9F938A53B36E4067CF-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--C823C7E947264B9F938A53B36E4067CF--></AD_COLUMN>
-
 <!--C9FD369BECE545828033CC49CAB85D9D--><AD_COLUMN>
 <!--C9FD369BECE545828033CC49CAB85D9D-->  <AD_COLUMN_ID><![CDATA[C9FD369BECE545828033CC49CAB85D9D]]></AD_COLUMN_ID>
 <!--C9FD369BECE545828033CC49CAB85D9D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -10125,14 +9985,13 @@
 <!--E297E8C56BE84A64B46CD1439A93CDF9-->  <HELP><![CDATA[A Business Partner is anyone with whom you transact.  This can include a customer, vendor, employee or any combination of these.]]></HELP>
 <!--E297E8C56BE84A64B46CD1439A93CDF9-->  <COLUMNNAME><![CDATA[c_bpartner_id]]></COLUMNNAME>
 <!--E297E8C56BE84A64B46CD1439A93CDF9-->  <AD_TABLE_ID><![CDATA[85DA470A6BB3479E955D88C136EEC8A3]]></AD_TABLE_ID>
-<!--E297E8C56BE84A64B46CD1439A93CDF9-->  <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID>
-<!--E297E8C56BE84A64B46CD1439A93CDF9-->  <AD_REFERENCE_VALUE_ID><![CDATA[138]]></AD_REFERENCE_VALUE_ID>
+<!--E297E8C56BE84A64B46CD1439A93CDF9-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
 <!--E297E8C56BE84A64B46CD1439A93CDF9-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--E297E8C56BE84A64B46CD1439A93CDF9-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--E297E8C56BE84A64B46CD1439A93CDF9-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--E297E8C56BE84A64B46CD1439A93CDF9-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--E297E8C56BE84A64B46CD1439A93CDF9-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--E297E8C56BE84A64B46CD1439A93CDF9-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
+<!--E297E8C56BE84A64B46CD1439A93CDF9-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--E297E8C56BE84A64B46CD1439A93CDF9-->  <SEQNO><![CDATA[10]]></SEQNO>
 <!--E297E8C56BE84A64B46CD1439A93CDF9-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--E297E8C56BE84A64B46CD1439A93CDF9-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml	Wed Aug 20 11:13:32 2014 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml	Wed Aug 20 12:48:37 2014 +0200
@@ -703,6 +703,18 @@
 <!--82EFB8E4046319C9E040007F01003778-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--82EFB8E4046319C9E040007F01003778--></AD_ELEMENT>
 
+<!--832E0DB3A4C84BAD81707C70D6ECECF7--><AD_ELEMENT>
+<!--832E0DB3A4C84BAD81707C70D6ECECF7-->  <AD_ELEMENT_ID><![CDATA[832E0DB3A4C84BAD81707C70D6ECECF7]]></AD_ELEMENT_ID>
+<!--832E0DB3A4C84BAD81707C70D6ECECF7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--832E0DB3A4C84BAD81707C70D6ECECF7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--832E0DB3A4C84BAD81707C70D6ECECF7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--832E0DB3A4C84BAD81707C70D6ECECF7-->  <COLUMNNAME><![CDATA[MatchType]]></COLUMNNAME>
+<!--832E0DB3A4C84BAD81707C70D6ECECF7-->  <NAME><![CDATA[Match Type]]></NAME>
+<!--832E0DB3A4C84BAD81707C70D6ECECF7-->  <PRINTNAME><![CDATA[Match Type]]></PRINTNAME>
+<!--832E0DB3A4C84BAD81707C70D6ECECF7-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--832E0DB3A4C84BAD81707C70D6ECECF7-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--832E0DB3A4C84BAD81707C70D6ECECF7--></AD_ELEMENT>
+
 <!--8337CDFBF2904C07AB7F9D69E1536663--><AD_ELEMENT>
 <!--8337CDFBF2904C07AB7F9D69E1536663-->  <AD_ELEMENT_ID><![CDATA[8337CDFBF2904C07AB7F9D69E1536663]]></AD_ELEMENT_ID>
 <!--8337CDFBF2904C07AB7F9D69E1536663-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1134,6 +1146,18 @@
 <!--C1DA4E5EEEDE4FE5B2E9411AA411BF67-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--C1DA4E5EEEDE4FE5B2E9411AA411BF67--></AD_ELEMENT>
 
+<!--C2AA8534BC0B42FCB7C9D9957E37BF1E--><AD_ELEMENT>
+<!--C2AA8534BC0B42FCB7C9D9957E37BF1E-->  <AD_ELEMENT_ID><![CDATA[C2AA8534BC0B42FCB7C9D9957E37BF1E]]></AD_ELEMENT_ID>
+<!--C2AA8534BC0B42FCB7C9D9957E37BF1E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C2AA8534BC0B42FCB7C9D9957E37BF1E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C2AA8534BC0B42FCB7C9D9957E37BF1E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C2AA8534BC0B42FCB7C9D9957E37BF1E-->  <COLUMNNAME><![CDATA[MatchedDoc]]></COLUMNNAME>
+<!--C2AA8534BC0B42FCB7C9D9957E37BF1E-->  <NAME><![CDATA[Matched Doc]]></NAME>
+<!--C2AA8534BC0B42FCB7C9D9957E37BF1E-->  <PRINTNAME><![CDATA[Matched Doc]]></PRINTNAME>
+<!--C2AA8534BC0B42FCB7C9D9957E37BF1E-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--C2AA8534BC0B42FCB7C9D9957E37BF1E-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--C2AA8534BC0B42FCB7C9D9957E37BF1E--></AD_ELEMENT>
+
 <!--C581AB086E0141EEAA2EEAA8605BD8F0--><AD_ELEMENT>
 <!--C581AB086E0141EEAA2EEAA8605BD8F0-->  <AD_ELEMENT_ID><![CDATA[C581AB086E0141EEAA2EEAA8605BD8F0]]></AD_ELEMENT_ID>
 <!--C581AB086E0141EEAA2EEAA8605BD8F0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml	Wed Aug 20 11:13:32 2014 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml	Wed Aug 20 12:48:37 2014 +0200
@@ -3042,9 +3042,9 @@
 <!--3051C28FEDA14C34B17B95922DDD5E1F-->  <AD_COLUMN_ID><![CDATA[E297E8C56BE84A64B46CD1439A93CDF9]]></AD_COLUMN_ID>
 <!--3051C28FEDA14C34B17B95922DDD5E1F-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--3051C28FEDA14C34B17B95922DDD5E1F-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--3051C28FEDA14C34B17B95922DDD5E1F-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--3051C28FEDA14C34B17B95922DDD5E1F-->  <DISPLAYLENGTH><![CDATA[35]]></DISPLAYLENGTH>
 <!--3051C28FEDA14C34B17B95922DDD5E1F-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
-<!--3051C28FEDA14C34B17B95922DDD5E1F-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--3051C28FEDA14C34B17B95922DDD5E1F-->  <SEQNO><![CDATA[50]]></SEQNO>
 <!--3051C28FEDA14C34B17B95922DDD5E1F-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--3051C28FEDA14C34B17B95922DDD5E1F-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--3051C28FEDA14C34B17B95922DDD5E1F-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -4437,36 +4437,6 @@
 <!--40289C1D2E1298CF012E12F26EB1010A-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--40289C1D2E1298CF012E12F26EB1010A--></AD_FIELD>
 
-<!--412FC46C28A442E6A42CE169C40C54B9--><AD_FIELD>
-<!--412FC46C28A442E6A42CE169C40C54B9-->  <AD_FIELD_ID><![CDATA[412FC46C28A442E6A42CE169C40C54B9]]></AD_FIELD_ID>
-<!--412FC46C28A442E6A42CE169C40C54B9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--412FC46C28A442E6A42CE169C40C54B9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--412FC46C28A442E6A42CE169C40C54B9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--412FC46C28A442E6A42CE169C40C54B9-->  <NAME><![CDATA[Active]]></NAME>
-<!--412FC46C28A442E6A42CE169C40C54B9-->  <DESCRIPTION><![CDATA[A flag indicating whether this record is available for use or de-activated.]]></DESCRIPTION>
-<!--412FC46C28A442E6A42CE169C40C54B9-->  <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>
-<!--412FC46C28A442E6A42CE169C40C54B9-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--412FC46C28A442E6A42CE169C40C54B9-->  <AD_TAB_ID><![CDATA[5BDDC298B6944AA6942DD2868D1AF6EB]]></AD_TAB_ID>
-<!--412FC46C28A442E6A42CE169C40C54B9-->  <AD_COLUMN_ID><![CDATA[77A46591A67E4CE491C01F33865C87FB]]></AD_COLUMN_ID>
-<!--412FC46C28A442E6A42CE169C40C54B9-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--412FC46C28A442E6A42CE169C40C54B9-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
-<!--412FC46C28A442E6A42CE169C40C54B9-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
-<!--412FC46C28A442E6A42CE169C40C54B9-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--412FC46C28A442E6A42CE169C40C54B9-->  <SEQNO><![CDATA[50]]></SEQNO>
-<!--412FC46C28A442E6A42CE169C40C54B9-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--412FC46C28A442E6A42CE169C40C54B9-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--412FC46C28A442E6A42CE169C40C54B9-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--412FC46C28A442E6A42CE169C40C54B9-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
-<!--412FC46C28A442E6A42CE169C40C54B9-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--412FC46C28A442E6A42CE169C40C54B9-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--412FC46C28A442E6A42CE169C40C54B9-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--412FC46C28A442E6A42CE169C40C54B9-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--412FC46C28A442E6A42CE169C40C54B9-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--412FC46C28A442E6A42CE169C40C54B9-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
-<!--412FC46C28A442E6A42CE169C40C54B9--></AD_FIELD>
-
 <!--415EA1A7A7084D1485CC4413DAC73458--><AD_FIELD>
 <!--415EA1A7A7084D1485CC4413DAC73458-->  <AD_FIELD_ID><![CDATA[415EA1A7A7084D1485CC4413DAC73458]]></AD_FIELD_ID>
 <!--415EA1A7A7084D1485CC4413DAC73458-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -6787,6 +6757,32 @@
 <!--6217B6E7C2CA46E8A399B7B4178F8CEC-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--6217B6E7C2CA46E8A399B7B4178F8CEC--></AD_FIELD>
 
+<!--631F4D73647B4EF897874F03C431B264--><AD_FIELD>
+<!--631F4D73647B4EF897874F03C431B264-->  <AD_FIELD_ID><![CDATA[631F4D73647B4EF897874F03C431B264]]></AD_FIELD_ID>
+<!--631F4D73647B4EF897874F03C431B264-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--631F4D73647B4EF897874F03C431B264-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--631F4D73647B4EF897874F03C431B264-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--631F4D73647B4EF897874F03C431B264-->  <NAME><![CDATA[Match Type]]></NAME>
+<!--631F4D73647B4EF897874F03C431B264-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--631F4D73647B4EF897874F03C431B264-->  <AD_TAB_ID><![CDATA[5BDDC298B6944AA6942DD2868D1AF6EB]]></AD_TAB_ID>
+<!--631F4D73647B4EF897874F03C431B264-->  <AD_COLUMN_ID><![CDATA[55D50ACE30704F47B3D9C5F9779BF991]]></AD_COLUMN_ID>
+<!--631F4D73647B4EF897874F03C431B264-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--631F4D73647B4EF897874F03C431B264-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--631F4D73647B4EF897874F03C431B264-->  <DISPLAYLENGTH><![CDATA[5]]></DISPLAYLENGTH>
+<!--631F4D73647B4EF897874F03C431B264-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--631F4D73647B4EF897874F03C431B264-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--631F4D73647B4EF897874F03C431B264-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--631F4D73647B4EF897874F03C431B264-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--631F4D73647B4EF897874F03C431B264-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--631F4D73647B4EF897874F03C431B264-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--631F4D73647B4EF897874F03C431B264-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--631F4D73647B4EF897874F03C431B264-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--631F4D73647B4EF897874F03C431B264-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--631F4D73647B4EF897874F03C431B264-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--631F4D73647B4EF897874F03C431B264-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--631F4D73647B4EF897874F03C431B264-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--631F4D73647B4EF897874F03C431B264--></AD_FIELD>
+
 <!--6376408E4B3B4208825144CBD72F54CA--><AD_FIELD>
 <!--6376408E4B3B4208825144CBD72F54CA-->  <AD_FIELD_ID><![CDATA[6376408E4B3B4208825144CBD72F54CA]]></AD_FIELD_ID>
 <!--6376408E4B3B4208825144CBD72F54CA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -7517,33 +7513,6 @@
 <!--6C7C6E2543B543AFA1171C12D356CC38-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--6C7C6E2543B543AFA1171C12D356CC38--></AD_FIELD>
 
-<!--6CA56FDAA683479D969CAFD341A78600--><AD_FIELD>
-<!--6CA56FDAA683479D969CAFD341A78600-->  <AD_FIELD_ID><![CDATA[6CA56FDAA683479D969CAFD341A78600]]></AD_FIELD_ID>
-<!--6CA56FDAA683479D969CAFD341A78600-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--6CA56FDAA683479D969CAFD341A78600-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--6CA56FDAA683479D969CAFD341A78600-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--6CA56FDAA683479D969CAFD341A78600-->  <NAME><![CDATA[Client]]></NAME>
-<!--6CA56FDAA683479D969CAFD341A78600-->  <DESCRIPTION><![CDATA[Client for this installation.]]></DESCRIPTION>
-<!--6CA56FDAA683479D969CAFD341A78600-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
-<!--6CA56FDAA683479D969CAFD341A78600-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--6CA56FDAA683479D969CAFD341A78600-->  <AD_TAB_ID><![CDATA[5BDDC298B6944AA6942DD2868D1AF6EB]]></AD_TAB_ID>
-<!--6CA56FDAA683479D969CAFD341A78600-->  <AD_COLUMN_ID><![CDATA[78918F4C85454FD5AA4D8FBC818F73D2]]></AD_COLUMN_ID>
-<!--6CA56FDAA683479D969CAFD341A78600-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--6CA56FDAA683479D969CAFD341A78600-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
-<!--6CA56FDAA683479D969CAFD341A78600-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
-<!--6CA56FDAA683479D969CAFD341A78600-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--6CA56FDAA683479D969CAFD341A78600-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--6CA56FDAA683479D969CAFD341A78600-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--6CA56FDAA683479D969CAFD341A78600-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--6CA56FDAA683479D969CAFD341A78600-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
-<!--6CA56FDAA683479D969CAFD341A78600-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--6CA56FDAA683479D969CAFD341A78600-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--6CA56FDAA683479D969CAFD341A78600-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--6CA56FDAA683479D969CAFD341A78600-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--6CA56FDAA683479D969CAFD341A78600-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--6CA56FDAA683479D969CAFD341A78600-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
-<!--6CA56FDAA683479D969CAFD341A78600--></AD_FIELD>
-
 <!--6CF8A431D2F84F4BB1428D0595EA9C74--><AD_FIELD>
 <!--6CF8A431D2F84F4BB1428D0595EA9C74-->  <AD_FIELD_ID><![CDATA[6CF8A431D2F84F4BB1428D0595EA9C74]]></AD_FIELD_ID>
 <!--6CF8A431D2F84F4BB1428D0595EA9C74-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -8266,7 +8235,7 @@
 <!--79A4CEEC89F54403BF9030AF18EE22B1-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--79A4CEEC89F54403BF9030AF18EE22B1-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--79A4CEEC89F54403BF9030AF18EE22B1-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--79A4CEEC89F54403BF9030AF18EE22B1-->  <CLIENTCLASS><![CDATA[OBLevelImg {"valuesList":["NO", "dummy1", "AP", "dummy3", "AU"]}]]></CLIENTCLASS>
+<!--79A4CEEC89F54403BF9030AF18EE22B1-->  <CLIENTCLASS><![CDATA[OBLevelImg {"valuesList":["0", "1", "2", "3", "4"]}]]></CLIENTCLASS>
 <!--79A4CEEC89F54403BF9030AF18EE22B1-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--79A4CEEC89F54403BF9030AF18EE22B1--></AD_FIELD>
 
@@ -16607,6 +16576,32 @@
 <!--B4BC626AFBAE4F17AA54997C2796B534-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--B4BC626AFBAE4F17AA54997C2796B534--></AD_FIELD>
 
+<!--B4CC856353D044CE91C64508FFE27904--><AD_FIELD>
+<!--B4CC856353D044CE91C64508FFE27904-->  <AD_FIELD_ID><![CDATA[B4CC856353D044CE91C64508FFE27904]]></AD_FIELD_ID>
+<!--B4CC856353D044CE91C64508FFE27904-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B4CC856353D044CE91C64508FFE27904-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B4CC856353D044CE91C64508FFE27904-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B4CC856353D044CE91C64508FFE27904-->  <NAME><![CDATA[Matched Doc]]></NAME>
+<!--B4CC856353D044CE91C64508FFE27904-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--B4CC856353D044CE91C64508FFE27904-->  <AD_TAB_ID><![CDATA[5BDDC298B6944AA6942DD2868D1AF6EB]]></AD_TAB_ID>
+<!--B4CC856353D044CE91C64508FFE27904-->  <AD_COLUMN_ID><![CDATA[58DA4A28792442CDB8A2E3871FAC2AAA]]></AD_COLUMN_ID>
+<!--B4CC856353D044CE91C64508FFE27904-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--B4CC856353D044CE91C64508FFE27904-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--B4CC856353D044CE91C64508FFE27904-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
+<!--B4CC856353D044CE91C64508FFE27904-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--B4CC856353D044CE91C64508FFE27904-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--B4CC856353D044CE91C64508FFE27904-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--B4CC856353D044CE91C64508FFE27904-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--B4CC856353D044CE91C64508FFE27904-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--B4CC856353D044CE91C64508FFE27904-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--B4CC856353D044CE91C64508FFE27904-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--B4CC856353D044CE91C64508FFE27904-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--B4CC856353D044CE91C64508FFE27904-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--B4CC856353D044CE91C64508FFE27904-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--B4CC856353D044CE91C64508FFE27904-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--B4CC856353D044CE91C64508FFE27904-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--B4CC856353D044CE91C64508FFE27904--></AD_FIELD>
+
 <!--B4E23F0CD8C347A6A3BB86E8A3758BD5--><AD_FIELD>
 <!--B4E23F0CD8C347A6A3BB86E8A3758BD5-->  <AD_FIELD_ID><![CDATA[B4E23F0CD8C347A6A3BB86E8A3758BD5]]></AD_FIELD_ID>
 <!--B4E23F0CD8C347A6A3BB86E8A3758BD5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -18467,34 +18462,6 @@
 <!--CB9B7A7C9AB845E299BA3385935C33B5-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--CB9B7A7C9AB845E299BA3385935C33B5--></AD_FIELD>
 
-<!--CBD105AD24C441FD85F9B3DC5AC2819D--><AD_FIELD>
-<!--CBD105AD24C441FD85F9B3DC5AC2819D-->  <AD_FIELD_ID><![CDATA[CBD105AD24C441FD85F9B3DC5AC2819D]]></AD_FIELD_ID>
-<!--CBD105AD24C441FD85F9B3DC5AC2819D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--CBD105AD24C441FD85F9B3DC5AC2819D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--CBD105AD24C441FD85F9B3DC5AC2819D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--CBD105AD24C441FD85F9B3DC5AC2819D-->  <NAME><![CDATA[Organization]]></NAME>
-<!--CBD105AD24C441FD85F9B3DC5AC2819D-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
-<!--CBD105AD24C441FD85F9B3DC5AC2819D-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
-<!--CBD105AD24C441FD85F9B3DC5AC2819D-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--CBD105AD24C441FD85F9B3DC5AC2819D-->  <AD_TAB_ID><![CDATA[5BDDC298B6944AA6942DD2868D1AF6EB]]></AD_TAB_ID>
-<!--CBD105AD24C441FD85F9B3DC5AC2819D-->  <AD_COLUMN_ID><![CDATA[32595588E533456BBCCCEA2F2B2235C1]]></AD_COLUMN_ID>
-<!--CBD105AD24C441FD85F9B3DC5AC2819D-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--CBD105AD24C441FD85F9B3DC5AC2819D-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
-<!--CBD105AD24C441FD85F9B3DC5AC2819D-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
-<!--CBD105AD24C441FD85F9B3DC5AC2819D-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--CBD105AD24C441FD85F9B3DC5AC2819D-->  <SEQNO><![CDATA[10]]></SEQNO>
-<!--CBD105AD24C441FD85F9B3DC5AC2819D-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--CBD105AD24C441FD85F9B3DC5AC2819D-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--CBD105AD24C441FD85F9B3DC5AC2819D-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--CBD105AD24C441FD85F9B3DC5AC2819D-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
-<!--CBD105AD24C441FD85F9B3DC5AC2819D-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--CBD105AD24C441FD85F9B3DC5AC2819D-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--CBD105AD24C441FD85F9B3DC5AC2819D-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--CBD105AD24C441FD85F9B3DC5AC2819D-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--CBD105AD24C441FD85F9B3DC5AC2819D-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--CBD105AD24C441FD85F9B3DC5AC2819D-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
-<!--CBD105AD24C441FD85F9B3DC5AC2819D--></AD_FIELD>
-
 <!--CBF872363CCC4F6BA39996C23C9E2E79--><AD_FIELD>
 <!--CBF872363CCC4F6BA39996C23C9E2E79-->  <AD_FIELD_ID><![CDATA[CBF872363CCC4F6BA39996C23C9E2E79]]></AD_FIELD_ID>
 <!--CBF872363CCC4F6BA39996C23C9E2E79-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -20447,6 +20414,34 @@
 <!--EC4A97FF9A1C41D997A1546340F83F55-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--EC4A97FF9A1C41D997A1546340F83F55--></AD_FIELD>
 
+<!--EC713D2A848C4E69A314CBE493077756--><AD_FIELD>
+<!--EC713D2A848C4E69A314CBE493077756-->  <AD_FIELD_ID><![CDATA[EC713D2A848C4E69A314CBE493077756]]></AD_FIELD_ID>
+<!--EC713D2A848C4E69A314CBE493077756-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--EC713D2A848C4E69A314CBE493077756-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--EC713D2A848C4E69A314CBE493077756-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--EC713D2A848C4E69A314CBE493077756-->  <NAME><![CDATA[Reference]]></NAME>
+<!--EC713D2A848C4E69A314CBE493077756-->  <DESCRIPTION><![CDATA[The number for a specific reference.]]></DESCRIPTION>
+<!--EC713D2A848C4E69A314CBE493077756-->  <HELP><![CDATA[The reference number can be printed on orders and invoices to allow your business partner to faster identify your records.]]></HELP>
+<!--EC713D2A848C4E69A314CBE493077756-->  <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED>
+<!--EC713D2A848C4E69A314CBE493077756-->  <AD_TAB_ID><![CDATA[5BDDC298B6944AA6942DD2868D1AF6EB]]></AD_TAB_ID>
+<!--EC713D2A848C4E69A314CBE493077756-->  <AD_COLUMN_ID><![CDATA[34555BD1C6784070B62F8BCE984E2AED]]></AD_COLUMN_ID>
+<!--EC713D2A848C4E69A314CBE493077756-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--EC713D2A848C4E69A314CBE493077756-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--EC713D2A848C4E69A314CBE493077756-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
+<!--EC713D2A848C4E69A314CBE493077756-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--EC713D2A848C4E69A314CBE493077756-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--EC713D2A848C4E69A314CBE493077756-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--EC713D2A848C4E69A314CBE493077756-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--EC713D2A848C4E69A314CBE493077756-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--EC713D2A848C4E69A314CBE493077756-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--EC713D2A848C4E69A314CBE493077756-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--EC713D2A848C4E69A314CBE493077756-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--EC713D2A848C4E69A314CBE493077756-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--EC713D2A848C4E69A314CBE493077756-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--EC713D2A848C4E69A314CBE493077756-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--EC713D2A848C4E69A314CBE493077756-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--EC713D2A848C4E69A314CBE493077756--></AD_FIELD>
+
 <!--ECBAF1315A9A4893B43905FD8CE86911--><AD_FIELD>
 <!--ECBAF1315A9A4893B43905FD8CE86911-->  <AD_FIELD_ID><![CDATA[ECBAF1315A9A4893B43905FD8CE86911]]></AD_FIELD_ID>
 <!--ECBAF1315A9A4893B43905FD8CE86911-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -20646,32 +20641,6 @@
 <!--EE7FC2EB831145CA9D1B48C209CCB581-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--EE7FC2EB831145CA9D1B48C209CCB581--></AD_FIELD>
 
-<!--F15766DD1B8347C69992805F41FCEBF5--><AD_FIELD>
-<!--F15766DD1B8347C69992805F41FCEBF5-->  <AD_FIELD_ID><![CDATA[F15766DD1B8347C69992805F41FCEBF5]]></AD_FIELD_ID>
-<!--F15766DD1B8347C69992805F41FCEBF5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--F15766DD1B8347C69992805F41FCEBF5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--F15766DD1B8347C69992805F41FCEBF5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--F15766DD1B8347C69992805F41FCEBF5-->  <NAME><![CDATA[Amount]]></NAME>
-<!--F15766DD1B8347C69992805F41FCEBF5-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--F15766DD1B8347C69992805F41FCEBF5-->  <AD_TAB_ID><![CDATA[5BDDC298B6944AA6942DD2868D1AF6EB]]></AD_TAB_ID>
-<!--F15766DD1B8347C69992805F41FCEBF5-->  <AD_COLUMN_ID><![CDATA[B31F203A1F1E46B496924F71684DBD9D]]></AD_COLUMN_ID>
-<!--F15766DD1B8347C69992805F41FCEBF5-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--F15766DD1B8347C69992805F41FCEBF5-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--F15766DD1B8347C69992805F41FCEBF5-->  <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
-<!--F15766DD1B8347C69992805F41FCEBF5-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
-<!--F15766DD1B8347C69992805F41FCEBF5-->  <SEQNO><![CDATA[60]]></SEQNO>
-<!--F15766DD1B8347C69992805F41FCEBF5-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--F15766DD1B8347C69992805F41FCEBF5-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--F15766DD1B8347C69992805F41FCEBF5-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--F15766DD1B8347C69992805F41FCEBF5-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
-<!--F15766DD1B8347C69992805F41FCEBF5-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--F15766DD1B8347C69992805F41FCEBF5-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--F15766DD1B8347C69992805F41FCEBF5-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--F15766DD1B8347C69992805F41FCEBF5-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--F15766DD1B8347C69992805F41FCEBF5-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--F15766DD1B8347C69992805F41FCEBF5-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
-<!--F15766DD1B8347C69992805F41FCEBF5--></AD_FIELD>
-
 <!--F183507AF521490292E8E31141D1610E--><AD_FIELD>
 <!--F183507AF521490292E8E31141D1610E-->  <AD_FIELD_ID><![CDATA[F183507AF521490292E8E31141D1610E]]></AD_FIELD_ID>
 <!--F183507AF521490292E8E31141D1610E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -21162,7 +21131,7 @@
 <!--F734811D3120487B8E122C91307AC077-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--F734811D3120487B8E122C91307AC077-->  <DISPLAYLENGTH><![CDATA[19]]></DISPLAYLENGTH>
 <!--F734811D3120487B8E122C91307AC077-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
-<!--F734811D3120487B8E122C91307AC077-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--F734811D3120487B8E122C91307AC077-->  <SEQNO><![CDATA[40]]></SEQNO>
 <!--F734811D3120487B8E122C91307AC077-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--F734811D3120487B8E122C91307AC077-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--F734811D3120487B8E122C91307AC077-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml	Wed Aug 20 11:13:32 2014 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml	Wed Aug 20 12:48:37 2014 +0200
@@ -24,6 +24,18 @@
 <!--0CC268ED2E8D4B0397A0DCBBFA2237DE-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
 <!--0CC268ED2E8D4B0397A0DCBBFA2237DE--></AD_REFERENCE>
 
+<!--10536BBE003041DDBE293C619E336D4B--><AD_REFERENCE>
+<!--10536BBE003041DDBE293C619E336D4B-->  <AD_REFERENCE_ID><![CDATA[10536BBE003041DDBE293C619E336D4B]]></AD_REFERENCE_ID>
+<!--10536BBE003041DDBE293C619E336D4B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--10536BBE003041DDBE293C619E336D4B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--10536BBE003041DDBE293C619E336D4B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--10536BBE003041DDBE293C619E336D4B-->  <NAME><![CDATA[Matched Doc]]></NAME>
+<!--10536BBE003041DDBE293C619E336D4B-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--10536BBE003041DDBE293C619E336D4B-->  <ISBASEREFERENCE><![CDATA[N]]></ISBASEREFERENCE>
+<!--10536BBE003041DDBE293C619E336D4B-->  <PARENTREFERENCE_ID><![CDATA[17]]></PARENTREFERENCE_ID>
+<!--10536BBE003041DDBE293C619E336D4B-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
+<!--10536BBE003041DDBE293C619E336D4B--></AD_REFERENCE>
+
 <!--1221BEA5C19F4FA89D3565CA8877A82E--><AD_REFERENCE>
 <!--1221BEA5C19F4FA89D3565CA8877A82E-->  <AD_REFERENCE_ID><![CDATA[1221BEA5C19F4FA89D3565CA8877A82E]]></AD_REFERENCE_ID>
 <!--1221BEA5C19F4FA89D3565CA8877A82E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -36,6 +48,18 @@
 <!--1221BEA5C19F4FA89D3565CA8877A82E-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
 <!--1221BEA5C19F4FA89D3565CA8877A82E--></AD_REFERENCE>
 
+<!--125FEBA3F9E841FF928C2D13F33540EC--><AD_REFERENCE>
+<!--125FEBA3F9E841FF928C2D13F33540EC-->  <AD_REFERENCE_ID><![CDATA[125FEBA3F9E841FF928C2D13F33540EC]]></AD_REFERENCE_ID>
+<!--125FEBA3F9E841FF928C2D13F33540EC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--125FEBA3F9E841FF928C2D13F33540EC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--125FEBA3F9E841FF928C2D13F33540EC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--125FEBA3F9E841FF928C2D13F33540EC-->  <NAME><![CDATA[Match Type]]></NAME>
+<!--125FEBA3F9E841FF928C2D13F33540EC-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--125FEBA3F9E841FF928C2D13F33540EC-->  <ISBASEREFERENCE><![CDATA[N]]></ISBASEREFERENCE>
+<!--125FEBA3F9E841FF928C2D13F33540EC-->  <PARENTREFERENCE_ID><![CDATA[17]]></PARENTREFERENCE_ID>
+<!--125FEBA3F9E841FF928C2D13F33540EC-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
+<!--125FEBA3F9E841FF928C2D13F33540EC--></AD_REFERENCE>
+
 <!--1543EE40981840C3929CBC16320FE155--><AD_REFERENCE>
 <!--1543EE40981840C3929CBC16320FE155-->  <AD_REFERENCE_ID><![CDATA[1543EE40981840C3929CBC16320FE155]]></AD_REFERENCE_ID>
 <!--1543EE40981840C3929CBC16320FE155-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REF_LIST.xml	Wed Aug 20 11:13:32 2014 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REF_LIST.xml	Wed Aug 20 12:48:37 2014 +0200
@@ -1,5 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <data>
+<!--00236C38C91849298C5F9275367A4E61--><AD_REF_LIST>
+<!--00236C38C91849298C5F9275367A4E61-->  <AD_REF_LIST_ID><![CDATA[00236C38C91849298C5F9275367A4E61]]></AD_REF_LIST_ID>
+<!--00236C38C91849298C5F9275367A4E61-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--00236C38C91849298C5F9275367A4E61-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--00236C38C91849298C5F9275367A4E61-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--00236C38C91849298C5F9275367A4E61-->  <VALUE><![CDATA[I]]></VALUE>
+<!--00236C38C91849298C5F9275367A4E61-->  <NAME><![CDATA[Invoice]]></NAME>
+<!--00236C38C91849298C5F9275367A4E61-->  <AD_REFERENCE_ID><![CDATA[10536BBE003041DDBE293C619E336D4B]]></AD_REFERENCE_ID>
+<!--00236C38C91849298C5F9275367A4E61-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--00236C38C91849298C5F9275367A4E61--></AD_REF_LIST>
+
 <!--25889363327D44FC851D97EA78F6BCFC--><AD_REF_LIST>
 <!--25889363327D44FC851D97EA78F6BCFC-->  <AD_REF_LIST_ID><![CDATA[25889363327D44FC851D97EA78F6BCFC]]></AD_REF_LIST_ID>
 <!--25889363327D44FC851D97EA78F6BCFC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -227,6 +238,17 @@
 <!--72DCA5FC143E44DE818116701D529F28-->  <SEQNO><![CDATA[10]]></SEQNO>
 <!--72DCA5FC143E44DE818116701D529F28--></AD_REF_LIST>
 
+<!--73B22C8611CD45989ADC0B4AE3A55F5F--><AD_REF_LIST>
+<!--73B22C8611CD45989ADC0B4AE3A55F5F-->  <AD_REF_LIST_ID><![CDATA[73B22C8611CD45989ADC0B4AE3A55F5F]]></AD_REF_LIST_ID>
+<!--73B22C8611CD45989ADC0B4AE3A55F5F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--73B22C8611CD45989ADC0B4AE3A55F5F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--73B22C8611CD45989ADC0B4AE3A55F5F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--73B22C8611CD45989ADC0B4AE3A55F5F-->  <VALUE><![CDATA[T]]></VALUE>
+<!--73B22C8611CD45989ADC0B4AE3A55F5F-->  <NAME><![CDATA[Transaction]]></NAME>
+<!--73B22C8611CD45989ADC0B4AE3A55F5F-->  <AD_REFERENCE_ID><![CDATA[10536BBE003041DDBE293C619E336D4B]]></AD_REFERENCE_ID>
+<!--73B22C8611CD45989ADC0B4AE3A55F5F-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--73B22C8611CD45989ADC0B4AE3A55F5F--></AD_REF_LIST>
+
 <!--7AC4F4FF644247B7BD320BBF67C4F066--><AD_REF_LIST>
 <!--7AC4F4FF644247B7BD320BBF67C4F066-->  <AD_REF_LIST_ID><![CDATA[7AC4F4FF644247B7BD320BBF67C4F066]]></AD_REF_LIST_ID>
 <!--7AC4F4FF644247B7BD320BBF67C4F066-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -262,6 +284,17 @@
 <!--A5D519E8B6B54FFDA61842449DB75A31-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--A5D519E8B6B54FFDA61842449DB75A31--></AD_REF_LIST>
 
+<!--A86E37A9B86C4EF4821E12765C04E525--><AD_REF_LIST>
+<!--A86E37A9B86C4EF4821E12765C04E525-->  <AD_REF_LIST_ID><![CDATA[A86E37A9B86C4EF4821E12765C04E525]]></AD_REF_LIST_ID>
+<!--A86E37A9B86C4EF4821E12765C04E525-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A86E37A9B86C4EF4821E12765C04E525-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A86E37A9B86C4EF4821E12765C04E525-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A86E37A9B86C4EF4821E12765C04E525-->  <VALUE><![CDATA[O]]></VALUE>
+<!--A86E37A9B86C4EF4821E12765C04E525-->  <NAME><![CDATA[Order]]></NAME>
+<!--A86E37A9B86C4EF4821E12765C04E525-->  <AD_REFERENCE_ID><![CDATA[10536BBE003041DDBE293C619E336D4B]]></AD_REFERENCE_ID>
+<!--A86E37A9B86C4EF4821E12765C04E525-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--A86E37A9B86C4EF4821E12765C04E525--></AD_REF_LIST>
+
 <!--AA18A706616845D183B63BE88C967C89--><AD_REF_LIST>
 <!--AA18A706616845D183B63BE88C967C89-->  <AD_REF_LIST_ID><![CDATA[AA18A706616845D183B63BE88C967C89]]></AD_REF_LIST_ID>
 <!--AA18A706616845D183B63BE88C967C89-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -311,6 +344,17 @@
 <!--C0D9FAD1047343BAA53AF6F60D572DD0-->  <SEQNO><![CDATA[20]]></SEQNO>
 <!--C0D9FAD1047343BAA53AF6F60D572DD0--></AD_REF_LIST>
 
+<!--C219A5CC3FFD48FDBD00845200E3E33C--><AD_REF_LIST>
+<!--C219A5CC3FFD48FDBD00845200E3E33C-->  <AD_REF_LIST_ID><![CDATA[C219A5CC3FFD48FDBD00845200E3E33C]]></AD_REF_LIST_ID>
+<!--C219A5CC3FFD48FDBD00845200E3E33C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C219A5CC3FFD48FDBD00845200E3E33C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C219A5CC3FFD48FDBD00845200E3E33C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C219A5CC3FFD48FDBD00845200E3E33C-->  <VALUE><![CDATA[A]]></VALUE>
+<!--C219A5CC3FFD48FDBD00845200E3E33C-->  <NAME><![CDATA[Auto]]></NAME>
+<!--C219A5CC3FFD48FDBD00845200E3E33C-->  <AD_REFERENCE_ID><![CDATA[125FEBA3F9E841FF928C2D13F33540EC]]></AD_REFERENCE_ID>
+<!--C219A5CC3FFD48FDBD00845200E3E33C-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--C219A5CC3FFD48FDBD00845200E3E33C--></AD_REF_LIST>
+
 <!--C5D1596D065545B49156C1F9426C9E14--><AD_REF_LIST>
 <!--C5D1596D065545B49156C1F9426C9E14-->  <AD_REF_LIST_ID><![CDATA[C5D1596D065545B49156C1F9426C9E14]]></AD_REF_LIST_ID>
 <!--C5D1596D065545B49156C1F9426C9E14-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -347,6 +391,17 @@
 <!--DDCDE32A9FC046E694D5074144DD6AFF-->  <SEQNO><![CDATA[30]]></SEQNO>
 <!--DDCDE32A9FC046E694D5074144DD6AFF--></AD_REF_LIST>
 
+<!--DF2C9E7524A64BE5A16BE6F9644A7D3E--><AD_REF_LIST>
+<!--DF2C9E7524A64BE5A16BE6F9644A7D3E-->  <AD_REF_LIST_ID><![CDATA[DF2C9E7524A64BE5A16BE6F9644A7D3E]]></AD_REF_LIST_ID>
+<!--DF2C9E7524A64BE5A16BE6F9644A7D3E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--DF2C9E7524A64BE5A16BE6F9644A7D3E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--DF2C9E7524A64BE5A16BE6F9644A7D3E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--DF2C9E7524A64BE5A16BE6F9644A7D3E-->  <VALUE><![CDATA[P]]></VALUE>
+<!--DF2C9E7524A64BE5A16BE6F9644A7D3E-->  <NAME><![CDATA[Payment]]></NAME>
+<!--DF2C9E7524A64BE5A16BE6F9644A7D3E-->  <AD_REFERENCE_ID><![CDATA[10536BBE003041DDBE293C619E336D4B]]></AD_REFERENCE_ID>
+<!--DF2C9E7524A64BE5A16BE6F9644A7D3E-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--DF2C9E7524A64BE5A16BE6F9644A7D3E--></AD_REF_LIST>
+
 <!--E047F81FACD0440EACB0EE63EB18A4EE--><AD_REF_LIST>
 <!--E047F81FACD0440EACB0EE63EB18A4EE-->  <AD_REF_LIST_ID><![CDATA[E047F81FACD0440EACB0EE63EB18A4EE]]></AD_REF_LIST_ID>
 <!--E047F81FACD0440EACB0EE63EB18A4EE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -359,6 +414,17 @@
 <!--E047F81FACD0440EACB0EE63EB18A4EE-->  <SEQNO><![CDATA[10]]></SEQNO>
 <!--E047F81FACD0440EACB0EE63EB18A4EE--></AD_REF_LIST>
 
+<!--E20CDC34CA3C43D39A25855EF6D1D37B--><AD_REF_LIST>
+<!--E20CDC34CA3C43D39A25855EF6D1D37B-->  <AD_REF_LIST_ID><![CDATA[E20CDC34CA3C43D39A25855EF6D1D37B]]></AD_REF_LIST_ID>
+<!--E20CDC34CA3C43D39A25855EF6D1D37B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E20CDC34CA3C43D39A25855EF6D1D37B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E20CDC34CA3C43D39A25855EF6D1D37B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E20CDC34CA3C43D39A25855EF6D1D37B-->  <VALUE><![CDATA[M]]></VALUE>
+<!--E20CDC34CA3C43D39A25855EF6D1D37B-->  <NAME><![CDATA[Manual]]></NAME>
+<!--E20CDC34CA3C43D39A25855EF6D1D37B-->  <AD_REFERENCE_ID><![CDATA[125FEBA3F9E841FF928C2D13F33540EC]]></AD_REFERENCE_ID>
+<!--E20CDC34CA3C43D39A25855EF6D1D37B-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--E20CDC34CA3C43D39A25855EF6D1D37B--></AD_REF_LIST>
+
 <!--FD081D76045444C691F7E1D40060486C--><AD_REF_LIST>
 <!--FD081D76045444C691F7E1D40060486C-->  <AD_REF_LIST_ID><![CDATA[FD081D76045444C691F7E1D40060486C]]></AD_REF_LIST_ID>
 <!--FD081D76045444C691F7E1D40060486C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml	Wed Aug 20 11:13:32 2014 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml	Wed Aug 20 12:48:37 2014 +0200
@@ -228,7 +228,7 @@
 <!--5BDDC298B6944AA6942DD2868D1AF6EB-->  <ISSHOWTREENODEICONS><![CDATA[Y]]></ISSHOWTREENODEICONS>
 <!--5BDDC298B6944AA6942DD2868D1AF6EB-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
 <!--5BDDC298B6944AA6942DD2868D1AF6EB-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
-<!--5BDDC298B6944AA6942DD2868D1AF6EB-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
+<!--5BDDC298B6944AA6942DD2868D1AF6EB-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[N]]></EM_OBUIAPP_SHOW_SELECT>
 <!--5BDDC298B6944AA6942DD2868D1AF6EB-->  <EM_OBUIAPP_SELECTION_TYPE><![CDATA[S]]></EM_OBUIAPP_SELECTION_TYPE>
 <!--5BDDC298B6944AA6942DD2868D1AF6EB--></AD_TAB>
 
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/algorithm/StandardMatchingCandidatesAlgorithm.java	Wed Aug 20 11:13:32 2014 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/algorithm/StandardMatchingCandidatesAlgorithm.java	Wed Aug 20 12:48:37 2014 +0200
@@ -54,7 +54,7 @@
     for (final FIN_FinaccTransaction transactionCandidate : MatchTransactionDao
         .getMatchingFinancialTransaction(line.getBankStatement().getAccount().getId(), amount,
             excluded)) {
-      candidateRecords.add(new FIN_CandidateRecord(transactionCandidate));
+      candidateRecords.add(new FIN_CandidateRecord(transactionCandidate, line));
     }
 
     return candidateRecords;
@@ -113,16 +113,9 @@
       whereClause.append(FIN_Payment.PROPERTY_PAYMENTDATE);
       whereClause.append(" <= ?");
       parameters.add(line.getTransactionDate());
-      // TODO: Add order to show first scheduled payments from invoices and later scheduled payments
-      // from not invoiced orders.
-      whereClause.append(" order by");
-      whereClause.append(" p.");
-      whereClause.append(FIN_Payment.PROPERTY_PAYMENTDATE);
-      whereClause.append(", p.");
-      whereClause.append(FIN_Payment.PROPERTY_DOCUMENTNO);
+
       final OBQuery<FIN_Payment> obqPayment = OBDal.getInstance().createQuery(FIN_Payment.class,
           whereClause.toString());
-
       obqPayment.setParameters(parameters);
 
       final List<FIN_CandidateRecord> candidateRecords = new ArrayList<FIN_CandidateRecord>();
@@ -130,7 +123,7 @@
       int j = 1;
       while (scrollLines.next()) {
         final FIN_Payment paymentCandidate = (FIN_Payment) scrollLines.get(0);
-        candidateRecords.add(new FIN_CandidateRecord(paymentCandidate));
+        candidateRecords.add(new FIN_CandidateRecord(paymentCandidate, line));
         if (j % 100 == 0) {
           OBDal.getInstance().getSession().clear();
         }
@@ -156,16 +149,6 @@
     ScrollableResults scrollLines = null;
     try {
       hql.append(" select distinct(i.id) ");
-
-      // hql.append(" psdi.");
-      // hql.append(FIN_PaymentSchedule.PROPERTY_FINPAYMENTPRIORITY);
-      // hql.append(", psdi.");
-      // hql.append(FIN_PaymentSchedule.PROPERTY_DUEDATE);
-      // hql.append(", psdi.");
-      // hql.append(FIN_PaymentSchedule.PROPERTY_INVOICE);
-      // hql.append(".");
-      // hql.append(Invoice.PROPERTY_DOCUMENTNO);
-
       hql.append(" from FIN_Payment_ScheduleDetail as psd "); // pending scheduled payments //
       hql.append(" inner join psd.invoicePaymentSchedule as psdi");
       hql.append(" inner join psdi.invoice as i ");
@@ -211,25 +194,6 @@
       hql.append(FIN_PaymentSchedule.PROPERTY_OUTSTANDINGAMOUNT);
       hql.append(" = ?");
       parameters.add(amount.abs());
-      // dateTo
-      // TODO Review this date. i guess someone can pay a bill prior to due date
-      // whereClause.append(" and psd.");
-      // whereClause.append(FIN_PaymentScheduleDetail.PROPERTY_INVOICEPAYMENTSCHEDULE);
-      // whereClause.append(".");
-      // whereClause.append(FIN_PaymentSchedule.PROPERTY_DUEDATE);
-      // whereClause.append(" <= ?");
-      // parameters.add(line.getTransactionDate());
-      // TODO: Add order to show first scheduled payments from invoices and later scheduled payments
-      // from not invoiced orders.
-      // hql.append(" order by");
-      // hql.append(" psdi.");
-      // hql.append(FIN_PaymentSchedule.PROPERTY_FINPAYMENTPRIORITY);
-      // hql.append(", psdi.");
-      // hql.append(FIN_PaymentSchedule.PROPERTY_DUEDATE);
-      // hql.append(", psdi.");
-      // hql.append(FIN_PaymentSchedule.PROPERTY_INVOICE);
-      // hql.append(".");
-      // hql.append(Invoice.PROPERTY_DOCUMENTNO);
 
       final Session session = OBDal.getInstance().getSession();
       final Query query = session.createQuery(hql.toString());
@@ -243,7 +207,7 @@
       while (scrollLines.next()) {
         final String invoiceId = scrollLines.getString(0);
         candidateRecords.add(new FIN_CandidateRecord(OBDal.getInstance().get(Invoice.class,
-            invoiceId)));
+            invoiceId), line));
         if (j % 100 == 0) {
           session.clear();
         }
@@ -315,16 +279,6 @@
       hql.append(FIN_PaymentSchedule.PROPERTY_OUTSTANDINGAMOUNT);
       hql.append(" = ?");
       parameters.add(amount.abs());
-      // dateTo
-      // TODO Review this date. i guess someone can pay a bill prior to due date
-      // whereClause.append(" and psd.");
-      // whereClause.append(FIN_PaymentScheduleDetail.PROPERTY_ORDERPAYMENTSCHEDULE);
-      // whereClause.append(".");
-      // whereClause.append(FIN_PaymentSchedule.PROPERTY_DUEDATE);
-      // whereClause.append(" <= ?");
-      // parameters.add(line.getTransactionDate());
-      // TODO: Add order to show first scheduled payments from invoices and later scheduled payments
-      // from not invoiced orders.
 
       final Session session = OBDal.getInstance().getSession();
       final Query query = session.createQuery(hql.toString());
@@ -337,8 +291,8 @@
       int j = 1;
       while (scrollLines.next()) {
         final String orderId = scrollLines.getString(0);
-        candidateRecords
-            .add(new FIN_CandidateRecord(OBDal.getInstance().get(Order.class, orderId)));
+        candidateRecords.add(new FIN_CandidateRecord(OBDal.getInstance().get(Order.class, orderId),
+            line));
         if (j % 100 == 0) {
           session.clear();
         }
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/APRMConstants.java	Wed Aug 20 11:13:32 2014 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/APRMConstants.java	Wed Aug 20 12:48:37 2014 +0200
@@ -28,4 +28,14 @@
   public final static String TRANSACTION_WINDOW_ID = "94EAA455D2644E04AB25D93BE5157B6D";
   public final static String ADD_PAYMENT_MENU = "NULLWINDOWID";
 
+  /* Matching Candidate Algorithm */
+  // Matched Document
+  public final static String CANDIDATE_MATCHED_DOCUMENT__TRANSACTION = "T";
+  public final static String CANDIDATE_MATCHED_DOCUMENT__PAYMENT = "P";
+  public final static String CANDIDATE_MATCHED_DOCUMENT__INVOICE = "I";
+  public final static String CANDIDATE_MATCHED_DOCUMENT__ORDER = "O";
+
+  // Match Type
+  public final static String CANDIDATE_MATCH_TYPE__AUTO = "A";
+  public final static String CANDIDATE_MATCH_TYPE__MANUAL = "M";
 }
\ No newline at end of file
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_CandidateRecord.java	Wed Aug 20 11:13:32 2014 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_CandidateRecord.java	Wed Aug 20 12:48:37 2014 +0200
@@ -20,15 +20,19 @@
 package org.openbravo.advpaymentmngt.utility;
 
 import java.math.BigDecimal;
+import java.security.InvalidParameterException;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.openbravo.base.exception.OBException;
 import org.openbravo.base.structure.BaseOBObject;
 import org.openbravo.model.common.businesspartner.BusinessPartner;
 import org.openbravo.model.common.invoice.Invoice;
 import org.openbravo.model.common.order.Order;
+import org.openbravo.model.financialmgmt.payment.FIN_BankStatementLine;
 import org.openbravo.model.financialmgmt.payment.FIN_FinaccTransaction;
 import org.openbravo.model.financialmgmt.payment.FIN_Payment;
 
@@ -38,24 +42,62 @@
   private FIN_Payment payment;
   private Invoice invoice;
   private Order order;
+  private Date date;
+  private BusinessPartner businessPartner;
+  private BigDecimal amount;
+  private String matchedDoc;
+  private String matchType = APRMConstants.CANDIDATE_MATCH_TYPE__AUTO;
+  private String reference;
   private String affinity;
 
-  public FIN_CandidateRecord(final BaseOBObject baseOBObject) {
+  public FIN_CandidateRecord(final BaseOBObject baseOBObject,
+      final FIN_BankStatementLine bankStatementLine) {
+    if (baseOBObject == null || bankStatementLine == null) {
+      throw new InvalidParameterException(
+          "FIN_CandidateRecord: baseOBObject and bankStatementLine must not be null");
+    }
+
     this.baseOBObject = baseOBObject;
     if (baseOBObject instanceof FIN_FinaccTransaction) {
       this.transaction = (FIN_FinaccTransaction) baseOBObject;
+      this.matchedDoc = APRMConstants.CANDIDATE_MATCHED_DOCUMENT__TRANSACTION;
+      this.date = transaction.getDateAcct();
+      this.amount = transaction.getPaymentAmount();
+      this.reference = transaction.getDescription();
     } else if (baseOBObject instanceof FIN_Payment) {
       this.payment = (FIN_Payment) baseOBObject;
+      this.matchedDoc = APRMConstants.CANDIDATE_MATCHED_DOCUMENT__PAYMENT;
+      this.date = payment.getPaymentDate();
+      this.amount = payment.getAmount();
+      this.reference = payment.getReferenceNo();
     } else if (baseOBObject instanceof Invoice) {
       this.invoice = (Invoice) baseOBObject;
+      this.matchedDoc = APRMConstants.CANDIDATE_MATCHED_DOCUMENT__INVOICE;
+      this.date = invoice.getInvoiceDate();
+      this.amount = invoice.getGrandTotalAmount();
+      this.reference = invoice.getDocumentNo();
     } else if (baseOBObject instanceof Order) {
       this.order = (Order) baseOBObject;
+      this.matchedDoc = APRMConstants.CANDIDATE_MATCHED_DOCUMENT__ORDER;
+      this.date = order.getOrderDate();
+      this.amount = order.getGrandTotalAmount();
+      this.reference = order.getDocumentNo();
     } else {
       throw new OBException(
           "The FIN_CandidateRecord only accepts instances of FIN_FinaccTransaction/FIN_Payment/Invoice/Order, and the this object is instance of "
               + baseOBObject.getClass().toString());
     }
-    this.affinity = calculateAffinity(getBusinessPartner(), getDate(), getAmount());
+    try {
+      this.businessPartner = (BusinessPartner) (baseOBObject.getClass()).getMethod(
+          "getBusinessPartner", new Class[0]).invoke(baseOBObject, new Object[0]);
+    } catch (Exception e) {
+      throw new OBException("Error while getting the FIN_CandidateRecord business partner");
+    }
+    this.affinity = calculateAffinity(bankStatementLine);
+  }
+
+  public BaseOBObject getBaseOBObject() {
+    return baseOBObject;
   }
 
   public FIN_FinaccTransaction getTransaction() {
@@ -78,90 +120,88 @@
     return affinity;
   }
 
+  public String getMatchedDoc() {
+    return matchedDoc;
+  }
+
+  public String getMatchType() {
+    return matchType;
+  }
+
   public BusinessPartner getBusinessPartner() {
+    return businessPartner;
+  }
+
+  public Date getDate() {
+    return date;
+  }
+
+  public BigDecimal getAmount() {
+    return amount;
+  }
+
+  public String getReference() {
+    return reference;
+  }
+
+  @Override
+  public boolean equals(Object other) {
     try {
-      return (BusinessPartner) (baseOBObject.getClass()).getMethod("getBusinessPartner",
-          new Class[0]).invoke(baseOBObject, new Object[0]);
+      return ((FIN_CandidateRecord) other).getBaseOBObject().getId()
+          .equals(getBaseOBObject().getId());
     } catch (Exception e) {
-      throw new OBException("Error while getting the FIN_CandidateRecord business partner");
+      return false;
     }
   }
 
-  public Date getDate() {
-    if (baseOBObject instanceof FIN_FinaccTransaction) {
-      return transaction.getDateAcct();
-    } else if (baseOBObject instanceof FIN_Payment) {
-      return payment.getPaymentDate();
-    } else if (baseOBObject instanceof Invoice) {
-      return invoice.getInvoiceDate();
-    } else if (baseOBObject instanceof Order) {
-      return order.getOrderDate();
-    } else {
-      throw new OBException(
-          "The FIN_CandidateRecord only accepts instances of FIN_FinaccTransaction/FIN_Payment/Invoice/Order, and the this object is instance of "
-              + baseOBObject.getClass().toString());
-    }
+  @Override
+  public int hashCode() {
+    HashCodeBuilder hcb = new HashCodeBuilder();
+    hcb.append(getBaseOBObject().getId());
+    return hcb.toHashCode();
   }
 
-  public BigDecimal getAmount() {
-    if (baseOBObject instanceof FIN_FinaccTransaction) {
-      return transaction.getPaymentAmount();
-    } else if (baseOBObject instanceof FIN_Payment) {
-      return payment.getAmount();
-    } else if (baseOBObject instanceof Invoice) {
-      return invoice.getGrandTotalAmount();
-    } else if (baseOBObject instanceof Order) {
-      return order.getGrandTotalAmount();
-    } else {
-      throw new OBException(
-          "The FIN_CandidateRecord only accepts instances of FIN_FinaccTransaction/FIN_Payment/Invoice/Order, and the this object is instance of "
-              + baseOBObject.getClass().toString());
-    }
+  public String toString() {
+    return matchedDoc + "-" + baseOBObject.getId();
   }
 
-  public String calculateAffinity(final BusinessPartner bpBankLine, final Date dateBankLine,
-      final BigDecimal amountBankLine) {
-    return calculateAffinity(bpBankLine, getBusinessPartner(), dateBankLine, getDate(),
-        amountBankLine, getAmount());
-  }
+  public String calculateAffinity(final FIN_BankStatementLine bankStatementLine) {
+    final BusinessPartner bankLineBP = bankStatementLine.getBusinessPartner();
+    final Date bankLineDate = bankStatementLine.getTransactionDate();
+    final BigDecimal bankLineAmt = bankStatementLine.getCramount().subtract(
+        bankStatementLine.getDramount());
+    final String bankLineReference = bankStatementLine.getReferenceNo();
 
-  public static String calculateAffinity(final BusinessPartner bpBankLine,
-      final BusinessPartner bpRecord, final Date dateBankLine, final Date dateRecord,
-      final BigDecimal amountBankLine, final BigDecimal amountRecord) {
-    int i = 0;
-    if (bpBankLine != null && bpBankLine.getId().equals(bpRecord.getId())) {
-      i++;
+    int affinityPoints = 0;
+    if (bankLineBP != null && StringUtils.equals(bankLineBP.getId(), businessPartner.getId())) {
+      affinityPoints++;
     }
-    if (dateBankLine != null && dateBankLine.equals(dateRecord)) {
-      i++;
+    if (bankLineDate != null && bankLineDate.equals(date)) {
+      affinityPoints++;
     }
-    if (amountBankLine != null && amountBankLine.compareTo(amountRecord) == 0) {
-      i++;
+    if (bankLineAmt != null && bankLineAmt.compareTo(amount) == 0) {
+      affinityPoints++;
+    }
+    if (StringUtils.contains(reference, bankLineReference)) {
+      affinityPoints++;
     }
 
-    // TODO define a better algorithm
-    return "TODO";
+    return Integer.toString(affinityPoints);
   }
 
   public Map<String, Object> toMap() {
-    // TODO other columns
     final Map<String, Object> map = new HashMap<String, Object>();
-
+    map.put("_identifier", toString());
     map.put("id", baseOBObject.getId());
-    map.put("ad_client_id", "23C59575B9CF467C9620760EB255B389");
-    map.put("ad_org_id", "B843C30461EA4501935CB1D125C9C25A");
-    map.put("createdby", "100");
-    map.put("updatedby", "100");
-    map.put("created", new Date());
-    map.put("updated", new Date());
-    map.put("isactive", "Y");
-    // map.put("affinity", affinity);
-    map.put("affinity", "dummy3");
+    map.put("affinity", getAffinity());
     map.put("date", getDate());
-    map.put("c_bpartner_id", getBusinessPartner().getId());
+    map.put("businessPartner", getBusinessPartner().getId());
+    map.put("businessPartner$_identifier", getBusinessPartner().getIdentifier());
     map.put("amount", getAmount());
-    map.put("date", new Date());
-
+    map.put("date", getDate());
+    map.put("matchedDoc", getMatchedDoc());
+    map.put("matchType", getMatchType());
+    map.put("reference", getReference());
     return map;
   }
 }