Merge lp:~openerp-dev/openobject-addons/6.0-opw-574271-skh into lp:openobject-addons/6.0

[Somesh Khare]

Hello Sir,

{fix]: When we merge 2 Purchase order from the same Supplier, It merges the PO line but did not consider the price-list defined on the product form.
Scenario:
1. Create a "test product" and go-to Supplier tab.
2. Select a Supplier "Test Supplier" and define the price line eg: Qty =0-9 have price =100, Qty = 10-19 has price =90 and Qty = 20 and above has price =80.
3. Now create 2 PO with qty 10 in each(product price = 90), for same supplier as "Test Supplier" and merge the PO.
4. New created PO has qty=20 but the price is 90 where it should be 80.

This branch fixes the issue.

Thanks,
Somesh Khare

[Naresh(OpenERP) (nch-openerp)]

review: Approve

Unmerged revisions

5217. By Somesh Khare on 2012-05-01

[FIX] Purchase: Mergin of purchase order did not consider the Supplier Pricelist on the product form(Case: ref 574271)

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2012-03-20 10:37:52 +0000
+++ purchase/purchase.py	2012-05-01 11:17:22 +0000
@@ -574,22 +574,25 @@
                     order_infos['origin'] = (order_infos['origin'] or '') + ' ' + porder.origin
 
             for order_line in porder.order_line:
-                line_key = make_key(order_line, ('name', 'date_planned', 'taxes_id', 'price_unit', 'notes', 'product_id', 'move_dest_id', 'account_analytic_id'))
+                line_key = make_key(order_line, ('name', 'date_planned', 'taxes_id', 'notes', 'product_id', 'move_dest_id', 'account_analytic_id'))
                 o_line = order_infos['order_line'].setdefault(line_key, {})
                 if o_line:
                     # merge the line with an existing line
                     o_line['product_qty'] += order_line.product_qty * order_line.product_uom.factor / o_line['uom_factor']
+                    o_line['price_unit'] = self.pool.get('product.pricelist').price_get(cr,uid,[order_infos['pricelist_id']],
+                    order_line.product_id.id, o_line['product_qty'] or 1.0, order_infos['partner_id'], {
+                        'uom': o_line['product_uom'],
+                        'date': time.strftime('%Y-%m-%d'),
+                        })[order_infos['pricelist_id']]
                 else:
                     # append a new "standalone" line
-                    for field in ('product_qty', 'product_uom'):
+                    for field in ('product_qty', 'product_uom','price_unit'):
                         field_val = getattr(order_line, field)
                         if isinstance(field_val, browse_record):
                             field_val = field_val.id
                         o_line[field] = field_val
                     o_line['uom_factor'] = order_line.product_uom and order_line.product_uom.factor or 1.0
 
-
-
         allorders = []
         orders_info = {}
         for order_key, (order_data, old_ids) in new_orders.iteritems():
@@ -597,13 +600,12 @@
             if len(old_ids) < 2:
                 allorders += (old_ids or [])
                 continue
-
+            
             # cleanup order line data
             for key, value in order_data['order_line'].iteritems():
                 del value['uom_factor']
                 value.update(dict(key))
             order_data['order_line'] = [(0, 0, value) for value in order_data['order_line'].itervalues()]
-
             # create the new order
             neworder_id = self.create(cr, uid, order_data)
             orders_info.update({neworder_id: old_ids})