Fixes issue 31441 & Fixes issue 31443: Add two new columns in Match Statement
authorAlvaro Ferraz <alvaro.ferraz@openbravo.com>
Wed, 11 Nov 2015 20:01:21 +0100
changeset 28104 b2793ba35559
parent 28103 9e87509d3090
child 28105 12dfd7922c07
Fixes issue 31441 & Fixes issue 31443: Add two new columns in Match Statement

Added Business Partner Name and Transaction Description as new fields in Match Statement P&E window. They will not be shown in grid by default.
HQL Query in aprm_matchstatement table has been modified to retrieve this two new columns from FIN_BankStatementLine and FIN_Finacc_Transaction tables, and to retrieve bp.name as businessPartner also in case it is null.
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml	Tue Nov 10 19:05:45 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml	Wed Nov 11 20:01:21 2015 +0100
@@ -6532,6 +6532,41 @@
 <!--93E0298CEA7A446B863D7D3456A1157E-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--93E0298CEA7A446B863D7D3456A1157E--></AD_COLUMN>
 
+<!--952500641B5A4EC8883B5204EC4870ED--><AD_COLUMN>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <AD_COLUMN_ID><![CDATA[952500641B5A4EC8883B5204EC4870ED]]></AD_COLUMN_ID>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <NAME><![CDATA[Bpartnername]]></NAME>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <DESCRIPTION><![CDATA[Business Partner Name]]></DESCRIPTION>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <HELP><![CDATA[Business Partner Name]]></HELP>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <COLUMNNAME><![CDATA[Bpartnername]]></COLUMNNAME>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <AD_TABLE_ID><![CDATA[BC21981DCF0846338D631887BEDFE7FA]]></AD_TABLE_ID>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <SEQNO><![CDATA[200]]></SEQNO>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <AD_ELEMENT_ID><![CDATA[8189F49FFECC6E56E040007F01003E83]]></AD_ELEMENT_ID>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--952500641B5A4EC8883B5204EC4870ED-->  <ENTITY_ALIAS><![CDATA[bsl.bpartnername]]></ENTITY_ALIAS>
+<!--952500641B5A4EC8883B5204EC4870ED--></AD_COLUMN>
+
 <!--96221416E24540059B9BEFEC5F09D3FF--><AD_COLUMN>
 <!--96221416E24540059B9BEFEC5F09D3FF-->  <AD_COLUMN_ID><![CDATA[96221416E24540059B9BEFEC5F09D3FF]]></AD_COLUMN_ID>
 <!--96221416E24540059B9BEFEC5F09D3FF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -10026,6 +10061,7 @@
 <!--C5814D2F8ECC4DF798BEFA235A7352B9-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
 <!--C5814D2F8ECC4DF798BEFA235A7352B9-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
 <!--C5814D2F8ECC4DF798BEFA235A7352B9-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--C5814D2F8ECC4DF798BEFA235A7352B9-->  <ENTITY_ALIAS><![CDATA[bsl.description]]></ENTITY_ALIAS>
 <!--C5814D2F8ECC4DF798BEFA235A7352B9--></AD_COLUMN>
 
 <!--C72EC790B2EF4BEEA2A843D30770B85D--><AD_COLUMN>
@@ -10341,6 +10377,41 @@
 <!--D9CE146DA825427A9F0132F13599424B-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--D9CE146DA825427A9F0132F13599424B--></AD_COLUMN>
 
+<!--DB65D341BFA24AC697482DCCE1731C6A--><AD_COLUMN>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <AD_COLUMN_ID><![CDATA[DB65D341BFA24AC697482DCCE1731C6A]]></AD_COLUMN_ID>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <NAME><![CDATA[fatDescription]]></NAME>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <DESCRIPTION><![CDATA[A space to write additional related information.]]></DESCRIPTION>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <HELP><![CDATA[A description is limited to 255 characters.]]></HELP>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <COLUMNNAME><![CDATA[fatDescription]]></COLUMNNAME>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <AD_TABLE_ID><![CDATA[BC21981DCF0846338D631887BEDFE7FA]]></AD_TABLE_ID>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <SEQNO><![CDATA[210]]></SEQNO>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <AD_ELEMENT_ID><![CDATA[275]]></AD_ELEMENT_ID>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--DB65D341BFA24AC697482DCCE1731C6A-->  <ENTITY_ALIAS><![CDATA[fat.description]]></ENTITY_ALIAS>
+<!--DB65D341BFA24AC697482DCCE1731C6A--></AD_COLUMN>
+
 <!--E156A67751484C5A9D367C235769BB24--><AD_COLUMN>
 <!--E156A67751484C5A9D367C235769BB24-->  <AD_COLUMN_ID><![CDATA[E156A67751484C5A9D367C235769BB24]]></AD_COLUMN_ID>
 <!--E156A67751484C5A9D367C235769BB24-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml	Tue Nov 10 19:05:45 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml	Wed Nov 11 20:01:21 2015 +0100
@@ -6440,6 +6440,34 @@
 <!--5826408A05044E458F0DCFDB9696C82C-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--5826408A05044E458F0DCFDB9696C82C--></AD_FIELD>
 
+<!--58D6982C3BD046EB831A9D61095B763F--><AD_FIELD>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <AD_FIELD_ID><![CDATA[58D6982C3BD046EB831A9D61095B763F]]></AD_FIELD_ID>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <NAME><![CDATA[Transaction Description]]></NAME>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <DESCRIPTION><![CDATA[A space to write additional related information.]]></DESCRIPTION>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <HELP><![CDATA[A description is limited to 255 characters.]]></HELP>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <AD_TAB_ID><![CDATA[ED54A4E24196476596955286D403461E]]></AD_TAB_ID>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <AD_COLUMN_ID><![CDATA[DB65D341BFA24AC697482DCCE1731C6A]]></AD_COLUMN_ID>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <SEQNO><![CDATA[110]]></SEQNO>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--58D6982C3BD046EB831A9D61095B763F-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--58D6982C3BD046EB831A9D61095B763F--></AD_FIELD>
+
 <!--58DEB15AC19842A9AE2D92B136A040E2--><AD_FIELD>
 <!--58DEB15AC19842A9AE2D92B136A040E2-->  <AD_FIELD_ID><![CDATA[58DEB15AC19842A9AE2D92B136A040E2]]></AD_FIELD_ID>
 <!--58DEB15AC19842A9AE2D92B136A040E2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -8632,6 +8660,34 @@
 <!--797FE216F70D4B318CEB1FE6C1EA7B5E-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--797FE216F70D4B318CEB1FE6C1EA7B5E--></AD_FIELD>
 
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C--><AD_FIELD>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <AD_FIELD_ID><![CDATA[7985E4F3C77F40DEB85E9BBDBACCD28C]]></AD_FIELD_ID>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <NAME><![CDATA[Business Partner Name]]></NAME>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <DESCRIPTION><![CDATA[Business Partner Name]]></DESCRIPTION>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <HELP><![CDATA[Business Partner Name]]></HELP>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <AD_TAB_ID><![CDATA[ED54A4E24196476596955286D403461E]]></AD_TAB_ID>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <AD_COLUMN_ID><![CDATA[952500641B5A4EC8883B5204EC4870ED]]></AD_COLUMN_ID>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <SEQNO><![CDATA[25]]></SEQNO>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--7985E4F3C77F40DEB85E9BBDBACCD28C--></AD_FIELD>
+
 <!--7A169944D6C3486EBB925F5C3E5F9830--><AD_FIELD>
 <!--7A169944D6C3486EBB925F5C3E5F9830-->  <AD_FIELD_ID><![CDATA[7A169944D6C3486EBB925F5C3E5F9830]]></AD_FIELD_ID>
 <!--7A169944D6C3486EBB925F5C3E5F9830-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml	Tue Nov 10 19:05:45 2015 +0100
+++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml	Wed Nov 11 20:01:21 2015 +0100
@@ -205,10 +205,10 @@
 <!--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 banklineDate, case when bp is null then bsl.bpartnername  else bp.name end AS businessPartner, bsl.referenceNo as referenceNo, bsl.cramount - bsl.dramount as amount, bsl.id as match, bsl.matchingtype as affinity, 
+<!--BC21981DCF0846338D631887BEDFE7FA-->  <HQLQUERY><![CDATA[select bsl.transactionDate as banklineDate, case when bp is null then bsl.bpartnername  else bp.name end AS businessPartner, bsl.bpartnername AS Bpartnername, bsl.referenceNo as referenceNo, bsl.cramount - bsl.dramount as amount, bsl.id as match, bsl.matchingtype as affinity, 
 case when fat is null then false else true end AS cleared,
 bsl.matchingtype as matchingtype, bsl.id as id, 
-fat.transactionDate as transactionDate, transactionBP.name as transactionBPName, fat.depositAmount - fat.paymentAmount as transactionAmount, bsl.lineNo as lineNo, fat as fin_finacc_transaction_id, bsl.description, case when bsl.cramount - bsl.dramount >0 then 'D' else 'P' end as type, bsl.matchedDocument, transactionGLItem.name as transactionGLItemName, glitem.name as glitemName, bsl.updated as bslUpdated
+fat.transactionDate as transactionDate, transactionBP.name as transactionBPName, fat.depositAmount - fat.paymentAmount as transactionAmount, bsl.lineNo as lineNo, fat as fin_finacc_transaction_id, bsl.description as description, fat.description as fatDescription, case when bsl.cramount - bsl.dramount >0 then 'D' else 'P' end as type, bsl.matchedDocument, transactionGLItem.name as transactionGLItemName, glitem.name as glitemName, bsl.updated as bslUpdated
  @selectClause@
 from FIN_BankStatementLine as bsl
  join bsl.bankStatement as bs