Merge lp:~openerp-dev/openobject-addons/trunk-opw-577224-port-mma into lp:openobject-addons

[Mayur Maheshwari(OpenERP)]

Hello,

  I have Fixed the issue of currency conversion in sales analysis report.
  sales with different currency but in sale analysis report Total price should be convert with
  Base currency of company.
  e.g
     create a sale order with GBP, USD and EUR(Price lsit) in order line it will convert properly according to currency rate with base currency.But in sales analysis report it is not converting Total price with base currency.

   code is forward port from 6.1

Thanks,
Mayur

[Fabien (Open ERP) (fp-tinyerp)]

invalid fix, you must use the price from the SO, not the product (eventually with a currency conversion)

review: Disapprove

[Mayur Maheshwari(OpenERP) (mma-openerp)]

Hello

   I haveimprove code and now use price from the so with currency conversion

Thanks,
Mayur

Unmerged revisions

8106. By Mayur Maheshwari(OpenERP) on 2012-12-19

[IMP]sale: use unit price on so with a currency conversion to fix total price was not reflecting in currency conversion

8105. By Hardik Ansodariya (OpenERP) on 2012-11-23

[FIX]sale_report: Total price was not reflecting in currency conversion

=== modified file 'sale/report/sale_report.py'
--- sale/report/sale_report.py	2012-12-06 14:56:32 +0000
+++ sale/report/sale_report.py	2012-12-19 05:59:28 +0000
@@ -70,7 +70,7 @@
                     l.product_id as product_id,
                     t.uom_id as product_uom,
                     sum(l.product_uom_qty / u.factor * u2.factor) as product_uom_qty,
-                    sum(l.product_uom_qty * l.price_unit * (100.0-l.discount) / 100.0) as price_total,
+                    sum(l.product_uom_qty * (l.price_unit/cr.rate) * (100.0-l.discount) / 100.0) as price_total,
                     1 as nbr,
                     s.date_order as date,
                     s.date_confirm as date_confirm,
@@ -88,12 +88,18 @@
                     s.project_id as analytic_account_id
                 from
                     sale_order s
+                    left join product_pricelist pp on (pp.id=s.pricelist_id)
                     left join sale_order_line l on (s.id=l.order_id)
-                        left join product_product p on (l.product_id=p.id)
-                            left join product_template t on (p.product_tmpl_id=t.id)
+                    left join product_product p on (l.product_id=p.id)
+                    left join product_template t on (p.product_tmpl_id=t.id)
                     left join product_uom u on (u.id=l.product_uom)
                     left join product_uom u2 on (u2.id=t.uom_id)
+                    left join res_currency_rate cr on (cr.currency_id=pp.currency_id)
                 where l.product_id is not null
+                AND cr.id IN (SELECT id FROM res_currency_rate cr2
+                    WHERE (cr2.currency_id = pp.currency_id)
+                    AND (cr.name <= NOW())
+                    ORDER BY name DESC LIMIT 1)
                 group by
                     l.product_id,
                     l.product_uom_qty,