Ajay Chauhan(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons_issue_hr-cha into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons_issue_hr-cha/+merge/115695
Hello,
i placed crm_meeting demo & data file at right location in base_calendar having
done some little changes.
Thanks,
Ajay Chauhan
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons_issue_hr-cha/+merge/115695
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-addons_issue_hr-cha.
=== modified file 'base_calendar/__openerp__.py'
--- base_calendar/__openerp__.py 2012-07-06 12:29:59 +0000
+++ base_calendar/__openerp__.py 2012-07-19 10:34:22 +0000
@@ -39,9 +39,10 @@
'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',
=== added file 'base_calendar/crm_meeting_data.xml'
--- base_calendar/crm_meeting_data.xml 1970-01-01 00:00:00 +0000
+++ base_calendar/crm_meeting_data.xml 2012-07-19 10:34:22 +0000
@@ -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>
=== added file 'base_calendar/crm_meeting_demo.xml'
--- base_calendar/crm_meeting_demo.xml 1970-01-01 00:00:00 +0000
+++ base_calendar/crm_meeting_demo.xml 2012-07-19 10:34:22 +0000
@@ -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=""Meeting to discuss project plan and hash out the details of implementation "" name="description"/>
+ <field eval=""open"" 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=""Follow-up on proposal"" 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=""draft"" 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=""Initial discussion"" name="name"/>
+ <field eval="time.strftime('%Y-%m-05 19:01:01')" name="date_deadline"/>
+ <field eval=""[email protected]"" 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=""Meeting to discuss project plan and hash out the details of implementation "" name="description"/>
+ <field eval=""done"" 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=""Discuss pricing"" 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=""open"" 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=""Review needs"" 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=""draft"" 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=""Changes in Designing"" name="name"/>
+ <field eval="time.strftime('%Y-%m-22 16:05:05')" name="date_deadline"/>
+ <field eval=""[email protected]"" 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=""done"" 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=""Update the data"" name="name"/>
+ <field eval="13.3" name="duration"/>
+ <field eval="time.strftime('%Y-%m-19 02:30:49')" name="date_deadline"/>
+ </record>
+ </data>
+</openerp>
=== modified file 'crm/__openerp__.py'
--- crm/__openerp__.py 2012-05-29 14:03:14 +0000
+++ crm/__openerp__.py 2012-07-19 10:34:22 +0000
@@ -68,7 +68,6 @@
'init_xml': [
'crm_data.xml',
'crm_lead_data.xml',
- 'crm_meeting_data.xml',
'crm_phonecall_data.xml',
],
'update_xml': [
@@ -115,7 +114,6 @@
'demo_xml': [
'crm_demo.xml',
'crm_lead_demo.xml',
- 'crm_meeting_demo.xml',
'crm_phonecall_demo.xml',
],
'test': [
=== removed file 'crm/crm_meeting_data.xml'
--- crm/crm_meeting_data.xml 2012-07-04 14:10:42 +0000
+++ crm/crm_meeting_data.xml 1970-01-01 00:00:00 +0000
@@ -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>
=== removed file 'crm/crm_meeting_demo.xml'
--- crm/crm_meeting_demo.xml 2012-07-14 15:33:50 +0000
+++ crm/crm_meeting_demo.xml 1970-01-01 00:00:00 +0000
@@ -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=""Meeting to discuss project plan and hash out the details of implementation "" name="description"/>
- <field eval=""open"" name="state"/>
- <field eval="time.strftime('%Y-%m-03 10:20:03')" name="date"/>
- <field name="categ_id" ref="crm.categ_meet2"/>
- <field eval=""Follow-up on proposal"" 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=""draft"" name="state"/>
- <field eval="time.strftime('%Y-%m-05 12:01:01')" name="date"/>
- <field name="categ_id" ref="crm.categ_meet3"/>
- <field eval=""Initial discussion"" name="name"/>
- <field eval="time.strftime('%Y-%m-05 19:01:01')" name="date_deadline"/>
- <field eval=""[email protected]"" 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=""Meeting to discuss project plan and hash out the details of implementation "" name="description"/>
- <field eval=""done"" name="state"/>
- <field eval="time.strftime('%Y-%m-12 15:55:05')" name="date"/>
- <field name="categ_id" ref="crm.categ_meet1"/>
- <field eval=""Discuss pricing"" 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=""open"" name="state"/>
- <field eval="time.strftime('%Y-%m-20 10:02:02')" name="date"/>
- <field name="categ_id" ref="crm.categ_meet3"/>
- <field eval=""Review needs"" 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=""draft"" name="state"/>
- <field eval="time.strftime('%Y-%m-22 11:05:05')" name="date"/>
- <field name="categ_id" ref="crm.categ_meet2"/>
- <field eval=""Changes in Designing"" name="name"/>
- <field eval="time.strftime('%Y-%m-22 16:05:05')" name="date_deadline"/>
- <field eval=""[email protected]"" 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=""done"" name="state"/>
- <field eval="time.strftime('%Y-%m-18 13:12:49')" name="date"/>
- <field name="categ_id" ref="crm.categ_meet2"/>
- <field eval=""Update the data"" name="name"/>
- <field eval="13.3" name="duration"/>
- <field eval="time.strftime('%Y-%m-19 02:30:49')" name="date_deadline"/>
- </record>
- </data>
-</openerp>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
