From 48a33faa5ec791a2e97e3c4f6985536aa94a6c94 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Thu, 11 Feb 2010 13:55:01 +0530
Subject: [PATCH] [IMP]: crm(meeting): Meeting views improvement

bzr revid: rpa@openerp.co.in-20100211082501-15fu84s06t29btzk
---
 addons/crm/crm_meeting_menu.xml        |  1 +
 addons/crm/crm_meeting_view.xml        | 21 +++++++++++++--------
 addons/crm/crm_phonecall_menu.xml      |  1 +
 addons/crm_caldav/crm_meeting.py       |  1 -
 addons/crm_caldav/crm_meeting_view.xml | 19 ++++++++++++++++---
 5 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index a52f3b5b297..64356d382ae 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -9,6 +9,7 @@
         src_model="res.partner"
         view_mode="calendar,tree,form,gantt"
         context="{'default_partner_id': active_id, 'default_duration': 4.0}"
+        domain="[('partner_id', '=', active_id)]"
     />
 
 
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 5adcf8856e6..5591297d9be 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -32,11 +32,22 @@
             		<field name="date" string="Start Date" required="1" />
             		<field name="duration" widget="float_time" />
             		<field name="date_deadline" string="End Date" required="1" />
-            		
-            		
             	</group>
             	<notebook colspan="4">
             		<page string="Meeting">
+            		<separator colspan="4" string="Communication"/>
+                        <field name="partner_id" string="Partner"
+                        	on_change="onchange_partner_id(partner_id)" />
+                        <field name="partner_address_id"
+                        	string="Contact"
+                        	on_change="onchange_partner_address_id(partner_address_id, email_from)" />
+                        <field name="email_from"/>
+            		<separator colspan="4" string="Status and Categarization"/>
+                        <group colspan="4" col="6">
+                            <field name="priority"/>
+							 <field name="user_id" />
+	                        <field name="section_id" widget="selection" />            	
+	                    </group>
             			<separator string="Description" colspan="4" />
             			<field name="description" nolabel="1" colspan="4" />
                         <separator colspan="4"/>
@@ -50,12 +61,6 @@
                             <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"  icon="gtk-convert"/>
                         </group>
             		</page>            		
-            		<page string="Other Information">
-            			<field name="priority"/>
-            			<field name="user_id" on_change="onchange_user_id(user_id)"/>
-                        <field name="section_id" widget="selection"
-            			/>            			
-            		</page>
             	</notebook>
     
                             	
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index 4bb8f0aaabb..e3d001583f0 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -9,6 +9,7 @@
         src_model="res.partner"
         view_mode="calendar,tree,form"
         context="{'default_partner_id': active_id, 'default_duration': 1.0}"
+        domain="[('partner_id', '=', active_id)]"
         />
 
 
diff --git a/addons/crm_caldav/crm_meeting.py b/addons/crm_caldav/crm_meeting.py
index be7ba346c26..137d19e141a 100644
--- a/addons/crm_caldav/crm_meeting.py
+++ b/addons/crm_caldav/crm_meeting.py
@@ -37,7 +37,6 @@ independently or section-wise.'),
         'phonecall_id':fields.many2one ('crm.phonecall', 'Phonecall'),        
         'opportunity_id':fields.many2one ('crm.opportunity', 'Opportunity'),       
         'attendee_ids': fields.many2many('calendar.attendee', 'event_attendee_rel', 'event_id', 'attendee_id', 'Attendees'),
-        
     }
 
 crm_meeting()
diff --git a/addons/crm_caldav/crm_meeting_view.xml b/addons/crm_caldav/crm_meeting_view.xml
index 16e1423456a..4405084fc71 100644
--- a/addons/crm_caldav/crm_meeting_view.xml
+++ b/addons/crm_caldav/crm_meeting_view.xml
@@ -77,10 +77,10 @@
                 <field name="type">form</field>
                 <field name="inherit_id" ref="crm.crm_case_form_view_meet"/>                
                 <field name="arch" type="xml">
-                    <xpath expr="/form/notebook/page[@string='Other Information']/field[@name='section_id']" position="after">
+                    <xpath expr="/form/notebook/page/group/field[@name='section_id']" position="after">
                         <newline/>
-                        <field name="show_as"/>            			
-            			<field name="class"/>
+                        <field name="show_as" string="Show time as"/>            			
+            			<field name="class" string="Privacy"/>
                         <field name="vtimezone"/>
             			<field name="recurrent_id" invisible="1" />
             			<field name="recurrent_uid" invisible="1" />
@@ -88,5 +88,18 @@
                     </xpath>
                 </field>
         </record>
+        
+        <record id="meeting_form_view_inherit4" model="ir.ui.view">
+                <field name="name">CRM - Meetings Form Inherit4</field>
+                <field name="model">crm.meeting</field>
+                <field name="type">form</field>
+                <field name="inherit_id" ref="crm.crm_case_form_view_meet"/>                
+                <field name="arch" type="xml">
+                    <xpath expr="/form/notebook/page/group/field[@name='user_id']" position="replace">
+                        <field name="user_id" on_change="onchange_user_id(user_id)"/>
+                    </xpath>
+                </field>
+        </record>
+        
 	</data>
 </openerp>