[MERGE] correct conflict

bzr revid: mva@openerp.com-20120213153924-jbyeq83s6e8tp96t

addons/event/__openerp__.py

@@ -55,12 +55,8 @@ Note that:
     'demo_xml': ['event_demo.xml'],
     'test': [],
     'installable': True,
-<<<<<<< TREE
     'active': False,
-=======
     'auto_install': False,
-    'certificate': '0083059161581',
->>>>>>> MERGE-SOURCE
     'images': ['images/1_event_type_list.jpeg','images/2_events.jpeg','images/3_registrations.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/event/event.py

@@ -102,7 +102,7 @@ class event_event(osv.osv):
         for event in self.browse(cr, uid, ids, context=context):
             total_confirmed = event.register_current
             if total_confirmed < event.register_min or total_confirmed > event.register_max and event.register_max!=0:
-                raise osv.except_osv(_('Error!'),_("The total of confirmed registration for the event '%s' does not meet the expected minimum/maximum. You should maybe reconsider those limits before going further") % (even.name))
+                raise osv.except_osv(_('Error!'),_("The total of confirmed registration for the event '%s' does not meet the expected minimum/maximum. You should maybe reconsider those limits before going further") % (event.name))
             if event.email_confirmation_id:
                 #send reminder that will confirm the event for all the people that were already confirmed
                 reg_ids = register_pool.search(cr, uid, [