Merge lp:~openerp-dev/openobject-addons/trunk-bug-1154223-dka into lp:openobject-addons

[Darshan Kalola(OpenERP)]

Hello sir,

    I have fixed the issue , price_total miscalculated in Turnover Report when COA and invoice in USD.

thanks,
Darshan.

Unmerged revisions

8983. By Darshan Kalola(OpenERP) on 2013-11-19

[FIX]USD price_total miscalculated in Turnover Report

=== modified file 'account/report/account_invoice_report.py'
--- account/report/account_invoice_report.py	2013-05-14 12:05:18 +0000
+++ account/report/account_invoice_report.py	2013-11-21 04:57:26 +0000
@@ -109,7 +109,13 @@
                 sub.payment_term, sub.period_id, sub.uom_name, sub.currency_id, sub.journal_id,
                 sub.fiscal_position, sub.user_id, sub.company_id, sub.nbr, sub.type, sub.state,
                 sub.categ_id, sub.date_due, sub.account_id, sub.account_line_id, sub.partner_bank_id,
-                sub.product_qty, sub.price_total / cr.rate as price_total, sub.price_average /cr.rate as price_average,
+                sub.product_qty, 
+                CASE
+                 WHEN (SELECT currency_id FROM res_company WHERE id = sub.company_id) <> sub.currency_id
+                    THEN sub.price_total / cr.rate
+                    ELSE sub.price_total
+                END AS price_total,
+                sub.price_average /cr.rate as price_average,
                 cr.rate as currency_rate, sub.residual / cr.rate as residual, sub.commercial_partner_id as commercial_partner_id
         """
         return select_str