Merge lp:~openerp-dev/openobject-addons/trunk-bug-937669-mma into lp:openobject-addons

[Mayur Maheshwari(OpenERP)]

Hello,

    stock: passed move product qty in reference amount

Thanks.
mma

Unmerged revisions

6668. By Graeme Gellatly on 2012-03-12

[FIX]stock: passed move product qty in reference amount

=== modified file 'stock/stock.py'
--- stock/stock.py	2012-02-28 14:08:16 +0000
+++ stock/stock.py	2012-03-12 10:32:21 +0000
@@ -2149,13 +2149,10 @@
         # by default the reference currency is that of the move's company
         reference_currency_id = move.company_id.currency_id.id
 
-        default_uom = move.product_id.uom_id.id
-        qty = product_uom_obj._compute_qty(cr, uid, move.product_uom.id, move.product_qty, default_uom)
-
         # if product is set to average price and a specific value was entered in the picking wizard,
         # we use it
         if move.product_id.cost_method == 'average' and move.price_unit:
-            reference_amount = qty * move.price_unit
+            reference_amount = move.product_qty * move.price_unit
             reference_currency_id = move.price_currency_id.id or reference_currency_id
 
         # Otherwise we default to the company's valuation price type, considering that the values of the
@@ -2163,8 +2160,10 @@
         else:
             if context is None:
                 context = {}
-            currency_ctx = dict(context, currency_id = move.company_id.currency_id.id)
+            currency_ctx = dict(context, currency_id = reference_currency_id)
             amount_unit = move.product_id.price_get('standard_price', context=currency_ctx)[move.product_id.id]
+            default_uom = move.product_id.uom_id.id
+            qty = product_uom_obj._compute_qty(cr, uid, move.product_uom.id, move.product_qty, default_uom)
             reference_amount = amount_unit * qty or 1.0
 
         return reference_amount, reference_currency_id