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 1/5] [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 2/5] [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 3/5] [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 4/5] [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 5/5] [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>