details: https://code.openbravo.com/erp/devel/pi/rev/be5c334a0dcb
changeset: 17804:be5c334a0dcb
user: David Miguelez <david.miguelez <at> openbravo.com>
date: Wed Aug 29 16:35:21 2012 +0200
summary: Fixes issue 21497: Moves part of the filter clause to the where
clause.
Also fixes reference, from tableDir to search and fixes ad_element names.
diffstat:
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml
| 2 +-
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml
| 4 ++--
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
| 4 ++--
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml
| 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diffs (69 lines):
diff -r f7b62f3e8e34 -r be5c334a0dcb
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml
Wed Aug 29 14:17:29 2012 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml
Wed Aug 29 16:35:21 2012 +0200
@@ -6951,7 +6951,7 @@
<!--A9FAC7D05AED45A28899DDFDF1D1D6E0--> <DESCRIPTION><![CDATA[It is the
method by which payment is expected to be made or received.]]></DESCRIPTION>
<!--A9FAC7D05AED45A28899DDFDF1D1D6E0-->
<COLUMNNAME><![CDATA[FIN_Paymentmethod_ID]]></COLUMNNAME>
<!--A9FAC7D05AED45A28899DDFDF1D1D6E0-->
<AD_TABLE_ID><![CDATA[DC814AB3BC84486CA5411131724BC95A]]></AD_TABLE_ID>
-<!--A9FAC7D05AED45A28899DDFDF1D1D6E0-->
<AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--A9FAC7D05AED45A28899DDFDF1D1D6E0-->
<AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
<!--A9FAC7D05AED45A28899DDFDF1D1D6E0-->
<FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
<!--A9FAC7D05AED45A28899DDFDF1D1D6E0--> <ISKEY><![CDATA[N]]></ISKEY>
<!--A9FAC7D05AED45A28899DDFDF1D1D6E0--> <ISPARENT><![CDATA[N]]></ISPARENT>
diff -r f7b62f3e8e34 -r be5c334a0dcb
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml
Wed Aug 29 14:17:29 2012 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml
Wed Aug 29 16:35:21 2012 +0200
@@ -90,7 +90,7 @@
<!--583D70554DDA45BD8C80C0AF11C64FC5--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--583D70554DDA45BD8C80C0AF11C64FC5--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--583D70554DDA45BD8C80C0AF11C64FC5-->
<COLUMNNAME><![CDATA[Invoice_Documentno]]></COLUMNNAME>
-<!--583D70554DDA45BD8C80C0AF11C64FC5--> <NAME><![CDATA[Invoice
Documentno]]></NAME>
+<!--583D70554DDA45BD8C80C0AF11C64FC5--> <NAME><![CDATA[Invoice Document
No.]]></NAME>
<!--583D70554DDA45BD8C80C0AF11C64FC5-->
<PRINTNAME><![CDATA[Invoice_Documentno]]></PRINTNAME>
<!--583D70554DDA45BD8C80C0AF11C64FC5-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
<!--583D70554DDA45BD8C80C0AF11C64FC5--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
@@ -126,7 +126,7 @@
<!--64B01B6184B84599B2B073BC7971EA19--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--64B01B6184B84599B2B073BC7971EA19--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--64B01B6184B84599B2B073BC7971EA19-->
<COLUMNNAME><![CDATA[Order_Documentno]]></COLUMNNAME>
-<!--64B01B6184B84599B2B073BC7971EA19--> <NAME><![CDATA[Order
Documentno]]></NAME>
+<!--64B01B6184B84599B2B073BC7971EA19--> <NAME><![CDATA[Order Document
No.]]></NAME>
<!--64B01B6184B84599B2B073BC7971EA19-->
<PRINTNAME><![CDATA[Order_Documentno]]></PRINTNAME>
<!--64B01B6184B84599B2B073BC7971EA19-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
<!--64B01B6184B84599B2B073BC7971EA19--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
diff -r f7b62f3e8e34 -r be5c334a0dcb
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
Wed Aug 29 14:17:29 2012 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
Wed Aug 29 16:35:21 2012 +0200
@@ -8765,7 +8765,7 @@
<!--8AFD30956A0E4A079AA0D80B41A0A494-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--8AFD30956A0E4A079AA0D80B41A0A494--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--8AFD30956A0E4A079AA0D80B41A0A494--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8AFD30956A0E4A079AA0D80B41A0A494--> <NAME><![CDATA[Order
Documentno]]></NAME>
+<!--8AFD30956A0E4A079AA0D80B41A0A494--> <NAME><![CDATA[Order Document
No.]]></NAME>
<!--8AFD30956A0E4A079AA0D80B41A0A494-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--8AFD30956A0E4A079AA0D80B41A0A494-->
<AD_TAB_ID><![CDATA[81644A22CC4D4B879AA71C33C30E00A4]]></AD_TAB_ID>
<!--8AFD30956A0E4A079AA0D80B41A0A494-->
<AD_COLUMN_ID><![CDATA[02EF18D28F1B4C43ADF91B3E73C2BF12]]></AD_COLUMN_ID>
@@ -12548,7 +12548,7 @@
<!--B4F12711D3DB4B14B7D0ADF22EBEB981-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
<!--B4F12711D3DB4B14B7D0ADF22EBEB981--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--B4F12711D3DB4B14B7D0ADF22EBEB981--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--B4F12711D3DB4B14B7D0ADF22EBEB981--> <NAME><![CDATA[Invoice
Documentno]]></NAME>
+<!--B4F12711D3DB4B14B7D0ADF22EBEB981--> <NAME><![CDATA[Invoice Document
No.]]></NAME>
<!--B4F12711D3DB4B14B7D0ADF22EBEB981-->
<ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--B4F12711D3DB4B14B7D0ADF22EBEB981-->
<AD_TAB_ID><![CDATA[81644A22CC4D4B879AA71C33C30E00A4]]></AD_TAB_ID>
<!--B4F12711D3DB4B14B7D0ADF22EBEB981-->
<AD_COLUMN_ID><![CDATA[41DAD5FF72274650A3C41D103F20C111]]></AD_COLUMN_ID>
diff -r f7b62f3e8e34 -r be5c334a0dcb
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml
Wed Aug 29 14:17:29 2012 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml
Wed Aug 29 16:35:21 2012 +0200
@@ -251,9 +251,9 @@
<!--81644A22CC4D4B879AA71C33C30E00A4--> <ISSORTTAB><![CDATA[N]]></ISSORTTAB>
<!--81644A22CC4D4B879AA71C33C30E00A4-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
<!--81644A22CC4D4B879AA71C33C30E00A4--> <UIPATTERN><![CDATA[STD]]></UIPATTERN>
-<!--81644A22CC4D4B879AA71C33C30E00A4-->
<HQLWHERECLAUSE><![CDATA[((e.obSelected = true and e.paymentProposal.id =
@FIN_Payment_Proposal.id@) or e.obSelected = false) and e.salesTransaction =
false]]></HQLWHERECLAUSE>
+<!--81644A22CC4D4B879AA71C33C30E00A4-->
<HQLWHERECLAUSE><![CDATA[((e.obSelected = true and e.paymentProposal.id =
@FIN_Payment_Proposal.id@) or e.obSelected = false) and e.salesTransaction =
false and e.currency.id= @FIN_Payment_Proposal.currency@ and
(@FIN_Payment_Proposal.businessPartner@ is null OR
@FIN_Payment_Proposal.businessPartner@ = '' OR
@FIN_Payment_Proposal.businessPartner@ = e.businessPartner.id) and
(@FIN_Payment_Proposal.duedate@ = '' OR @FIN_Payment_Proposal.duedate@ is null
OR @FIN_Payment_Proposal.duedate@ = 'null' OR e.expectedDate <=
to_date(@FIN_Payment_Proposal.duedate@,'YYYY-MM-DD'))]]></HQLWHERECLAUSE>
<!--81644A22CC4D4B879AA71C33C30E00A4--> <HQLORDERBYCLAUSE><![CDATA[obSelected
desc, paymentPriority, expectedDate, coalesce(orderDocumentno,
invoiceorderDocumentno)]]></HQLORDERBYCLAUSE>
-<!--81644A22CC4D4B879AA71C33C30E00A4-->
<HQLFILTERCLAUSE><![CDATA[(e.obSelected = true) OR (e.paymentMethod.id =
@FIN_Payment_Proposal.paymentMethod@ and e.currency.id=
@FIN_Payment_Proposal.currency@ and (@FIN_Payment_Proposal.businessPartner@ is
null OR @FIN_Payment_Proposal.businessPartner@ = '' OR
@FIN_Payment_Proposal.businessPartner@ = e.businessPartner.id) and
(@FIN_Payment_Proposal.duedate@ = '' OR @FIN_Payment_Proposal.duedate@ is null
OR e.expectedDate <=
to_date(@FIN_Payment_Proposal.duedate@,'YYYY-MM-DD')))]]></HQLFILTERCLAUSE>
+<!--81644A22CC4D4B879AA71C33C30E00A4-->
<HQLFILTERCLAUSE><![CDATA[(e.obSelected = true) OR (e.paymentMethod.id =
@FIN_Payment_Proposal.paymentMethod@)]]></HQLFILTERCLAUSE>
<!--81644A22CC4D4B879AA71C33C30E00A4-->
<SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
<!--81644A22CC4D4B879AA71C33C30E00A4-->
<EM_OBUIAPP_SELECTION><![CDATA[OB.APRM.selectionChangePaymentProposalPickAndEdit]]></EM_OBUIAPP_SELECTION>
<!--81644A22CC4D4B879AA71C33C30E00A4-->
<EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
