From d177d9a2a9ffffb105f3d06e280ce53c81059a8f Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 6 Jul 2012 14:29:59 +0200
Subject: [IMP] move the views of crm.meeting in base_calendar, adapt xml ids
 in xml, and improve the code that opens those views

bzr revid: rco@openerp.com-20120706122959-o8clpxqvewpyha0k
---
 addons/import_google/sync_google_calendar_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/import_google/sync_google_calendar_view.xml')

diff --git a/addons/import_google/sync_google_calendar_view.xml b/addons/import_google/sync_google_calendar_view.xml
index 84f0176c5ec..bbcf297068e 100644
--- a/addons/import_google/sync_google_calendar_view.xml
+++ b/addons/import_google/sync_google_calendar_view.xml
@@ -5,7 +5,7 @@
             <field name="name">CRM - Meetings Form (Inherited)</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="inherit_id" ref="base_calendar.view_crm_meeting_form"/>
             <field name="arch" type="xml">
                 <field name="categ_id" position="replace">
                    <field name="categ_id" widget="selection"
@@ -19,7 +19,7 @@
             <field name="name">CRM - Meetings Tree (Inherited)</field>
             <field name="model">crm.meeting</field>
             <field name="type">tree</field>
-            <field name="inherit_id" ref="crm.crm_case_tree_view_meet"/>
+            <field name="inherit_id" ref="base_calendar.view_crm_meeting_tree"/>
             <field name="arch" type="xml">
                <field name="categ_id" position="replace">
                    <field name="categ_id" widget="selection"
-- 
cgit v1.2.3


From 9195edf76ca1eff140e05b54fba03ce3ceecdf35 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 6 Jul 2012 14:43:14 +0200
Subject: [FIX] import_google: adapt extension of crm.meeting.type

bzr revid: rco@openerp.com-20120706124314-n8qinysgh9wjf3rn
---
 addons/import_google/sync_google_calendar_view.xml | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

(limited to 'addons/import_google/sync_google_calendar_view.xml')

diff --git a/addons/import_google/sync_google_calendar_view.xml b/addons/import_google/sync_google_calendar_view.xml
index bbcf297068e..626d803d4df 100644
--- a/addons/import_google/sync_google_calendar_view.xml
+++ b/addons/import_google/sync_google_calendar_view.xml
@@ -1,30 +1,14 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-        <record model="ir.ui.view" id="crm_case_form_view_meet_inherit">
+        <record model="ir.ui.view" id="view_crm_meeting_form">
             <field name="name">CRM - Meetings Form (Inherited)</field>
             <field name="model">crm.meeting</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base_calendar.view_crm_meeting_form"/>
             <field name="arch" type="xml">
                 <field name="categ_id" position="replace">
-                   <field name="categ_id" widget="selection"
-                          string="Meeting Type"
-                          domain="[('object_id.model', '=', 'crm.meeting'),('user_id','in',[uid, False])]" />
-                </field>
-            </field>
-        </record>
-        
-        <record model="ir.ui.view" id="crm_case_tree_view_meet_inherit">
-            <field name="name">CRM - Meetings Tree (Inherited)</field>
-            <field name="model">crm.meeting</field>
-            <field name="type">tree</field>
-            <field name="inherit_id" ref="base_calendar.view_crm_meeting_tree"/>
-            <field name="arch" type="xml">
-               <field name="categ_id" position="replace">
-                   <field name="categ_id" widget="selection"
-                          string="Meeting Type"
-                          domain="[('object_id.model', '=', 'crm.meeting'),('user_id','in',[uid, False])]" />
+                    <field name="categ_id" widget="selection" domain="[('user_id', 'in', [uid, False])]"/>
                 </field>
             </field>
         </record>
-- 
cgit v1.2.3