From f4aca67e14492bc88eec7a4312c8df2243356d73 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Tue, 17 Jul 2012 19:00:24 +0530
Subject: [PATCH] [IMP] improve label of fields in sales config wizard

bzr revid: fka@tinyerp.com-20120717133024-7ah0r5cx5p12r3bj
---
 addons/base_setup/res_config_view.xml         |  8 ++--
 addons/crm/res_config_view.xml                | 14 +++---
 addons/crm_claim/res_config_view.xml          |  2 +-
 addons/plugin_outlook/plugin_outlook.xml      |  2 +-
 .../plugin_thunderbird/plugin_thunderbird.xml |  2 +-
 addons/sale/res_config_view.xml               | 43 ++++++++++---------
 6 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index c3ebab6da4e..2cd55d0cdc8 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -63,10 +63,10 @@
                                     Users can do it from the mail client by pressing a button or it can be configured to automatically synchronize from your mail server.</div>
                                 <group name="On Mail Client"><label for="id" string="On Mail Client"/>
                                 <div>
-                                    <div name="module_plugin_thunderbird"><field name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)]}" class="oe_inline"/>
-                                    <label for="module_plugin_thunderbird"/></div>
-                                    <div name="module_plugin_outlook"><field name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}" class="oe_inline"/>
-                                    <label for="module_plugin_outlook"/></div>
+                                    <div name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)]}" class="oe_inline"><field name="module_plugin_thunderbird"/>
+                                    <label for="module_plugin_thunderbird" string="Thunderbird"/>plugin</div>
+                                    <div name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}"><field name="module_plugin_outlook" class="oe_inline"/>
+                                    <label for="module_plugin_outlook" string="Outlook"/>plugin</div>
                                 </div>
                                 </group>
                             </group>
diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml
index dc6a8c7d94d..de5260072b7 100644
--- a/addons/crm/res_config_view.xml
+++ b/addons/crm/res_config_view.xml
@@ -13,7 +13,7 @@
                     <label for="id" string="On Mail Server"/>
                     <div>
                         <div name="fetchmail_lead"><field name="fetchmail_lead" class="oe_inline"/>
-                        <label for="fetchmail_lead"/>
+                        Create<label for="fetchmail_lead" string="Leads"/>from Incoming Mails
                         <button name="configure_fetchmail_lead" type="object" string="Configure" icon="gtk-go-forward"
                             attrs="{'invisible': [('fetchmail_lead','=',False)]}" class="oe_link"/>
                         </div>
@@ -25,17 +25,16 @@
                     <group>
                     <label for="id" string="Import From"/>
                     <div>
-                        <div><field name="module_import_sugarcrm"/>
-                        <label for="module_import_sugarcrm" string="SugarCRM"/></div>
+                        <div><field name="module_import_sugarcrm"/>SugarCRM</div>
                     </div>
                     </group>
                     <group>
                     <label for="id" string="Synchronize with"/>
                     <div>
                     <div><field name="module_import_google"/>
-                    <label for="module_import_google" string="Google (Contact and Calendar)"/></div>
+                    <label for="module_import_google" string="Google"/>(Contact and Calendar)</div>
                     <div><field name="module_crm_caldav"/>
-                    <label for="module_crm_caldav" string="Application with Caldav protocol"/></div>
+                    Application with<label for="module_crm_caldav" string="Caldav"/>Protocol</div>
                     </div>
                     </group>
                 </group>
@@ -48,12 +47,11 @@
             <field name="inherit_id" ref="sale.view_sales_config"/>
             <field name="arch" type="xml">
                 <div name="module_sale_journal" version="7.0" position="after">
-                     <div><field name="module_google_map"/>
-                    <label for="module_google_map" string="Add google maps on customer"/></div>
+                     <div><field name="module_google_map"/>Add Google Maps on Customer</div>
                 </div>
                 <div name="module_sale_margin" version="7.0" position="after">
                     <div><field name="module_wiki_sale_faq"/>
-                        <label for="module_wiki_sale_faq" string="Share information with sales FAQ"/></div>
+                        Share Information with<label for="module_wiki_sale_faq" string="Sales FAQ"/></div>
                 </div>
             </field>
         </record>
diff --git a/addons/crm_claim/res_config_view.xml b/addons/crm_claim/res_config_view.xml
index bdcec2df43c..e0ca00103dc 100644
--- a/addons/crm_claim/res_config_view.xml
+++ b/addons/crm_claim/res_config_view.xml
@@ -11,7 +11,7 @@
             <field name="arch" type="xml">
                <div name="fetchmail_lead" position="after">
                         <div><field name="fetchmail_claim" class="oe_inline"/>
-                        <label for="fetchmail_claim"/>
+                        Create<label for="fetchmail_claim" string="Claims"/>from Incoming Mails
                         <button type="object" name="configure_fetchmail_claim" string="Configure" icon="gtk-go-forward"
                             attrs="{'invisible': [('fetchmail_claim','=',False)]}" class="oe_link"/></div>
                 </div>
diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index 428c7f2a649..381597824e1 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -54,7 +54,7 @@
             <field name="arch" type="xml">
                 <div name="module_plugin_outlook" version="7.0" position="replace">
                         <div><field name="module_plugin_outlook" class="oe_inline"/>
-                        <label for="module_plugin_outlook"/>
+                        <label for="module_plugin_outlook" string="Outlook"/>plugin
                         <button name="%(action_outlook_installer)d" type="action" string="Configure" icon="gtk-execute"
                             attrs="{'invisible': [('module_plugin_outlook','=',False)]}" class="oe_link"/></div>
                 </div>
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml
index 5be79c069ff..f62c2f45187 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.xml
+++ b/addons/plugin_thunderbird/plugin_thunderbird.xml
@@ -60,7 +60,7 @@
             <field name="arch" type="xml">
                 <div name="module_plugin_thunderbird" version="7.0" position="replace">
                         <div><field name="module_plugin_thunderbird" class="oe_inline"/>
-                        <label for="module_plugin_thunderbird"/>
+                        <label for="module_plugin_thunderbird" string="Thunderbird"/>plugin
                         <button name="%(action_thunderbird_installer)d" type="action" string="Download and install the plugin" icon="gtk-execute"
                             attrs="{'invisible': [('module_plugin_thunderbird','=',False)]}" class="oe_link"/></div>
                 </div>
diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index 8bead1c4411..66a3775fe14 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -15,24 +15,27 @@
                         <label for="id" string="Invoicing Process"/>
                         <div>
                             <div><field name="group_invoice_so_lines" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)" class="oe_inline"/>
-                            <label for="group_invoice_so_lines" string="genrate invoices based on the sale order"/></div>
+                            Genrate Invoices<label for="group_invoice_so_lines" string="Based On The Sale Order"/></div>
                             <div><field name="group_invoice_deli_orders" class="oe_inline" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
-                            <label for="group_invoice_deli_orders" string="genrate invoices after and based on delivery orders"/></div>
+                            Genrate Invoices After and<label for="group_invoice_deli_orders" string="Based on Delivery Orders"/></div>
                             <div><field name="task_work" class="oe_inline" on_change="onchange_task_work(task_work)"/>
-                            <label for="task_work" string="prepare invoices based on task's activities"/></div>
+                            Prepare Invoices<label for="task_work" string="Based On Task's Activities"/></div>
                             <div><field name="timesheet" class="oe_inline" on_change="onchange_timesheet(timesheet)"/>
-                            <label for="timesheet" string="prepare invoices based on timesheets"/></div>
+                            Prepare Invoices<label for="timesheet" string="Based On Timesheets"/></div>
                         </div>    
                     </group> 
                     <group>
                         <label for="id" string="Default Process"/>
                         <div>
                             <div attrs="{'invisible':['|',('group_invoice_so_lines','=',False),('group_invoice_deli_orders','=',False)],'required': ['|',('group_invoice_so_lines','=',True),('group_invoice_deli_orders','=',True)]}">
-                                <field name="default_order_policy" string="the default invocing method is" />
+                                The<label for="default_order_policy" string="Default"/>Invocing method is
+                                <field name="default_order_policy"/>
                             </div>
                             <div attrs="{'invisible':[('group_invoice_so_lines','=',False), ('group_invoice_deli_orders','=',False)]}"><field name="module_delivery" class="oe_inline"/>
-                            <label for="module_delivery" string="allow adding shipping cost"/></div>
-                            <div attrs="{'invisible': [('task_work','=',False), ('module_account_analytic_analysis','=',False)],'required': ['|', ('task_work','=',True), ('module_account_analytic_analysis','=',True)]}"><field name="time_unit" string="the default working time unit for service is " domain="[('category_id.name','=','Working Time')]"/>
+                            Allow Adding Shipping Costs</div>
+                            <div attrs="{'invisible': [('task_work','=',False), ('module_account_analytic_analysis','=',False)],'required': ['|', ('task_work','=',True), ('module_account_analytic_analysis','=',True)]}">
+                                The Default<label for="time_unit" string="Working Time Unit"/>For Service is
+                                <field name="time_unit" domain="[('category_id.name','=','Working Time')]"/>
                             </div>
                         </div>
                     </group>
@@ -45,23 +48,23 @@
                         <label for="id" string="Customer Features"/>
                         <div>
                             <div><field name="group_sale_delivery_address" class="oe_inline"/>
-                            <label for="group_sale_delivery_address"/></div>
+                            Allow a<label for="group_sale_delivery_address" string="Different Address"/>For Delivery and Invoicing</div>
                             <div><field name="group_sale_pricelist" class="oe_inline"/>
-                            <label for="group_sale_pricelist" string="use pricelists to adapt your price per customers"/></div>
-                            <div><field name="module_warning" class="oe_inline"/>
-                            <label for="module_warning" string="allow configuring alert by customer or products"/></div>
+                            <label for="group_sale_pricelist" string="Use Pricelists"/>to Adapt your Price Per Customers</div>
                             <div name="module_sale_journal"><field name="module_sale_journal" class="oe_inline"/>
-                            <label for="module_sale_journal" string="allow batch invoicing through journals"/></div>
+                            Allow Batch<label for="module_sale_journal" string="Invoicing through Journals"/></div>
+                            <div><field name="module_warning" class="oe_inline"/>
+                            Allow Configuring<label for="module_warning" string="alert"/>by Customer or Products</div>
                         </div>
                     </group>
                     <group>
                         <label for="id" string="Product Features"/>
                         <div>
                             <div><field name="group_uom" class="oe_inline"/>
-                            <label for="group_uom" /></div>
+                            Allow Different<label for="group_uom" string="Units of Measure"/></div>
                             <div><field name="group_discount_per_so_line" class="oe_inline"/>
-                            <label for="group_discount_per_so_line" string="Allow setting a discount on the sale order lines" /></div>
-                            <div><label for="decimal_precision" string="What's the decimal precision on prices:"/>
+                            Allow Setting a<label for="group_discount_per_so_line" string="discount"/>on the Sale Order Lines</div>
+                            <div>What's the decimal precision on prices:
                             <field name="decimal_precision" class="oe_inline"/></div>
                         </div>
                     </group>
@@ -69,11 +72,11 @@
                         <label for="id" string="Sale Features"/>
                         <div>
                             <div><field name="group_multiple_shops" class="oe_inline"/>
-                            <label for="group_multiple_shops" /></div>
+                            Manage<label for="group_multiple_shops" string="Multiple Shops"/></div>
                             <div attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}"><field name="default_picking_policy" class="oe_inline"/>
-                            <label for="default_picking_policy" /></div>
+                            Configure Per Order if yoy<label for="default_picking_policy" string="Deliver in One Pack or each Product"/>when Available</div>
                             <div name="module_sale_margin"><field name="module_sale_margin" class="oe_inline"/>
-                            <label for="module_sale_margin" /></div>
+                            <label for="module_sale_margin" string="Display Margins"/>on Sale Orders</div>
                         </div>
                     </group>
                     <separator string="Contracts Management" colspan="2"/>
@@ -82,9 +85,9 @@
                         <label for="id" string="Contract Feature"/>
                         <div>
                             <div><field name="module_account_analytic_analysis" on_change="onchange_timesheet(module_account_analytic_analysis)" class="oe_inline"/>
-                            <label for="module_account_analytic_analysis" string="Use contract management"/></div>
+                            Use Contract Management</div>
                             <div attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}"><field name="module_analytic_user_function" class="oe_inline"/>
-                            <label for="module_analytic_user_function"/></div>
+                            Assign User Roles per Contract</div>
                         </div>
                     </group>
                 </group>