Merge lp:~openerp-dev/openobject-addons/trunk-bug-904029-ksa into lp:openobject-addons

[Kirti Savalia(OpenERP)]

[Rucha (Open ERP) (rpa-openerp)]

well it seems a nice improvement,
but if you see on bug report Ferdinand have a problem with the code "move.product_id.standard_price"
which is actually not in latest trunk, so there is no chance of problem,
Can you please check?

thanks

review: Approve

[Fabien (Open ERP) (fp-tinyerp)]

not sure it's good.
It has to be clear on which cost we take, and not one of the three.

review: Disapprove

[Kirti Savalia(OpenERP) (ksa-openerp)]

review: Needs Resubmitting

[Raphael Collet (OpenERP) (rco-openerp)]

review: Approve

Unmerged revisions

6169. By Kirti Savalia(OpenERP) on 2012-01-25

[MERGE]:with latest addons

6168. By Kirti Savalia(OpenERP) on 2012-01-25

[IMP]:use the price for move

6167. By Kirti Savalia(OpenERP) on 2011-12-27

[FIX]:average price value in stock move

=== modified file 'purchase/stock.py'
--- purchase/stock.py	2011-12-19 16:54:40 +0000
+++ purchase/stock.py	2012-01-25 11:46:26 +0000
@@ -127,7 +127,7 @@
     # incoming pickings.
     def _product_cost_for_average_update(self, cr, uid, move):
         if move.picking_id.purchase_id:
-            return {'cost': move.purchase_line_id.price_unit,
+            return {'cost': move.price_unit,
                     'currency': move.picking_id.purchase_id.pricelist_id.currency_id.id}
         return super(stock_partial_picking, self)._product_cost_for_average_update(cr, uid, move)