From 99656278bfc3d0b26011a855fc53d1614ec39bf8 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Tue, 2 Feb 2010 13:55:49 +0530
Subject: [PATCH] [IMP] caldav, crm: improve view of attendee and change menu

bzr revid: hmo@tinyerp.com-20100202082549-ao8atwkf8zourzjd
---
 addons/caldav/caldav_view.xml   | 35 ++++++---------------------------
 addons/crm/crm_meeting_menu.xml | 16 +++++++++++++++
 2 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index 54aaea8c5f4..4d10b9529f5 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -65,6 +65,8 @@
             		<field name="user_id"
             			on_change="onchange_user_id(user_id)" readonly="1" />
             		<field name="email" select="1" readonly="1" />
+                    <field name="partner_id" select="1" readonly="1" />
+                    <field name="partner_address_id" select="1" readonly="1" />
             		<newline />
             		<field name="role" select="1" readonly="1" string="Role" />
             		<field name="cutype" select="1" readonly="1"  string="Invitation type" />
@@ -114,7 +116,7 @@
             </field>
         </record>
 
-	 <record id="caldav_attendee_tree_view" model="ir.ui.view">
+	    <record id="caldav_attendee_tree_view" model="ir.ui.view">
             <field name="name">calendar.attendee.tree</field>
             <field name="model">calendar.attendee</field>
             <field name="type">tree</field>
@@ -126,32 +128,9 @@
             		<field name="state" />
             	</tree>
             </field>
-        </record>
+        </record>	 
 
-	 <record id="action_view_attendee_form" model="ir.actions.act_window">
-	 	<field name="name">My Invitations</field>
-	 	<field name="type">ir.actions.act_window</field>
-	 	<field name="res_model">calendar.attendee</field>
-	 	<field name="view_type">form</field>
-	 	<field name="view_mode">tree,form</field>
-	 	<field name="view_id" ref="caldav_attendee_tree_view" />
-	 	<field name="domain">[('user_id', '=', uid)]</field>
-	 	<field name="context">{'default_sent_by_uid': uid}</field>
-	 </record>
-
-	 <record id="action_invitation_tree_view1" model="ir.actions.act_window.view">
-	 	<field eval="1" name="sequence" />
-	 	<field name="view_mode">tree</field>
-	 	<field name="view_id" ref="caldav_attendee_tree_view" />
-	 	<field name="act_window_id" ref="action_view_attendee_form" />
-	 </record>
 	 
-	 <record id="action_invitation_form_view1" model="ir.actions.act_window.view">
-	 	<field eval="2" name="sequence" />
-	 	<field name="view_mode">form</field>
-	 	<field name="view_id" ref="caldav_attendee_form_view" />
-	 	<field name="act_window_id" ref="action_view_attendee_form" />
-	 </record>
 	 
         <record id="res_alarm_form_view" model="ir.ui.view">
             <field name="name">res.alarm.form</field>
@@ -251,7 +230,7 @@
             </field>
         </record>
 	
-	<record id="action_calendar_custom_rrule_wizard" model="ir.actions.act_window">
+    	<record id="action_calendar_custom_rrule_wizard" model="ir.actions.act_window">
             <field name="name">Custom Rule</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">calendar.custom.rrule</field>
@@ -260,9 +239,7 @@
             <field name="target">new</field>
         </record>
         
-        <menuitem id="menu_attendee_invitations"
-			name="My Invitations" parent="base_calendar.menu_calendar_configuration"
-			sequence="10" action="action_view_attendee_form" />
+        
         
         <!--	Available alarms-->
 
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index c18a6e4554d..34d03979897 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -119,6 +119,22 @@
     <menuitem name="Meetings" id="menu_meeting_sale" parent="base.menu_base_partner" sequence="3"/>
     <menuitem name="Meetings" id="menu_crm_case_categ_meet" action="crm_case_categ_meet" parent="menu_meeting_sale" sequence="1"/>
 
+    <record id="action_view_attendee_form" model="ir.actions.act_window">
+	 	<field name="name">Meeting Invitations</field>
+	 	<field name="type">ir.actions.act_window</field>
+	 	<field name="res_model">calendar.attendee</field>
+	 	<field name="view_type">form</field>
+	 	<field name="view_mode">tree,form</field>
+	 	<field name="view_id" ref="caldav.caldav_attendee_tree_view" />	 	
+        <field name="domain">[('ref','like','crm.meeting,')]</field>
+	 	<field name="context">{'default_sent_by_uid': uid}</field>
+	 </record>
+
+    <menuitem id="menu_attendee_invitations"
+			name="Meeting Invitations" parent="menu_meeting_sale"
+			sequence="10" action="action_view_attendee_form" />
+    
+
     <record model="ir.actions.act_window" id="crm_case_category_act_meetall3">
         <field name="name">Next Meetings</field>
         <field name="res_model">crm.meeting</field>