Merge lp:~openerp-dev/openobject-addons/6.0-opw-576147-jap into lp:openobject-addons/6.0

[Jagdish Panchal (Open ERP)]

Hello,

Steps to Reproduce the issue:

1) Create an invoice, for CPU1 (discount 20%) and CPU2 (discount 30%) and Validate.

2) Go to Accounting>Reporting>Statistic Reports>invoice analysis the average price is wrong.

3) Average price should be calculated after deducting discount if any

This MP contains fix for this issue

Thanks

[Naresh(OpenERP) (nch-openerp)]

review: Approve

Unmerged revisions

5280. By Jagdish Panchal (Open ERP) on 2012-07-02

[FIX] account: Fix the problem wrong product average price in Invoices Analysis report(Maintenance Case : 576147)

=== modified file 'account/report/account_invoice_report.py'
--- account/report/account_invoice_report.py	2012-03-15 10:08:19 +0000
+++ account/report/account_invoice_report.py	2012-07-02 06:56:22 +0000
@@ -132,9 +132,9 @@
                             ELSE 1 
                             END) / cr.rate as price_total_tax,
                     (case when ai.type in ('out_refund','in_invoice') then
-                      sum(ail.quantity*ail.price_unit*-1)
+                      sum(ail.quantity*ail.price_subtotal*-1)
                     else
-                      sum(ail.quantity*ail.price_unit)
+                      sum(ail.quantity*ail.price_subtotal)
                     end) / (CASE WHEN
                          (case when ai.type in ('out_refund','in_invoice') 
                           then sum(ail.quantity/u.factor*-1)