[IMP] improve code

bzr revid: voraamitr@gmail.com-20140310131847-jht58ov5mar8nsif

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 6badcdb..6d5dbf0 100644 (file)
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -393,7 +393,7 @@
                             <button class="oe_inline" type="action" string="Calls" 
                                 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"
+                            <button string="Schedule a Meeting" type="action"
                                 name="%(calendar.action_calendar_event)d"
                                 context="{'partner_id': partner_id}"/>
                         </div>

diff --git a/addons/crm/res_config.py b/addons/crm/res_config.py
index 73086c9..94e063d 100644 (file)
--- a/addons/crm/res_config.py
+++ b/addons/crm/res_config.py
@@ -69,9 +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",
+        'group_scheduled_calls_menu': fields.boolean("Schedule calls to manage call center",
             implied_group='crm.group_scheduled_calls_menu',
-            help="""Allow to show 'Scheduled Calls' menu under 'Sales/Phone Calls' menu""")
+            help="""This adds menu 'Scheduled Calls' under 'Sales / Phone Calls'""")
     }
 
     _defaults = {

diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml
index b68f04f..02d2e91 100644 (file)
--- a/addons/crm/res_config_view.xml
+++ b/addons/crm/res_config_view.xml
@@ -9,9 +9,18 @@
             <field name="arch" type="xml">
                 <data>
                    <div name="config_sale" position="before">
-                       <separator string="After-Sale Services"/>
+                       <separator string="Sale Services"/>
+                       <group>
+                        <label for="id" string="Pre-Sale Services"/>
+                        <div>
+                            <div>
+                                <field name="group_scheduled_calls_menu" class="oe_inline"/>
+                                <label for="group_scheduled_calls_menu"/>
+                            </div>
+                        </div>
+                    </group>
                     <group>
-                        <label for="id" string="Features"/>
+                        <label for="id" string="After-Sale Services"/>
                         <div>
                             <div>
                                 <field name="module_crm_claim" class="oe_inline"/>
@@ -21,10 +30,6 @@
                                 <field name="module_crm_helpdesk" class="oe_inline"/>
                                 <label for="module_crm_helpdesk"/>
                             </div>
-                            <div>
-                                <field name="group_scheduled_calls_menu" class="oe_inline"/>
-                                <label for="group_scheduled_calls_menu"/>
-                            </div>
                         </div>
                     </group>
                     <separator string="Sales Teams"/>

diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 0c8872d..71f813b 100644 (file)
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -95,7 +95,7 @@
                             name="%(crm.crm_case_category_act_oppor11)d"
                             context="{'search_default_partner_id': active_id}"/>
                         <button class="oe_inline" type="action"
-                            string="Schedule Meetings"
+                            string="Schedule a Meeting"
                             name="%(calendar.action_calendar_event)d"
                             context="{'user_id': user_id}"/>
                         <button class="oe_inline" type="action" string="Calls"