diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py index ccfc0608f3d..44ac8b6381f 100644 --- a/addons/crm/__terp__.py +++ b/addons/crm/__terp__.py @@ -91,8 +91,7 @@ between mails and Open ERP.""", 'process/crm_configuration_process.xml' ], 'demo_xml': [ - 'crm_demo.xml', - 'crm_meeting_demo.xml', + 'crm_demo.xml', 'crm_claims_demo.xml', 'crm_fund_demo.xml', 'crm_helpdesk_demo.xml', diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py index f27ec8433b3..e69cc8c8593 100644 --- a/addons/crm/crm_meeting.py +++ b/addons/crm/crm_meeting.py @@ -284,7 +284,7 @@ class crm_meeting(osv.osv): select = [ids] else: select = ids - select = map(lambda x:(str(x), common.caldav_id2real_id(x)), select) + select = map(lambda x:(x, common.caldav_id2real_id(x)), select) result = [] if fields and 'date' not in fields: fields.append('date')