Merge lp:~openerp-dev/openobject-addons/6.1-opw-582922-msh into lp:openobject-addons/6.1

[Mohammed Shekha(Open ERP)]

Hello,

Fixed the issue of Product UOM, unit price was calculated wrong due to wrong UOM when unit price is calculated from partner section of the form.

Demo :- Do the following configuration of product.

Product Type: Stockable, Procurement Method: Make to order, Supply method: Buy, Sale Price: 20, Cost Price: 10

Default unit of measure: kg, Purchase unit of measure: kg, Unit of sale: 100g(obviosuly smaller than reference and 10 time smaller),

Define supplier in product say for example 'abc' which has pricelist as 1 Qty = 10, the supplier abc uses Default purchase price list for Purchase pricelist so whenever we will create purchase order for that supplier Default purchase pricelist will be used, Default purchase pricelist has Produce listprices items which has Based on value = Partner section of the product form.

Now with this product configuration create request for quotation, select partner 'abc' and select product which we have created with above configuration, you will see there is unit price difference, for 1 kg if we have set 10 in supplier section then still it gives 100 as a unit price.

Reason :- All calculation goes well for price_get and price_get_multi in pricelist.py but while calculating price(by calling _compute_price method) we have passed product.uos_id.id, there should be uom of context if context contains uom, if there is uom in context that means price_get is called from sale or purchase product_id_onchange, we already set uom in context from product_id_onchange of sale/purchase, so we should consider uom of context.

One more thing here there is problem with product_id and tmpl_id, while calculating partner_where we have fired a query SELECT name FROM product_supplierinfo WHERE product_id = %s, here product_id of product_supplierinfo has relationship with product_template so there should be tmpl_id not product_id because id of product and id of template will not always be same, so changed that also.

I have added a video for reference at https://docs.google.com/file/d/0B035wZ_8-uAIYXF6VzU2eGFVdzA/edit?pli=1

Thanks.

[lp:~openerp-dev/openobject-addons/6.1-opw-582922-msh]

7101. By Mohammed Shekha(Open ERP) on 2012-12-20

[FIX]Refixed the issue of UOM, fixed stupid mistake in previous commit

Unmerged revisions

7101. By Mohammed Shekha(Open ERP) on 2012-12-20

[FIX]Refixed the issue of UOM, fixed stupid mistake in previous commit

=== modified file 'mail/res_partner.py'
--- mail/res_partner.py	2012-12-12 15:48:10 +0000
+++ mail/res_partner.py	2012-12-20 06:39:23 +0000
@@ -28,12 +28,6 @@
     _columns = {
         'emails': fields.one2many('mail.message', 'partner_id', 'Emails', readonly=True, domain=[('email_from','!=',False)]),
     }
-    
-    def copy(self, cr, uid, id, default=None, context=None):
-        if not default:
-            default = {}
-        default = dict(default, emails=[])
-        return super(res_partner, self).copy(cr, uid, id, default=default, context=context)
 
 res_partner()
 
 
=== modified file 'product/pricelist.py'
--- product/pricelist.py	2012-01-31 13:36:57 +0000
+++ product/pricelist.py	2012-12-20 06:39:23 +0000
@@ -204,7 +204,7 @@
 
                 if partner:
                     partner_where = 'base <> -2 OR %s IN (SELECT name FROM product_supplierinfo WHERE product_id = %s) '
-                    partner_args = (partner, product_id)
+                    partner_args = (partner, tmpl_id)
                 else:
                     partner_where = 'base <> -2 '
                     partner_args = ()
@@ -288,8 +288,8 @@
                     results['item_id'] = res['id']
                     if 'uom' in context and not uom_price_already_computed:
                         product = products_dict[product_id]
-                        uom = product.uos_id or product.uom_id
-                        price = product_uom_obj._compute_price(cr, uid, uom.id, price, context['uom'])
+                        uom = context['uom']
+                        price = product_uom_obj._compute_price(cr, uid, uom, price, context['uom'])
 
                 if results.get(product_id):
                     results[product_id][pricelist_id] = price
 
=== modified file 'project/res_partner.py'
--- project/res_partner.py	2012-12-12 15:48:10 +0000
+++ project/res_partner.py	2012-12-20 06:39:23 +0000
@@ -28,12 +28,6 @@
     _columns = {
         'task_ids': fields.one2many('project.task', 'partner_id', 'Tasks'),
     }
-    
-    def copy(self, cr, uid, id, default=None, context=None):
-        if not default:
-            default = {}
-        default = dict(default, task_ids=[])
-        return super(res_partner, self).copy(cr, uid, id, default=default, context=context)
 
 res_partner()