From 39748abf8caf9a334d39ac9d1c9c14436d4d4764 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Mon, 5 Jan 2015 17:32:40 +0100 Subject: [PATCH] Revert "[FIX] stock_account: return product at purchased price" This reverts commit 1fd13fbe2bb32e55757b3d1950ac2aa2ada1b2ad. For FIFO it was not needed as the cost is already set to the returned quant. For standard price, this is wrong as the stock is reevaluated when the product price is changed. --- addons/stock_account/stock_account.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/addons/stock_account/stock_account.py b/addons/stock_account/stock_account.py index 78d33b8ae04..2fcc661c079 100644 --- a/addons/stock_account/stock_account.py +++ b/addons/stock_account/stock_account.py @@ -194,14 +194,7 @@ class stock_quant(osv.osv): if move.product_id.cost_method == 'average': valuation_amount = move.location_id.usage != 'internal' and move.location_dest_id.usage == 'internal' and cost or move.product_id.standard_price else: - # TODO check also in average price and correct product price - if move.origin_returned_move_id: - # use the original cost of the returned product to cancel the cost - valuation_amount = move.origin_returned_move_id.price_unit - elif move.product_id.cost_method == 'real': - valuation_amount = cost - else: - valuation_amount = move.product_id.standard_price + valuation_amount = move.product_id.cost_method == 'real' and cost or move.product_id.standard_price #the standard_price of the product may be in another decimal precision, or not compatible with the coinage of #the company currency... so we need to use round() before creating the accounting entries. valuation_amount = currency_obj.round(cr, uid, move.company_id.currency_id, valuation_amount * qty)