[fix] cleaned on_change product_uom in sale
bzr revid: nicolas.vanhoren@openerp.com-20110701151348-gl6aoxrfy97ow80m
This commit is contained in:
parent
4a00aefa4d
commit
f418321fd4
|
@ -1148,7 +1148,9 @@ class sale_order_line(osv.osv):
|
||||||
|
|
||||||
def product_uom_change(self, cursor, user, ids, pricelist, product, qty=0,
|
def product_uom_change(self, cursor, user, ids, pricelist, product, qty=0,
|
||||||
uom=False, qty_uos=0, uos=False, name='', partner_id=False,
|
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,
|
res = self.product_id_change(cursor, user, ids, pricelist, product,
|
||||||
qty=qty, uom=uom, qty_uos=qty_uos, uos=uos, name=name,
|
qty=qty, uom=uom, qty_uos=qty_uos, uos=uos, name=name,
|
||||||
partner_id=partner_id, lang=lang, update_tax=update_tax,
|
partner_id=partner_id, lang=lang, update_tax=update_tax,
|
||||||
|
|
|
@ -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)"
|
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"
|
<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_qty"/>
|
||||||
<field groups="product.group_uos" name="product_uos"/>
|
<field groups="product.group_uos" name="product_uos"/>
|
||||||
<field
|
<field
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
<field name="product_uom"
|
<field name="product_uom"
|
||||||
required="0"
|
required="0"
|
||||||
attrs="{'readonly':[('layout_type','!=','article')], 'required':[('layout_type','not in',['title','text','subtotal','line','break'])]}"
|
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
|
<field
|
||||||
name="product_packaging"
|
name="product_packaging"
|
||||||
attrs="{'readonly':[('layout_type','!=','article')]}"
|
attrs="{'readonly':[('layout_type','!=','article')]}"
|
||||||
|
|
Loading…
Reference in New Issue