[MERGE] merged the evv branch related to help tooltips on menuitems

[odoo/odoo.git] / addons / event / wizard / partner_event_registration.py

diff --git a/addons/event/wizard/partner_event_registration.py b/addons/event/wizard/partner_event_registration.py
index 33ed6e6..b8521e4 100644 (file)
--- a/addons/event/wizard/partner_event_registration.py
+++ b/addons/event/wizard/partner_event_registration.py
@@ -19,13 +19,10 @@
 #
 ##############################################################################
 
-import netsvc
-import tools
 from osv import fields, osv
 from tools.translate import _
 from decimal_precision import decimal_precision as dp
 
-
 class partner_event_registration(osv.osv_memory):
     """  event Registration """
 
@@ -67,25 +64,24 @@ class partner_event_registration(osv.osv_memory):
                         contact_id = contact.contact_id.id
                         email = contact.email
 
-        result = mod_obj._get_id(cr, uid, 'event', 'view_registration_search')
-        res = mod_obj.read(cr, uid, result, ['res_id'])
+        result = mod_obj.get_object_reference(cr, uid, 'event', 'view_registration_search')
+        res = result and result[1] or False
 
         # Select the view
-        id2 = mod_obj._get_id(cr, uid, 'event', 'view_event_registration_form')
-        id3 = mod_obj._get_id(cr, uid, 'event', 'view_event_registration_tree')
-        if id2:
-            id2 = mod_obj.browse(cr, uid, id2, context=context).res_id
-        if id3:
-            id3 = mod_obj.browse(cr, uid, id3, context=context).res_id
+
+        id2 = mod_obj.get_object_reference(cr, uid, 'event', 'view_event_registration_form')
+        id2 = id2 and id2[1] or False
+        id3 = mod_obj.get_object_reference(cr, uid, 'event', 'view_event_registration_tree')
+        id3 = id3 and id3[1] or False
 
         for current in self.browse(cr, uid, ids, context=context):
             for partner in res_obj.browse(cr, uid, record_ids, context=context):
                 new_case = reg_obj.create(cr, uid, {
-                        'name' : 'Registration',
-                        'event_id' : current.event_id and current.event_id.id or False,
-                        'unit_price' : current.unit_price,
-                        'partner_id' : partner.id,
-                        'partner_invoice_id' :  partner.id,
+                        'name': 'Registration',
+                        'event_id': current.event_id and current.event_id.id or False,
+                        'unit_price': current.unit_price,
+                        'partner_id': partner.id,
+                        'partner_invoice_id':  partner.id,
                         'event_product': current.event_id.product_id.name,
                         'contact_id': contact_id,
                         'email_from': email,
@@ -98,10 +94,10 @@ class partner_event_registration(osv.osv_memory):
                 'view_type': 'form',
                 'view_mode': 'tree,form',
                 'res_model': 'event.registration',
-                'res_id' : new_case,
+                'res_id': new_case,
                 'views': [(id2, 'form'), (id3, 'tree'), (False, 'calendar'), (False, 'graph')],
                 'type': 'ir.actions.act_window',
-                'search_view_id': res['res_id']
+                'search_view_id': res
         }
         return value
 
@@ -109,8 +105,6 @@ class partner_event_registration(osv.osv_memory):
         """Overrides orm name_get method
         @param ids: List of partner_event_register ids
         """
-        if not context:
-            context = {}
 
         res = []
         if not ids:
@@ -128,7 +122,7 @@ class partner_event_registration(osv.osv_memory):
         event_obj = self.pool.get('event.event')
         product_obj = self.pool.get('product.product')
         partner_obj = self.pool.get('res.partner')
-        if not context:
+        if context is None:
             context = {}
         partner_id = context.get('active_id', False)
         if event_id:
@@ -149,5 +143,4 @@ class partner_event_registration(osv.osv_memory):
 
 partner_event_registration()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file