Merge lp:~openerp-dev/openobject-addons/trunk-imp-event-ptr into lp:~openerp-dev/openobject-addons/trunk-imp-event-psa

[Pariket Trivedi(OpenERP)]

hello,

I have imporve code for report file in event module.

thank you,
ptr

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

9332. By Pariket Trivedi(OpenERP) on 2014-04-18

[IMP]: replace event.registration by event.registration_attendee object.

9333. By Pariket Trivedi(OpenERP) on 2014-04-18

[IMP]: add marker in website.

9334. By Pariket Trivedi(OpenERP) on 2014-04-22

[IMP]: remove markers argument.

9335. By Pariket Trivedi(OpenERP) on 2014-04-22

[MERGE]: merge with trunk-imp-event-psa.

=== modified file 'event/board_association_view.xml'
--- event/board_association_view.xml	2014-01-28 17:58:35 +0000
+++ event/board_association_view.xml	2014-04-22 07:17:23 +0000
@@ -4,7 +4,7 @@
         <!-- Events dashboard -->
         <record model ="ir.ui.view" id="view_report_event_reg_graph">
             <field name="name">Registration Event report</field>
-            <field name="model">report.event.registration</field>
+            <field name="model">report.event.registration_attendee</field>
             <field name="arch" type="xml">
                 <graph string="Events Filling Status" type="bar" >
                     <field name="event_id" type="row"/>
@@ -15,7 +15,7 @@
 
         <record  model="ir.actions.act_window" id="act_event_reg">
             <field name="name">Events Filling Status</field>
-            <field name="res_model">report.event.registration</field>
+            <field name="res_model">report.event.registration_attendee</field>
             <field name="view_type">form</field>
             <field name="domain">[('event_state','not in',('cancel','done'))]</field>
             <field name="view_mode">graph,tree</field>
@@ -34,7 +34,7 @@
         <record model="ir.actions.act_window" id="act_event_view_registration">
             <field name="name">New Registration</field>
             <field name="type">ir.actions.act_window</field>
-            <field name="res_model">event.registration</field>
+            <field name="res_model">event.registration_attendee</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','draft')]</field>

=== modified file 'event/email_template.xml'
--- event/email_template.xml	2013-11-22 10:45:09 +0000
+++ event/email_template.xml	2014-04-22 07:17:23 +0000
@@ -3,7 +3,7 @@
     <data>
         <record id="confirmation_event" model="email.template">
         <field name="name">Confirmation of the Event</field>
-        <field name="model_id" ref="event.model_event_registration"/>
+        <field name="model_id" ref="event.model_event_registration_attendee"/>
         <field name="email_from" >${(object.user_id.email or object.company_id.email or 'noreply@' + object.company_id.name + '.com')|safe}</field>
         <field name="email_to" >${object.email|safe}</field>
         <field name="subject">Your registration at ${object.event_id.name}</field>
@@ -20,7 +20,7 @@
 
         <record id="confirmation_registration" model="email.template">
         <field name="name">Confirmation of the Registration</field>
-        <field name="model_id" ref="event.model_event_registration"/>
+        <field name="model_id" ref="event.model_event_registration_attendee"/>
         <field name="email_from" >${(object.user_id.email or object.company_id.email or 'noreply@' + object.company_id.name + '.com')|safe}</field>
         <field name="email_to" >${object.email|safe}</field>
         <field name="subject">Your registration at ${object.event_id.name}</field>

=== modified file 'event/event.py'
--- event/event.py	2014-04-22 05:56:27 +0000
+++ event/event.py	2014-04-22 07:17:23 +0000
@@ -80,7 +80,7 @@
         return self.write(cr, uid, ids, {'state': 'draft'}, context=context)
 
     def button_cancel(self, cr, uid, ids, context=None):
-        registration = self.pool.get('event.registration')
+        registration = self.pool.get('event.registration_attendee')
         reg_ids = registration.search(cr, uid, [('event_id','in',ids)], context=context)
         for event_reg in registration.browse(cr,uid,reg_ids,context=context):
             if event_reg.state == 'done':
@@ -92,7 +92,7 @@
         return self.write(cr, uid, ids, {'state': 'done'}, context=context)
 
     def confirm_event(self, cr, uid, ids, context=None):
-        register_pool = self.pool.get('event.registration')
+        register_pool = self.pool.get('event.registration_attendee')
         for event in self.browse(cr, uid, ids, context=context):
             if event.email_confirmation_id:
             #send reminder that will confirm the event for all the people that were already confirmed
@@ -115,7 +115,7 @@
         res = {}
         for event_id in ids:
             res[event_id] = {key:0 for key in keys.values()}
-        query = "SELECT state, sum(nb_register) FROM event_registration WHERE event_id = %s AND state IN ('draft','open','done') GROUP BY state"
+        query = "SELECT state, sum(nb_register) FROM event_registration_attendee WHERE event_id = %s AND state IN ('draft','open','done') GROUP BY state"
         for event in self.pool.get('event.event').browse(cr, uid, ids, context=context):
             cr.execute(query, (event.id,))
             reg_states = cr.fetchall()
@@ -138,7 +138,7 @@
     def _subscribe_fnc(self, cr, uid, ids, fields, args, context=None):
         """This functional fields compute if the current user (uid) is already subscribed or not to the event passed in parameter (ids)
         """
-        register_pool = self.pool.get('event.registration')
+        register_pool = self.pool.get('event.registration_attendee')
         res = {}
         for event in self.browse(cr, uid, ids, context=context):
             res[event.id] = False
@@ -157,18 +157,18 @@
         'seats_max': fields.integer('Maximum Avalaible Seats', oldname='register_max', help="You can for each event define a maximum registration level. If you have too much registrations you are not able to confirm your event. (put 0 to ignore this rule )", readonly=True, states={'draft': [('readonly', False)]}),
         'seats_min': fields.integer('Minimum Reserved Seats', oldname='register_min', help="You can for each event define a minimum registration level. If you do not enough registrations you are not able to confirm your event. (put 0 to ignore this rule )", readonly=True, states={'draft': [('readonly', False)]}),
         'seats_reserved': fields.function(_get_seats, oldname='register_current', string='Reserved Seats', type='integer', multi='seats_reserved',
-            store={'event.registration': (_get_events_from_registrations, ['state'], 10),
+            store={'event.registration_attendee': (_get_events_from_registrations, ['state'], 10),
                    'event.event': (lambda  self, cr, uid, ids, c = {}: ids, ['seats_max', 'registration_ids'], 20)}),
         'seats_available': fields.function(_get_seats, oldname='register_avail', string='Available Seats', type='integer', multi='seats_reserved',
-            store={'event.registration': (_get_events_from_registrations, ['state'], 10),
+            store={'event.registration_attendee': (_get_events_from_registrations, ['state'], 10),
                    'event.event': (lambda  self, cr, uid, ids, c = {}: ids, ['seats_max', 'registration_ids'], 20)}),
         'seats_unconfirmed': fields.function(_get_seats, oldname='register_prospect', string='Unconfirmed Seat Reservations', type='integer', multi='seats_reserved',
-            store={'event.registration': (_get_events_from_registrations, ['state'], 10),
+            store={'event.registration_attendee': (_get_events_from_registrations, ['state'], 10),
                    'event.event': (lambda  self, cr, uid, ids, c = {}: ids, ['seats_max', 'registration_ids'], 20)}),
         'seats_used': fields.function(_get_seats, oldname='register_attended', string='Number of Participations', type='integer', multi='seats_reserved',
-            store={'event.registration': (_get_events_from_registrations, ['state'], 10),
+            store={'event.registration_attendee': (_get_events_from_registrations, ['state'], 10),
                    'event.event': (lambda  self, cr, uid, ids, c = {}: ids, ['seats_max', 'registration_ids'], 20)}),
-        'registration_ids': fields.one2many('event.registration', 'event_id', 'Registrations', readonly=False, states={'done': [('readonly', True)]}),
+        'registration_ids': fields.one2many('event.registration_attendee', 'event_id', 'Registrations', readonly=False, states={'done': [('readonly', True)]}),
         'date_begin': fields.datetime('Start Date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'date_end': fields.datetime('End Date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'state': fields.selection([
@@ -194,7 +194,7 @@
         'location': fields.selection([("online", "Online Event"),
                                       ("physical", "Physical Event")], "Location"),
         'event_reminder_ids' : fields.one2many('event.reminder', 'event_id', "Event Reminders"),
-        'attendee_ids' : fields.one2many('event.registration_attendee', 'event_id', "Attendees"),
+        'attendee_ids' : fields.one2many('event.registration_attendee_attendee', 'event_id', "Attendees"),
         'badge_layout' : fields.selection([("business_card", "Business Card"),
                                            ("A4", "A4")], "Badges Format"),
     }
@@ -218,7 +218,7 @@
     ]
 
     def subscribe_to_event(self, cr, uid, ids, context=None):
-        register_pool = self.pool.get('event.registration')
+        register_pool = self.pool.get('event.registration_attendee')
         user_pool = self.pool.get('res.users')
         num_of_seats = int(context.get('ticket', 1))
         user = user_pool.browse(cr, uid, uid, context=context)
@@ -231,7 +231,7 @@
         return register_pool.confirm_registration(cr, SUPERUSER_ID, curr_reg_ids, context=context)
 
     def unsubscribe_to_event(self, cr, uid, ids, context=None):
-        register_pool = self.pool.get('event.registration')
+        register_pool = self.pool.get('event.registration_attendee')
         #the unsubscription is done with SUPERUSER_ID because in case we share the kanban view, we want anyone to be able to unsubscribe
         curr_reg_ids = register_pool.search(cr, SUPERUSER_ID, [('user_id', '=', uid), ('event_id', '=', ids[0])])
         return register_pool.button_reg_cancel(cr, SUPERUSER_ID, curr_reg_ids, context=context)
@@ -273,7 +273,7 @@
 
 class event_registration(osv.osv):
     """Event Registration"""
-    _name= 'event.registration'
+    _name= 'event.registration_attendee'
     _description = __doc__
     _inherit = ['mail.thread', 'ir.needaction_mixin']
     _columns = {
@@ -409,7 +409,7 @@
                                     ('before_event', 'Before Event'),
                                     ('after_event', 'After Event')], string="Element", required=True, help="(subscription or event)"),
         'email_template': fields.many2one('email.template', 'Email Template', required=True, help="Email template to be send."),
-        'sended' : fields.boolean("Sended", help="Works for reminder linked to an event and not for a registration (see event.registration)"),
+        'sended' : fields.boolean("Sended", help="Works for reminder linked to an event and not for a registration (see event.registration_attendee)"),
         'event_id' : fields.many2one('event.event', 'Event ID'),
     }
 
@@ -437,7 +437,7 @@
                             time_to_send = datetime.strptime(subs.registration_date, '%Y-%m-%d') + timedelta(days=self._get_number_days(reminder))
                             if time_to_send < datetime.now():
                                 self.pool.get('event.event').send_reminder_mail(cr, uid, event.id, reminder.email_template.id, context=context)
-                                self.pool.get('event.registration').write(cr, uid, [subs.id], {'reminder_sended': True}, context=context)
+                                self.pool.get('event.registration_attendee').write(cr, uid, [subs.id], {'reminder_sended': True}, context=context)
                 else:
                     for subs in event.attendee_ids:
                         time_to_send = datetime.max

=== modified file 'event/event_demo.xml'
--- event/event_demo.xml	2014-04-16 09:39:39 +0000
+++ event/event_demo.xml	2014-04-22 07:17:23 +0000
@@ -208,7 +208,7 @@
     <function model="event.event" name="button_confirm" eval="[ref('event_2')]"/>
 
 <!-- Demo data for Event Registration-->
-    <record id="reg_1_1" model="event.registration">
+    <record id="reg_1_1" model="event.registration_attendee">
         <field name="name">Agrolait</field>
         <field name="email">[e-mail]</field>
         <field name="phone">003281588558</field>
@@ -217,7 +217,7 @@
         <field name="nb_register">5</field>
     </record>
 
-    <record id="reg_1_2" model="event.registration">
+    <record id="reg_1_2" model="event.registration_attendee">
         <field name="name">ASUStek</field>
         <field name="email">[e-mail]</field>
         <field name="phone">+ 1 64 61 04 01</field>
@@ -226,7 +226,7 @@
         <field name="nb_register">10</field>
     </record>
 
-    <record id="reg_0_2" model="event.registration">
+    <record id="reg_0_2" model="event.registration_attendee">
         <field name="name">Camptocamp</field>
         <field name="email">[e-mail]</field>
         <field name="phone">[phone] </field>

=== modified file 'event/event_reports.xml'
--- event/event_reports.xml	2014-04-17 06:03:21 +0000
+++ event/event_reports.xml	2014-04-22 07:17:23 +0000
@@ -4,7 +4,7 @@
         <report 
             id="action_report_event_registration_attendee_business_card_ticket"
             string="Business Card Badge"
-            model="event.registration"
+            model="event.registration_attendee"
             report_type="qweb-html"
             file="event.report_event_registration_attendees_business_card"
             name="event.report_event_registration_attendees_business_card"
@@ -18,7 +18,7 @@
         <report 
             id="action_report_event_registration_attendee_A4_ticket"
             string="A4 Badge"
-            model="event.registration"
+            model="event.registration_attendee"
             report_type="qweb-html"
             file="event.report_event_registration_attendees_A4"
             name="event.report_event_registration_attendees_A4"

=== modified file 'event/event_view.xml'
--- event/event_view.xml	2014-04-16 05:54:32 +0000
+++ event/event_view.xml	2014-04-22 07:17:23 +0000
@@ -3,7 +3,7 @@
     <data>
 
         <record id="act_event_list_register_event" model="ir.actions.act_window">
-            <field name="res_model">event.registration</field>
+            <field name="res_model">event.registration_attendee</field>
             <field name="view_type">form</field>
             <field name="name">Registrations</field>
             <field name="view_mode">tree,form,calendar,graph</field>
@@ -12,7 +12,7 @@
 
         <record model="ir.actions.act_window" id="action_attendee_management">
           <field name="name">Attendees Management</field>
-          <field name="res_model">event.registration</field>
+          <field name="res_model">event.registration_attendee</field>
           <field name="view_type">form</field>
           <field name="domain">[('event_id', 'in', [active_id])]</field>
           <field name="view_mode">tree,form</field>
@@ -33,9 +33,9 @@
                         <field name="name"/>
                         <field name="default_reply_to"/>
                         <field name="default_registration_min"/>
-                        <field name="default_email_event" domain="[('model_id.model','=','event.registration')]"/>
+                        <field name="default_email_event" domain="[('model_id.model','=','event.registration_attendee')]"/>
                         <field name="default_registration_max"/>
-                        <field name="default_email_registration" domain="[('model_id.model','=','event.registration')]"/>
+                        <field name="default_email_registration" domain="[('model_id.model','=','event.registration_attendee')]"/>
                     </group>
                 </form>
             </field>
@@ -292,7 +292,7 @@
         <act_window
             id="act_register_event_partner"
             name="Subscribe"
-            res_model="event.registration"
+            res_model="event.registration_attendee"
             src_model="res.partner"
             view_mode="tree,form,calendar,graph"
             context="{'search_default_partner_id': [active_id], 'default_partner_id': active_id}"
@@ -304,8 +304,8 @@
 
 
         <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="name">event.registration_attendee.tree</field>
+            <field name="model">event.registration_attendee</field>
             <field name="arch" type="xml">
                 <tree string="Registration" fonts="bold:message_unread==True">
                     <field name="create_date"/>
@@ -326,8 +326,8 @@
         </record>
 
         <record model="ir.ui.view" id="view_event_registration_form">
-            <field name="name">event.registration.form</field>
-            <field name="model">event.registration</field>
+            <field name="name">event.registration_attendee.form</field>
+            <field name="model">event.registration_attendee</field>
             <field name="arch" type="xml">
                 <form string="Event Registration" version="7.0">
                     <header>
@@ -375,8 +375,8 @@
 
          <!-- 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>
+            <field name="name">event.registration_attendee.calendar</field>
+            <field name="model">event.registration_attendee</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <calendar color="event_id" date_start="event_begin_date" date_stop="event_end_date" string="Event Registration">
@@ -388,7 +388,7 @@
 
         <record model="ir.ui.view" id="view_event_registration_graph">
             <field name="name">Registration Graph</field>
-            <field name="model">event.registration</field>
+            <field name="model">event.registration_attendee</field>
             <field name="arch" type="xml">
                 <graph string="Registration" type="bar">
                     <field name="event_id" type="row"/>
@@ -401,7 +401,7 @@
         <!-- 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>
+            <field name="model">event.registration_attendee</field>
             <field name="arch" type="xml">
                 <search string="Event Registration">
                     <field name="name" string="Participant" filter_domain="['|','|',('name','ilike',self),('email','ilike',self),('origin','ilike',self)]"/>
@@ -426,7 +426,7 @@
 
         <record model="ir.actions.act_window" id="action_registration">
           <field name="name">Attendees</field>
-          <field name="res_model">event.registration</field>
+          <field name="res_model">event.registration_attendee</field>
           <field name="view_type">form</field>
           <field name="domain"></field>
           <field name="view_mode">tree,form,calendar,graph</field>

=== modified file 'event/report/report_event_registration.py'
--- event/report/report_event_registration.py	2014-03-10 14:36:00 +0000
+++ event/report/report_event_registration.py	2014-04-22 07:17:23 +0000
@@ -23,7 +23,7 @@
 from openerp import tools
 
 class report_event_registration(osv.osv):
-    _name = "report.event.registration"
+    _name = "report.event.registration_attendee"
     _description = "Events Analysis"
     _auto = False
     _columns = {
@@ -68,7 +68,7 @@
                 r.state AS registration_state
             FROM
                 event_event e
-                LEFT JOIN event_registration r ON (e.id=r.event_id)
+                LEFT JOIN event_registration_attendee r ON (e.id=r.event_id)
 
             GROUP BY
                 event_id,

=== modified file 'event/report/report_event_registration_view.xml'
--- event/report/report_event_registration_view.xml	2014-03-05 10:17:37 +0000
+++ event/report/report_event_registration_view.xml	2014-04-22 07:17:23 +0000
@@ -3,8 +3,8 @@
     <data>
 
         <record model ="ir.ui.view" id="report_event_registration_graph">
-            <field name="name">report.event.registration.graph</field>
-            <field name="model">report.event.registration</field>
+            <field name="name">report.event.registration_attendee.graph</field>
+            <field name="model">report.event.registration_attendee</field>
             <field name="arch" type="xml">
                 <graph string="Event on Registration"  type="pivot" >
                     <field name="event_type" type="row"/>
@@ -17,8 +17,8 @@
 
         <!-- Event on Registration search view -->
         <record model="ir.ui.view" id="view_report_event_registration_search">
-            <field name="name">report.event.registration.search</field>
-            <field name="model">report.event.registration</field>
+            <field name="name">report.event.registration_attendee.search</field>
+            <field name="model">report.event.registration_attendee</field>
             <field name="arch" type="xml">
                 <search string="Event on Registration">
                     <filter icon="terp-document-new" string="New" domain="[('event_state','=','draft')]" help="Events which are in New state"/>
@@ -55,7 +55,7 @@
 
         <record model="ir.actions.act_window" id="action_report_event_registration">
             <field name="name">Events Analysis</field>
-            <field name="res_model">report.event.registration</field>
+            <field name="res_model">report.event.registration_attendee</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph</field>
             <field name="search_view_id" ref="view_report_event_registration_search"/>

=== modified file 'event/security/event_security.xml'
--- event/security/event_security.xml	2013-10-27 12:31:04 +0000
+++ event/security/event_security.xml	2014-04-22 07:17:23 +0000
@@ -38,7 +38,7 @@
         </record>
         <record model="ir.rule" id="event_registration_company_rule">
             <field name="name">Event/Registration: multi-company</field>
-            <field name="model_id" ref="model_event_registration"/>
+            <field name="model_id" ref="model_event_registration_attendee"/>
             <field name="global" eval="True"/>
             <field name="domain_force">['|',
                                             ('company_id', '=', False),
@@ -48,7 +48,7 @@
         </record>
         <record model="ir.rule" id="report_event_registration_company_rule">
             <field name="name">Event/Report Registration: multi-company</field>
-            <field name="model_id" ref="model_report_event_registration"/>
+            <field name="model_id" ref="model_report_event_registration_attendee"/>
             <field name="global" eval="True"/>
             <field name="domain_force">['|',
                                             ('company_id', '=', False),

=== modified file 'event/security/ir.model.access.csv'
--- event/security/ir.model.access.csv	2014-04-22 05:56:27 +0000
+++ event/security/ir.model.access.csv	2014-04-22 07:17:23 +0000
@@ -2,7 +2,8 @@
 access_event_type,event.type,model_event_type,event.group_event_user,1,0,0,0
 access_event_type_manager,event.type manager,model_event_type,event.group_event_manager,1,1,1,1
 access_event_event,event.event,model_event_event,event.group_event_user,1,1,1,1
-access_event_registration_attendee,event.registration,model_event_registration,event.group_event_user,1,1,1,1
-access_report_event_registration_attendee,report.event.registration,model_report_event_registration,event.group_event_user,1,1,1,1
+access_event_registration_attendee,event.registration_attendee,model_event_registration_attendee,event.group_event_user,1,1,1,1
+access_report_event_registration_attendee,report.event.registration_attendee,model_report_event_registration_attendee,event.group_event_user,1,1,1,1
 access_event_event_portal,event.event,model_event_event,,1,0,0,0
-access_event_registration_attendee_portal,event.registration,model_event_registration,,1,0,0,0
+access_event_registration_attendee_portal,event.registration_attendee,model_event_registration_attendee,,1,0,0,0
+

=== modified file 'event/test/process/event_draft2done.yml'
--- event/test/process/event_draft2done.yml	2014-01-27 13:58:28 +0000
+++ event/test/process/event_draft2done.yml	2014-04-22 07:17:23 +0000
@@ -18,14 +18,14 @@
 -
   I create a registration for the event
 -
-  !record {model: event.registration, id: event_registration1}:
+  !record {model: event.registration_attendee, id: event_registration1}:
    event_id: event_event
    name: test_confirm
    nb_register: 10
 -
   I create a second registration for the same event
 -
-   !record {model: event.registration, id: event_registration2}:
+   !record {model: event.registration_attendee, id: event_registration2}:
     event_id: event_event
     name: test_cancel
     nb_register: 5
@@ -37,13 +37,13 @@
 -
    I confirm the registration1
 -
-   !python {model: event.registration}: |
+   !python {model: event.registration_attendee}: |
      event_pool = self.pool.get("event.event")
      self.registration_open(cr, uid, [ref("event_registration1")],context=context)
 -
    I check that registration is "confirmed"
 -
-   !assert {model: event.registration, id: event_registration1}:
+   !assert {model: event.registration_attendee, id: event_registration1}:
      - state == 'open', "registration should be confirmed."
 -
    I check if the number of confirmed registration is correct
@@ -53,12 +53,12 @@
 -
    I close the registration
 -
-   !python {model: event.registration}: |
+   !python {model: event.registration_attendee}: |
      self.button_reg_close(cr, uid, [ref("event_registration1")],context=context)
 -
     I check if registration is correctly finnished
 -
-  !assert {model: event.registration, id: event_registration1}:
+  !assert {model: event.registration_attendee, id: event_registration1}:
       - state == 'done'
 -
    I check if attended registration is correct
@@ -68,12 +68,12 @@
 -
     I cancel the second registration
 -
-  !python {model: event.registration}: |
+  !python {model: event.registration_attendee}: |
     self.button_reg_cancel(cr, uid, [ref("event_registration2")],context=context)
 -
     I Check that registration is cancelled
 -
-  !assert {model: event.registration, id: event_registration2}:
+  !assert {model: event.registration_attendee, id: event_registration2}:
     - state == 'cancel', "Registration should be cancelled."
 -
     I confirm the event
@@ -110,7 +110,7 @@
 -
   I create a registration for the event
 -
-  !record {model: event.registration, id: event_registration_cancel}:
+  !record {model: event.registration_attendee, id: event_registration_cancel}:
    event_id: event_event1
    name: test_confirm_again
    nb_register: 5
@@ -127,5 +127,5 @@
 -
     I check if its registrations are cancelled too
 -
-  !assert {model: event.registration, id: event_registration_cancel}:
+  !assert {model: event.registration_attendee, id: event_registration_cancel}:
      - state == 'cancel', "Registration should be cancelled."

=== modified file 'event/test/ui/demo_data.yml'
--- event/test/ui/demo_data.yml	2012-11-29 22:26:45 +0000
+++ event/test/ui/demo_data.yml	2014-04-22 07:17:23 +0000
@@ -1,7 +1,7 @@
 -
   I create event registation record to call event onchange and partner onchange.
 -
-  !record {model: event.registration, id: reg_0_1}:
+  !record {model: event.registration_attendee, id: reg_0_1}:
     event_id: event_0
     partner_id: base.res_partner_1
     name: 'Ticket for Concert'
@@ -14,7 +14,7 @@
 -
   I call onchange event from event registration wizard. 
 -
-  !python {model: partner.event.registration}: |
+  !python {model: partner.event.registration_attendee}: |
     context.update({'active_id': ref("base.res_partner_5")})
     self.onchange_event_id(cr, uid, 1, ref("event_1"), context=context)
 -
@@ -27,5 +27,5 @@
 -
   I call close registration process.
 -
-  !python {model: event.registration}: |
+  !python {model: event.registration_attendee}: |
     self.button_reg_close(cr, uid, [ref("reg_0_2")])

=== modified file 'event/test/ui/duplicate_event.yml'
--- event/test/ui/duplicate_event.yml	2011-11-28 09:11:58 +0000
+++ event/test/ui/duplicate_event.yml	2014-04-22 07:17:23 +0000
@@ -9,7 +9,7 @@
 -
   Copy of event registarion.
 -
-  !python {model: event.registration}: |
+  !python {model: event.registration_attendee}: |
     try:
       self.copy(cr, uid, ref("reg_1_1"))
     except:

=== modified file 'event/views/report_event_attendees_registration.xml'
--- event/views/report_event_attendees_registration.xml	2014-04-18 07:19:32 +0000
+++ event/views/report_event_attendees_registration.xml	2014-04-22 07:17:23 +0000
@@ -5,12 +5,12 @@
         <t t-call="report.html_container">
             <div class="page">
                 <t t-foreach="docs" t-as="o">
-                    <div class="text-center" style="border:1px dashed black; height: 55mm; width: 85mm; padding: 2mm; float:left;">
+                    <div class="text-center" style="border:1px dashed black; height: 59mm; width: 85mm; padding: 2mm; float:left;">
                         <div>
+                            <t t-if="o.event_id and o.event_id.organizer_id and o.event_id.organizer_id.company_id and o.event_id.organizer_id.company_id.logo_web">
+                                <img t-att-src="'data:image/png;base64,%s' % o.event_id.organizer_id.company_id.logo_web"  style="max-height:1cm; max-width:2cm;" />
+                            </t>
                             <h3>
-                                <t t-if="o.event_id and o.event_id.organizer_id and o.event_id.organizer_id.company_id and o.event_id.organizer_id.company_id.logo_web">
-                                    <img t-att-src="'data:image/png;base64,%s' % o.event_id.organizer_id.company_id.logo_web"  style="max-height:1cm; max-width:2cm;" />
-                                </t>
                                 <span> </span>
                                 <span t-field="o.event_id.name" />
                             </h3>
@@ -18,7 +18,6 @@
                         <div>
                             <p t-field="o.event_ticket_id.name" t-if="o.event_ticket_id"/>
                         </div>
-                        <br/><br/>
                         <div>
                             <h4 t-field="o.name" />
                             <span> </span>
@@ -40,7 +39,7 @@
 
                         <!-- Inner right -->
                         <div class="col-xs-6" style="padding-left:7mm; border-left:1px dashed black; height: 149mm; -webkit-transform:rotate(180deg)">
-                           dfdfdfdfdfdf <img t-att-src="o.event_id.google_map_img(zoom=10)" style="margin-top:15px; width:9cm; height:9cm; margin-right:10px;"/>
+                           <img t-att-src="o.event_id.google_map_img(zoom=10)" style="margin-top:15px; width:9cm; height:9cm; margin-right:10px;"/>
                             <div style="position:relative; margin: 0 auto; width:9cm; height:3cm;">
                                 <h5>Address :</h5>
                                 <p t-field="o.event_id.address_id" t-field-options="{&quot;widget&quot;:&quot;contact&quot;,&quot;fields&quot;:[&quot;address&quot;, &quot;phone&quot;, &quot;mobile&quot;]}"/>
@@ -71,7 +70,7 @@
                                 <t t-if="o.partner_id.is_company == True">
                                     <h1 t-field="o.partner_id.name"/>
                                     <small>
-                                        <img t-att-src="'/event/static/img/%s.svg' % o.partner_id.country_id.code.lower()" style="width:16; height:12;"/>
+                                        <img t-att-src="'/event/static/src/img/%s.svg' % o.partner_id.country_id.code.lower()" style="width:16px; height:12px;"/>
                                         <span t-field="o.partner_id.country_id.code"/>
                                     </small>
                                 </t>

=== modified file 'event_sale/event_sale.py'
--- event_sale/event_sale.py	2014-04-18 11:30:38 +0000
+++ event_sale/event_sale.py	2014-04-22 07:17:23 +0000
@@ -87,7 +87,7 @@
         '''
         if context is None:
             context = {}
-        registration_obj = self.pool.get('event.registration')
+        registration_obj = self.pool.get('event.registration_attendee')
         for order_line in self.browse(cr, uid, ids, context=context):
             if order_line.event_id:
                 dic = {
@@ -200,7 +200,7 @@
         'name': fields.char('Name', size=64, required=True, translate=True),
         'event_id': fields.many2one('event.event', "Event", required=True, ondelete='cascade'),
         'product_id': fields.many2one('product.product', 'Product', required=True, domain=[("event_type_id", "!=", False)]),
-        'registration_ids': fields.one2many('event.registration', 'event_ticket_id', 'Registrations'),
+        'registration_ids': fields.one2many('event.registration_attendee', 'event_ticket_id', 'Registrations'),
         'deadline': fields.date("Sales End"),
         'price': fields.float('Price'),
         'seats_max': fields.integer('Maximum Avalaible Seats', oldname='register_max', help="You can for each event define a maximum registration level. If you have too much registrations you are not able to confirm your event. (put 0 to ignore this rule )"),
@@ -238,7 +238,7 @@
 
 class event_registration(osv.osv):
     """Event Registration"""
-    _inherit= 'event.registration'
+    _inherit= 'event.registration_attendee'
     _columns = {
         'event_ticket_id': fields.many2one('event.event.ticket', 'Event Ticket'),
     }

=== modified file 'event_sale/event_sale_view.xml'
--- event_sale/event_sale_view.xml	2014-04-16 05:54:32 +0000
+++ event_sale/event_sale_view.xml	2014-04-22 07:17:23 +0000
@@ -18,8 +18,8 @@
         </record>
 
         <record model="ir.ui.view" id="view_event_registration_ticket_search">
-            <field name="name">event.registration.ticket.search</field>
-            <field name="model">event.registration</field>
+            <field name="name">event.registration_attendee.ticket.search</field>
+            <field name="model">event.registration_attendee</field>
             <field name="inherit_id" ref="event.view_registration_search" />
             <field name="arch" type="xml">
                 <filter name="group_event" position="after">
@@ -29,8 +29,8 @@
         </record>
 
         <record model="ir.ui.view" id="view_event_registration_ticket_tree">
-            <field name="name">event.registration.ticket.tree</field>
-            <field name="model">event.registration</field>
+            <field name="name">event.registration_attendee.ticket.tree</field>
+            <field name="model">event.registration_attendee</field>
             <field name="inherit_id" ref="event.view_event_registration_tree" />
             <field name="arch" type="xml">
                 <field name="event_id" position="after">

=== modified file 'event_sale/test/confirm.yml'
--- event_sale/test/confirm.yml	2012-11-29 22:26:45 +0000
+++ event_sale/test/confirm.yml	2014-04-22 07:17:23 +0000
@@ -45,7 +45,7 @@
 -
     I check if a registration is created
 -
-    !python {model: event.registration}: |
+    !python {model: event.registration_attendee}: |
         order_id = ref('order1')
         order =  self.pool.get('sale.order').browse(cr, uid,order_id)
         registration_ids = self.search(cr,uid,[('origin','=',order.name)])

=== modified file 'website/models/website.py'
--- website/models/website.py	2014-04-16 08:51:36 +0000
+++ website/models/website.py	2014-04-22 07:17:23 +0000
@@ -661,6 +661,7 @@
             'center': '%s, %s %s, %s' % (partner.street or '', partner.city or '', partner.zip or '', partner.country_id and partner.country_id.name_get()[0][1] or ''),
             'size': "%sx%s" % (height, width),
             'zoom': zoom,
+            'markers': '%s, %s %s, %s' % (partner.street, partner.city, partner.zip, partner.country_id and partner.country_id.name_get()[0][1] or ''),
             'sensor': 'false',
         }
         return urlplus('http://maps.googleapis.com/maps/api/staticmap' , params)

=== modified file 'website_event/models/event.py'
--- website_event/models/event.py	2014-04-16 05:54:32 +0000
+++ website_event/models/event.py	2014-04-22 07:17:23 +0000
@@ -114,7 +114,7 @@
     def google_map_img(self, cr, uid, ids, zoom=8, width=298, height=298, context=None):
         event = self.browse(cr, uid, ids[0], context=context)
         if event.address_id:
-            return self.browse(cr, SUPERUSER_ID, ids[0], context=context).address_id.google_map_img()
+            return self.browse(cr, SUPERUSER_ID, ids[0], context=context).address_id.google_map_img(zoom=zoom, width=width, height=height, context=context)
         return None
 
     def google_map_link(self, cr, uid, ids, zoom=8, context=None):