[IMP]: Place crm_meeting demo & data file at right location in base_calendar

bzr revid: cha@tinyerp.com-20120719100924-61t3jqsqzj61squb

diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py
index 3f6ca12..c7df187 100644 (file)
--- a/addons/base_calendar/__openerp__.py
+++ b/addons/base_calendar/__openerp__.py
@@ -39,9 +39,10 @@ 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'
+        'base_calendar_data.xml',
+        'crm_meeting_data.xml',
     ],
-    "demo_xml": [],
+    "demo_xml": ['crm_meeting_demo.xml'],
     "update_xml": [
         'security/calendar_security.xml',
         'security/ir.model.access.csv',

diff --git a/addons/base_calendar/crm_meeting_data.xml b/addons/base_calendar/crm_meeting_data.xml
new file mode 100644 (file)
index 0000000..82752d1
--- /dev/null
+++ b/addons/base_calendar/crm_meeting_data.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<openerp>
+    <data noupdate="1">
+
+        <!--    CASE CATEGORY(categ_id)        -->
+
+        <record model="crm.meeting.type" id="categ_meet1">
+            <field name="name">Customer Meeting</field>
+        </record>
+
+        <record model="crm.meeting.type" id="categ_meet2">
+            <field name="name">Internal Meeting</field>
+        </record>
+
+        <record model="crm.meeting.type" id="categ_meet3">
+            <field name="name">Phone Call</field>
+        </record>
+
+         <record model="res.request.link" id="request_link_meeting">
+            <field name="name">Meeting</field>
+            <field name="object">crm.meeting</field>
+        </record>
+    </data>
+</openerp>

diff --git a/addons/base_calendar/crm_meeting_demo.xml b/addons/base_calendar/crm_meeting_demo.xml
new file mode 100644 (file)
index 0000000..ad88c11
--- /dev/null
+++ b/addons/base_calendar/crm_meeting_demo.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0"?>
+<openerp>
+    <data noupdate="1">
+    <!-- 
+        ((((((((((( Demo Cases ))))))))))) 
+    -->
+
+    <!--For Meetings-->
+        <record id="crm_case_followuponproposal0" model="crm.meeting">
+            <field eval="1" name="active"/>
+            <field name="user_id" ref="base.user_root"/>
+            <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 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"/>
+        </record>
+    
+        <record id="crm_case_initialdiscussion0" model="crm.meeting">
+            <field eval="1" name="active"/>
+            <field eval="7.0" name="duration"/>
+            <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 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"/>
+        </record>
+    
+        <record id="crm_case_discusspricing0" model="crm.meeting">
+            <field eval="1" name="active"/>
+            <field eval="3.0" name="duration"/>
+            <field name="user_id" ref="base.user_root"/>
+            <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 eval="&quot;Discuss pricing&quot;" name="name"/>
+            <field eval="time.strftime('%Y-%m-12 18:55:05')" name="date_deadline"/>
+        </record>
+
+        <record id="crm_case_reviewneeds0" model="crm.meeting">
+            <field eval="1" name="active"/>
+            <field eval="6.0" name="duration"/>
+            <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 eval="&quot;Review needs&quot;" name="name"/>
+            <field eval="time.strftime('%Y-%m-20 16:02:02')" name="date_deadline"/>
+        </record>
+
+        <record id="crm_case_changesindesigning0" model="crm.meeting">
+            <field eval="1" name="active"/>
+            <field eval="05" name="duration"/>
+            <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 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"/>
+        </record>
+    
+        <record id="crm_case_updatethedata0" model="crm.meeting">
+            <field eval="1" name="active"/>
+            <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 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"/>
+        </record>
+    </data>
+</openerp>

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 0c9b75b..9fb1a4d 100644 (file)
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -68,7 +68,6 @@ 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': [
@@ -115,7 +114,6 @@ 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/crm/crm_meeting_data.xml b/addons/crm/crm_meeting_data.xml
deleted file mode 100644 (file)
index 82752d1..0000000
--- a/addons/crm/crm_meeting_data.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data noupdate="1">
-
-        <!--    CASE CATEGORY(categ_id)        -->
-
-        <record model="crm.meeting.type" id="categ_meet1">
-            <field name="name">Customer Meeting</field>
-        </record>
-
-        <record model="crm.meeting.type" id="categ_meet2">
-            <field name="name">Internal Meeting</field>
-        </record>
-
-        <record model="crm.meeting.type" id="categ_meet3">
-            <field name="name">Phone Call</field>
-        </record>
-
-         <record model="res.request.link" id="request_link_meeting">
-            <field name="name">Meeting</field>
-            <field name="object">crm.meeting</field>
-        </record>
-    </data>
-</openerp>

diff --git a/addons/crm/crm_meeting_demo.xml b/addons/crm/crm_meeting_demo.xml
deleted file mode 100644 (file)
index dda6d5a..0000000
--- a/addons/crm/crm_meeting_demo.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data noupdate="1">
-    <!-- 
-        ((((((((((( Demo Cases ))))))))))) 
-    -->
-
-    <!--For Meetings-->
-        <record id="crm_case_followuponproposal0" model="crm.meeting">
-            <field eval="1" name="active"/>
-            <field name="user_id" ref="base.user_root"/>
-            <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_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"/>
-        </record>
-    
-        <record id="crm_case_initialdiscussion0" model="crm.meeting">
-            <field eval="1" name="active"/>
-            <field eval="7.0" name="duration"/>
-            <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_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"/>
-        </record>
-    
-        <record id="crm_case_discusspricing0" model="crm.meeting">
-            <field eval="1" name="active"/>
-            <field eval="3.0" name="duration"/>
-            <field name="user_id" ref="base.user_root"/>
-            <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_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>
-
-        <record id="crm_case_reviewneeds0" model="crm.meeting">
-            <field eval="1" name="active"/>
-            <field eval="6.0" name="duration"/>
-            <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_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>
-
-        <record id="crm_case_changesindesigning0" model="crm.meeting">
-            <field eval="1" name="active"/>
-            <field eval="05" name="duration"/>
-            <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_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"/>
-        </record>
-    
-        <record id="crm_case_updatethedata0" model="crm.meeting">
-            <field eval="1" name="active"/>
-            <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_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"/>
-        </record>
-    </data>
-</openerp>