From f418321fd434ae7fbc2f8dfe396c58a783709c6d Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Fri, 1 Jul 2011 17:13:48 +0200
Subject: [PATCH] [fix] cleaned on_change product_uom in sale

bzr revid: nicolas.vanhoren@openerp.com-20110701151348-gl6aoxrfy97ow80m
---
 addons/sale/sale.py                     | 4 +++-
 addons/sale/sale_view.xml               | 2 +-
 addons/sale_layout/sale_layout_view.xml | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 64faca26e77..fd2dddbe309 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1148,7 +1148,9 @@ class sale_order_line(osv.osv):
 
     def product_uom_change(self, cursor, user, ids, pricelist, product, qty=0,
             uom=False, qty_uos=0, uos=False, name='', partner_id=False,
-            lang=False, update_tax=True, date_order=False):
+            lang=False, update_tax=True, date_order=False, context=None):
+        context = context or {}
+        lang = lang or ('lang' in context and context['lang'])
         res = self.product_id_change(cursor, user, ids, pricelist, product,
                 qty=qty, uom=uom, qty_uos=qty_uos, uos=uos, name=name,
                 partner_id=partner_id, lang=lang, update_tax=update_tax,
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 14d3046e885..28201cfaa76 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -136,7 +136,7 @@
                                                 on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, True, context)"
                                                 />
                                             <field name="product_uom"
-                                                on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order)"/>
+                                                on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, context)"/>
                                             <field groups="product.group_uos" name="product_uos_qty"/>
                                             <field groups="product.group_uos" name="product_uos"/>
                                             <field
diff --git a/addons/sale_layout/sale_layout_view.xml b/addons/sale_layout/sale_layout_view.xml
index 4b69a01d919..dbea639f86e 100644
--- a/addons/sale_layout/sale_layout_view.xml
+++ b/addons/sale_layout/sale_layout_view.xml
@@ -33,7 +33,7 @@
                                         <field name="product_uom"
                                                required="0"
                                             attrs="{'readonly':[('layout_type','!=','article')],  'required':[('layout_type','not in',['title','text','subtotal','line','break'])]}"
-                                            on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order)"/>
+                                            on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, context)"/>
                                         <field
                                             name="product_packaging"
                                             attrs="{'readonly':[('layout_type','!=','article')]}"