Merge lp:~openerp-dev/openobject-addons/7.0-opw-597108-dhs into lp:openobject-addons/7.0

[Dhruti Shastri(OpenERP)]

Hello Sir,

[FIX]purchase: Button "Process Entirely" doesn't update average price

Steps to reproduce this issue,
1. Create product having (average) cost Price = 100
2. Now Create purchase order with this product but with cost price 200.
3. Go to Incoming shipment and receive product with option "Process Entirely"

Expected result:

* Product cost price should be updated with 200.

[Vinay Rana (OpenERP) (vra-openerp)]

The Propose Fix will fixes the average costing calculation for stock move entire button.

review: Approve

Unmerged revisions

9527. By Dhruti Shastri(OpenERP) on 2013-10-17

[purcahse]:In Warehouse button Process Entirely is not updating average cost(case:597108)

=== modified file 'purchase/stock.py'
--- purchase/stock.py	2012-12-06 14:56:32 +0000
+++ purchase/stock.py	2013-10-17 06:42:46 +0000
@@ -28,6 +28,41 @@
             'Purchase Order Line', ondelete='set null', select=True,
             readonly=True),
     }
+    
+    def action_done(self, cr, uid, ids, context=None):
+            """ Inherited action of stock to compute cost price based on Purchase order
+            line.
+            @return:
+            """
+            # This fucntion doesn't calculate Cost Price for Average Method
+            for move in self.browse(cr, uid, ids, context=context):
+                if (move.picking_id.type == 'in') and (move.product_id.cost_method == 'average'):
+                    product_obj = self.pool.get('product.product')
+                    currency_obj = self.pool.get('res.currency')
+                    uom_obj = self.pool.get('product.uom')
+                    product = product_obj.browse(cr, uid, move.product_id.id)
+                    move_currency_id = move.company_id.currency_id.id
+                    context['currency_id'] = move_currency_id
+                    qty = uom_obj._compute_qty(cr, uid, move.product_uom.id, move.product_qty, product.uom_id.id)
+                    if move.product_qty > 0:
+                        amount_unit = product.price_get('standard_price', context=context)[product.id]
+                        price_unit = amount_unit
+                        if move.purchase_line_id :
+                            purchase_obj = self.pool.get('purchase.order.line').browse(cr, uid, move.purchase_line_id.id)
+                            price_unit = purchase_obj.price_unit
+                        if qty > 0:
+                                new_price = currency_obj.compute(cr, uid, move.price_currency_id.id,
+                                        move_currency_id, price_unit)
+                                new_price = uom_obj._compute_price(cr, uid, move.product_uom.id, new_price,
+                                        product.uom_id.id)
+                                if product.qty_available <= 0:
+                                    new_std_price = new_price
+                                else :    
+                                    new_std_price = ((amount_unit * product.qty_available)\
+                                                     + (price_unit * move.product_qty))/(product.qty_available + move.product_qty)
+                        product_obj.write(cr, uid, [product.id],{'standard_price': new_std_price})
+            
+            return super(stock_move, self).action_done(cr, uid, ids, context=None)
 
 stock_move()