[FIX] : scheduled meeting action not found

[ADD] : field group scheduled calls menu

bzr revid: aja@tinyerp.com-20140304061738-cbk1qalggohf70zc

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 0929933..7b72201 100644 (file)
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -393,7 +393,7 @@
                                 name="%(crm.crm_case_categ_phone_incoming0)d" 
                                 context="{'default_opportunity_id': active_id, 'search_default_opportunity_id': active_id, 'default_partner_id': partner_id, 'default_duration': 1.0}" />
                             <button string="Schedule Meeting" type="action"
-                                name="%(base_calendar.action_crm_meeting)d"
+                                name="%(calendar.action_view_calendar_event_calendar)d"
                                 context="{'search_default_attendee_id': active_id, 'default_attendee_id' : active_id}"/>
                         </div>
                         <div class="oe_title">

diff --git a/addons/crm/res_config.py b/addons/crm/res_config.py
index c3e368f..73086c9 100644 (file)
--- a/addons/crm/res_config.py
+++ b/addons/crm/res_config.py
@@ -69,6 +69,9 @@ class crm_configuration(osv.TransientModel):
             help="""Allows you to use Sales Teams to manage your leads and opportunities."""),
         'alias_prefix': fields.char('Default Alias Name for Leads'),
         'alias_domain' : fields.char('Alias Domain'),
+        'group_scheduled_calls_menu': fields.boolean("Show Scheduled Calls Menu",
+            implied_group='crm.group_scheduled_calls_menu',
+            help="""Allow to show 'Scheduled Calls' menu under 'Sales/Phone Calls' menu""")
     }
 
     _defaults = {