[MERGE]: Merged with addons

[odoo/odoo.git] / addons / crm / crm_phonecall.py

diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index ccf4edf..19bc98c 100644 (file)
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -117,9 +117,11 @@ class crm_phonecall(osv.osv):
         model_data = self.pool.get('ir.model.data')
         phonecall_dict = {}
         if not categ_id:
-            res_id = model_data._get_id(cr, uid, 'crm', 'categ_phone2')
-            if res_id:
+            try:
+                res_id = model_data._get_id(cr, uid, 'crm', 'categ_phone2')
                 categ_id = model_data.browse(cr, uid, res_id, context=context).res_id
+            except ValueError:
+                pass
         for call in self.browse(cr, uid, ids, context=context):
             if not section_id:
                 section_id = call.section_id and call.section_id.id or False
@@ -266,7 +268,7 @@ class crm_phonecall(osv.osv):
         phonecall = self.browse(cr, uid, ids[0], context)
         if phonecall.partner_id and phonecall.partner_id.email:
             partner_ids.append(phonecall.partner_id.id)
-        res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid, 'base_calendar', 'action_crm_meeting', context)
+        res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid, 'calendar', 'action_calendar_event', context)
         res['context'] = {
             'default_phonecall_id': phonecall.id,
             'default_partner_ids': partner_ids,