From ae8b2f65ed50e33340453ffc624bacc4a9c72179 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Fri, 20 Jul 2012 14:12:46 +0200
Subject: [PATCH] [FIX] merge of
 lp:~openerp-dev/openobject-addons/trunk-addons_issue_hr-cha and fix

bzr revid: stw@openerp.com-20120720121246-ltdbylsj8aveiz13
---
 addons/base_calendar/__openerp__.py                  |  5 +++--
 addons/base_calendar/base_calendar_data.xml          |  2 +-
 addons/{crm => base_calendar}/crm_meeting_data.xml   |  0
 addons/{crm => base_calendar}/crm_meeting_demo.xml   | 12 ++++++------
 .../wizard/base_calendar_invite_attendee.py          |  3 +++
 addons/crm/__openerp__.py                            |  2 --
 addons/crm/test/process/lead2opportunity2win.yml     |  2 +-
 7 files changed, 14 insertions(+), 12 deletions(-)
 rename addons/{crm => base_calendar}/crm_meeting_data.xml (100%)
 rename addons/{crm => base_calendar}/crm_meeting_demo.xml (89%)

diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py
index 3f6ca129f6f..c7df187dd87 100644
--- 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/base_calendar_data.xml b/addons/base_calendar/base_calendar_data.xml
index 3c20bf5fad5..727a0703db2 100644
--- a/addons/base_calendar/base_calendar_data.xml
+++ b/addons/base_calendar/base_calendar_data.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data noupdate="1">
     
-     <record model="res.request.link" id="request_link_meeting">
+     <record model="res.request.link" id="request_link_event">
             <field name="name">Event</field>
             <field name="object">calendar.event</field>
         </record>
diff --git a/addons/crm/crm_meeting_data.xml b/addons/base_calendar/crm_meeting_data.xml
similarity index 100%
rename from addons/crm/crm_meeting_data.xml
rename to addons/base_calendar/crm_meeting_data.xml
diff --git a/addons/crm/crm_meeting_demo.xml b/addons/base_calendar/crm_meeting_demo.xml
similarity index 89%
rename from addons/crm/crm_meeting_demo.xml
rename to addons/base_calendar/crm_meeting_demo.xml
index dda6d5a03a8..ad88c11bb1b 100644
--- a/addons/crm/crm_meeting_demo.xml
+++ b/addons/base_calendar/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_id" ref="crm.categ_meet2"/>
+            <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"/>
@@ -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_id" ref="crm.categ_meet3"/>
+            <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"/>
@@ -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_id" ref="crm.categ_meet1"/>
+            <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>
@@ -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_id" ref="crm.categ_meet3"/>
+            <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>
@@ -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_id" ref="crm.categ_meet2"/>
+            <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"/>
@@ -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_id" ref="crm.categ_meet2"/>
+            <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"/>
diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee.py b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
index 676f9b3fdd2..0e62555f6ba 100644
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee.py
+++ b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
@@ -78,6 +78,9 @@ send an Email to Invited Person')
         att_obj = self.pool.get('calendar.attendee')
         user_obj = self.pool.get('res.users')
         current_user = user_obj.browse(cr, uid, uid, context=context)
+
+        import pdb
+        pdb.set_trace()
         for datas in self.read(cr, uid, ids, context=context):
             type = datas.get('type')
             vals = []
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 0c9b75b4d41..9fb1a4db28d 100644
--- 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/test/process/lead2opportunity2win.yml b/addons/crm/test/process/lead2opportunity2win.yml
index c1caf394c2e..1c2cfdeb605 100644
--- a/addons/crm/test/process/lead2opportunity2win.yml
+++ b/addons/crm/test/process/lead2opportunity2win.yml
@@ -113,7 +113,7 @@
 -
   !python {model: crm.meeting}: |
     context.update({'active_model': 'crm.meeting'}) 
-    self.case_open(cr, uid, [ref('crm.crm_case_reviewneeds0')])
+    self.case_open(cr, uid, [ref('base_calendar.crm_case_reviewneeds0')])
 -
   I invite a user for meeting.
 -