Merge lp:~openerp-dev/openobject-addons/trunk-bug-1006494-ssu into lp:openobject-addons

[Saurang Suthar(OpenERP)]

Hello sir,

I have fixed the issue when the movement is processed of receiving the product, the account journal entry amount is differ from the actual result.

Thank you.
Saurang Suthar

[Harry (OpenERP) (hmo-tinyerp)]

it's seem good.

Thanks

review: Approve

[Harry (OpenERP) (hmo-tinyerp)]

oh.. sorry I forgot to check qty variable is used.

need to correct this.

review: Needs Fixing

Unmerged revisions

6894. By Saurang Suthar(OpenERP) on 2012-06-13

[FIX]stock:fixed the bug

=== modified file 'stock/stock.py'
--- stock/stock.py	2012-05-25 10:26:43 +0000
+++ stock/stock.py	2012-06-13 10:54:21 +0000
@@ -2198,12 +2198,11 @@
         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