openerp-dev-web team mailing list archive

["Nehal Panchal \(Open ERP\)" <nep@xxxxxxxxxxx>]

Nehal Panchal (Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/6.0-bug-740964-nep into lp:openobject-addons/6.0.

Requested reviews:
  Anup(OpenERP) (ach-openerp)
Related bugs:
  Bug #740964 in OpenERP Addons: "Stock Input/Output Accounts doesn't work well"
  https://bugs.launchpad.net/openobject-addons/+bug/740964

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-bug-740964-nep/+merge/62956
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-bug-740964-nep/+merge/62956
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/6.0-bug-740964-nep.

=== modified file 'purchase/stock.py'
--- purchase/stock.py	2011-01-19 01:17:24 +0000
+++ purchase/stock.py	2011-05-31 09:24:45 +0000
@@ -40,7 +40,8 @@
             # no average price costing or cost not specified during picking validation, we will
             # plug the purchase line values if they are found.
             if move.purchase_line_id and move.picking_id.purchase_id.pricelist_id:
-                reference_amount, reference_currency_id = move.purchase_line_id.price_unit, move.picking_id.purchase_id.pricelist_id.currency_id.id
+                qty = self.pool.get('product.uom')._compute_qty(cr, uid, move.product_uom.id, move.product_qty, move.product_id.uom_id.id)
+                reference_amount, reference_currency_id = move.purchase_line_id.price_unit * qty, move.picking_id.purchase_id.pricelist_id.currency_id.id
         return reference_amount, reference_currency_id
 
 stock_move()