From f8991e035fc08383470543575cc220c2a5876754 Mon Sep 17 00:00:00 2001 From: MVA Date: Thu, 9 Feb 2012 09:39:58 +0100 Subject: [PATCH] [REF] inherit product_id_onchange and correct some bugs, change attrs for event in sale order line bzr revid: mva@openerp.com-20120209083958-f1muqpp30e3drfp4 --- addons/event_sale_order/sale_order.py | 27 ++++++++++++++------- addons/event_sale_order/sale_order_view.xml | 6 ++--- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/addons/event_sale_order/sale_order.py b/addons/event_sale_order/sale_order.py index 4d8c44ca602..bf62afb949e 100644 --- a/addons/event_sale_order/sale_order.py +++ b/addons/event_sale_order/sale_order.py @@ -34,15 +34,25 @@ class sale_order_line(osv.osv): _columns={ 'event':fields.many2one('event.event','Event'), 'event_type':fields.char('event_type',128), + 'event_ok':fields.boolean('event_ok'), } - def onchange_product(self,cr,uid,ids,product): - product = self.pool.get('product.product').browse(cr, uid, product) - if product.event_type: - res={'value' : { - 'event_type':product.event_type.name - } - } - return res + + + def product_id_change(self, cr, uid, ids, pricelist, product, qty=0, + uom=False, qty_uos=0, uos=False, name='', partner_id=False, + lang=False, update_tax=True, date_order=False, packaging=False, fiscal_position=False, flag=False, context=None): + res = {} + if product: + product_res = self.pool.get('product.product').browse(cr, uid, product) + if product_res.event_type: + res={'value' : { + 'event_type':product_res.event_type.name, + 'event_ok':product_res.event_ok + } + } + return res + + return super(sale_order_line,self).product_id_change(cr,uid,ids,res,context) def button_confirm(self,cr,uid,ids,context=None): registration = self.browse(cr,uid,ids,context=None) @@ -60,6 +70,5 @@ class sale_order_line(osv.osv): }) return super(sale_order_line, self).button_confirm(cr, uid, ids, context) -sale_order_line() diff --git a/addons/event_sale_order/sale_order_view.xml b/addons/event_sale_order/sale_order_view.xml index 31dc79beb4c..b9562be8d6d 100644 --- a/addons/event_sale_order/sale_order_view.xml +++ b/addons/event_sale_order/sale_order_view.xml @@ -9,7 +9,7 @@ - + @@ -21,9 +21,9 @@ - - + +