Merge lp:~openerp-dev/openobject-addons/trunk-event-mva into lp:openobject-addons

[Antony Lesuisse (OpenERP)]

event rework

[lp:~openerp-dev/openobject-addons/trunk-event-mva]

6288. By Michael (OpenERP) on 2012-01-24

[CLEAN] cleaning the code

6289. By Michael (OpenERP) on 2012-01-24

[MERGE] merged with main trunk

6290. By Michael (OpenERP) on 2012-01-24

[merge]merge with the trunk

6291. By Michael (OpenERP) on 2012-01-24

[merge]merge with the trunk

6292. By Michael (OpenERP) on 2012-01-24

[CLEAN] cleaning the code

6293. By Michael (OpenERP) on 2012-01-24

[CLEAN] cleaning the code

6294. By Michael (OpenERP) on 2012-01-25

[REF] remove product id from the report view

6295. By Michael (OpenERP) on 2012-01-25

[ADD] add email template

6296. By Quentin (OpenERP) <email address hidden> on 2012-01-27

[IMP] event: some usability changes

6297. By Quentin (OpenERP) <email address hidden> on 2012-01-27

[REF] event: code refactoring

6298. By Michael (OpenERP) on 2012-01-30

[REF] remove the make invoice action

6299. By Michael (OpenERP) on 2012-01-30

[IMP] change the sql request and change demo data

6300. By Michael (OpenERP) on 2012-01-30

[REF] clean the sql in the report

6301. By Michael (OpenERP) on 2012-02-02

[REF] remove the certificate

Unmerged revisions

6301. By Michael (OpenERP) on 2012-02-02

[REF] remove the certificate

6300. By Michael (OpenERP) on 2012-01-30

[REF] clean the sql in the report

6299. By Michael (OpenERP) on 2012-01-30

[IMP] change the sql request and change demo data

6298. By Michael (OpenERP) on 2012-01-30

[REF] remove the make invoice action

6297. By Quentin (OpenERP) <email address hidden> on 2012-01-27

[REF] event: code refactoring

6296. By Quentin (OpenERP) <email address hidden> on 2012-01-27

[IMP] event: some usability changes

=== modified file 'event/__openerp__.py'
--- event/__openerp__.py	2012-01-31 13:36:57 +0000
+++ event/__openerp__.py	2012-02-02 16:05:26 +0000
@@ -39,7 +39,7 @@
         Association / Configuration / Types of Events
 """,
     'author': 'OpenERP SA',
-    'depends': ['crm', 'account', 'marketing', 'mail'],
+    'depends': ['crm', 'account', 'marketing', 'email_template'],
     'init_xml': [],
     'update_xml': [
         'security/ir.model.access.csv',
@@ -47,20 +47,20 @@
         'wizard/event_confirm_view.xml',
         'event_view.xml',
         'report/report_event_registration_view.xml',
-        'wizard/event_make_invoice_view.xml',
         'wizard/partner_event_registration_view.xml',
         'board_association_view.xml',
         'res_partner_view.xml',
+        'email_template.xml',
     ],
     'demo_xml': ['event_demo.xml'],
-    'test': ['test/process/event_confirm2done.yml',
-             'test/process/event_draft2cancel.yml',
-             'test/process/partner_register2invoice.yml',
-             'test/ui/duplicate_event.yml',
-             'test/ui/demo_data.yml'],
+    'test': [],
     'installable': True,
+<<<<<<< TREE
     'auto_install': False,
     'certificate': '0083059161581',
+=======
+    'active': False,
+>>>>>>> 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:

=== modified file 'event/board_association_view.xml'
--- event/board_association_view.xml	2011-12-19 16:54:40 +0000
+++ event/board_association_view.xml	2012-02-02 16:05:26 +0000
@@ -21,7 +21,7 @@
             <field name="name">Events Filling Status</field>
             <field name="res_model">report.event.registration</field>
             <field name="view_type">form</field>
-            <field name="domain">[('state','not in',('cancel','done'))]</field>
+            <field name="domain">[('event_state','not in',('cancel','done'))]</field>
             <field name="view_mode">graph,tree</field>
             <field name="view_id" ref="view_report_event_reg_graph"/>
         </record>
@@ -45,9 +45,9 @@
                             <action string="Next Events"
                                 name="%(act_event_view)d"
                                 domain="[('state','not in',('cancel','done'))]"/>
-                            <action string="Unconfirmed Registrations"
+                            <!--<action string="Unconfirmed Registrations"
                                 name="%(event.act_event_list_register_event)d"
-                                domain="[('state','=','draft')]"/>
+                                domain="[('state','=','draft')]"/>-->
                         </column>
                         <column>
                             <action string="Events Filling Status"

=== added file 'event/email_template.xml'
--- event/email_template.xml	1970-01-01 00:00:00 +0000
+++ event/email_template.xml	2012-02-02 16:05:26 +0000
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<openerp>
+	<data>
+        
+        <record id="confirmation_event" model="email.template">
+		<field name="name">confirmation the event</field>
+<!--		<field name="model_id" ref="event.event_registration"/>-->
+		<field name="email_from" >${object.user_id.user_email or object.company_id.email or 'noreply@localhost'}</field>
+		<field name="email_to" >${object.email_from}</field>
+		<field name="subject">Ticket for ${object.event_id.name}</field>
+		<field name="body_text">thank you for your registration</field>
+        </record>
+        
+    </data>
+	<data>
+        
+        <record id="confirmation_registration" model="email.template">
+    	<field name="name">confirmation the registration</field>
+<!--		<field name="model_id" ref="event.event_registration"/>-->
+		<field name="email_from" >${object.user_id.user_email or object.company_id.email or 'noreply@localhost'}</field>
+		<field name="email_to" >${object.email_from}</field>
+		<field name="subject">Ticket for ${object.event_id.name}</field>
+		<field name="body_text">thank you for your registration</field>
+        </record>
+        
+    </data>
+</openerp>

=== modified file 'event/event.py'
--- event/event.py	2011-12-22 17:02:05 +0000
+++ event/event.py	2012-02-02 16:05:26 +0000
@@ -47,9 +47,7 @@
     _order = 'date_begin'
 
     def copy(self, cr, uid, id, default=None, context=None):
-        """ Copy record of Given id
-        @param id: Id of Event record.
-        @param context: A standard dictionary for contextual values
+        """ Reset the state and the registrations while copying an event
         """
         if not default:
             default = {}
@@ -59,20 +57,6 @@
         })
         return super(event_event, self).copy(cr, uid, id, default=default, context=context)
 
-    def onchange_product(self, cr, uid, ids, product_id=False):
-        """This function returns value of  product's unit price based on product id.
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of Event IDs
-        @param product_id: Product's id
-        """
-        if not product_id:
-            return {'value': {'unit_price': False}}
-        else:
-           unit_price=self.pool.get('product.product').price_get(cr, uid, [product_id])[product_id]
-           return {'value': {'unit_price': unit_price}}
-
     def button_draft(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state': 'draft'}, context=context)
 
@@ -80,61 +64,27 @@
         return self.write(cr, uid, ids, {'state': 'cancel'}, context=context)
 
     def button_done(self, cr, uid, ids, context=None):
-        if type(ids) in (int, long,):
-            ids = [ids]
         return self.write(cr, uid, ids, {'state': 'done'}, context=context)
 
-    def do_confirm(self, cr, uid, ids, context=None):
+    def button_confirm(self, cr, uid, ids, context=None):
         """ Confirm Event and send confirmation email to all register peoples
         """
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        #renforcing method : create a list of ids
         register_pool = self.pool.get('event.registration')
         for event in self.browse(cr, uid, ids, context=context):
-            if event.mail_auto_confirm:
+            total_confirmed = event.register_current
+            if total_confirmed < event.register_min or total_confirmed > event.register_max:
+                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))
+            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, [
                                ('event_id', '=', event.id),
                                ('state', 'not in', ['draft', 'cancel'])], context=context)
                 register_pool.mail_user_confirm(cr, uid, reg_ids)
-
         return self.write(cr, uid, ids, {'state': 'confirm'}, context=context)
 
-    def button_confirm(self, cr, uid, ids, context=None):
-        """This Function Confirm Event.
-        @param ids: List of Event IDs
-        @param context: A standard dictionary for contextual values
-        @return: True
-        """
-        if context is None:
-            context = {}
-        res = False
-        if type(ids) in (int, long,):
-            ids = [ids]
-        data_pool = self.pool.get('ir.model.data')
-        unconfirmed_ids = []
-        for event in self.browse(cr, uid, ids, context=context):
-            total_confirmed = event.register_current
-            if total_confirmed >= event.register_min or event.register_max == 0:
-                res = self.do_confirm(cr, uid, [event.id], context=context)
-            else:
-                unconfirmed_ids.append(event.id)
-        if unconfirmed_ids:
-            view_id = data_pool.get_object_reference(cr, uid, 'event', 'view_event_confirm')
-            view_id = view_id and view_id[1] or False
-            context['event_ids'] = unconfirmed_ids
-            return {
-                'name': _('Confirm Event'),
-                'context': context,
-                'view_type': 'form',
-                'view_mode': 'tree,form',
-                'res_model': 'event.confirm',
-                'views': [(view_id, 'form')],
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-                'context': context,
-                'nodestroy': True
-            }
-        return res
-
     def _get_register(self, cr, uid, ids, fields, args, context=None):
         """Get Confirm or uncofirm register value.
         @param ids: List of Event registration type's id
@@ -169,44 +119,10 @@
                 res[event.id]['register_prospect'] = number and number[0] or 0.0
         return res
 
-    def write(self, cr, uid, ids, vals, context=None):
-        """
-        Writes values in one or several fields.
-        @param ids: List of Event registration type's IDs
-        @param vals: dictionary with values to update.
-        @return: True
-        """
-        register_pool = self.pool.get('event.registration')
-        res = super(event_event, self).write(cr, uid, ids, vals, context=context)
-        if vals.get('date_begin', False) or vals.get('mail_auto_confirm', False) or vals.get('mail_confirm', False):
-            for event in self.browse(cr, uid, ids, context=context):
-                #change the deadlines of the registration linked to this event
-                register_values = {}
-                if vals.get('date_begin', False):
-                    register_values['date_deadline'] = vals['date_begin']
-
-                #change the description of the registration linked to this event
-                if vals.get('mail_auto_confirm', False):
-                    if vals['mail_auto_confirm']:
-                        if 'mail_confirm' not in vals:
-                            vals['mail_confirm'] = event.mail_confirm
-                    else:
-                        vals['mail_confirm'] = False
-                if 'mail_confirm' in vals:
-                    register_values['description'] = vals['mail_confirm']
-
-                if register_values:
-                    reg_ids = register_pool.search(cr, uid, [('event_id', '=', event.id)], context=context)
-                    register_pool.write(cr, uid, reg_ids, register_values, context=context)
-        return res
-
     _columns = {
-        'name': fields.char('Summary', size=64, required=True, translate=True, readonly=False, states={'done': [('readonly', True)]}),
+        'name': fields.char('Name', size=64, required=True, translate=True, readonly=False, states={'done': [('readonly', True)]}),
         'user_id': fields.many2one('res.users', 'Responsible User', readonly=False, states={'done': [('readonly', True)]}),
-        'parent_id': fields.many2one('event.event', 'Parent Event', readonly=False, states={'done': [('readonly', True)]}),
         'section_id': fields.many2one('crm.case.section', 'Sale Team', readonly=False, states={'done': [('readonly', True)]}),
-        'child_ids': fields.one2many('event.event', 'parent_id', 'Child Events', readonly=False, states={'done': [('readonly', True)]}),
-        'reply_to': fields.char('Reply-To', size=64, readonly=False, states={'done': [('readonly', True)]}, help="The email address put in the 'Reply-To' of all emails sent by OpenERP"),
         'type': fields.many2one('event.type', 'Type', help="Type of Event like Seminar, Exhibition, Conference, Training.", readonly=False, states={'done': [('readonly', True)]}),
         'register_max': fields.integer('Maximum Registrations', help="Provide Maximum Number of Registrations", readonly=True, states={'draft': [('readonly', False)]}),
         'register_min': fields.integer('Minimum Registrations', help="Provide Minimum Number of Registrations", readonly=True, states={'draft': [('readonly', False)]}),
@@ -215,8 +131,8 @@
         'register_prospect': fields.function(_get_register, string='Unconfirmed Registrations', multi='register_prospect',
             help="Total of Prospect Registrations"),
         'registration_ids': fields.one2many('event.registration', 'event_id', 'Registrations', readonly=False, states={'done': [('readonly', True)]}),
-        'date_begin': fields.datetime('Beginning date', required=True, help="Beginning Date of Event", readonly=True, states={'draft': [('readonly', False)]}),
-        'date_end': fields.datetime('Closing date', required=True, help="Closing Date of Event", readonly=True, states={'draft': [('readonly', False)]}),
+        'date_begin': fields.datetime('Starting Date', required=True, help="Beginning Date of Event", readonly=True, states={'draft': [('readonly', False)]}),
+        'date_end': fields.datetime('Closing Date', required=True, help="Closing Date of Event", readonly=True, states={'draft': [('readonly', False)]}),
         'state': fields.selection([
             ('draft', 'Draft'),
             ('confirm', 'Confirmed'),
@@ -224,23 +140,18 @@
             ('cancel', 'Cancelled')],
             'State', readonly=True, required=True,
             help='If event is created, the state is \'Draft\'.If event is confirmed for the particular dates the state is set to \'Confirmed\'. If the event is over, the state is set to \'Done\'.If event is cancelled the state is set to \'Cancelled\'.'),
-        'mail_auto_registr': fields.boolean('Mail Auto Register', readonly=False, states={'done': [('readonly', True)]}, help='Check this box if you want to use automatic emailing for new registration.'),
-        'mail_auto_confirm': fields.boolean('Mail Auto Confirm', readonly=False, states={'done': [('readonly', True)]}, help='Check this box if you want to use automatic confirmation emailing or reminder.'),
-        'mail_registr': fields.text('Registration Email', readonly=False, states={'done': [('readonly', True)]}, help='This email will be sent when someone subscribes to the event.'),
-        'mail_confirm': fields.text('Confirmation Email', readonly=False, states={'done': [('readonly', True)]}, help="This email will be sent when the event gets confirmed or when someone subscribes to a confirmed event. This is also the email sent to remind someone about the event."),
-        'product_id': fields.many2one('product.product', 'Product', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="The invoices of this event registration will be created with this Product. Thus it allows you to set the default label and the accounting info you want by default on these invoices."),
-        'note': fields.text('Notes', help="Description or Summary of Event", readonly=False, states={'done': [('readonly', True)]}),
-        'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', readonly=True, states={'draft': [('readonly', False)]}, help="Pricelist version for current event."),
-        'unit_price': fields.related('product_id', 'list_price', type='float', string='Registration Cost', readonly=True, states={'draft':[('readonly',False)]}, help="This will be the default price used as registration cost when invoicing this event. Note that you can specify a specific amount for each registration.", digits_compute=dp.get_precision('Sale Price')),
+        'email_registration_id' : fields.many2one('email.template','Email registration'),
+        'email_confirmation_id' : fields.many2one('email.template','Email confirmation'),
+        'reply_to': fields.char('Reply-To', size=64, readonly=False, states={'done': [('readonly', True)]}, help="The email address put in the 'Reply-To' of all emails sent by OpenERP"),
         'main_speaker_id': fields.many2one('res.partner','Main Speaker', readonly=False, states={'done': [('readonly', True)]}, help="Speaker who will be giving speech at the event."),
         'speaker_ids': fields.many2many('res.partner', 'event_speaker_rel', 'speaker_id', 'partner_id', 'Other Speakers', readonly=False, states={'done': [('readonly', True)]}),
         'address_id': fields.many2one('res.partner.address','Location Address', readonly=False, states={'done': [('readonly', True)]}),
         'speaker_confirmed': fields.boolean('Speaker Confirmed', readonly=False, states={'done': [('readonly', True)]}),
         'country_id': fields.related('address_id', 'country_id',
                     type='many2one', relation='res.country', string='Country', readonly=False, states={'done': [('readonly', True)]}),
-        'language': fields.char('Language',size=64, readonly=False, states={'done': [('readonly', True)]}),
         'note': fields.text('Description', readonly=False, states={'done': [('readonly', True)]}),
         'company_id': fields.many2one('res.company', 'Company', required=False, change_default=True, readonly=False, states={'done': [('readonly', True)]}),
+        'product_id': fields.many2one('product.product', 'Product', readonly=True, states={'draft': [('readonly', False)]}, help="The product is optional and only serves informative purposes. It will be used for analysis mainly."),
     }
 
     _defaults = {
@@ -249,9 +160,6 @@
         'user_id': lambda obj, cr, uid, context: uid,
     }
 
-    def _check_recursion(self, cr, uid, ids, context=None):
-        return super(event_event, self)._check_recursion(cr, uid, ids, context=context)
-
     def _check_closing_date(self, cr, uid, ids, context=None):
         for event in self.browse(cr, uid, ids, context=context):
             if event.date_end < event.date_begin:
@@ -259,10 +167,9 @@
         return True
 
     _constraints = [
-        (_check_recursion, 'Error ! You cannot create recursive event.', ['parent_id']),
         (_check_closing_date, 'Error ! Closing Date cannot be set before Beginning Date.', ['date_end']),
     ]
-
+    #TODO: display sale_team in event form view and use this onchange
     def do_team_change(self, cr, uid, ids, team_id, context=None):
         """
         On Change Callback: when team change, this is call.
@@ -283,151 +190,36 @@
     """Event Registration"""
     _name= 'event.registration'
     _description = __doc__
-    _inherit = 'mail.thread'
-
-    def _amount_line(self, cr, uid, ids, field_name, arg, context=None):
-        cur_obj = self.pool.get('res.currency')
-        res = {}
-        for line in self.browse(cr, uid, ids, context=context):
-            price = line.unit_price * line.nb_register
-            pricelist = line.event_id.pricelist_id or line.partner_invoice_id.property_product_pricelist
-            cur = pricelist and pricelist.currency_id or False
-            res[line.id] = cur and cur_obj.round(cr, uid, cur, price) or price
-        return res
+    _inherit = ['mail.thread','res.partner.address']
 
     _columns = {
         'id': fields.integer('ID'),
-        'name': fields.char('Summary', size=124,  readonly=True, states={'draft': [('readonly', False)]}),
-        'email_cc': fields.text('CC', size=252, readonly=False, states={'done': [('readonly', True)]}, help="These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma"),
+        'origin': fields.char('Origin', size=124,  readonly=True, states={'draft': [('readonly', False)]}),
         'nb_register': fields.integer('Quantity', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="Number of Registrations or Tickets"),
         'event_id': fields.many2one('event.event', 'Event', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'partner_id': fields.many2one('res.partner', 'Partner', states={'done': [('readonly', True)]}),
-        "partner_invoice_id": fields.many2one('res.partner', 'Partner Invoiced', readonly=True, states={'draft': [('readonly', False)]}),
+        'partner_id_address': fields.many2one('res.partner.address', 'Partner', states={'done': [('readonly', True)]}),
         "contact_id": fields.many2one('res.partner.address', 'Partner Contact', readonly=False, states={'done': [('readonly', True)]}), #TODO: filter only the contacts that have a function into the selected partner_id
-        "unit_price": fields.float('Unit Price', required=True, digits_compute=dp.get_precision('Sale Price'), readonly=True, states={'draft': [('readonly', False)]}),
-        'price_subtotal': fields.function(_amount_line, string='Subtotal', digits_compute=dp.get_precision('Sale Price'), store=True),
-        "badge_ids": fields.one2many('event.registration.badge', 'registration_id', 'Badges', readonly=False, states={'done': [('readonly', True)]}),
-        "event_product": fields.char("Invoice Name", size=128, readonly=True, states={'draft': [('readonly', False)]}),
-        "tobe_invoiced": fields.boolean("To be Invoiced", readonly=True, states={'draft': [('readonly', False)]}),
-        "invoice_id": fields.many2one("account.invoice", "Invoice", readonly=True),
-        'date_closed': fields.datetime('Closed', readonly=True),
-        'ref': fields.reference('Reference', selection=crm._links_get, size=128),
-        'ref2': fields.reference('Reference 2', selection=crm._links_get, size=128),
-        'email_from': fields.char('Email', size=128, states={'done': [('readonly', True)]}, help="These people will receive email."),
-        'create_date': fields.datetime('Creation Date', readonly=True),
-        'write_date': fields.datetime('Write Date', readonly=True),
-        'description': fields.text('Description', states={'done': [('readonly', True)]}),
-        'message_ids': fields.one2many('mail.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
+        'date_closed': fields.datetime('Closure Date', readonly=True),
+        'email_from': fields.related('event_id','reply_to',string='Reply-to Email', type='char', size=128, readonly=True,),
         'log_ids': fields.one2many('mail.message', 'res_id', 'Logs', domain=[('email_from', '=', False),('model','=',_name)]),
-        'date_deadline': fields.related('event_id','date_end', type='datetime', string="End Date", readonly=True),
-        'date': fields.related('event_id', 'date_begin', type='datetime', string="Start Date", readonly=True),
+        'date_deadline': fields.related('event_id','date_end', type='datetime', string="Event End Date", readonly=True),
+        'date': fields.related('event_id', 'date_begin', type='datetime', string="Event Start Date", readonly=True),
         'user_id': fields.many2one('res.users', 'Responsible', states={'done': [('readonly', True)]}),
-        'active': fields.boolean('Active'),
         'section_id': fields.related('event_id', 'section_id', type='many2one', relation='crm.case.section', string='Sale Team', store=True, readonly=True),
         'company_id': fields.related('event_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'state': fields.selection([('open', 'Confirmed'),
-                                    ('draft', 'Unconfirmed'),
+        'state': fields.selection([('draft', 'Unconfirmed'),
+                                    ('open', 'Confirmed'),
                                     ('cancel', 'Cancelled'),
                                     ('done', 'Done')], 'State', \
                                     size=16, readonly=True)
     }
     _defaults = {
         'nb_register': 1,
-        'tobe_invoiced':  True,
         'state': 'draft',
-        'active': 1,
         'user_id': lambda self, cr, uid, ctx: uid,
     }
 
-    def _make_invoice(self, cr, uid, reg, lines, context=None):
-        """ Create Invoice from Invoice lines
-        @param reg: Model of Event Registration
-        @param lines: Ids of Invoice lines
-        """
-        if context is None:
-            context = {}
-        inv_pool = self.pool.get('account.invoice')
-        val_invoice = inv_pool.onchange_partner_id(cr, uid, [], 'out_invoice', reg.partner_invoice_id.id, False, False)
-        val_invoice['value'].update({'partner_id': reg.partner_invoice_id.id})
-        val_invoice['value'].update({
-                'origin': reg.event_product,
-                'reference': False,
-                'invoice_line': [(6, 0, lines)],
-                'comment': "",
-                'date_invoice': context.get('date_inv', False)
-            })
-        inv_id = inv_pool.create(cr, uid, val_invoice['value'], context=context)
-        inv_pool.button_compute(cr, uid, [inv_id])
-        self.message_append(cr, uid, [reg], _('Invoiced'))
-        return inv_id
-
-    def copy(self, cr, uid, id, default=None, context=None):
-        """ Copy record of Given id
-        @param id: Id of Registration record.
-        @param context: A standard dictionary for contextual values
-        """
-        if not default:
-            default = {}
-        default.update({
-            'invoice_id': False,
-        })
-        return super(event_registration, self).copy(cr, uid, id, default=default, context=context)
-
-    def action_invoice_create(self, cr, uid, ids, grouped=False, date_inv = False, context=None):
-        """ Action of Create Invoice """
-        res = False
-        invoices = {}
-        tax_ids=[]
-        new_invoice_ids = []
-        inv_lines_pool = self.pool.get('account.invoice.line')
-        inv_pool = self.pool.get('account.invoice')
-        product_pool = self.pool.get('product.product')
-        contact_pool = self.pool.get('res.partner.address')
-        if context is None:
-            context = {}
-        # If date was specified, use it as date invoiced, usefull when invoices are generated this month and put the
-        # last day of the last month as invoice date
-        if date_inv:
-            context['date_inv'] = date_inv
-
-        for reg in self.browse(cr, uid, ids, context=context):
-            val_invoice = inv_pool.onchange_partner_id(cr, uid, [], 'out_invoice', reg.partner_invoice_id.id, False, False)
-            val_invoice['value'].update({'partner_id': reg.partner_invoice_id.id})
-            partner_address_id = val_invoice['value']['address_invoice_id']
-            if not partner_address_id:
-               raise osv.except_osv(_('Error !'),
-                        _("Registered partner doesn't have an address to make the invoice."))
-
-            value = inv_lines_pool.product_id_change(cr, uid, [], reg.event_id.product_id.id, uom =False, partner_id=reg.partner_invoice_id.id, fposition_id=reg.partner_invoice_id.property_account_position.id)
-            product = product_pool.browse(cr, uid, reg.event_id.product_id.id, context=context)
-            for tax in product.taxes_id:
-                tax_ids.append(tax.id)
-            vals = value['value']
-            c_name = reg.contact_id and ('-' + contact_pool.name_get(cr, uid, [reg.contact_id.id])[0][1]) or ''
-            vals.update({
-                'name': reg.event_product + '-' + c_name,
-                'price_unit': reg.unit_price,
-                'quantity': reg.nb_register,
-                'product_id':reg.event_id.product_id.id,
-                'invoice_line_tax_id': [(6, 0, tax_ids)],
-            })
-            inv_line_ids = self._create_invoice_lines(cr, uid, [reg.id], vals)
-            invoices.setdefault(reg.partner_id.id, []).append((reg, inv_line_ids))
-        for val in invoices.values():
-            res = False
-            if grouped:
-                res = self._make_invoice(cr, uid, val[0][0], [v for k, v in val], context=context)
-
-                for k, v in val:
-                    self.do_close(cr, uid, [k.id], context={'invoice_id': res})
-
-            else:
-               for k, v in val:
-                   res = self._make_invoice(cr, uid, k, [v], context=context)
-                   self.do_close(cr, uid, [k.id], context={'invoice_id': res})
-            if res: new_invoice_ids.append(res)
-        return new_invoice_ids
-
     def do_open(self, cr, uid, ids, context=None):
         """ Open Registration
         """
@@ -441,274 +233,100 @@
         """
         if context is None:
             context = {}
-        invoice_id = context.get('invoice_id', False)
         values = {'state': 'done', 'date_closed': time.strftime('%Y-%m-%d %H:%M:%S')}
         msg = _('Done')
-        if invoice_id:
-            values['invoice_id'] = invoice_id
         res = self.write(cr, uid, ids, values)
         self.message_append(cr, uid, ids, msg)
         return res
-    
+
     # event uses add_note wizard from crm, which expects case_* methods
     def case_open(self, cr, uid, ids, context=None):
         self.do_open(cr, uid, ids, context)
-    
+
     # event uses add_note wizard from crm, which expects case_* methods
-    def case_close(self, cr, uid, ids, context=None):
-        self.do_close(cr, uid, ids, context)
-    
+    #def case_close(self, cr, uid, ids, context=None):
+    #    self.do_close(cr, uid, ids, context)
+    #    return self.write(cr, uid, ids, {'state': 'done'})
+
     # event uses add_note wizard from crm, which expects case_* methods
     def case_cancel(self, cr, uid, ids, context=None):
         """ Cancel Registration
         """
         self.message_append(cr, uid, ids, _('Cancel'))
         return self.write(cr, uid, ids, {'state': 'cancel'})
-    
+
     # event uses add_note wizard from crm, which expects case_* methods
     def case_reset(self, cr, uid, ids, context=None):
         pass
-    
+
     # event uses add_note wizard from crm, which expects case_* methods
     def case_pending(self, cr, uid, ids, context=None):
         pass
-    
-    def check_confirm(self, cr, uid, ids, context=None):
-        """This Function Open Event Registration and send email to user.
-        @param ids: List of Event registration's IDs
-        @param context: A standard dictionary for contextual values
-        @return: True
-        """
-        if type(ids) in (int, long,):
-            ids = [ids]
-        data_pool = self.pool.get('ir.model.data')
-        unconfirmed_ids = []
-        if context is None:
-            context = {}
-        for registration in self.browse(cr, uid, ids, context=context):
-            total_confirmed = registration.event_id.register_current + registration.nb_register
-            if total_confirmed <= registration.event_id.register_max or registration.event_id.register_max == 0:
-                self.do_open(cr, uid, [registration.id], context=context)
-            else:
-                unconfirmed_ids.append(registration.id)
-        if unconfirmed_ids:
-            view_id = data_pool.get_object_reference(cr, uid, 'event', 'view_event_confirm_registration')
-            view_id = view_id and view_id[1] or False
-            context['registration_ids'] = unconfirmed_ids
-            return {
-                'name': _('Confirm Registration'),
-                'context': context,
-                'view_type': 'form',
-                'view_mode': 'tree,form',
-                'res_model': 'event.confirm.registration',
-                'views': [(view_id, 'form')],
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-                'context': context,
-                'nodestroy': True
-            }
-        return True
 
-    def button_reg_close(self, cr, uid, ids, context=None):
-        """This Function Close Event Registration.
-        """
-        data_pool = self.pool.get('ir.model.data')
-        unclosed_ids = []
-        for registration in self.browse(cr, uid, ids, context=context):
-            if registration.tobe_invoiced and not registration.invoice_id:
-                unclosed_ids.append(registration.id)
-            else:
-                self.do_close(cr, uid, [registration.id], context=context)
-        if unclosed_ids:
-            view_id = data_pool.get_object_reference(cr, uid, 'event', 'view_event_make_invoice')
-            view_id = view_id and view_id[1] or False
-            context['active_ids'] = unclosed_ids
-            return {
-                'name': _('Close Registration'),
-                'context': context,
-                'view_type': 'form',
-                'view_mode': 'tree,form',
-                'res_model': 'event.make.invoice',
-                'views': [(view_id, 'form')],
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-                'context': context,
-                'nodestroy': True
-            }
-        return True
+    #def button_reg_close(self, cr, uid, ids, context=None):
+    #    """This Function Close Event Registration.
+    #    """
+    #    return self.case_close(cr, uid, ids)
 
     def button_reg_cancel(self, cr, uid, ids, context=None, *args):
         return self.case_cancel(cr, uid, ids)
 
     def mail_user(self, cr, uid, ids, confirm=False, context=None):
         """
-        Send email to user
+        Send email to user with email_template when registration is done
         """
-        mail_message = self.pool.get('mail.message')
         for registration in self.browse(cr, uid, ids, context=context):
-            src = registration.event_id.reply_to or False
-            email_to = []
-            email_cc = []
-            if registration.email_from:
-                email_to = [registration.email_from]
-            if registration.email_cc:
-                email_cc += [registration.email_cc]
-            if not (email_to or email_cc):
-                continue
-            subject = ""
-            body = ""
-            if confirm:
-                subject = _('Auto Confirmation: [%s] %s') %(registration.id, registration.name)
-                body = registration.event_id.mail_confirm
-            elif registration.event_id.mail_auto_confirm or registration.event_id.mail_auto_registr:
-                if registration.event_id.state in ['draft', 'fixed', 'open', 'confirm', 'running'] and registration.event_id.mail_auto_registr:
-                    subject = _('Auto Registration: [%s] %s') %(registration.id, registration.name)
-                    body = registration.event_id.mail_registr
-                if (registration.event_id.state in ['confirm', 'running']) and registration.event_id.mail_auto_confirm:
-                    subject = _('Auto Confirmation: [%s] %s') %(registration.id, registration.name)
-                    body = registration.event_id.mail_confirm
-            if subject or body:
-                mail_message.schedule_with_attach(cr, uid, src, email_to, subject, body, model='event.registration', email_cc=email_cc, res_id=registration.id)
-
+            template_id = registration.event_id.email_registration_id.id
+            if template_id:
+                mail_message = self.pool.get('email.template').send_mail(cr,uid,template_id,registration.id)
         return True
 
     def mail_user_confirm(self, cr, uid, ids, context=None):
         """
-        Send email to user
-        """
-        return self.mail_user(cr, uid, ids, confirm=True, context=context)
-
-    def _create_invoice_lines(self, cr, uid, ids, vals):
-        """ Create account Invoice line for Registration Id.
-        """
-        return self.pool.get('account.invoice.line').create(cr, uid, vals)
-
-    def onchange_contact_id(self, cr, uid, ids, contact, partner):
-
-        """This function returns value of Badge Name, Badge Title based on Partner contact.
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of Registration IDs
-        @param contact: Patner Contact IDS
-        @param partner: Partner IDS
-        """
+        Send email to user when the event is done
+        """
+        for registration in self.browse(cr, uid, ids, context=context):
+            template_id = registration.event_id.email_confirmation_id.id
+            if template_id:
+                mail_message = self.pool.get('email.template').send_mail(cr,uid,template_id,registration.id)
+        return True
+
+    def onchange_contact_id(self, cr, uid, ids, contact, partner, context=None):
         data ={}
         if not contact:
             return data
         addr_obj = self.pool.get('res.partner.address')
-        data['email_from'] = addr_obj.browse(cr, uid, contact).email
+        data['email_from'] = addr_obj.browse(cr, uid, contact, context).email
         return {'value': data}
 
-    def onchange_event(self, cr, uid, ids, event_id, partner_invoice_id):
+    def onchange_event(self, cr, uid, ids, event_id, context=None):
         """This function returns value of Product Name, Unit Price based on Event.
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of Registration IDs
-        @param event_id: Event ID
-        @param partner_invoice_id: Partner Invoice ID
         """
-        context = {}
+        if context is None:
+            context = {}
         if not event_id:
-            return {'value': {'unit_price': False, 'event_product': False}}
-
+            return {}
         event_obj = self.pool.get('event.event')
-        prod_obj = self.pool.get('product.product')
-        res_obj = self.pool.get('res.partner')
-
-        data_event =  event_obj.browse(cr, uid, event_id)
-        res = {'value': {'unit_price': False,
-                         'event_product': False,
-                         'user_id': False,
-                         'date': data_event.date_begin,
-                         'date_deadline': data_event.date_end,
-                         'description': data_event.note,
-                         'name': data_event.name,
-                         'section_id': data_event.section_id and data_event.section_id.id or False,
-                        }}
-        if data_event.user_id.id:
-            res['value'].update({'user_id': data_event.user_id.id})
-        if data_event.product_id:
-            pricelist_id = data_event.pricelist_id and data_event.pricelist_id.id or False
-            if partner_invoice_id:
-                partner = res_obj.browse(cr, uid, partner_invoice_id, context=context)
-                pricelist_id = pricelist_id or partner.property_product_pricelist.id
-            unit_price = prod_obj._product_price(cr, uid, [data_event.product_id.id], False, False, {'pricelist': pricelist_id})[data_event.product_id.id]
-            if not unit_price:
-                unit_price = data_event.unit_price
-            res['value'].update({'unit_price': unit_price, 'event_product': data_event.product_id.name})
-        return res
-
-    def onchange_partner_id(self, cr, uid, ids, part, event_id, email=False):
-        """This function returns value of Patner Invoice id, Unit Price, badget title based on partner and Event.
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of Registration IDs
-        @param event_id: Event ID
-        @param partner_invoice_id: Partner Invoice ID
-        """
+        data_event =  event_obj.browse(cr, uid, event_id, context=context)
+        return {'value': 
+                    {'date': data_event.date_begin,
+                     'date_deadline': data_event.date_end,
+                     'section_id': data_event.section_id and data_event.section_id.id or False,
+                     'company_id': data_event.company_id and data_event.company_id.id or False,
+                    }
+               }
+
+    def onchange_partner_id(self, cr, uid, ids, part, context=None):
         res_obj = self.pool.get('res.partner')
 
         data = {}
-        data['contact_id'], data['partner_invoice_id'], data['email_from'] = (False, False, False)
         if not part:
             return {'value': data}
-        data['partner_invoice_id'] = part
-        # this calls onchange_partner_invoice_id
-        d = self.onchange_partner_invoice_id(cr, uid, ids, event_id, part)
-        # this updates the dictionary
-        data.update(d['value'])
         addr = res_obj.address_get(cr, uid, [part]).get('default', False)
         if addr:
-            d = self.onchange_contact_id(cr, uid, ids, addr, part)
+            d = self.onchange_contact_id(cr, uid, ids, addr, part, context)
             data.update(d['value'])
         return {'value': data}
 
-    def onchange_partner_invoice_id(self, cr, uid, ids, event_id, partner_invoice_id):
-        """This function returns value of Product unit Price based on Invoiced partner.
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of Registration IDs
-        @param event_id: Event ID
-        @param partner_invoice_id: Partner Invoice ID
-        """
-        data = {}
-        context = {}
-        event_obj = self.pool.get('event.event')
-        prod_obj = self.pool.get('product.product')
-        res_obj = self.pool.get('res.partner')
-
-        data['unit_price']=False
-        if not event_id:
-            return {'value': data}
-        data_event =  event_obj.browse(cr, uid, event_id, context=context)
-        if data_event.product_id:
-            data['event_product'] = data_event.product_id.name
-            pricelist_id = data_event.pricelist_id and data_event.pricelist_id.id or False
-            if partner_invoice_id:
-                partner = res_obj.browse(cr, uid, partner_invoice_id, context=context)
-                pricelist_id = pricelist_id or partner.property_product_pricelist.id
-            unit_price = prod_obj._product_price(cr, uid, [data_event.product_id.id], False, False, {'pricelist': pricelist_id})[data_event.product_id.id]
-            if not unit_price:
-                unit_price = data_event.unit_price
-            data['unit_price'] = unit_price
-        return {'value': data}
-
 event_registration()
-
-class event_registration_badge(osv.osv):
-    _name = 'event.registration.badge'
-    _description = __doc__
-    _columns = {
-        "registration_id": fields.many2one('event.registration', 'Registration', required=True),
-        "title": fields.char('Title', size=128),
-        "name": fields.char('Name', size=128, required=True),
-        "address_id": fields.many2one('res.partner.address', 'Address'),
-    }
-
-event_registration_badge()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'event/event_demo.xml'
--- event/event_demo.xml	2011-12-19 16:54:40 +0000
+++ event/event_demo.xml	2012-02-02 16:05:26 +0000
@@ -4,6 +4,10 @@
     <record id="base.user_demo" model="res.users">
              <field name="groups_id" eval="[(4, ref('marketing.group_marketing_user')),(4, ref('base.group_sale_salesman'))]"/>
      </record>
+     
+     
+
+     
 <!-- Demo Data for Product -->
 	<record id="event_product_0" model="product.product">
 		<field name="list_price">68.00</field>
@@ -99,7 +103,7 @@
 <!-- Demo data for Event Registration-->
 	<record id="reg_1_1" model="event.registration">
 		<field name="event_id" ref="event_1"/>
-		<field name="partner_id" ref="base.res_partner_asus"/>
+		<field name="partner_id_address" ref="base.res_partner_asus"/>
 		<field name="partner_invoice_id" ref="base.res_partner_asus"/>
 		<field name="nb_register">5</field>
 		<field name="event_product">Ticket for Opera</field>
@@ -108,25 +112,25 @@
 
 	<record id="reg_1_2" model="event.registration">
 		<field name="event_id" ref="event_1"/>
-		<field name="partner_id" ref="base.res_partner_agrolait"/>
+		<field name="partner_id_address" ref="base.res_partner_agrolait"/>
 		<field name="partner_invoice_id" ref="base.res_partner_agrolait"/>
 		<field name="nb_register">10</field>
 		<field name="event_product">Ticket for Opera</field>
 		<field name="unit_price">24.00</field>
 	</record>
 
-	 <function model="event.registration" name="check_confirm" eval="[ref('reg_1_2')]"/> 
+	 
 
 	<record id="reg_0_1" model="event.registration">
 		<field name="event_id" ref="event_0"/>
-		<field name="partner_id" ref="base.res_partner_c2c"/>
+		<field name="partner_id_address" ref="base.res_partner_c2c"/>
 		<field name="partner_invoice_id" ref="base.res_partner_c2c"/>
 		<field name="nb_register">6</field>
 		<field name="event_product">Ticket for Concert</field>
 		<field name="unit_price">15.50</field>
 	</record>
 
-	 <function model="event.registration" name="check_confirm" eval="[ref('reg_0_1')]"/> 
+
 
     <record id="reg_0_2" model="event.registration">
         <field name="event_id" ref="event_2"/>
@@ -137,7 +141,7 @@
         <field name="unit_price">20</field>
     </record>
     
-    <function model="event.registration" name="check_confirm" eval="[ref('reg_0_2')]"/>
+
     
 	</data>
 </openerp>

=== modified file 'event/event_view.xml'
--- event/event_view.xml	2011-12-19 16:54:40 +0000
+++ event/event_view.xml	2012-02-02 16:05:26 +0000
@@ -38,11 +38,11 @@
             <field name="res_model">event.type</field>
             <field name="view_type">form</field>
         </record>
-        <menuitem name="Configuration" id="base.menu_marketing_config_root" parent="base.marketing_menu" sequence="30" groups="base.group_extended"/>
-        <menuitem name="Configuration" id="base.menu_marketing_config_association" parent="base.menu_association" sequence="30" groups="base.group_extended"/>
+        <menuitem name="Configuration" id="base.menu_marketing_config_root" parent="base.marketing_menu" sequence="30"/>
+        <menuitem name="Configuration" id="base.menu_marketing_config_association" parent="base.menu_association" sequence="30"/>
 
-        <menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="base.menu_marketing_config_root" groups="base.group_extended"/>
-        <menuitem name="Events Type" id="menu_event_type_association" action="action_event_type" parent="base.menu_marketing_config_association" groups="base.group_extended"/>
+        <menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="base.menu_marketing_config_root"/>
+        <menuitem name="Events Type" id="menu_event_type_association" action="action_event_type" parent="base.menu_marketing_config_association"/>
 
     <!-- Events Organisation/CONFIGURATION/EVENTS -->
 
@@ -57,32 +57,51 @@
                         <field name="date_begin"/>
                         <field name="date_end"/>
                         <field name="type" widget="selection"/>
-                        <field name="language"/>
-                        <field name="parent_id"/>
+                        <field name="user_id"/>
+                        <field name="address_id" />
                     </group>
                     <notebook colspan="4">
                     <page string="Event">
-                        <group colspan="4" col="4">
-                            <separator string="Invoice Information" colspan="4"/>
-                            <field name="product_id" on_change="onchange_product(product_id)" colspan="4"/>
-                            <field name="unit_price"/>
-                            <field name="pricelist_id" widget="selection" domain="[('type','=','sale')]" groups="base.group_extended"/>
-                        </group>
-                        <group colspan="2" col="2">
-                            <separator string="Contact" colspan="4"/>
-                            <field name="user_id"/>
-                            <field name="section_id" widget="selection" on_change="do_team_change(section_id)"/>
-                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                        </group>
-                        <group colspan="2" col="2">
-                            <separator string="Location" colspan="4"/>
-                            <field name="country_id" />
-                            <field name="address_id" domain="[('country_id','=',country_id)]"/>
-
-                        </group>
                         <separator string="Description" colspan="4"/>
                         <field name="note" colspan="4" nolabel="1"/>
-                        <field name="state" select="1"/>
+                        <field name="registration_ids" colspan="4" nolabel="1">
+                            <tree string="Registration" editable="top">
+                                <field name="name" />
+                                <field name="email" />
+                                <field name="phone"/>
+                                <field name="nb_register" />
+                                <field name="state"/>
+                                <button name="button_reg_close" string="Close Registration" states="open" type="object" icon="gtk-close"/>
+                                <button name="case_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                                <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
+                            </tree>
+                            <form string="Registration">
+                                <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)" />
+                                <field name="name"/>
+                                <group colspan="4" col="4">
+                                <field name="street"/>
+                                <field name="city"/>
+                                </group>
+                                <group colspan="4" col="4">
+                                <field name="email"/>
+                                <field name="phone"/>
+                                </group>
+                                <group colspan="4" col="4">
+                                    <field name="nb_register"/>
+                                </group>
+                                <group colspan="4" col="4">
+                                </group>
+                                    <group col="8" colspan="4">
+                                        <separator string="" colspan="4"/>
+                                        <newline/>
+                                        <field name="state" select="1" colspan="2"/>
+                                        <button name="button_reg_close" string="Close Registration" states="open" type="object" icon="gtk-close"/>
+                                        <button name="case_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                                        <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
+                                    </group>
+                            </form>
+                            </field> 
+                        <field name="state" select="1" widget="statusbar" statusbar_visible="draft,confirm,done"/>
                         <group col="4" colspan="2">
                            <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
                            <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
@@ -90,72 +109,33 @@
                            <button string="Set To Draft" name="button_draft" states="cancel" type="object" icon="gtk-convert"/>
                         </group>
                     </page>
-                    <page string="Speakers">
+                    <page string="Speakers" groups="base.group_extended">
                         <field name="main_speaker_id" domain="[('speaker','=',True)]"/>
                         <field name="speaker_confirmed"/>
                         <separator string="Other Speakers" colspan="4"/>
                         <field name="speaker_ids" domain="[('speaker','=',True)]" colspan="4" nolabel="1"/>
                     </page>
-                    <page string="Registrations">
-                        <field name="register_min"/>
-                        <field name="register_max"/>
-                        <field name="register_current"/>
-                        <field name="register_prospect"/>
-                        <field name="registration_ids" colspan="4" nolabel="1" readonly="1">
-                            <form string="Registration">
-                                <field name="name"/>
-                                <field name="date" string="Date"/>
-                                <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id,event_id)"/>
-                                <field name="partner_invoice_id" on_change="onchange_partner_invoice_id(event_id, partner_invoice_id)"/>
-                                <group colspan="4" col="4">
-                                    <field name="event_product"/>
-                                    <field name="nb_register"/>
-                                    <field name="unit_price"/>
-                                    <field name="price_subtotal"/>
-                                </group>
-                                <group col="8" colspan="4">
-                                    <separator string="" colspan="4"/>
-                                    <newline/>
-                                    <field name="state" select="1" colspan="2"/>
-                                    <button name="button_reg_close" string="Close Registration" states="open" type="object" icon="gtk-close"/>
-                                    <button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                                    <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
-                                </group>
-                            </form>
-                            <tree string="Registration">
-                                    <field name="create_date" string="Registration Date"/>
-                                    <field name="partner_id" required="1" string="Partner" on_change="onchange_partner_id(partner_id,event_id)"/>
-                                    <field name="event_product"/>
-                                    <field name="nb_register"/>
-                                    <field name="unit_price"/>
-                                    <field name="price_subtotal"/>
-                                    <field name="state"/>
-                                    <button name="button_reg_close" string="Close Registration" states="open" type="object" icon="gtk-close"/>
-                                    <button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                                    <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
-                            </tree>
-                        </field>
-                    </page>
-                    <page string="Mailing">
-                        <field name="reply_to" />
-                        <newline/>
-                        <group col="4" colspan="4">
-                            <group col="2" colspan="2">
-                                <separator string="Auto Registration Email" colspan="4"/>
-                                <field name="mail_auto_registr" colspan="4"/>
-                                <group colspan="4" attrs="{'readonly':[('mail_auto_registr','=',False)]}">
-                                    <separator string="Registration Email Body" colspan="4"/>
-                                    <field name="mail_registr" colspan="4" nolabel="1" />
-                                </group>
-                            </group>
-                            <group col="2" colspan="2">
-                                <separator string="Auto Confirmation Email" colspan="4"/>
-                                <field name="mail_auto_confirm" colspan="4"/>
-                                <group colspan="4" attrs="{'readonly':[('mail_auto_confirm','=',False)]}">
-                                    <separator string="Confirmation Email Body" colspan="4"/>
-                                    <field name="mail_confirm" nolabel="1" colspan="4"/>
-                                </group>
-                            </group>
+                    <page string="Extra Info">
+                        <group col="2" colspan="2">
+                            <separator string="Registrations" colspan="2"/>
+                            <field name="register_min"/>
+                            <field name="register_max"/>
+                            <field name="register_current"/>
+                            <field name="register_prospect"/>
+                        </group>
+                        <group col="2" colspan="2">
+                            <separator string="Emails" colspan="2"/>
+                            <field name="reply_to"/>
+                            <field name="email_registration_id" domain="[('model_id','=','Event Registration')]"/>
+                            <field name="email_confirmation_id"/>
+                        </group>
+                        <group col="2" colspan="2" groups="base.group_extended">
+                            <separator string="Misc" colspan="2"/>
+                            <field name="product_id"/>
+                        </group>
+                        <group col="2" colspan="2">
+                            <separator string="Sales Team" colspan="2"/>
+                            <field name="section_id" on_change="do_team_change(self, cr, uid, ids, team_id)"/>
                         </group>
                     </page>
                     </notebook>
@@ -172,14 +152,13 @@
             <field name="arch" type="xml">
                 <tree string="Events" colors="red:register_min>register_current;black:register_min&lt;=register_current">
                     <field name="name" string="Name"/>
-                    <field name="main_speaker_id"/>
-                    <field name="language"/>
                     <field name="type"/>
                     <field name="date_begin"/>
                     <field name="date_end"/>
+                    <field name="register_current"/>
                     <field name="register_min"/>
-                    <field name="register_current"/>
                     <field name="section_id" invisible="context.get('invisible_section', True)"/>
+                    <field name="main_speaker_id" groups="base.extended"/>
                     <field name="user_id"/>
                     <field name="state"/>
                     <button string="Confirm Event" help="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
@@ -262,8 +241,8 @@
             </field>
         </record>
 
-    <!-- Events Organisation/CONFIGURATION/EVENTS  -->
 
+        <!-- Events Organisation/CONFIGURATION/EVENTS  -->
        <record model="ir.actions.act_window" id="action_event_view">
            <field name="name">Events</field>
            <field name="type">ir.actions.act_window</field>
@@ -296,23 +275,23 @@
        <menuitem name="Events" id="menu_event_event" action="action_event_view" parent="base.menu_event_main" />
        <menuitem name="Events" id="menu_event_event_assiciation" action="action_event_view" parent="base.menu_event_association" />
 
-    <!-- EVENTS/REGISTRATIONS/EVENTS  -->
-
-
+
+        <!-- EVENTS/REGISTRATIONS/EVENTS  -->
         <record model="ir.ui.view" id="view_event_registration_tree">
             <field name="name">event.registration.tree</field>
             <field name="model">event.registration</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Registration">
-                    <field name="partner_id"/>
+                <tree string="Registration" >
+                    <field name="name"/>
+                    <field name="email"/>
+                    <field name="phone"/>
                     <field name="event_id"/>
-                    <field name="nb_register"/>
-                    <field name="price_subtotal" sum="Total"/>
+                    <field name="nb_register" invisible="1"/>
                     <field name="user_id"/>
                     <field name="state"/>
-                    <button name="button_reg_close" string="Close Registration" states="open" type="object" icon="gtk-close"/>
-                    <button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                    <button name="case_close" string="Close Registration" states="open" type="object" icon="gtk-close"/>
+                    <button name="case_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
                     <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
                 </tree>
             </field>
@@ -325,69 +304,39 @@
             <field name="arch" type="xml">
                 <form string="Registration">
                     <group col="6" colspan="4">
-                        <field name="event_id" on_change="onchange_event(event_id, partner_invoice_id)" domain="[('state','in',('draft','confirm'))]"/>
-                        <field name="create_date" string="Registration Date"/>
-                        <field name="name"/>
-                        <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" required="1" on_change="onchange_partner_id(partner_id,event_id)" />
-                        <field name="user_id" attrs="{'readonly':[('state','!=', 'draft')]}" />
-                        <field name="tobe_invoiced"/>
+                        <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]"/>
+                        <field name="nb_register"/>
+                        <field name="origin"/>
+                        <field name="name" colspan="4"/>
+                        <field name="user_id" attrs="{'readonly':[('state','!=', 'draft')]}"/>
                     </group>
                     <notebook colspan="4">
-                        <page string="Registration">
-                            <field name="date" />
-                            <field name="date_deadline" />
+                        <page string="Additional Information">
                             <group colspan="2" col="2">
-                                <separator string="Registration Cost" colspan="4"/>
-                                <field name="nb_register"/>
-                                <field name="unit_price"/>
-                                <field name="price_subtotal"/>
-                            </group>
-                            <group colspan="2" col="2" attrs="{'invisible':[('tobe_invoiced','=',False)]}">
-                                <separator string="Invoice" colspan="4"/>
-                                <field name="event_product" attrs="{'required':[('tobe_invoiced','=',True)]}"/>
-                                <field name="partner_invoice_id" attrs="{'required':[('tobe_invoiced','=',True)]}" on_change="onchange_partner_invoice_id(event_id, partner_invoice_id)"/>
-                                <field name="invoice_id"/>
-                           </group>
-                            <separator string="Description" colspan="4"/>
-                            <field name="description" colspan="4" nolabel="1"/>
+                                <separator string="Contact Information" colspan="2"/>
+                                <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)" groups="base.group_extended"/>
+                                <field name="contact_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_contact_id(contact_id, context)" groups="base.group_extended"/>
+                                <field name="email"/>
+                                <field name="phone"/>
+                                <field name="street"/>
+                                <field name="city"/>
+                            </group>
+                            <group colspan="2" col="2" groups="base.group_extended">
+                                <separator string="Dates" colspan="2"/>
+                                <field name="date_closed"/>
+                                <field name="date" />
+                                <field name="date_deadline" />
+                            </group>
+
                             <separator string="" colspan="4"/>
                             <group col="8" colspan="4">
-                                <field name="state" select="1" colspan="2"/>
+                                <field name="state" select="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/>
                                 <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
                                 <button name="button_reg_close" string="Close Registration" states="open" type="object" icon="gtk-close"/>
-                                <button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                            </group>
-                        </page>
-                        <page string="Extra Info">
-                            <separator string="Contact" colspan="4"/>
-                            <field name="contact_id" on_change="onchange_contact_id(contact_id, partner_id)" />
-                            <field name="email_from"/>
-                            <field name="badge_ids" colspan="4" nolabel="1">
-                                <tree string="Badges" editable="bottom">
-                                    <field name="name"/>
-                                    <field name="title"/>
-                                    <field name="address_id"/>
-                                </tree>
-                                <form string="Badges">
-                                    <field name="name"/>
-                                    <field name="title"/>
-                                    <field name="address_id"/>
-                                </form>
-                            </field>
-                            <group col="2" colspan="2" groups="base.group_extended">
-                               <separator string="Dates" colspan="2"/>
-                               <field name="date_closed"/>
-                            </group>
-                            <group col="2" colspan="2" groups="base.group_extended">
-                               <separator string="Misc" colspan="2"/>
-                               <field name="id"/>
-                               <field name="active"/>
+                                <button name="case_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
                             </group>
                         </page>
                         <page string="Emails" groups="base.group_extended">
-                            <group colspan="4">
-                                 <field colspan="4" name="email_cc" string="CC" widget="char" size="512"/>
-                            </group>
                             <field name="message_ids" colspan="4" nolabel="1" mode="tree">
                                 <tree string="History">
                                     <field name="display_text" string="History Information"/>
@@ -407,13 +356,13 @@
                                 name="%(mail.action_email_compose_message_wizard)d"
                                 icon="terp-mail-message-new" type="action"/>
                            </page>
+
                     </notebook>
                 </form>
             </field>
         </record>
 
- <!-- Calendar view of event registration -->
-
+         <!-- Calendar view of event registration -->
         <record id="view_event_registration_calendar" model="ir.ui.view">
             <field name="name">event.registration.calendar</field>
             <field name="model">event.registration</field>
@@ -422,7 +371,7 @@
             <field name="arch" type="xml">
                 <calendar color="event_id" date_start="date" date_stop="date_closed" string="Event Registration">
                     <field name="event_id"/>
-                    <field name="partner_invoice_id"/>
+                    <field name="name"/>
                 </calendar>
             </field>
         </record>
@@ -434,14 +383,13 @@
             <field name="arch" type="xml">
                 <graph string="Registration" type="bar" orientation="horizontal">
                     <field name="event_id"/>
-                    <field name = "nb_register" operator="+"/>
+                    <field name= "nb_register" operator="+"/>
                 </graph>
             </field>
         </record>
 
 
-<!-- Search view of event registration form-->
-
+        <!-- Search view of event registration -->
         <record model="ir.ui.view" id="view_registration_search">
             <field name="name">Registrations</field>
             <field name="model">event.registration</field>
@@ -452,24 +400,25 @@
                         <filter icon="terp-check" string="New" name="draft" domain="[('state','=','draft')]" help="Registrations in unconfirmed state"/>
                         <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','open')]" help="Confirmed registrations"/>
                         <separator orientation="vertical"/>
-                        <field name="partner_id" />
                         <field name="event_id" widget="selection"/>
+                        <field name="partner_id" groups="base.group_extended"/>
                         <field name="user_id" widget="selection">
                         <filter icon="terp-personal"
                               string="My Registrations"
                                 help="My Registrations"
                               domain="[('user_id','=',uid)]"/>
                         </field>
-                        <field name="state"/>
+                        <field name="origin"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Responsible"  icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}" groups="base.group_extended"/>
                         <separator orientation="vertical"/>
                         <filter string="Event" icon="terp-crm" domain="[]" context="{'group_by':'event_id'}"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                    </group>
+
                 </search>
             </field>
         </record>

=== modified file 'event/report/report_event_registration.py'
--- event/report/report_event_registration.py	2011-12-19 16:54:40 +0000
+++ event/report/report_event_registration.py	2012-02-02 16:05:26 +0000
@@ -29,7 +29,7 @@
     _auto = False
     _rec_name = 'date'
     _columns = {
-        'date': fields.date('Event Start Date', readonly=True),
+        'event_date': fields.date('Event Start Date', readonly=True),
         'year': fields.char('Year', size=4, readonly=True),
         'month': fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
             ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
@@ -39,16 +39,18 @@
         'confirm_state': fields.integer(' # No of Confirmed Registrations', size=20),
         'register_max': fields.integer('Maximum Registrations'),
         'nbevent': fields.integer('Number Of Events'),
-        'type': fields.many2one('event.type', 'Event Type'),
-        'state': fields.selection([('draft', 'Draft'), ('confirm', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, required=True),
+        'event_type': fields.many2one('event.type', 'Event Type'),
+        'registration_state': fields.selection([('draft', 'Draft'), ('confirm', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, required=True),
+        'event_state': fields.selection([('draft', 'Draft'), ('confirm', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, required=True),
         'user_id': fields.many2one('res.users', 'Responsible', readonly=True),
+        'user_id_registration': fields.many2one('res.users', 'Register', readonly=True),
+        'name_registration': fields.char('Register',size=45, readonly=True),
         'speaker_id': fields.many2one('res.partner', 'Speaker', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
-        'product_id': fields.many2one('product.product', 'Product', readonly=True),
         'total': fields.float('Total'),
         'section_id': fields.related('event_id', 'section_id', type='many2one', relation='crm.case.section', string='Sale Team', store=True, readonly=True),
     }
-    _order = 'date desc'
+    _order = 'event_date desc'
     def init(self, cr):
         """
         initialize the sql view for the event registration
@@ -58,75 +60,54 @@
         cr.execute("""
          CREATE OR REPLACE view report_event_registration AS (
                 SELECT
-                id,
                 event_id,
-                date,
-                user_id,
-                section_id,
-                company_id,
-                product_id,
-                speaker_id,
-                year,
-                month,
-                nbevent,
-                type,
-                SUM(draft_state) AS draft_state,
-                SUM(confirm_state) AS confirm_state,
-                SUM(total) AS total,
-                register_max,
-                state
-                FROM(
-                SELECT
-                MIN(e.id) AS id,
-                e.id AS event_id,
-                e.date_begin AS date,
+                r.id,
+                e.date_begin AS event_date,
                 e.user_id AS user_id,
+                r.user_id AS user_id_registration,
+                r.name AS name_registration,
                 e.section_id AS section_id,
                 e.company_id AS company_id,
-                e.product_id AS product_id,
                 e.main_speaker_id AS speaker_id,
                 to_char(e.date_begin, 'YYYY') AS year,
                 to_char(e.date_begin, 'MM') AS month,
                 count(e.id) AS nbevent,
-                t.id AS type,
-                CASE WHEN c.state IN ('draft') THEN c.nb_register ELSE 0 END AS draft_state,
-                CASE WHEN c.state IN ('open','done') THEN c.nb_register ELSE 0 END AS confirm_state,
-                CASE WHEN c.state IN ('done') THEN c.price_subtotal ELSE 0 END AS total,
+                CASE WHEN r.state IN ('draft') THEN r.nb_register ELSE 0 END AS draft_state,
+                CASE WHEN r.state IN ('open','done') THEN r.nb_register ELSE 0 END AS confirm_state,
+                e.type AS event_type,
                 e.register_max AS register_max,
-                e.state AS state
+                e.state AS  event_state,
+                r.state AS  registration_state
                 FROM
                 event_event e
-                LEFT JOIN
-                    event_registration c ON (e.id=c.event_id)
-                LEFT JOIN
-                    event_type t ON (e.type=t.id)
-                WHERE c.active = 'true'
+                
+                LEFT JOIN
+                    event_registration r ON (e.id=r.event_id)
+
+                WHERE r.active = 'true'
+               
                GROUP BY
-                    to_char(e.date_begin, 'YYYY'),
-                    to_char(e.date_begin, 'MM'),
-                    c.state,
-                    c.nb_register,
-                    t.id, e.id, e.date_begin, e.main_speaker_id,
-                    e.register_max, e.type, e.state, c.event_id, e.user_id,e.company_id,e.product_id,e.section_id,
-                    to_char(e.date_begin, 'YYYY-MM-DD'), c.id, c.price_subtotal )AS foo
-                GROUP BY
-                id,
                 event_id,
-                date,
-                user_id,
-                section_id,
-                company_id,
-                product_id,
-                speaker_id,
+                user_id_registration,
+                e.id,
+                r.id,
+                registration_state,
+                r.nb_register,
+                event_type, e.id, e.date_begin, e.main_speaker_id,
+                e.register_max,event_id, e.user_id,e.company_id,e.section_id,
+                e.user_id,
+                e.section_id,
+                event_state,
+                e.company_id,
+                e.main_speaker_id,
                 year,
                 month,
-                nbevent,
-                type,
-                register_max,
-                state
+                e.register_max,
+                name_registration
+
               )
                 """)
 
 report_event_registration()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'event/report/report_event_registration_view.xml'
--- event/report/report_event_registration_view.xml	2011-11-16 19:01:24 +0000
+++ event/report/report_event_registration_view.xml	2012-02-02 16:05:26 +0000
@@ -8,21 +8,23 @@
             <field name="model">report.event.registration</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state == 'draft';black:state == 'confirm';gray:state in('done','cancel')" string="Events Analysis">
-                    <field name="date" invisible="1"/>
+                <tree colors="blue:event_state == 'draft';black:event_state == 'confirm';gray:event_state in('done','cancel')" string="Events Analysis">
+                    <field name="event_date" invisible="1"/>
                     <field name="user_id" invisible="1"/>
                     <field name="speaker_id" invisible="1"/>
                     <field name="year" invisible="1"/>
                     <field name="month" invisible="1"/>
                     <field name="event_id" invisible="1"/>
-                    <field name="state" invisible="1"/>
-                    <field name="type" invisible="1"/>
+                    <field name="event_state" invisible="1"/>
+                    <field name="event_type" invisible="1"/>
                     <field name="nbevent"/>
                     <field name="draft_state" invisible="context.get('no_of_draft_invisible', False)"/>
                     <field name="confirm_state"/>
+                    <field name="registration_state" invisible="1"/>
+                    <field name="name_registration" invisible="1"/>
+                    <field name="user_id_registration" invisible="1"/>
                     <field name="register_max" invisible="context.get('max_reg_event_visible', True)"/>
                     <field name="company_id" invisible="1"/>
-                    <field name="product_id" invisible="1"/>
                     <field name="section_id" invisible="1"/>
                     <field name="total" invisible="context.get('total_invisible', True)" sum="Total"/>
                 </tree>
@@ -54,33 +56,30 @@
                 <search string="Event on Registration">
                     <group>
                     <filter string="Year" icon="terp-go-year" name="year"
-                          domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
+                          domain="[('event_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('event_date','&gt;=',time.strftime('%%Y-01-01'))]"
                           help="Events created in current year"/>
                     <separator orientation="vertical"/>
                     <filter string="Month" icon="terp-go-month" name="this_month"
-                          domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
+                          domain="[('event_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('event_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                           help="Events created in current month"/>
                     <filter icon="terp-go-month" string="    Month-1    "
-                          domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
+                          domain="[('event_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('event_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                           help="Events created in last month"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-document-new"
                         string="New"
-                        domain="[('state','=','draft')]"
+                        domain="[('event_state','=','draft')]"
                         help="Events which are in New state"/>
                     <filter icon="terp-check"
                         string="Confirm"
-                        domain="[('state','=','confirm')]"
+                        domain="[('event_state','=','confirm')]"
                         help="Events which are in confirm state"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-camera_test"
                           string="Confirmed Registrations"
                           help="Registrations in confirmed or done state"
                           context="{'no_of_draft_invisible':1}"/>
-                    <filter string="Invoiced"
-                        name="invoiced"
-                        icon="terp-dolar"
-                        help = "Invoiced Registrations only" context="{'total_invisible':0, 'no_of_draft_invisible':1}"/>
+                   
                     <separator orientation="vertical"/>
                     <field name="event_id" string="Event"/>
                     <field name="user_id" widget="selection">
@@ -92,31 +91,39 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                        <field name="type" widget="selection"/>
-                        <field name="date"/>
+                        <field name="event_type" widget="selection"/>
+                        <field name="event_date"/>
                     </group>
                     <newline/>
 
                     <group expand="1" string="Group By...">
                         <filter string="Responsible" name="user_id" icon="terp-personal" context="{'group_by': 'user_id'}"/>
                         <filter string="Speaker" name="speaker" icon="terp-personal+" context="{'group_by': 'speaker_id'}"/>
+                        <filter string="Participant" icon="terp-personal" context="{'group_by':'name_registration'}" help="Registration contact"/>
                         <filter string="Sale Team"  icon="terp-personal" context="{'group_by': 'section_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Event" name="event" icon="terp-crm" context="{'group_by':'event_id', 'max_reg_event_visible':0}"/>
-                        <filter string="Product"  icon="terp-accessories-archiver" context="{'group_by': 'product_id'}"/>
+                        
                         <separator orientation="vertical"/>
-                        <filter string="Event Type" icon="terp-crm"  context="{'group_by':'type'}"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}" help="Events States"/>
+                        <filter string="Event Type" icon="terp-crm"  context="{'group_by':'event_type'}"/>
+                        <filter string="event_state" icon="terp-stock_effects-object-colorize" context="{'group_by':'event_state'}" help="Events States"/>
                         <separator orientation="vertical" groups="base.group_multi_company"/>
                         <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                         <separator orientation="vertical" />
                         <filter string="Date" icon="terp-go-month"
-                            domain="[]" context="{'group_by':'date'}" help="Event Beginning Date"/>
+                            domain="[]" context="{'group_by':'event_date'}" help="Event Beginning Date"/>
                         <filter string="Month" icon="terp-go-month"
                             domain="[]" context="{'group_by':'month'}" help="Event Beginning Date"/>
                         <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'year'}" help="Event Beginning Date"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'registration_state'}" help="Events States"/>
+                        <filter string="name of the register" icon="terp-personal" context="{'group_by':'user_id_registration'}" help="Registration contact"/>
+
                     </group>
+
+
+
+
                 </search>
             </field>
         </record>

=== modified file 'event/security/ir.model.access.csv'
--- event/security/ir.model.access.csv	2011-12-19 16:54:40 +0000
+++ event/security/ir.model.access.csv	2012-02-02 16:05:26 +0000
@@ -8,8 +8,5 @@
 access_event_registration_manager,event.registration manager,model_event_registration,marketing.group_marketing_manager,1,0,0,0
 access_crm_case_section_manager,crm.case.section manager,crm.model_crm_case_section,marketing.group_marketing_manager,1,1,1,1
 access_product_product,product.product.product manager,product.model_product_product,marketing.group_marketing_manager,1,1,1,1
-access_event_registration_badge_manager,event.registration.badge manager,model_event_registration_badge,marketing.group_marketing_manager,1,1,1,1
 access_event_event_sale_salesman,event.event.sale,model_event_event,base.group_sale_salesman,1,0,0,0
-access_account_account_invoice_manager,account.account.invoice,account.model_account_invoice,marketing.group_marketing_manager,1,0,0,0
-access_event_registration_badge,event.registration.badge,model_event_registration_badge,marketing.group_marketing_user,1,0,0,0
 access_event_registration_sale_user,event.registration.sale.user,model_event_registration,base.group_sale_salesman,1,0,0,0

=== modified file 'event/test/process/partner_register2invoice.yml'
--- event/test/process/partner_register2invoice.yml	2011-11-15 09:18:56 +0000
+++ event/test/process/partner_register2invoice.yml	2012-02-02 16:05:26 +0000
@@ -22,41 +22,11 @@
 - 
   !assert {model: event.registration, id: reg_1_1}: 
      - state == 'open', "Registration should be open here."
--
-  After confirmation of partner, I create invoice base on costing of event. 
--
-  !python {model: event.registration}: |
-    self.action_invoice_create(cr, uid, [ref("reg_1_1")])
--
-  Now I Check for Invoice is created and Registration should be closed after invoice generated.
-- 
-  !python {model: event.registration}: |
-    record = self.browse(cr, uid, [ref("reg_1_1")])[0]
-    assert record.invoice_id, "Invoice should be generated"
-    assert record.invoice_id.state == "draft", "Invoice state should be draft"
-    assert record.invoice_id.partner_id == record.partner_id, "Customer is not correspond with registration"
-    assert record.invoice_id.type == 'out_invoice', "Invoice type is not correct"
-    assert record.invoice_id.origin == record.event_product, "Invoice origin is not correct"
-    assert record.invoice_id.amount_total == record.price_subtotal, "Invoice amount is not correct"
-    assert record.state == "done", "Registration should be closed after invoice generated"
--
-  Now I check for same partner registration for two diffrent event and I create group invoices for same partner. 
--
-  !python {model: event.make.invoice}: |
-    context.update({'active_model': 'event.make.invoice', 'active_ids': [ref("reg_0_1"), ref("reg_0_2")], 'active_id': ref("reg_0_1")})
-    invoice = self.create(cr, uid, {'grouped': True}, context=context)
-    self.make_invoice(cr, uid, [invoice], context=context)
--
-  Now I Check for group Invoice is created with total amount of both registration
-  and Registration should be closed after invoice generated.
-- 
-  !python {model: event.registration}: |
-    reg_data_1 = self.browse(cr, uid, [ref("reg_0_1")])[0]
-    reg_data_2 = self.browse(cr, uid, [ref("reg_0_2")])[0]
-    assert reg_data_1.invoice_id, "Invoice should be generated"
-    assert reg_data_1.invoice_id.state == "draft", "Invoice state should be draft"
-    assert reg_data_1.invoice_id.partner_id == reg_data_1.partner_id, "Customer is not correspond with registration"
-    assert reg_data_1.invoice_id.type == 'out_invoice', "Invoice type is not correct"
-    assert reg_data_1.invoice_id.origin == reg_data_1.event_product, "Invoice origin is not correct"
-    assert reg_data_1.invoice_id.amount_total == (reg_data_1.price_subtotal + reg_data_2.price_subtotal), "Invoice total amount is not correct"
-    assert reg_data_1.state == "done", "Registration should be closed after invoice generated"
+
+-
+  I Check that Registration is close.
+- 
+  !assert {model: event.registration, id: reg_1_1}: 
+     - state == 'done', "Registration should be done here."
+
+

=== modified file 'event/wizard/__init__.py'
--- event/wizard/__init__.py	2011-09-07 17:25:00 +0000
+++ event/wizard/__init__.py	2012-02-02 16:05:26 +0000
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-import event_make_invoice
+
 import event_confirm_registration
 import event_confirm
 import partner_event_registration

=== modified file 'event/wizard/event_confirm_registration.py'
--- event/wizard/event_confirm_registration.py	2011-01-14 00:11:01 +0000
+++ event/wizard/event_confirm_registration.py	2012-02-02 16:05:26 +0000
@@ -36,35 +36,11 @@
         'msg': 'The event limit is reached. What do you want to do?'
      }
 
-    def default_get(self, cr, uid, fields, context=None):
-        """
-        This function gets default values
-        """
-        if context is None:
-            context = {}
-        registration_pool = self.pool.get('event.registration')
-        registration_ids = context.get('registration_ids', [])
-        res = super(event_confirm_registration, self).default_get(cr, uid, fields, context=context)
-        msg = ""
-        overlimit_event_ids = []
-        for registration in registration_pool.browse(cr, uid, registration_ids, context=context):
-            register_max = registration.event_id.register_max
-            if registration.event_id.id not in overlimit_event_ids:
-                overlimit_event_ids.append(registration.event_id.id)
-                msg += _("Warning: The Event '%s' has reached its Maximum Limit (%s).") \
-                            %(registration.event_id.name, register_max)
-        if 'msg' in fields:
-            res.update({'msg': msg})
-        return res
+
 
     def confirm(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        registration_pool = self.pool.get('event.registration')
-        registration_ids = context.get('registration_ids', [])
-        registration_pool.do_open(cr, uid, registration_ids, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
 event_confirm_registration()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== removed file 'event/wizard/event_make_invoice.py'
--- event/wizard/event_make_invoice.py	2011-01-14 00:11:01 +0000
+++ event/wizard/event_make_invoice.py	1970-01-01 00:00:00 +0000
@@ -1,95 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import fields, osv
-from tools.translate import _
-
-class event_make_invoice(osv.osv_memory):
-    """
-    Make Invoices
-    """
-    _name = "event.make.invoice"
-    _description = "Event Make Invoice"
-    _columns = {
-        'grouped': fields.boolean('Group the invoices'),
-        'invoice_date': fields.date('Invoice Date'),
-    }
-
-    def view_init(self, cr, uid, fields, context=None):
-        """
-        This function checks for precondition before wizard executes
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param fields: List of fields for default value
-        @param context: A standard dictionary for contextual values
-        """
-        obj_event_reg = self.pool.get('event.registration')
-        data = context and context.get('active_ids', [])
-
-        for event_reg in obj_event_reg.browse(cr, uid, data, context=context):
-            if event_reg.state in ('draft', 'done', 'cancel'):
-                     raise osv.except_osv(_('Warning !'),
-                        _("Invoice cannot be created if the registration is in %s state.") % (event_reg.state))
-
-            if (not event_reg.tobe_invoiced):
-                    raise osv.except_osv(_('Warning !'),
-                        _("Registration is set as Cannot be invoiced"))
-
-            if not event_reg.event_id.product_id:
-                    raise osv.except_osv(_('Warning !'),
-                        _("Event related doesn't have any product defined"))
-
-            if not event_reg.partner_invoice_id:
-                   raise osv.except_osv(_('Warning !'),
-                        _("Registration doesn't have any partner to invoice."))
-
-    def default_get(self, cr, uid, fields_list, context=None):
-        return super(event_make_invoice, self).default_get(cr, uid, fields_list, context=context)
-
-    def make_invoice(self, cr, uid, ids, context=None):
-        reg_obj = self.pool.get('event.registration')
-        mod_obj = self.pool.get('ir.model.data')
-        if context is None:
-            context = {}
-
-        for data in self.browse(cr, uid, ids, context=context):
-            res = reg_obj.action_invoice_create(cr, uid, context.get(('active_ids'),[]), data.grouped, date_inv = data.invoice_date)
-
-        form_id = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_form')
-        form_res = form_id and form_id[1] or False
-        tree_id = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_tree')
-        tree_res = tree_id and tree_id[1] or False
-        return {
-            'domain': "[('id', 'in', %s)]" % res,
-            'name': _('Customer Invoices'),
-            'view_type': 'form',
-            'view_mode': 'tree,form',
-            'res_model': 'account.invoice',
-            'view_id': False,
-            'views': [(tree_res, 'tree'), (form_res, 'form')],
-            'context': "{'type':'out_refund'}",
-            'type': 'ir.actions.act_window',
-        }
-
-event_make_invoice()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== removed file 'event/wizard/event_make_invoice_view.xml'
--- event/wizard/event_make_invoice_view.xml	2011-01-14 00:11:01 +0000
+++ event/wizard/event_make_invoice_view.xml	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-    	<record id="view_event_make_invoice" model="ir.ui.view">
-            <field name="name">event.make.invoice</field>
-            <field name="model">event.make.invoice</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-             <form string="Create invoices">
-                <separator colspan="4" string="Do you really want to create the invoice(s) ?" />
-                <field name="grouped" />
-                <field name="invoice_date"/>
-                <group colspan="4">
-	                <separator string="" colspan="4" />
-	                <label string="" colspan="2"/>
-	                <button special="cancel" string="Close" icon="gtk-close"/>
-	                <button name="make_invoice" string="Done" type="object" icon="gtk-ok"/>
-                </group>
-             </form>
-            </field>
-		</record>
-
-		<record id="action_event_confirm_registration" model="ir.actions.act_window">
-            <field name="name">Make Invoices</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">event.make.invoice</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="view_event_make_invoice"/>
-            <field name="target">new</field>
-    	</record>
-
-        <act_window id="action_make_invoices"
-    		key2 = "client_action_multi"   name="Make Invoice"
-    		res_model="event.make.invoice"  src_model="event.registration"
-    		view_mode="form" target="new"  view_type="form" />
-
-    </data>
-</openerp>

=== modified file 'event/wizard/partner_event_registration.py'
--- event/wizard/partner_event_registration.py	2011-12-19 16:54:40 +0000
+++ event/wizard/partner_event_registration.py	2012-02-02 16:05:26 +0000
@@ -76,7 +76,6 @@
                         '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,