details: https://code.openbravo.com/erp/devel/pi/rev/d77c65f59275
changeset: 18224:d77c65f59275
user: Carlos Aristu <carlos.aristu <at> openbravo.com>
date: Mon Oct 15 13:07:17 2012 +0200
summary: fixes issue 21864: Discount Invoice Report is not filtering properly
diffstat:
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceDiscount_data.xsql | 4
+++-
1 files changed, 3 insertions(+), 1 deletions(-)
diffs (21 lines):
diff -r 4b56827a346b -r d77c65f59275
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceDiscount_data.xsql
--- a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceDiscount_data.xsql
Mon Oct 15 09:41:26 2012 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceDiscount_data.xsql
Mon Oct 15 13:07:17 2012 +0200
@@ -48,7 +48,7 @@
C_CURRENCY_CONVERT(I.TOTALLINES, I.C_CURRENCY_ID, ?,
TO_DATE(COALESCE(I.DATEINVOICED, NOW())), NULL, I.AD_CLIENT_ID, I.AD_ORG_ID) AS
TOTALLINES,
C_CURRENCY_CONVERT(-SUM(LINENETAMT), I.C_CURRENCY_ID, ?,
TO_DATE(COALESCE(I.DATEINVOICED, NOW())), NULL, IL.AD_CLIENT_ID, IL.AD_ORG_ID)
AS DISCOUNTLINES
FROM C_INVOICE I, C_INVOICELINE IL
- WHERE I.C_INVOICE_ID = IL.C_INVOICE_ID AND IL.C_INVOICE_DISCOUNT_ID IS
NOT NULL
+ WHERE I.C_INVOICE_ID = IL.C_INVOICE_ID AND IL.C_INVOICE_DISCOUNT_ID IS
NOT NULL AND I.AD_CLIENT_ID IN ('1') AND I.AD_ORG_ID IN ('1')
GROUP BY I.C_INVOICE_ID, I.TOTALLINES, I.C_CURRENCY_ID, I.DATEINVOICED,
I.AD_CLIENT_ID, I.AD_ORG_ID, IL.AD_CLIENT_ID, IL.AD_ORG_ID) BB) A on
C_INVOICELINE.C_INVOICE_ID = A.C_INVOICE_ID
left join C_INVOICE on C_INVOICELINE.C_INVOICE_ID = C_INVOICE.C_INVOICE_ID
LEFT Join C_DOCTYPE on C_INVOICE.C_DOCTYPE_ID=C_DOCTYPE.C_DOCTYPE_ID,
@@ -76,6 +76,8 @@
<Parameter name="cCurrencyConv"/>
<Parameter name="cCurrencyConv"/>
<Parameter name="cCurrencyConv"/>
+ <Parameter name="adUserClient" type="replace" optional="true"
after="I.AD_CLIENT_ID IN (" text="'1'"/>
+ <Parameter name="adUserOrg" type="replace" optional="true"
after="I.AD_ORG_ID IN (" text="'1'"/>
<Parameter name="adUserClient" type="replace" optional="true"
after="C_INVOICE.AD_CLIENT_ID IN (" text="'1'"/>
<Parameter name="adUserOrg" type="replace" optional="true"
after="C_INVOICE.AD_ORG_ID IN (" text="'1'"/>
<Parameter name="datefrom"/>
------------------------------------------------------------------------------
Don't let slow site performance ruin your business. Deploy New Relic APM
Deploy New Relic app performance management and know exactly
what is happening inside your Ruby, Python, PHP, Java, and .NET app
Try New Relic at no cost today and get our sweet Data Nerd shirt too!
http://p.sf.net/sfu/newrelic-dev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
