odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] merged bugfix 722961 

bzr revid: qdp-launchpad@openerp.com-20110225145347-p4x82nevh09nnhdr
This commit is contained in:
Quentin (OpenERP) 2011-02-25 15:53:47 +01:00
parent 41b6096a08 65590cba92
commit 45f264dca7
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/purchase/stock.py
View File

@ -35,12 +35,16 @@ class stock_move(osv.osv):
on the purchase order in case the valuation data was not directly specified during picking
confirmation.
"""
product_uom_obj = self.pool.get('product.uom')
reference_amount, reference_currency_id = super(stock_move, self)._get_reference_accounting_values_for_valuation(cr, uid, move, context=context)
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 move.product_id.cost_method != 'average' or not move.price_unit:
# 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
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()