Merge lp:~openerp-dev/openobject-addons/trunk-opw-578009-port-mma into lp:openobject-addons

[Mayur Maheshwari(OpenERP)]

Hello,

Notes field of sale order lines is not being translated in customer's language.

This fixes the issue.
Code is forward port from 6.1

Thanks,
Mayur

[Olivier Dony (Odoo) (odo-openerp)]

Obviously this patch was not tested, as product_obj is reused after being redefined as a browse_record - so the name_get calls will always fail. Please at least test your patches before creating merge proposals -- especially here as it seems you added an extra change to the original patch for 6.1.

review: Disapprove

=== modified file 'sale/sale.py'
--- sale/sale.py	2012-10-26 15:34:36 +0000
+++ sale/sale.py	2012-11-01 13:02:28 +0000
@@ -903,7 +903,7 @@
 
         result = {}
         warning_msgs = {}
-        product_obj = product_obj.browse(cr, uid, product, context=context)
+        product_obj = product_obj.browse(cr, uid, product, context=context_partner)
 
         uom2 = False
         if uom:
@@ -922,7 +922,7 @@
             result['tax_id'] = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, product_obj.taxes_id)
 
         if not flag:
-            result['name'] = self.pool.get('product.product').name_get(cr, uid, [product_obj.id], context=context_partner)[0][1]
+            result['name'] = product_obj.name_get(cr, uid, [product_obj.id], context=context_partner)[0][1]
             if product_obj.description_sale:
                 result['name'] += '\n'+product_obj.description_sale
         domain = {}