From 8ae9536d75bfce5d9710a20a701d88024426b32e Mon Sep 17 00:00:00 2001 From: "Hardik Ansodariy (OpenERP)" Date: Mon, 29 Aug 2011 11:17:15 +0530 Subject: [PATCH] [IMP] remove confliction bzr revid: han@tinyerp.com-20110829054715-pics8t7v7t9xyb01 --- addons/crm/crm_installer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm/crm_installer.py b/addons/crm/crm_installer.py index 38d0a10b4e8..1c4706a10d9 100644 --- a/addons/crm/crm_installer.py +++ b/addons/crm/crm_installer.py @@ -37,7 +37,7 @@ class crm_installer(osv.osv_memory): 'thunderbird': fields.boolean('Thunderbird', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."), 'outlook': fields.boolean('MS-Outlook', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."), 'wiki_sale_faq': fields.boolean('Sale FAQ', help="Helps you manage wiki pages for Frequently Asked Questions on Sales Application."), - 'crm_todo': fields.boolean('CRM TODO', help=" add a todo list in your Opportunities form."), + 'crm_todo': fields.boolean('CRM TODO', help=" add a crm todo list in your Opportunities form."), } def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):