From f071af29f6574681fc8a409aeef74fc5965af3bf Mon Sep 17 00:00:00 2001 From: MVA Date: Wed, 8 Feb 2012 14:20:40 +0100 Subject: [PATCH] [ADD] create the view on the onchange for sale event bzr revid: mva@openerp.com-20120208132040-j34v114440an47pj --- addons/event_moodle/event_moodle.py | 6 ---- addons/event_moodle/event_view.xml | 2 +- addons/event_sale_order/__init__.py | 3 -- addons/event_sale_order/sale_order.py | 32 ++++++++++++++++++--- addons/event_sale_order/sale_order_view.xml | 15 ++++++++++ 5 files changed, 44 insertions(+), 14 deletions(-) diff --git a/addons/event_moodle/event_moodle.py b/addons/event_moodle/event_moodle.py index 263ff98aa8b..10b6fb29726 100644 --- a/addons/event_moodle/event_moodle.py +++ b/addons/event_moodle/event_moodle.py @@ -27,7 +27,6 @@ import random from random import sample class event_moodle(osv.osv): - """ Event Type """ _name = 'event.moodle' _columns = { 'moodle_username' : fields.char('Moodle username', 128,help="You can also connect with your username that you define when you create a tokken"), @@ -226,12 +225,8 @@ class event_registration(osv.osv): create a user and match to a course if the event is already confirmed """ register = self.browse(cr, uid, ids, context=context) - print'<<<<<<<<<<<<<<<<<<<<<<<<' - print register[0].event_id.state if register[0].event_id.state =='confirm': moodle_pool = self.pool.get('event.moodle') - print register[0].moodle_users_id - print '<<<<<<<<<<<<<<<<<<<<<<<<<<<' if register[0].moodle_users_id ==0: moodle_pool = self.pool.get('event.moodle') name_user = moodle_pool.make_username(register[0].name,register[0].event_id.moodle_id) @@ -259,7 +254,6 @@ class event_registration(osv.osv): 'userid' :register[0].moodle_users_id, 'courseid' :register[0].event_id.moodle_id }] - print 'ok>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' moodle_pool.moodle_enrolled(cr,uid,[1],enrolled) return super(event_registration, self).case_open(cr, uid, ids, context) diff --git a/addons/event_moodle/event_view.xml b/addons/event_moodle/event_view.xml index 6882620e058..9bb2ab764da 100644 --- a/addons/event_moodle/event_view.xml +++ b/addons/event_moodle/event_view.xml @@ -35,7 +35,7 @@ form - + diff --git a/addons/event_sale_order/__init__.py b/addons/event_sale_order/__init__.py index 6e223a0704b..dcb2255d9cd 100644 --- a/addons/event_sale_order/__init__.py +++ b/addons/event_sale_order/__init__.py @@ -18,7 +18,4 @@ # along with this program. If not, see . # ############################################################################## - import sale_order -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: - diff --git a/addons/event_sale_order/sale_order.py b/addons/event_sale_order/sale_order.py index 6143718f1cb..2418afe514d 100644 --- a/addons/event_sale_order/sale_order.py +++ b/addons/event_sale_order/sale_order.py @@ -21,12 +21,36 @@ from osv import fields, osv -class event_sale_order(osv.osv): - _name= 'event.sale_order' -event_sale_order() class product(osv.osv): _inherit='product.product' _columns={ - 'event_ok':fields.boolean('Event') + 'event_ok':fields.boolean('Event'), + 'event_type':fields.many2one('event.type','Type of event'), } product() + +class sale_order_line(osv.osv): + _inherit='sale.order.line' + _columns={ + 'event':fields.many2one('event.event','Event'), + 'event_type':fields.char('event_type',128), + } + 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 + +sale_order_line() + +class sale_order(osv.osv): + _inherit='sale.order' + _columns={ + } + def order_confirm(self,cr,uid,ids,context=None): + return super(sale_order, self).order_confirm(cr, uid, ids, context) +sale_order() + diff --git a/addons/event_sale_order/sale_order_view.xml b/addons/event_sale_order/sale_order_view.xml index 54ce5bb243c..dee7254d0dd 100644 --- a/addons/event_sale_order/sale_order_view.xml +++ b/addons/event_sale_order/sale_order_view.xml @@ -9,8 +9,23 @@ + + + + event.sale.order + sale.order + form + + + + + + + + +