From 145656b555cc61e5d2d9154d3c127c73522c6f3e Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Tue, 26 Jun 2012 15:56:18 +0530
Subject: [PATCH 01/21] [IMP] change form view of registration in event module

bzr revid: fka@tinyerp.com-20120626102618-py2cnj472tzofwbw
---
 addons/event/event_view.xml | 86 +++++++++++++++++++------------------
 1 file changed, 45 insertions(+), 41 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index ed539e7bf39..c577c43a2e2 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -362,50 +362,54 @@
                     <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object"/>
                     <field name="state" select="1" nolabel="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/>
                 </header>
-                <sheet string="Registration" layout="auto">
-                    <group col="6" colspan="4">
-                        <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]"/>
-                        <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)"/>
-                        <field name="nb_register"/>
-                        <field name="user_id" attrs="{'readonly':[('state','!=', 'draft')]}"/>
-                        <field name="origin"/>
+               <sheet string="Registration">
+                    <group colspan="6" col="7">
+                        <group colspan="3">
+                            <h1>
+                                <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]" class="oe_tital"/>
+                            </h1>
+                        </group>
+                        <group colspan="4">
+                            <h1>
+                                ( <field name="event_begin_date" class="oe_inline"/> - <field name="event_end_date" class="oe_inline"/> )
+                            </h1>
+                        </group>  
+                    </group>              
+                    <group colspan="2" col="2">
+                        <h2>
+                            <field name="nb_register"/>Participates
+                        </h2>
                     </group>
-                    <notebook colspan="4">
-                        <page string="Additional Information">
-                            <group colspan="2" col="2">
-                                <separator string="Contact Information" colspan="2"/>
-                                <field name="name"/>
-                                <field name="email"/>
-                                <field name="phone"/>
-                            </group>
-                            <group colspan="2" col="2" groups="base.group_no_one">
-                                <separator string="Dates" colspan="2"/>
-                                <field name="create_date"/>
-                                <field name="date_closed"/>
-                                <field name="event_begin_date" />
-                                <field name="event_end_date" />
-                            </group>
-                        </page>
-                        <page string="Emails">
-<!--
-                            <field name="message_ids" colspan="4" nolabel="1" mode="tree">
-                                <tree string="History">
-                                    <field name="display_text" string="History Information"/>
-                                    <field name="reply_to" invisible="1"/>
-                                    <button
-                                        string="Reply" attrs="{'invisible': [('reply_to', '=', False)]}"
-                                        name="%(mail.action_email_compose_message_wizard)d"
-                                        context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
-                                        icon="terp-mail-replied" type="action" />
-                                </tree>
-                            </field>
--->
-                            <button string="Send New Email"
+                    <group colspan="4" col="4">
+                        <group colspan="2">
+                            <field name="name" invisible="1"/>
+                            <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)"/>
+                        </group>
+                        <group colspan="2">
+                            <field name="user_id" attrs="{'readonly':[('state','!=', 'draft')]}"/>
+                        </group>
+                    </group>
+                    <group colspan="4" col="4">
+                        <group colspan="2">
+                            <label for="email" string="E-Mail"/>
+                            <group colspan="1">
+                                <field name="email" invisible="1"/>
+                                <button string="Send New Email"
                                 name="%(mail.action_email_compose_message_wizard)d"
                                 icon="terp-mail-message-new" context= '{"default_email_to":email}' type="action"/>
-                           </page>
-
-                    </notebook>
+                            </group>
+                        </group>
+                        <group colspan="2">
+                            <field name="nb_register"/>
+                        </group>
+                    </group>
+                    <group colspan="2" col="2">
+                        <field name="phone"/>
+                    </group>
+                   <group colspan="2" col="2" groups="base.group_no_one">
+                        <field name="create_date"/>
+                        <field name="date_closed"/>
+                    </group>
                     </sheet>
                     <div class="oe_sheet_width">
                         <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>

From 1a897732297859af73a85ede34abb834a6dc2562 Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Tue, 26 Jun 2012 16:15:01 +0530
Subject: [PATCH 02/21] [IMP]event_form

bzr revid: pna@tinyerp.com-20120626104501-2a5gmtvi3ij62d0f
---
 addons/event/event.py       |  3 ++
 addons/event/event_view.xml | 65 ++++++++++++++++++++++++-------------
 2 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index a348e005d06..71c8d3d8c34 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -214,6 +214,9 @@ class event_event(osv.osv):
         'reply_to': fields.char('Reply-To Email', size=64, readonly=False, states={'done': [('readonly', True)]}, help="The email address of the organizer is likely to be put here, with the effect to be in the 'Reply-To' of the mails sent automatically at event or registrations confirmation. You can also put the email address of your mail gateway if you use one."),
         '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."),
         'address_id': fields.many2one('res.partner','Location Address', readonly=False, states={'done': [('readonly', True)]}),
+        'street': fields.related('address_id','street',type='char',string='Street'),
+        'zip': fields.related('address_id','zip',type='char',string='zip'),
+        'city': fields.related('address_id','city',type='char',string='city'),
         '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)]}),
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index ed539e7bf39..0504fc9cd25 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -61,40 +61,53 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,done"/>
                 </header>
                 <sheet>
-
-                <div class="oe_right" style="height: 200px"></div>
-                <div class="oe_title">
-                    <h1><field name="name"/></h1>
+                	<div class="oe_right oe_button_box">
+	                    <button name="%(event.act_event_list_register_event)d" type="action" string="Registration" icon="gtk-index" help="Register with this event"/>
+	                </div>
+                <!--div class="oe_right" style="height: 200px"></div-->
+                <div class="oe_title" style="width: 650px" >
+	            	<label for="name" class="oe_edit_only"/>
+		            <group colspan="6" col="6">
+		            	<group colspan="2"><h1><field name="name"/></h1></group>
+	                    <group colspan="4"><h1><label string="(" attrs="{'invisible': [('type', '=', '')]}" /><field name="type" nolabel="1" on_change="onchange_event_type(type,context)" class="oe_inline"/><label string=")" attrs="{'invisible': [('type', '=', '')]}" /></h1></group>
+		            </group>  
+		        </div> 
+                <div>
+                	<h2 class="oe_inline">From <field name="date_begin"/> to <field name="date_end"/></h2>
                     <group>
                         <group>
-                            <field name="type" on_change="onchange_event_type(type,context)"/>
-                            <field name="user_id"/>
-                            <field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_google_map'}"/>
+                            <label for="address_id" string="Address"/>
+                            <div>
+                                <field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_google_map'}"/>
+                            	<field name="street" />                            
+                            	<div>
+                                     <field name="city" class="oe_inline" placeholder="City"/>
+                            	     <field name="zip" class="oe_inline"/>
+                                </div>
+                            </div>
                         </group>
                         <group>
-                            <field name="date_begin"/>
-                            <field name="date_end"/>
-                            <field name="register_min"/>
-                            <field name="register_max"/>
-                        </group>
-                    </group>
+	                      	<field name="register_min"/>
+	                       	<field name="register_max"/>
+	                   	</group>
+                     </group>
                 </div>
-
                 <notebook>
                     <page string="Event Description">
                         <field name="note" colspan="4" nolabel="1"/>
                     </page>
                     <page string="Internal Data">
-                         <group class="oe_group_label_border" colspan="2" col="2">
-                            <field name="register_current"/>
-                            <field name="register_prospect"/>
-                            <field name="register_attended"/>
-                         </group> 
-                         <group class="oe_group_label_border" colspan="2" col="2">
+                      <group>
+                          <group class="oe_group_label_border">
                             <field name="main_speaker_id" domain="[('speaker','=',True)]" context="{'default_speaker':1}"/>
                             <field name="speaker_confirmed"/>
-                        </group>
-                        <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
+                          </group>
+                          <group class="oe_group_label_border">
+                            <field name="register_current"/>
+                            <field name="register_prospect"/>
+                          </group> 
+                      </group>
+                      <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
                             <tree string="Registration" editable="top">
                                 <field name="name" />
                                 <field name="email" />
@@ -126,6 +139,12 @@
                                         <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
                                     </group>
                             </form>
+                            <group class="oe_subtotal_footer" colspan="4" style="margin-left:450px" name="regi_total">
+                                <field name="register_current"/>
+                                <field name="register_prospect"/>
+                                <field name="register_attended" class="oe_subtotal_footer_separator" />
+                            </group>
+							<separator string="" class="oe_clear"/>
                             </field>
                     </page>
                     </notebook>
@@ -313,7 +332,7 @@
             name="Registration"
             res_model="event.registration"
             src_model="event.event"
-            view_mode="calendar,tree,form,graph"
+            view_mode="form,calendar,tree,graph"
             context="{'search_default_event_id': [active_id], 'default_event_id': active_id}"
             view_type="form"/>
 

From 8d07971b5398f1df157c9efd1fa93d24315ba38f Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Tue, 26 Jun 2012 16:22:12 +0530
Subject: [PATCH 03/21] [IMP]event_form

bzr revid: pna@tinyerp.com-20120626105212-etyqs0n30vd7ksio
---
 addons/event/event_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 0504fc9cd25..7d7d47c4a60 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -139,13 +139,13 @@
                                         <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
                                     </group>
                             </form>
+                            </field>
                             <group class="oe_subtotal_footer" colspan="4" style="margin-left:450px" name="regi_total">
                                 <field name="register_current"/>
                                 <field name="register_prospect"/>
                                 <field name="register_attended" class="oe_subtotal_footer_separator" />
                             </group>
 							<separator string="" class="oe_clear"/>
-                            </field>
                     </page>
                     </notebook>
                     </sheet>

From 183b879e5e4e9e03b9c7c426d5f429c1b5f590a1 Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Tue, 26 Jun 2012 18:23:02 +0530
Subject: [PATCH 04/21] [IMP]event_form

bzr revid: pna@tinyerp.com-20120626125302-rvubrzttwsiff292
---
 addons/event/event.py       |  4 ++--
 addons/event/event_view.xml | 22 ++++++++++------------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 71c8d3d8c34..5387a64001f 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -192,8 +192,8 @@ class event_event(osv.osv):
         '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)]}),
         'type': fields.many2one('event.type', 'Type of Event', readonly=False, states={'done': [('readonly', True)]}),
-        'register_max': fields.integer('Maximum Registrations', 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)]}),
-        'register_min': fields.integer('Minimum Registrations', 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)]}),
+        'register_max': fields.integer('Maximum Registration', 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)]}),
+        'register_min': fields.integer('Minimum Registration', 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)]}),
         'register_current': fields.function(_get_register, string='Confirmed Registrations', multi='register_numbers'),
         'register_avail': fields.function(_get_register, string='Available Registrations', multi='register_numbers',type='integer'),
         'register_prospect': fields.function(_get_register, string='Unconfirmed Registrations', multi='register_numbers'),
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 7d7d47c4a60..5caf9ad5369 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-
+      <act_window
+            id="act_event_list_register_event"
+            name="Registration"
+            res_model="event.registration"
+            src_model="event.event"
+            view_mode="calendar,tree,form,graph"
+            context="{'search_default_event_id': [active_id], 'default_event_id': active_id}"
+            view_type="form"/>
         <menuitem  name="Events" id="event_main_menu"/>
         <menuitem name="Events Organisation" id="base.menu_event_main" parent="event_main_menu" />
 
@@ -73,7 +80,7 @@
 		            </group>  
 		        </div> 
                 <div>
-                	<h2 class="oe_inline">From <field name="date_begin"/> to <field name="date_end"/></h2>
+                	<h2>From <field name="date_begin" class="oe_inline" /> to <field name="date_end" class="oe_inline"/></h2>
                     <group>
                         <group>
                             <label for="address_id" string="Address"/>
@@ -140,7 +147,7 @@
                                     </group>
                             </form>
                             </field>
-                            <group class="oe_subtotal_footer" colspan="4" style="margin-left:450px" name="regi_total">
+                            <group class="oe_subtotal_footer oe_right" colspan="2" name="regi_total">
                                 <field name="register_current"/>
                                 <field name="register_prospect"/>
                                 <field name="register_attended" class="oe_subtotal_footer_separator" />
@@ -327,15 +334,6 @@
            <field name="help">Event is the low level object used by meeting and others documents that should be synchronized with mobile devices or calendar applications through caldav. Most of the users should work in the Calendar menu, and not in the list of events.</field>
        </record>
 
-      <act_window
-            id="act_event_list_register_event"
-            name="Registration"
-            res_model="event.registration"
-            src_model="event.event"
-            view_mode="form,calendar,tree,graph"
-            context="{'search_default_event_id': [active_id], 'default_event_id': active_id}"
-            view_type="form"/>
-
       <act_window
             id="act_register_event_partner"
             name="Subscribe"

From 6878899c42bbea8ebc5683ce412e2b5ea1a75365 Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Tue, 26 Jun 2012 18:31:52 +0530
Subject: [PATCH 05/21] [IMP]event_form

bzr revid: pna@tinyerp.com-20120626130152-kovzkfq2tin2bx1i
---
 addons/event/event.py       | 12 ++++++++++++
 addons/event/event_view.xml |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 5387a64001f..288d2fa330f 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -258,6 +258,18 @@ class event_event(osv.osv):
     _constraints = [
         (_check_closing_date, 'Error ! Closing Date cannot be set before Beginning Date.', ['date_end']),
     ]
+    def onchange_address_id(self, cr, uid, ids, address, context=None):
+        data ={}
+        if not address:
+            return data
+        addr_obj = self.pool.get('res.partner')
+        addr_id =  addr_obj.browse(cr, uid, address, context=context)
+        data = {
+            'street':addr_id.street,
+            'zip':addr_id.zip,
+            'city':addr_id.city,
+            }
+        return {'value': data}
     def onchange_event_type(self, cr, uid, ids, type_event, context=None):
         if type_event:
             type_info =  self.pool.get('event.type').browse(cr,uid,type_event,context)
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 5caf9ad5369..d6f01677ac6 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -85,7 +85,7 @@
                         <group>
                             <label for="address_id" string="Address"/>
                             <div>
-                                <field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_google_map'}"/>
+                                <field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_google_map'}" on_change="onchange_address_id(address_id, context)" />
                             	<field name="street" />                            
                             	<div>
                                      <field name="city" class="oe_inline" placeholder="City"/>

From 26635ac3855e2461f19c4d5a89d7ab81a59c871e Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Wed, 27 Jun 2012 10:27:25 +0530
Subject: [PATCH 06/21] [IMP]eventtype-form

bzr revid: pna@tinyerp.com-20120627045725-1gtw8bfi3349rt91
---
 addons/event/event_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index d6f01677ac6..2cdbb280939 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -7,7 +7,7 @@
             res_model="event.registration"
             src_model="event.event"
             view_mode="calendar,tree,form,graph"
-            context="{'search_default_event_id': [active_id], 'default_event_id': active_id}"
+            context="{'search_default_event_id': active_id, 'default_event_id': active_id}"
             view_type="form"/>
         <menuitem  name="Events" id="event_main_menu"/>
         <menuitem name="Events Organisation" id="base.menu_event_main" parent="event_main_menu" />
@@ -24,10 +24,10 @@
                     <group col="4">
                         <field name="name"/>
                         <field name="default_reply_to"/>
-                        <field name="default_email_event" domain="[('model_id.model','=','event.registration')]"/>
-                        <field name="default_email_registration" domain="[('model_id.model','=','event.registration')]"/>
                         <field name="default_registration_min"/>
+                        <field name="default_email_event" domain="[('model_id.model','=','event.registration')]"/>
                         <field name="default_registration_max"/>
+                        <field name="default_email_registration" domain="[('model_id.model','=','event.registration')]"/>
                     </group>
                 </form>
             </field>

From 32b030c763a0bf7c20da209af3f0f3226838538c Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Wed, 27 Jun 2012 18:31:47 +0530
Subject: [PATCH 07/21] [IMP] set email button and chenge text of user_id field

bzr revid: kjo@tinyerp.com-20120627130147-tktvn9b5cdsblzp0
---
 addons/event/event.py       | 2 +-
 addons/event/event_view.xml | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 3fcf63156f6..ba3fedea69e 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -326,7 +326,7 @@ class event_registration(osv.osv):
         'log_ids': fields.one2many('mail.message', 'res_id', 'Logs', domain=[('email_from', '=', False),('model','=',_name)]),
         'event_end_date': fields.related('event_id','date_end', type='datetime', string="Event End Date", readonly=True),
         'event_begin_date': fields.related('event_id', 'date_begin', type='datetime', string="Event Start Date", readonly=True),
-        'user_id': fields.many2one('res.users', 'Attendee (user)', states={'done': [('readonly', True)]}),
+        'user_id': fields.many2one('res.users', 'User', states={'done': [('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([('draft', 'Unconfirmed'),
                                     ('cancel', 'Cancelled'),
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 223e3cdff5f..8f378af3775 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -71,7 +71,7 @@
                 	<div class="oe_right oe_button_box">
 	                    <button name="%(event.act_event_list_register_event)d" type="action" string="Registration" icon="gtk-index" help="Register with this event"/>
 	                </div>
-                <!--div class="oe_right" style="height: 200px"></div-->
+                
                 <div class="oe_title" style="width: 650px" >
 	            	<label for="name" class="oe_edit_only"/>
 		            <group colspan="6" col="6">
@@ -99,6 +99,7 @@
 	                   	</group>
                      </group>
                 </div>
+                <!-- <div class="oe_right" style="height: 200px"></div> -->
                 <notebook>
                     <page string="Event Description">
                         <field name="note" colspan="4" nolabel="1"/>
@@ -404,11 +405,11 @@
                             <field name="name" invisible="1"/>
                             <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)"/>
                             <label for="email" string="E-Mail"/>
-                            <group colspan="1">
-                                <field name="email" invisible="1"/>
+                            <group col="2">
+                                <field name="email" nolabel="1" class="oe_inline"/>
                                 <button string="Send New Email"
                                 name="%(mail.action_email_compose_message_wizard)d"
-                                icon="terp-mail-message-new" context= '{"default_email_to":email}' type="action"/>
+                                icon="terp-mail-message-new" context= '{"default_email_to":email}' type="action" class="oe_inline"/>
                             </group>
                         </group>
                         <group colspan="2">

From 5135c8a3a502127a024f693e07edab9e19f57d4c Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 28 Jun 2012 16:58:41 +0530
Subject: [PATCH 08/21] [IMP]event_moodle: remove xpath

bzr revid: kjo@tinyerp.com-20120628112841-c1sp8tm4wqef9g1k
---
 addons/event_moodle/event_view.xml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/addons/event_moodle/event_view.xml b/addons/event_moodle/event_view.xml
index b009339d564..4fa0172c5f5 100644
--- a/addons/event_moodle/event_view.xml
+++ b/addons/event_moodle/event_view.xml
@@ -7,14 +7,8 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="event.view_event_registration_form" />
             <field name="arch" type="xml">
-                <xpath expr="//page[@string='Emails']" position="after">
-                    <page string="Moodle">
-                        <field name="moodle_user_password" readonly='1' colspan="2"/>
-                        <field name="moodle_uid" readonly="1"/>
-                    </page>
-                </xpath>
                 <field name="email" position="replace">
-                     <field name="email" required="1" />
+                     <field name="email" nolabel="1" required="1" />
                 </field>
                 <field name="name" position="replace">
                      <field name="moodle_username" colspan="2" on_change="onchange_moodle_name(moodle_user_password)"/>

From 6d0c9fa8865835b23b56c7c734647b9e027bffea Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 28 Jun 2012 18:03:26 +0530
Subject: [PATCH 09/21] [IMP]event_sale: inherit event.registration

bzr revid: kjo@tinyerp.com-20120628123326-sqyhz0qj6kft82hf
---
 addons/event_sale/event_sale.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index 0d6497c45f2..96468bd471f 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -91,3 +91,9 @@ class sale_order_line(osv.osv):
                 message = _("The registration %s has been created from the Sale Order %s.") % (registration_id, order_line.order_id.name)
                 registration_obj.log(cr, uid, registration_id, message)
         return super(sale_order_line, self).button_confirm(cr, uid, ids, context=context)
+
+class event_registration(osv.osv):
+    # TOFIX: section_id field is not availble in event_registration table in database but In _columns (_inherited) findout section_id field which added in crm module in res.partner model. so need to fix in framework to restrive columns but right now Fixed to inherit again to update  event_registration table.
+    _name = 'event.registration'
+    _inherit = ['event.registration','ir.needaction_mixin','mail.thread', 'res.partner']
+    

From bafe6650225d858e4ca2b485f95b078fe99d8c02 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Fri, 29 Jun 2012 12:54:31 +0530
Subject: [PATCH 10/21] [IMP]event: remove res.partner inherit

bzr revid: kjo@tinyerp.com-20120629072431-4bsg54hzww6dzjd6
---
 addons/event/event.py           | 8 +++++++-
 addons/event_sale/event_sale.py | 5 -----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index ba3fedea69e..029b9f86310 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -312,7 +312,7 @@ class event_registration(osv.osv):
     """Event Registration"""
     _name= 'event.registration'
     _description = __doc__
-    _inherit = ['ir.needaction_mixin','mail.thread','res.partner']
+    _inherit = ['ir.needaction_mixin','mail.thread']
     _columns = {
         'id': fields.integer('ID'),
         'origin': fields.char('Source', size=124,readonly=True,help="Name of the sale order which create the registration"),
@@ -333,11 +333,17 @@ class event_registration(osv.osv):
                                     ('open', 'Confirmed'),
                                     ('done', 'Attended')], 'Status',
                                     size=16, readonly=True),
+        # Fields for address, due to separation from event.registration and res.partner
+        'email': fields.char('Email', size=240),
+        'phone': fields.char('Phone', size=64),
+        'name': fields.char('Name', size=128, required=True, select=True),
+        'active': fields.boolean('Active'),
     }
 
     _defaults = {
         'nb_register': 1,
         'state': 'draft',
+        'active': True,
     }
     _order = 'name, create_date desc'
 
diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index 0fb89f46775..426c410dd99 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -90,9 +90,4 @@ class sale_order_line(osv.osv):
                 message = _("The registration %s has been created from the Sale Order %s.") % (registration_id, order_line.order_id.name)
                 registration_obj.message_append_note(cr, uid, [registration_id], body=message, context=context)
         return super(sale_order_line, self).button_confirm(cr, uid, ids, context=context)
-
-class event_registration(osv.osv):
-    # TOFIX: section_id field is not availble in event_registration table in database but In _columns (_inherited) findout section_id field which added in crm module in res.partner model. so need to fix in framework to restrive columns but right now Fixed to inherit again to update  event_registration table.
-    _name = 'event.registration'
-    _inherit = ['event.registration','ir.needaction_mixin','mail.thread', 'res.partner']
     

From 57329cc83378057590cbb33d8350c7a138247d08 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Fri, 29 Jun 2012 17:40:00 +0530
Subject: [PATCH 11/21] [IMP]event: event_view.xml change

bzr revid: kjo@tinyerp.com-20120629121000-x071xn35pb4wi4wa
---
 addons/event/event_view.xml | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 8f378af3775..d6da35a3e2f 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -382,19 +382,17 @@
                     <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object"/>
                     <field name="state" select="1" nolabel="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/>
                 </header>
-               <sheet string="Registration">
-                    <group colspan="6" col="7">
-                        <group colspan="3">
-                            <h1>
-                                <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]" class="oe_tital"/>
-                            </h1>
-                        </group>
-                        <group colspan="4">
-                            <h1>
-                                ( <field name="event_begin_date" class="oe_inline"/> - <field name="event_end_date" class="oe_inline"/> )
-                            </h1>
-                        </group>  
-                    </group>              
+                <sheet string="Registration">
+                   <label for="event_id" class="oe_edit_only"/>
+                   <h1>
+                            <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]" nolabel="1" class="oe_inline"/>
+                            <label string="(" attrs="{'invisible': ['|',('event_begin_date', '=', ''),('event_id', '=', '')]}" class="oe_inline"/>
+                            <field nolabel="1" name="event_begin_date" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
+                            <label string="-" attrs="{'invisible': ['|',('event_begin_date', '=', ''), ('event_id', '=', '')]}" class="oe_inline"/>
+                            <field nolabel="1" name="event_end_date" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline" />
+                            <label string=")" attrs="{'invisible': ['|',('event_begin_date', '=', ''),('event_id', '=', '')]}" class="oe_inline"/>
+	                </h1>   
+		                   
                     <group colspan="2" col="2">
                         <h2>
                             <field name="nb_register" class="oe_inline"/>  Participants
@@ -431,12 +429,12 @@
                         <field name="create_date"/>
                         <field name="date_closed"/>
                     </group>
-                    </sheet>
-                    <footer>
-                        <div class="oe_sheet_width">
-                            <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                        </div>
-                    </footer>
+                </sheet>
+                <footer>
+                    <div class="oe_sheet_width">
+                        <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+                    </div>
+                </footer>
                 </form>
             </field>
         </record>

From 36dca91195fc322dc80782a993ab9e644dc4fa1e Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Wed, 4 Jul 2012 16:45:29 +0530
Subject: [PATCH 12/21] [IMP]event: remove date and add duration

bzr revid: kjo@tinyerp.com-20120704111529-8nm276wyabrcn1wd
---
 addons/event/event.py       | 17 ++++++++++++-----
 addons/event/event_view.xml | 14 +++-----------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 029b9f86310..09495560051 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -23,6 +23,7 @@ import time
 from osv import fields, osv
 from tools.translate import _
 import decimal_precision as dp
+from datetime import datetime, timedelta
 
 class event_type(osv.osv):
     """ Event Type """
@@ -336,8 +337,9 @@ class event_registration(osv.osv):
         # Fields for address, due to separation from event.registration and res.partner
         'email': fields.char('Email', size=240),
         'phone': fields.char('Phone', size=64),
-        'name': fields.char('Name', size=128, required=True, select=True),
+        'name': fields.char('Name', size=128, select=True),
         'active': fields.boolean('Active'),
+        'duration': fields.float('Duration'),
     }
 
     _defaults = {
@@ -347,7 +349,6 @@ class event_registration(osv.osv):
     }
     _order = 'name, create_date desc'
 
-
     def do_draft(self, cr, uid, ids, context=None):
         self.do_draft_send_note(cr, uid, ids, context=context)
         return self.write(cr, uid, ids, {'state': 'draft'}, context=context)
@@ -432,17 +433,23 @@ class event_registration(osv.osv):
     def onchange_event(self, cr, uid, ids, event_id, context=None):
         """This function returns value of Product Name, Unit Price based on Event.
         """
+        value= {}
         if context is None:
             context = {}
         if not event_id:
             return {}
         event_obj = self.pool.get('event.event')
         data_event =  event_obj.browse(cr, uid, event_id, context=context)
-        return {'value': 
-                    {'event_begin_date': data_event.date_begin,
+        start = datetime.strptime(data_event.date_begin, "%Y-%m-%d %H:%M:%S")
+        end = datetime.strptime(data_event.date_end, "%Y-%m-%d %H:%M:%S")
+        diff = end - start
+        duration = float(diff.days)* 24 + (float(diff.seconds) / 3600)
+        value['duration'] = round(duration, 2)
+        return {'value': {'event_begin_date': data_event.date_begin,
                      'event_end_date': data_event.date_end,
                      'company_id': data_event.company_id and data_event.company_id.id or False,
-                    }
+                     'duration': value['duration'],
+               }
                }
 
     def onchange_partner_id(self, cr, uid, ids, part, context=None):
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index d6da35a3e2f..0b424b9794b 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -386,18 +386,10 @@
                    <label for="event_id" class="oe_edit_only"/>
                    <h1>
                             <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]" nolabel="1" class="oe_inline"/>
-                            <label string="(" attrs="{'invisible': ['|',('event_begin_date', '=', ''),('event_id', '=', '')]}" class="oe_inline"/>
-                            <field nolabel="1" name="event_begin_date" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
-                            <label string="-" attrs="{'invisible': ['|',('event_begin_date', '=', ''), ('event_id', '=', '')]}" class="oe_inline"/>
-                            <field nolabel="1" name="event_end_date" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline" />
-                            <label string=")" attrs="{'invisible': ['|',('event_begin_date', '=', ''),('event_id', '=', '')]}" class="oe_inline"/>
+                            <label string="(" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
+                            <field name="duration" widget="float_time" attrs="{'invisible': [('event_id', '=', '')]}"/>
+                            <label string=")" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
 	                </h1>   
-		                   
-                    <group colspan="2" col="2">
-                        <h2>
-                            <field name="nb_register" class="oe_inline"/>  Participants
-                        </h2>
-                    </group>
                     <group colspan="4" col="4">
                         <group colspan="2">
                             <field name="name" invisible="1"/>

From 4d14b9378a1d96e4f4bbdf84cea85e13f54b7054 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 5 Jul 2012 12:27:12 +0530
Subject: [PATCH 13/21] [IMP]event: add duration field

bzr revid: kjo@tinyerp.com-20120705065712-ivluxs98wd1kjyza
---
 addons/event/__openerp__.py |  2 +-
 addons/event/event.py       |  8 ++-
 addons/event/event_demo.xml | 98 -------------------------------------
 addons/event/event_demo.yml | 73 +++++++++++++++++++++++++++
 addons/event/event_view.xml |  2 +-
 5 files changed, 78 insertions(+), 105 deletions(-)
 delete mode 100644 addons/event/event_demo.xml
 create mode 100644 addons/event/event_demo.yml

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index f1a9769f803..120f9651745 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -51,7 +51,7 @@ Note that:
         'res_partner_view.xml',
         'email_template.xml',
     ],
-    'demo_xml': ['event_demo.xml'],
+    'demo_xml': ['event_demo.yml'],
     'test': ['test/process/event_draft2done.yml'],
     'css': ['static/src/css/event.css'],
     'installable': True,
diff --git a/addons/event/event.py b/addons/event/event.py
index 09495560051..72c28b3315f 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -424,7 +424,6 @@ class event_registration(osv.osv):
         contact_id =  addr_obj.browse(cr, uid, contact, context=context)
         data = {
             'email':contact_id.email,
-            'contact_id':contact_id.id,
             'name':contact_id.name,
             'phone':contact_id.phone,
             }
@@ -444,13 +443,12 @@ class event_registration(osv.osv):
         end = datetime.strptime(data_event.date_end, "%Y-%m-%d %H:%M:%S")
         diff = end - start
         duration = float(diff.days)* 24 + (float(diff.seconds) / 3600)
-        value['duration'] = round(duration, 2)
-        return {'value': {'event_begin_date': data_event.date_begin,
+        value ['value']= {'event_begin_date': data_event.date_begin,
                      'event_end_date': data_event.date_end,
                      'company_id': data_event.company_id and data_event.company_id.id or False,
-                     'duration': value['duration'],
-               }
+                     'duration': round(duration, 2),
                }
+        return value
 
     def onchange_partner_id(self, cr, uid, ids, part, context=None):
         res_obj = self.pool.get('res.partner')
diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml
deleted file mode 100644
index 81dad07b5e4..00000000000
--- a/addons/event/event_demo.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-    <record id="base.user_demo" model="res.users">
-             <field name="groups_id" eval="[(4, ref('event.group_event_user'))]"/>
-     </record>
-
-
-<!-- Demo Data for Event Type -->
-    <record id="event_type_0" model="event.type">
-        <field name="name">Seminar</field>
-    </record>
-
-    <record id="event_type_1" model="event.type">
-        <field name="name">Exhibition</field>
-    </record>
-
-    <record id="event_type_2" model="event.type">
-        <field name="name">Conference</field>
-    </record>
-
-    <record id="event_type_3" model="event.type">
-        <field name="name">Show</field>
-    </record>
-
-    <record id="event_type_4" model="event.type">
-        <field name="name">Training</field>
-    </record>
-
-<!-- Demo data for Event -->
-    <record id="event_0" model="event.event">
-        <field name="name">Concert of Bon Jovi</field>
-        <field eval="time.strftime('%Y-%m-01 19:05:15')" name="date_begin"/>
-        <field eval="time.strftime('%Y-%m-01 23:05:15')" name="date_end"/>
-        <field name="register_max">500</field>
-        <field name="type" ref="event_type_1"/>
-    </record>
-
-    <record id="event_1" model="event.event">
-        <field name="name">Opera of Verdi</field>
-        <field eval="(DateTime.today()+ timedelta(days=1)).strftime('%Y-%m-%d 18:00:00')" name="date_begin"/>
-        <field eval="(DateTime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 21:00:00')" name="date_end"/>
-        <field name="type" ref="event_type_1"/>
-        <field name="register_min">50</field>
-        <field name="register_max">350</field>
-    </record>
-    <record id="event_2" model="event.event">
-        <field name="name">Conference on ERP Business</field>
-        <field eval="(DateTime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 14:00:00')" name="date_begin"/>
-        <field eval="(DateTime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 16:30:00')" name="date_end"/>
-        <field name="type" ref="event_type_2"/>
-        <field name="register_max">200</field>
-    </record>
-    <function model="event.event" name="button_confirm" eval="[ref('event_2')]"/>
-    <function model="event.event" name="button_confirm" eval="[ref('event_2')]"/>
-
-<!-- Demo data for Event Registration-->
-    <record id="reg_1_1" model="event.registration">
-        <field name="name">Agrolait</field>
-        <field name="email">s.l@agrolait.be</field>
-        <field name="phone">003281588558</field>
-        <field name="event_id" ref="event_1"/>
-        <field name="partner_id" ref="base.res_partner_agrolait"/>
-        <field name="nb_register">5</field>
-    </record>
-
-    <record id="reg_1_2" model="event.registration">
-        <field name="name">ASUStek</field>
-        <field name="email">info@asustek.com</field>
-        <field name="phone">+ 1 64 61 04 01</field>
-        <field name="partner_id" ref="base.res_partner_asus"/>
-        <field name="event_id" ref="event_1"/>
-        <field name="nb_register">10</field>
-    </record>
-
-
-    <record id="reg_0_1" model="event.registration">
-        <field name="name">Syleam</field>
-        <field name="email">contact@syleam.fr</field>
-        <field name="phone">+33 (0) 2 33 31 22 10</field>
-        <field name="partner_id" ref="base.res_partner_sednacom"/>
-        <field name="event_id" ref="event_0"/>
-        <field name="nb_register">6</field>
-    </record>
-
-
-
-    <record id="reg_0_2" model="event.registration">
-        <field name="name">Camptocamp</field>
-        <field name="email">openerp@camptocamp.com</field>
-        <field name="phone">+41 21 619 10 04 </field>
-        <field name="event_id" ref="event_2"/>
-        <field name="partner_id" ref="base.res_partner_c2c"/>
-        <field name="nb_register">5</field>
-    </record>
-
-    </data>
-</openerp>
diff --git a/addons/event/event_demo.yml b/addons/event/event_demo.yml
new file mode 100644
index 00000000000..f4e5cf04495
--- /dev/null
+++ b/addons/event/event_demo.yml
@@ -0,0 +1,73 @@
+-
+  from datetime import datetime, timedelta
+-
+  !record {model: event.type, id: event_type_0}:
+    name: 'Seminar'
+-
+  !record {model: event.type, id: event_type_1}:
+    name: 'Exhibition'
+-
+  !record {model: event.type, id: event_type_2}:
+    name: 'Conference'
+-
+  !record {model: event.type, id: event_type_3}:
+    name: 'Show'
+-
+  !record {model: event.type, id: event_type_4}:
+    name: 'Training'
+-
+  !record {model: event.event, id: event_0}:
+    name: 'Concert of Bon Jovi'
+    date_begin: !eval time.strftime('%Y-%m-01 19:05:15')
+    date_end: !eval time.strftime('%Y-%m-01 23:05:15')
+    register_max: 500
+    type: event_type_1
+-
+  !record {model: event.event, id: event_1}:
+    name: 'Opera of Verdi'
+    date_begin: !eval (datetime.today()+ timedelta(days=1)).strftime('%Y-%m-%d 18:00:00')
+    date_end: !eval (datetime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 21:00:00')
+    register_min: 50
+    register_max: 350
+    type: event_type_1
+-
+  !record {model: event.event, id: event_2}:
+    name: 'Conference on ERP Business'
+    date_begin: !eval (datetime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 14:00:00')
+    date_end: !eval (datetime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 16:30:00')
+    register_min: 50
+    register_max: 350
+    type: event_type_2
+-
+  !record {model: event.registration, id: reg_1_1}:
+    name: 'Agrolait'
+    email: 's.l@agrolait.be'
+    phone: '003281588558'
+    event_id: event_1
+    partner_id: base.res_partner_asus
+    nb_register: 5
+-
+  !record {model: event.registration, id: reg_1_2}:
+    name: 'ASUStek'
+    email: 'info@asustek.com'
+    phone: '+ 1 64 61 04 01'
+    event_id: event_1
+    partner_id: base.res_partner_asus
+    nb_register: 10
+-
+  !record {model: event.registration, id: reg_0_1}:
+    name: 'Syleam'
+    email: 'contact@syleam.fr'
+    phone: '+33 (0) 2 33 31 22 10'
+    event_id: event_0
+    partner_id: base.res_partner_sednacom
+    nb_register: 6
+-
+  !record {model: event.registration, id: reg_0_2}:
+    name: 'Camptocamp'
+    email: 'openerp@camptocamp.com'
+    phone: '+41 21 619 10 04'
+    event_id: event_2
+    partner_id: base.res_partner_c2c
+    nb_register: 5
+ 
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 0b424b9794b..f3564048b55 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -387,7 +387,7 @@
                    <h1>
                             <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]" nolabel="1" class="oe_inline"/>
                             <label string="(" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
-                            <field name="duration" widget="float_time" attrs="{'invisible': [('event_id', '=', '')]}"/>
+                            <field name="duration" widget="float_time" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
                             <label string=")" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
 	                </h1>   
                     <group colspan="4" col="4">

From c5d9158a292c6439d4192cbd2601b15ae9ee51b5 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 5 Jul 2012 14:38:30 +0530
Subject: [PATCH 14/21] [IMP]event: remove conflict

bzr revid: kjo@tinyerp.com-20120705090830-trou4tqk01ylqqqh
---
 addons/event/event_view.xml | 51 ++++---------------------------------
 1 file changed, 5 insertions(+), 46 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 34b3b6b71ad..1019706f8db 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -462,9 +462,8 @@
                     <field name="state" nolabel="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/>
                 </header>
                 <sheet string="Registration">
-<<<<<<< TREE
-                   <label for="event_id" class="oe_edit_only"/>
-                   <h1>
+                    <label for="event_id" class="oe_edit_only"/>
+                    <h1>
                             <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]" nolabel="1" class="oe_inline"/>
                             <label string="(" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
                             <field name="duration" widget="float_time" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
@@ -478,36 +477,8 @@
                             <group col="2">
                                 <field name="email" nolabel="1" class="oe_inline"/>
                                 <button string="Send New Email"
-=======
-                    <group col="6" colspan="4">
-                        <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]"/>
-                        <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)"/>
-                        <field name="nb_register"/>
-                        <field name="user_id" attrs="{'readonly':[('state','!=', 'draft')]}"/>
-                        <field name="origin"/>
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Additional Information">
-                            <group colspan="2" col="2">
-                                <separator string="Contact Information" colspan="2"/>
-                                <field name="name"/>
-                                <field name="email"/>
-                                <field name="phone"/>
-                            </group>
-                            <group colspan="2" col="2" groups="base.group_no_one">
-                                <separator string="Dates" colspan="2"/>
-                                <field name="create_date"/>
-                                <field name="date_closed"/>
-                                <field name="event_begin_date" />
-                                <field name="event_end_date" />
-                            </group>
-                        </page>
-                        <page string="Emails">
-                            <button string="Send New Email"
->>>>>>> MERGE-SOURCE
                                 name="%(mail.action_email_compose_message_wizard)d"
-<<<<<<< TREE
-                                icon="terp-mail-message-new" context= '{"default_email_to":email}' type="action" class="oe_inline"/>
+                                context= '{"default_email_to":email}' type="action" class="oe_inline"/>
                             </group>
                         </group>
                         <group colspan="2">
@@ -525,26 +496,14 @@
                     <group colspan="2" col="2">
                         <field name="phone"/>
                     </group>
-                   <group colspan="2" col="2" groups="base.group_no_one">
+                    <group colspan="2" col="2" groups="base.group_no_one">
                         <field name="create_date"/>
                         <field name="date_closed"/>
                     </group>
                 </sheet>
                 <footer>
-                    <div class="oe_sheet_width">
-                        <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                    </div>
+                    <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                 </footer>
-=======
-                                icon="terp-mail-message-new" context= '{"default_email_to":email}' type="action"/>
-                           </page>
-
-                    </notebook>
-                    </sheet>
-                    <footer>
-                        <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
-                    </footer>
->>>>>>> MERGE-SOURCE
                 </form>
             </field>
         </record>

From 0c4816aa7e1d88909031b36a17dc41d3710bd3ab Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 5 Jul 2012 15:03:11 +0530
Subject: [PATCH 15/21] [IMP]event: set indentation

bzr revid: kjo@tinyerp.com-20120705093311-pxcn4do73mtcd2mg
---
 addons/event/event_view.xml | 270 ++++++++++++++++++------------------
 1 file changed, 132 insertions(+), 138 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 1019706f8db..a982af9d6af 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -96,108 +96,109 @@
             <field name="model">event.event</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Events" version="7.0">
-                <header>
-                    <button string="Confirm Event" name="button_confirm" states="draft" type="object" class="oe_highlight"/>
-                    <button string="Event Ended" name="button_done" states="confirm" type="object" class="oe_highlight"/>
-                    <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" />
-                    <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object"/>
-                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm,done"/>
-                </header>
-                <sheet>
-                	<div class="oe_right oe_button_box">
-	                    <button name="%(event.act_event_list_register_event)d" type="action" string="Registration" icon="gtk-index" help="Register with this event"/>
-	                </div>
-                
-                <div class="oe_title" style="width: 650px" >
-	            	<label for="name" class="oe_edit_only"/>
-		            <group colspan="6" col="6">
-		            	<group colspan="2"><h1><field name="name"/></h1></group>
-	                    <group colspan="4"><h1><label string="(" attrs="{'invisible': [('type', '=', '')]}" /><field name="type" nolabel="1" on_change="onchange_event_type(type,context)" class="oe_inline"/><label string=")" attrs="{'invisible': [('type', '=', '')]}" /></h1></group>
-		            </group>  
-		        </div> 
-                <div>
-                	<h2>From <field name="date_begin" class="oe_inline" /> to <field name="date_end" class="oe_inline"/></h2>
-                    <group>
-                        <group>
-                            <label for="address_id" string="Location Address"/>
-                            <div>
-                                <field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_google_map'}"/>
-                            	<field name="street" placeholder="Street..."/>                            
-                            	<div>
-                            	     <field name="zip" class="oe_inline" placeholder="Zip"/>
-                                     <field name="city" class="oe_inline" placeholder="City"/>
-                                </div>
-                            </div>
-                        </group>
-                        <group>
-	                      	<field name="register_min"/>
-	                       	<field name="register_max"/>
-	                   	</group>
-                     </group>
-                </div>
-                <!-- <div class="oe_right" style="height: 200px"></div> -->
-                <notebook>
-                    <page string="Event Description">
-                        <field name="note" colspan="4" nolabel="1"/>
-                    </page>
-                    <page string="Internal Data">
-                      <group>
-                          <group class="oe_group_label_border">
-                            <field name="main_speaker_id" domain="[('speaker','=',True)]" context="{'default_speaker':1}"/>
-                            <field name="speaker_confirmed"/>
-                          </group>
-                          <group class="oe_group_label_border">
-                            <field name="register_current"/>
-                            <field name="register_prospect"/>
-                          </group> 
-                      </group>
-                      <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
-                            <tree string="Registration" editable="top">
-                                <field name="name" />
-                                <field name="email" />
-                                <field name="phone"/>
-                                <field name="nb_register" />
-                                <field name="state"/>
-                                <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                                <button name="button_reg_close" string="Attented the Event" states="open" type="object" icon="gtk-jump-to"/>
-                                <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="email"/>
-                                <field name="phone"/>
+                <form string="Events" version="7.0">
+                    <header>
+                        <button string="Confirm Event" name="button_confirm" states="draft" type="object" class="oe_highlight"/>
+                        <button string="Event Ended" name="button_done" states="confirm" type="object" class="oe_highlight"/>
+                        <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" />
+                        <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,confirm,done"/>
+                    </header>
+                    <sheet>
+                    	<div class="oe_right oe_button_box">
+	                        <button name="%(event.act_event_list_register_event)d" type="action" string="Registration" icon="gtk-index" help="Register with this event"/>
+	                    </div>
+                    
+                        <div class="oe_title" style="width: 650px" >
+	                    	<label for="name" class="oe_edit_only"/>
+		                    <group colspan="6" col="6">
+		                    	<group colspan="2"><h1><field name="name"/></h1></group>
+	                            <group colspan="4"><h1><label string="(" attrs="{'invisible': [('type', '=', '')]}" /><field name="type" nolabel="1" on_change="onchange_event_type(type,context)" class="oe_inline"/><label string=")" attrs="{'invisible': [('type', '=', '')]}" /></h1></group>
+		                    </group>  
+		                </div> 
+                        <div>
+                        	<h2>From <field name="date_begin" class="oe_inline" /> to <field name="date_end" class="oe_inline"/>
+                        	</h2>
+                            <group>
+                                <group>
+                                    <label for="address_id" string="Location Address"/>
+                                    <div>
+                                        <field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_google_map'}"/>
+                                    	<field name="street" placeholder="Street..."/>                            
+                                    	<div>
+                                    	     <field name="zip" class="oe_inline" placeholder="Zip"/>
+                                             <field name="city" class="oe_inline" placeholder="City"/>
+                                        </div>
+                                    </div>
                                 </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" colspan="2"/>
-                                        <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                                        <button name="button_reg_close" string="Attended the Event" states="open" type="object" icon="gtk-jump-to"/>
-                                        <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
-                                    </group>
-                            </form>
-                            </field>
-                            <group class="oe_subtotal_footer oe_right" colspan="2" name="regi_total">
-                                <field name="register_current"/>
-                                <field name="register_prospect"/>
-                                <field name="register_attended" class="oe_subtotal_footer_separator" />
+                                <group>
+	                              	<field name="register_min"/>
+	                               	<field name="register_max"/>
+	                           	</group>
                             </group>
-                        <separator string="" class="oe_clear"/>
-                    </page>
-                    </notebook>
+                        </div>
+                        <!-- <div class="oe_right" style="height: 200px"></div> -->
+                        <notebook>
+                            <page string="Event Description">
+                                <field name="note" colspan="4" nolabel="1"/>
+                            </page>
+                            <page string="Internal Data">
+                              <group>
+                                  <group class="oe_group_label_border">
+                                    <field name="main_speaker_id" domain="[('speaker','=',True)]" context="{'default_speaker':1}"/>
+                                    <field name="speaker_confirmed"/>
+                                  </group>
+                                  <group class="oe_group_label_border">
+                                    <field name="register_current"/>
+                                    <field name="register_prospect"/>
+                                  </group> 
+                              </group>
+                              <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
+                                    <tree string="Registration" editable="top">
+                                        <field name="name" />
+                                        <field name="email" />
+                                        <field name="phone"/>
+                                        <field name="nb_register" />
+                                        <field name="state"/>
+                                        <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                                        <button name="button_reg_close" string="Attented the Event" states="open" type="object" icon="gtk-jump-to"/>
+                                        <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="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" colspan="2"/>
+                                                <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                                                <button name="button_reg_close" string="Attended the Event" states="open" type="object" icon="gtk-jump-to"/>
+                                                <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
+                                            </group>
+                                    </form>
+                                    </field>
+                                    <group class="oe_subtotal_footer oe_right" colspan="2" name="regi_total">
+                                        <field name="register_current"/>
+                                        <field name="register_prospect"/>
+                                        <field name="register_attended" class="oe_subtotal_footer_separator" />
+                                    </group>
+                                <separator string="" class="oe_clear"/>
+                            </page>
+                        </notebook>
                     </sheet>
                     <footer>
                         <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                     </footer>
-            </form>
+                </form>
             </field>
         </record>
 
@@ -454,56 +455,49 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form version="7.0">
-                <header>
-                    <button name="registration_open" string="Confirm" states="draft" type="object" class="oe_highlight"/>
-                    <button name="button_reg_close" string="Attended" states="open" type="object" class="oe_highlight"/>
-                    <button string="Set To Unconfirmed" name="do_draft" states="cancel,done" type="object" />
-                    <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object"/>
-                    <field name="state" nolabel="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/>
-                </header>
-                <sheet string="Registration">
-                    <label for="event_id" class="oe_edit_only"/>
-                    <h1>
+                    <header>
+                        <button name="registration_open" string="Confirm" states="draft" type="object" class="oe_highlight"/>
+                        <button name="button_reg_close" string="Attended" states="open" type="object" class="oe_highlight"/>
+                        <button string="Set To Unconfirmed" name="do_draft" states="cancel,done" type="object" />
+                        <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object"/>
+                        <field name="state" nolabel="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/>
+                    </header>
+                    <sheet string="Registration">
+                        <label for="event_id" class="oe_edit_only"/>
+                        <h1>
                             <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]" nolabel="1" class="oe_inline"/>
                             <label string="(" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
                             <field name="duration" widget="float_time" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
                             <label string=")" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
-	                </h1>   
-                    <group colspan="4" col="4">
-                        <group colspan="2">
-                            <field name="name" invisible="1"/>
-                            <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)"/>
-                            <label for="email" string="E-Mail"/>
-                            <group col="2">
-                                <field name="email" nolabel="1" class="oe_inline"/>
-                                <button string="Send New Email"
-                                name="%(mail.action_email_compose_message_wizard)d"
-                                context= '{"default_email_to":email}' type="action" class="oe_inline"/>
+	                    </h1>   
+                        <group colspan="4" col="4">
+                            <group colspan="2">
+                                <field name="name" invisible="1"/>
+                                <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)"/>
+                                <label for="email" string="E-Mail"/>
+                                <group col="2">
+                                    <field name="email" nolabel="1" class="oe_inline"/>
+                                    <button string="Send New Email"
+                                    name="%(mail.action_email_compose_message_wizard)d"
+                                    context= '{"default_email_to":email}' type="action" class="oe_inline"/>
+                                </group>
+                            </group>
+                            <group colspan="2">
+                                <field name="user_id" attrs="{'readonly':[('state','!=', 'draft')]}"/>
+                                <field name="nb_register"/>
                             </group>
                         </group>
-                        <group colspan="2">
-                            <field name="user_id" attrs="{'readonly':[('state','!=', 'draft')]}"/>
-                            <field name="nb_register"/>
+                        <group colspan="2" col="2">
+                            <field name="phone"/>
                         </group>
-                    </group>
-                    <group colspan="4" col="4">
-                        <group colspan="2">
-                            
+                        <group colspan="2" col="2" groups="base.group_no_one">
+                            <field name="create_date"/>
+                            <field name="date_closed"/>
                         </group>
-                        <group colspan="2">
-                        </group>
-                    </group>
-                    <group colspan="2" col="2">
-                        <field name="phone"/>
-                    </group>
-                    <group colspan="2" col="2" groups="base.group_no_one">
-                        <field name="create_date"/>
-                        <field name="date_closed"/>
-                    </group>
-                </sheet>
-                <footer>
-                    <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
-                </footer>
+                    </sheet>
+                    <footer>
+                        <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
+                    </footer>
                 </form>
             </field>
         </record>

From 9102ef13d89629520df449d8803a1d1db0ef90a1 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Thu, 5 Jul 2012 15:28:26 +0530
Subject: [PATCH 16/21] [IMP]remove tab

bzr revid: kjo@tinyerp.com-20120705095826-1pzoelsdmmhbm50h
---
 addons/event/event_view.xml | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index a982af9d6af..276842c4d4a 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -105,36 +105,36 @@
                         <field name="state" widget="statusbar" statusbar_visible="draft,confirm,done"/>
                     </header>
                     <sheet>
-                    	<div class="oe_right oe_button_box">
-	                        <button name="%(event.act_event_list_register_event)d" type="action" string="Registration" icon="gtk-index" help="Register with this event"/>
-	                    </div>
+                        <div class="oe_right oe_button_box">
+                            <button name="%(event.act_event_list_register_event)d" type="action" string="Registration" icon="gtk-index" help="Register with this event"/>
+                        </div>
                     
                         <div class="oe_title" style="width: 650px" >
-	                    	<label for="name" class="oe_edit_only"/>
-		                    <group colspan="6" col="6">
-		                    	<group colspan="2"><h1><field name="name"/></h1></group>
-	                            <group colspan="4"><h1><label string="(" attrs="{'invisible': [('type', '=', '')]}" /><field name="type" nolabel="1" on_change="onchange_event_type(type,context)" class="oe_inline"/><label string=")" attrs="{'invisible': [('type', '=', '')]}" /></h1></group>
-		                    </group>  
-		                </div> 
+                            <label for="name" class="oe_edit_only"/>
+                            <group colspan="6" col="6">
+                                <group colspan="2"><h1><field name="name"/></h1></group>
+                                <group colspan="4"><h1><label string="(" attrs="{'invisible': [('type', '=', '')]}" /><field name="type" nolabel="1" on_change="onchange_event_type(type,context)" class="oe_inline"/><label string=")" attrs="{'invisible': [('type', '=', '')]}" /></h1></group>
+                            </group>  
+                        </div> 
                         <div>
-                        	<h2>From <field name="date_begin" class="oe_inline" /> to <field name="date_end" class="oe_inline"/>
-                        	</h2>
+                            <h2>From <field name="date_begin" class="oe_inline" /> to <field name="date_end" class="oe_inline"/>
+                            </h2>
                             <group>
                                 <group>
                                     <label for="address_id" string="Location Address"/>
                                     <div>
                                         <field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_google_map'}"/>
-                                    	<field name="street" placeholder="Street..."/>                            
-                                    	<div>
-                                    	     <field name="zip" class="oe_inline" placeholder="Zip"/>
+                                        <field name="street" placeholder="Street..."/>                            
+                                        <div>
+                                             <field name="zip" class="oe_inline" placeholder="Zip"/>
                                              <field name="city" class="oe_inline" placeholder="City"/>
                                         </div>
                                     </div>
                                 </group>
                                 <group>
-	                              	<field name="register_min"/>
-	                               	<field name="register_max"/>
-	                           	</group>
+                                      <field name="register_min"/>
+                                       <field name="register_max"/>
+                                   </group>
                             </group>
                         </div>
                         <!-- <div class="oe_right" style="height: 200px"></div> -->
@@ -469,7 +469,7 @@
                             <label string="(" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
                             <field name="duration" widget="float_time" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
                             <label string=")" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
-	                    </h1>   
+                        </h1>   
                         <group colspan="4" col="4">
                             <group colspan="2">
                                 <field name="name" invisible="1"/>

From 55aace115f8781a7ba26001e393ef9e6006eb77e Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Fri, 6 Jul 2012 10:53:21 +0530
Subject: [PATCH 17/21] [IMP]event: remove name_get method

bzr revid: kjo@tinyerp.com-20120706052321-fcxb95cckpfwsyvo
---
 addons/event/event.py | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 51e067e7d66..5e075d4bd30 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -51,27 +51,6 @@ class event_event(osv.osv):
     _order = 'date_begin'
     _inherit = ['ir.needaction_mixin','mail.thread']
 
-    def name_get(self, cr, uid, ids, context=None):
-        if not ids:
-              return []
-        res = []
-        for record in self.browse(cr, uid, ids, context=context):
-            date = record.date_begin.split(" ")
-            date = date[0]
-            registers=''
-            if record.register_max !=0:
-                register_max = str(record.register_max)
-                register_tot = record.register_current+record.register_prospect
-                register_tot = str(register_tot)
-                registers = register_tot+'/'+register_max
-            name = record.name+' ('+date+') '+registers
-            res.append((record['id'], name))
-        return res
-
-    def _name_get_fnc(self, cr, uid, ids,prop,unknow, context=None):
-        res = self.name_get(cr, uid, ids, context=context)
-        return dict(res)
-
     def create(self, cr, uid, vals, context=None):
         obj_id = super(event_event, self).create(cr, uid, vals, context)
         self.create_send_note(cr, uid, [obj_id], context=context)
@@ -211,7 +190,6 @@ class event_event(osv.osv):
             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\'.'),
         'email_registration_id' : fields.many2one('email.template','Registration Confirmation Email', help='This field contains the template of the mail that will be automatically sent each time a registration for this event is confirmed.'),
         'email_confirmation_id' : fields.many2one('email.template','Event Confirmation Email', help="If you set an email template, each participant will receive this email announcing the confirmation of the event."),
-        'full_name' : fields.function(_name_get_fnc, type="char", string='Name'),
         'reply_to': fields.char('Reply-To Email', size=64, readonly=False, states={'done': [('readonly', True)]}, help="The email address of the organizer is likely to be put here, with the effect to be in the 'Reply-To' of the mails sent automatically at event or registrations confirmation. You can also put the email address of your mail gateway if you use one."),
         '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."),
         'address_id': fields.many2one('res.partner','Location Address', readonly=False, states={'done': [('readonly', True)]}),

From f9cfe908cfebceed95c6cbf10b4d0290aa9a8b70 Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Fri, 6 Jul 2012 12:20:05 +0530
Subject: [PATCH 18/21] [IMP]event: remove oe_subtotal_footer oe_right class

bzr revid: kjo@tinyerp.com-20120706065005-agkoyvnja05apcvq
---
 addons/event/event_view.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 276842c4d4a..6fc0a149cf3 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -151,6 +151,7 @@
                                   <group class="oe_group_label_border">
                                     <field name="register_current"/>
                                     <field name="register_prospect"/>
+                                    <field name="register_attended"/>
                                   </group> 
                               </group>
                               <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
@@ -186,11 +187,6 @@
                                             </group>
                                     </form>
                                     </field>
-                                    <group class="oe_subtotal_footer oe_right" colspan="2" name="regi_total">
-                                        <field name="register_current"/>
-                                        <field name="register_prospect"/>
-                                        <field name="register_attended" class="oe_subtotal_footer_separator" />
-                                    </group>
                                 <separator string="" class="oe_clear"/>
                             </page>
                         </notebook>

From 6f70dc88c6f5ce3e7472087f61435fa475f727fc Mon Sep 17 00:00:00 2001
From: "Kuldeep Joshi (OpenERP)" <kjo@tinyerp.com>
Date: Fri, 6 Jul 2012 17:43:44 +0530
Subject: [PATCH 19/21] [IMP]event: change registration view

bzr revid: kjo@tinyerp.com-20120706121344-330s2e44t11epg5o
---
 addons/event/event.py       | 6 ------
 addons/event/event_view.xml | 7 +++----
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 5e075d4bd30..376fc122120 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -310,7 +310,6 @@ class event_registration(osv.osv):
         'phone': fields.char('Phone', size=64),
         'name': fields.char('Name', size=128, select=True),
         'active': fields.boolean('Active'),
-        'duration': fields.float('Duration'),
     }
 
     _defaults = {
@@ -410,14 +409,9 @@ class event_registration(osv.osv):
             return {}
         event_obj = self.pool.get('event.event')
         data_event =  event_obj.browse(cr, uid, event_id, context=context)
-        start = datetime.strptime(data_event.date_begin, "%Y-%m-%d %H:%M:%S")
-        end = datetime.strptime(data_event.date_end, "%Y-%m-%d %H:%M:%S")
-        diff = end - start
-        duration = float(diff.days)* 24 + (float(diff.seconds) / 3600)
         value ['value']= {'event_begin_date': data_event.date_begin,
                      'event_end_date': data_event.date_end,
                      'company_id': data_event.company_id and data_event.company_id.id or False,
-                     'duration': round(duration, 2),
                }
         return value
 
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 6fc0a149cf3..6dbad5fcd88 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -463,7 +463,9 @@
                         <h1>
                             <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]" nolabel="1" class="oe_inline"/>
                             <label string="(" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
-                            <field name="duration" widget="float_time" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
+                            <field name="event_begin_date" class="oe_inline" attrs="{'invisible': [('event_id', '=', '')]}"/>
+                            <label string="-" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
+                            <field name="event_end_date" class="oe_inline" attrs="{'invisible': [('event_id', '=', '')]}"/>
                             <label string=")" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
                         </h1>   
                         <group colspan="4" col="4">
@@ -473,9 +475,6 @@
                                 <label for="email" string="E-Mail"/>
                                 <group col="2">
                                     <field name="email" nolabel="1" class="oe_inline"/>
-                                    <button string="Send New Email"
-                                    name="%(mail.action_email_compose_message_wizard)d"
-                                    context= '{"default_email_to":email}' type="action" class="oe_inline"/>
                                 </group>
                             </group>
                             <group colspan="2">

From fa3301735e9bf6b35a0c4a62e149e8a6781858c3 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 9 Jul 2012 16:58:32 +0200
Subject: [PATCH 20/21] [IMP] event: usability, code review of form views

bzr revid: qdp-launchpad@openerp.com-20120709145832-idr4x5f8v4dtq3ol
---
 addons/event/event.py                         | 37 +++++----
 addons/event/event_demo.yml                   |  6 +-
 addons/event/event_view.xml                   | 82 +++++++++----------
 .../event/report/report_event_registration.py |  4 +-
 addons/event_moodle/event_view.xml            | 15 ++--
 addons/event_sale/event_sale.py               |  1 -
 6 files changed, 74 insertions(+), 71 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 376fc122120..6a8cf9f8a0b 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -23,7 +23,6 @@ import time
 from osv import fields, osv
 from tools.translate import _
 import decimal_precision as dp
-from datetime import datetime, timedelta
 
 class event_type(osv.osv):
     """ Event Type """
@@ -51,6 +50,19 @@ class event_event(osv.osv):
     _order = 'date_begin'
     _inherit = ['ir.needaction_mixin','mail.thread']
 
+    def name_get(self, cr, uid, ids, context=None):
+        if not ids:
+              return []
+        res = []
+        for record in self.browse(cr, uid, ids, context=context):
+            date = record.date_begin.split(" ")[0]
+            date_end = record.date_end.split(" ")[0]
+            if date != date_end:
+                date += ' - ' + date_end
+            display_name = record.name + ' (' + date + ')'
+            res.append((record['id'], display_name))
+        return res
+
     def create(self, cr, uid, vals, context=None):
         obj_id = super(event_event, self).create(cr, uid, vals, context)
         self.create_send_note(cr, uid, [obj_id], context=context)
@@ -172,8 +184,8 @@ class event_event(osv.osv):
         '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)]}),
         'type': fields.many2one('event.type', 'Type of Event', readonly=False, states={'done': [('readonly', True)]}),
-        'register_max': fields.integer('Maximum Registration', 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)]}),
-        'register_min': fields.integer('Minimum Registration', 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)]}),
+        'register_max': fields.integer('Maximum Registrations', 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)]}),
+        'register_min': fields.integer('Minimum Registrations', 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)]}),
         'register_current': fields.function(_get_register, string='Confirmed Registrations', multi='register_numbers'),
         'register_avail': fields.function(_get_register, string='Available Registrations', multi='register_numbers',type='integer'),
         'register_prospect': fields.function(_get_register, string='Unconfirmed Registrations', multi='register_numbers'),
@@ -305,17 +317,14 @@ class event_registration(osv.osv):
                                     ('open', 'Confirmed'),
                                     ('done', 'Attended')], 'Status',
                                     size=16, readonly=True),
-        # Fields for address, due to separation from event.registration and res.partner
-        'email': fields.char('Email', size=240),
+        'email': fields.char('Email', size=64),
         'phone': fields.char('Phone', size=64),
         'name': fields.char('Name', size=128, select=True),
-        'active': fields.boolean('Active'),
     }
 
     _defaults = {
         'nb_register': 1,
         'state': 'draft',
-        'active': True,
     }
     _order = 'name, create_date desc'
 
@@ -387,33 +396,31 @@ class event_registration(osv.osv):
         return True
 
     def onchange_contact_id(self, cr, uid, ids, contact, partner, context=None):
-        data ={}
         if not contact:
-            return data
+            return {}
         addr_obj = self.pool.get('res.partner')
         contact_id =  addr_obj.browse(cr, uid, contact, context=context)
-        data = {
+        return {'value': {
             'email':contact_id.email,
             'name':contact_id.name,
             'phone':contact_id.phone,
-            }
-        return {'value': data}
+            }}
 
     def onchange_event(self, cr, uid, ids, event_id, context=None):
         """This function returns value of Product Name, Unit Price based on Event.
         """
-        value= {}
         if context is None:
             context = {}
         if not event_id:
             return {}
         event_obj = self.pool.get('event.event')
         data_event =  event_obj.browse(cr, uid, event_id, context=context)
-        value ['value']= {'event_begin_date': data_event.date_begin,
+        return {'value': 
+                    {'event_begin_date': data_event.date_begin,
                      'event_end_date': data_event.date_end,
                      'company_id': data_event.company_id and data_event.company_id.id or False,
+                    }
                }
-        return value
 
     def onchange_partner_id(self, cr, uid, ids, part, context=None):
         res_obj = self.pool.get('res.partner')
diff --git a/addons/event/event_demo.yml b/addons/event/event_demo.yml
index f4e5cf04495..5fe1fb4ef12 100644
--- a/addons/event/event_demo.yml
+++ b/addons/event/event_demo.yml
@@ -26,15 +26,15 @@
   !record {model: event.event, id: event_1}:
     name: 'Opera of Verdi'
     date_begin: !eval (datetime.today()+ timedelta(days=1)).strftime('%Y-%m-%d 18:00:00')
-    date_end: !eval (datetime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 21:00:00')
+    date_end: !eval (datetime.today()+ timedelta(days=1)).strftime('%Y-%m-%d 21:00:00')
     register_min: 50
     register_max: 350
     type: event_type_1
 -
   !record {model: event.event, id: event_2}:
     name: 'Conference on ERP Business'
-    date_begin: !eval (datetime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 14:00:00')
-    date_end: !eval (datetime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 16:30:00')
+    date_begin: !eval (datetime.today()+ timedelta(months=2)).strftime('%Y-%m-%d 14:00:00')
+    date_end: !eval (datetime.today()+ timedelta(months=2)).strftime('%Y-%m-%d 16:30:00')
     register_min: 50
     register_max: 350
     type: event_type_2
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 6dbad5fcd88..1526437ddd5 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -108,13 +108,9 @@
                         <div class="oe_right oe_button_box">
                             <button name="%(event.act_event_list_register_event)d" type="action" string="Registration" icon="gtk-index" help="Register with this event"/>
                         </div>
-                    
-                        <div class="oe_title" style="width: 650px" >
+                        <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
-                            <group colspan="6" col="6">
-                                <group colspan="2"><h1><field name="name"/></h1></group>
-                                <group colspan="4"><h1><label string="(" attrs="{'invisible': [('type', '=', '')]}" /><field name="type" nolabel="1" on_change="onchange_event_type(type,context)" class="oe_inline"/><label string=")" attrs="{'invisible': [('type', '=', '')]}" /></h1></group>
-                            </group>  
+                            <h1><field name="name"/></h1>
                         </div> 
                         <div>
                             <h2>From <field name="date_begin" class="oe_inline" /> to <field name="date_end" class="oe_inline"/>
@@ -124,7 +120,7 @@
                                     <label for="address_id" string="Location Address"/>
                                     <div>
                                         <field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_google_map'}"/>
-                                        <field name="street" placeholder="Street..."/>                            
+                                        <field name="street" placeholder="Street..."/>
                                         <div>
                                              <field name="zip" class="oe_inline" placeholder="Zip"/>
                                              <field name="city" class="oe_inline" placeholder="City"/>
@@ -132,8 +128,13 @@
                                     </div>
                                 </group>
                                 <group>
-                                      <field name="register_min"/>
+                                       <field name="type" on_change="onchange_event_type(type,context)"/>
+                                       <field name="register_min"/>
                                        <field name="register_max"/>
+                                       <label for="register_current" string="Current Registrations"/>
+                                       <div>
+                                           Confirmed: <field name="register_current" class="oe_inline"/>, Unconfirmed: <field name="register_prospect" class="oe_inline"/>
+                                       </div>
                                    </group>
                             </group>
                         </div>
@@ -143,18 +144,16 @@
                                 <field name="note" colspan="4" nolabel="1"/>
                             </page>
                             <page string="Internal Data">
-                              <group>
-                                  <group class="oe_group_label_border">
-                                    <field name="main_speaker_id" domain="[('speaker','=',True)]" context="{'default_speaker':1}"/>
-                                    <field name="speaker_confirmed"/>
-                                  </group>
-                                  <group class="oe_group_label_border">
-                                    <field name="register_current"/>
-                                    <field name="register_prospect"/>
-                                    <field name="register_attended"/>
-                                  </group> 
-                              </group>
-                              <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
+                                <group>
+                                    <group>
+                                        <field name="main_speaker_id" domain="[('speaker','=',True)]" context="{'default_speaker':1}"/>
+                                        <field name="speaker_confirmed"/>
+                                    </group>
+                                    <group>
+                                        <field name="register_attended"/>
+                                    </group> 
+                                </group>
+                                <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
                                     <tree string="Registration" editable="top">
                                         <field name="name" />
                                         <field name="email" />
@@ -186,8 +185,7 @@
                                                 <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
                                             </group>
                                     </form>
-                                    </field>
-                                <separator string="" class="oe_clear"/>
+                                </field>
                             </page>
                         </notebook>
                     </sheet>
@@ -461,33 +459,29 @@
                     <sheet string="Registration">
                         <label for="event_id" class="oe_edit_only"/>
                         <h1>
-                            <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]" nolabel="1" class="oe_inline"/>
-                            <label string="(" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
-                            <field name="event_begin_date" class="oe_inline" attrs="{'invisible': [('event_id', '=', '')]}"/>
-                            <label string="-" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
-                            <field name="event_end_date" class="oe_inline" attrs="{'invisible': [('event_id', '=', '')]}"/>
-                            <label string=")" attrs="{'invisible': [('event_id', '=', '')]}" class="oe_inline"/>
-                        </h1>   
-                        <group colspan="4" col="4">
-                            <group colspan="2">
-                                <field name="name" invisible="1"/>
+                            <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]"/>
+                        </h1>
+                        <group>
+                            <group>
                                 <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)"/>
-                                <label for="email" string="E-Mail"/>
-                                <group col="2">
-                                    <field name="email" nolabel="1" class="oe_inline"/>
-                                </group>
+                                <field name="name"/>
+                                <field name="phone"/>
+                                <label for="email"/>
+                                <div>
+                                    <field name="email" class="oe_inline"/>
+                                    <button class="oe_inline oe_right" string="Send Email"
+                                      name="%(mail.action_email_compose_message_wizard)d"
+                                      icon="terp-mail-message-new" context= '{"default_email_to":email}' type="action"/>
+                                </div>
                             </group>
-                            <group colspan="2">
+                            <group>
                                 <field name="user_id" attrs="{'readonly':[('state','!=', 'draft')]}"/>
                                 <field name="nb_register"/>
                             </group>
-                        </group>
-                        <group colspan="2" col="2">
-                            <field name="phone"/>
-                        </group>
-                        <group colspan="2" col="2" groups="base.group_no_one">
-                            <field name="create_date"/>
-                            <field name="date_closed"/>
+                            <group groups="base.group_no_one">
+                                <field name="create_date"/>
+                                <field name="date_closed"/>
+                            </group>
                         </group>
                     </sheet>
                     <footer>
diff --git a/addons/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py
index 8697f46d867..17472e0cc95 100644
--- a/addons/event/report/report_event_registration.py
+++ b/addons/event/report/report_event_registration.py
@@ -77,12 +77,10 @@ class report_event_registration(osv.osv):
                 r.state AS  registration_state
                 FROM
                 event_event e
-                
+
                 LEFT JOIN
                     event_registration r ON (e.id=r.event_id)
 
-                WHERE r.active = 'true'
-               
                GROUP BY
                 event_id,
                 user_id_registration,
diff --git a/addons/event_moodle/event_view.xml b/addons/event_moodle/event_view.xml
index 4fa0172c5f5..4324990a1d8 100644
--- a/addons/event_moodle/event_view.xml
+++ b/addons/event_moodle/event_view.xml
@@ -7,7 +7,12 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="event.view_event_registration_form" />
             <field name="arch" type="xml">
+                <xpath expr="//field[@name='user_id']" position="after">
+                    <field name="moodle_user_password" readonly='1'/>
+                    <field name="moodle_uid" readonly="1"/>
+                </xpath>
                 <field name="email" position="replace">
+                     <!-- set the email as required -->
                      <field name="email" nolabel="1" required="1" />
                 </field>
                 <field name="name" position="replace">
@@ -23,12 +28,12 @@
             <field name="inherit_id" ref="event.view_event_form" />
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='registration_ids']/tree/field[@name='name']" position="replace">
-                     <field name="moodle_username" on_change="onchange_moodle_name(moodle_user_password)"/>
-                     <field name="name" required="1" />
+                   <field name="moodle_username" on_change="onchange_moodle_name(moodle_user_password)"/>
+                   <field name="name" required="1" />
                 </xpath>
-                      <field name="email" position="replace">
-                          <field name="email" required="1" />
-                      </field>
+                <field name="email" position="replace">
+                    <field name="email" required="1" />
+                </field>
            </field>
         </record>
     </data>
diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index 426c410dd99..9e65a034544 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -90,4 +90,3 @@ class sale_order_line(osv.osv):
                 message = _("The registration %s has been created from the Sale Order %s.") % (registration_id, order_line.order_id.name)
                 registration_obj.message_append_note(cr, uid, [registration_id], body=message, context=context)
         return super(sale_order_line, self).button_confirm(cr, uid, ids, context=context)
-    

From 8ba18ce67755810d87b343c95f19e90e6e4c4c9e Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 9 Jul 2012 18:41:17 +0200
Subject: [PATCH 21/21] [FIX] timedelta doesn't have a 'months' parameter

bzr revid: qdp-launchpad@openerp.com-20120709164117-bqjxqxeujhcdikim
---
 addons/event/event_demo.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/event/event_demo.yml b/addons/event/event_demo.yml
index 5fe1fb4ef12..6f843fd0965 100644
--- a/addons/event/event_demo.yml
+++ b/addons/event/event_demo.yml
@@ -33,8 +33,8 @@
 -
   !record {model: event.event, id: event_2}:
     name: 'Conference on ERP Business'
-    date_begin: !eval (datetime.today()+ timedelta(months=2)).strftime('%Y-%m-%d 14:00:00')
-    date_end: !eval (datetime.today()+ timedelta(months=2)).strftime('%Y-%m-%d 16:30:00')
+    date_begin: !eval (datetime.today()+ timedelta(days=20)).strftime('%Y-%m-%d 14:00:00')
+    date_end: !eval (datetime.today()+ timedelta(days=20)).strftime('%Y-%m-%d 16:30:00')
     register_min: 50
     register_max: 350
     type: event_type_2