[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9846 revid:dle@openerp.com...

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

diff --git a/addons/event/event.py b/addons/event/event.py
index 3c04f5c..72894ea 100644 (file)
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -256,6 +256,7 @@ class event_event(osv.osv):
     ]
 
     def onchange_event_type(self, cr, uid, ids, type_event, context=None):
+        values = {}
         if type_event:
             type_info =  self.pool.get('event.type').browse(cr,uid,type_event,context)
             dic ={
@@ -265,7 +266,8 @@ class event_event(osv.osv):
               'register_min': type_info.default_registration_min,
               'register_max': type_info.default_registration_max,
             }
-            return {'value': dic}
+            values.update(dic)
+        return values
 
     def on_change_address_id(self, cr, uid, ids, address_id, context=None):
         values = {}