From 7eb49260d163fb6a79e25208f24339cf0933dc3d Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Fri, 20 Jul 2012 09:34:59 +0200
Subject: [PATCH] [REVERT] previous merge of
 lp:~openerp-dev/openobject-addons/trunk-addons_issue_hr-cha

bzr revid: stw@openerp.com-20120720073459-bhslng4t8qbigoka
---
 addons/base_calendar/__openerp__.py                |  5 ++---
 addons/crm/__openerp__.py                          |  2 ++
 addons/{base_calendar => crm}/crm_meeting_data.xml |  0
 addons/{base_calendar => crm}/crm_meeting_demo.xml | 12 ++++++------
 4 files changed, 10 insertions(+), 9 deletions(-)
 rename addons/{base_calendar => crm}/crm_meeting_data.xml (100%)
 rename addons/{base_calendar => crm}/crm_meeting_demo.xml (89%)

diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py
index c7df187dd87..3f6ca129f6f 100644
--- a/addons/base_calendar/__openerp__.py
+++ b/addons/base_calendar/__openerp__.py
@@ -39,10 +39,9 @@ If you need to manage your meetings, you should install the CRM module.
     'category': 'Hidden/Dependency',
     'website': 'http://www.openerp.com',
     "init_xml": [
-        'base_calendar_data.xml',
-        'crm_meeting_data.xml',
+        'base_calendar_data.xml'
     ],
-    "demo_xml": ['crm_meeting_demo.xml'],
+    "demo_xml": [],
     "update_xml": [
         'security/calendar_security.xml',
         'security/ir.model.access.csv',
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 9fb1a4db28d..0c9b75b4d41 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -68,6 +68,7 @@ Creates a dashboard for CRM that includes:
     'init_xml': [
         'crm_data.xml',
         'crm_lead_data.xml',
+        'crm_meeting_data.xml',
         'crm_phonecall_data.xml',
     ],
     'update_xml': [
@@ -114,6 +115,7 @@ Creates a dashboard for CRM that includes:
     'demo_xml': [
         'crm_demo.xml',
         'crm_lead_demo.xml',
+        'crm_meeting_demo.xml',
         'crm_phonecall_demo.xml',
     ],
     'test': [
diff --git a/addons/base_calendar/crm_meeting_data.xml b/addons/crm/crm_meeting_data.xml
similarity index 100%
rename from addons/base_calendar/crm_meeting_data.xml
rename to addons/crm/crm_meeting_data.xml
diff --git a/addons/base_calendar/crm_meeting_demo.xml b/addons/crm/crm_meeting_demo.xml
similarity index 89%
rename from addons/base_calendar/crm_meeting_demo.xml
rename to addons/crm/crm_meeting_demo.xml
index ad88c11bb1b..dda6d5a03a8 100644
--- a/addons/base_calendar/crm_meeting_demo.xml
+++ b/addons/crm/crm_meeting_demo.xml
@@ -12,7 +12,7 @@
             <field eval="&quot;Meeting to discuss project plan and hash out the details of implementation  &quot;" name="description"/>
             <field eval="&quot;open&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-03 10:20:03')" name="date"/>
-            <field name="categ_ids" eval="[(6,0,[ref('categ_meet2')])]"/>
+            <field name="categ_id" ref="crm.categ_meet2"/>
             <field eval="&quot;Follow-up on proposal&quot;" name="name"/>
             <field eval="time.strftime('%Y-%m-03 16:38:03')" name="date_deadline"/>
             <field eval="6.3" name="duration"/>
@@ -24,7 +24,7 @@
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;draft&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-05 12:01:01')" name="date"/>
-            <field name="categ_ids" eval="[(6,0,[ref('categ_meet3')])]"/>
+            <field name="categ_id" ref="crm.categ_meet3"/>
             <field eval="&quot;Initial discussion&quot;" name="name"/>
             <field eval="time.strftime('%Y-%m-05 19:01:01')" name="date_deadline"/>
             <field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/>
@@ -37,7 +37,7 @@
             <field eval="&quot;Meeting to discuss project plan and hash out the details of implementation  &quot;" name="description"/>
             <field eval="&quot;done&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-12 15:55:05')" name="date"/>
-            <field name="categ_ids" eval="[(6,0,[ref('categ_meet1')])]"/>
+            <field name="categ_id" ref="crm.categ_meet1"/>
             <field eval="&quot;Discuss pricing&quot;" name="name"/>
             <field eval="time.strftime('%Y-%m-12 18:55:05')" name="date_deadline"/>
         </record>
@@ -48,7 +48,7 @@
             <field name="user_id" ref="base.user_demo"/>
             <field eval="&quot;open&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-20 10:02:02')" name="date"/>
-            <field name="categ_ids" eval="[(6,0,[ref('categ_meet3')])]"/>
+            <field name="categ_id" ref="crm.categ_meet3"/>
             <field eval="&quot;Review needs&quot;" name="name"/>
             <field eval="time.strftime('%Y-%m-20 16:02:02')" name="date_deadline"/>
         </record>
@@ -59,7 +59,7 @@
             <field name="user_id" ref="base.user_demo"/>
             <field eval="&quot;draft&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-22 11:05:05')" name="date"/>
-            <field name="categ_ids" eval="[(6,0,[ref('categ_meet2')])]"/>
+            <field name="categ_id" ref="crm.categ_meet2"/>
             <field eval="&quot;Changes in Designing&quot;" name="name"/>
             <field eval="time.strftime('%Y-%m-22 16:05:05')" name="date_deadline"/>
             <field eval="&quot;info@opensides.be&quot;" name="email_from"/>
@@ -70,7 +70,7 @@
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;done&quot;" name="state"/>
             <field eval="time.strftime('%Y-%m-18 13:12:49')" name="date"/>
-            <field name="categ_ids" eval="[(6,0,[ref('categ_meet2')])]"/>
+            <field name="categ_id" ref="crm.categ_meet2"/>
             <field eval="&quot;Update the data&quot;" name="name"/>
             <field eval="13.3" name="duration"/>
             <field eval="time.strftime('%Y-%m-19 02:30:49')" name="date_deadline"/>