[IMP] improve Homogenize the terms

bzr revid: voraamitr@gmail.com-20140123100058-lhcd5a95wkwi5jj0

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 770b32d..7691b82 100644 (file)
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -231,8 +231,8 @@ class crm_lead(format_address, osv.osv):
         'email_cc': fields.text('Global CC', help="These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma"),
         'description': fields.text('Notes'),
         'write_date': fields.datetime('Update Date', readonly=True),
-        'categ_ids': fields.many2many('crm.case.categ', 'crm_lead_category_rel', 'lead_id', 'category_id', 'Categories', \
-            domain="['|',('section_id','=',section_id),('section_id','=',False), ('object_id.model', '=', 'crm.lead')]"),
+        'categ_ids': fields.many2many('crm.case.categ', 'crm_lead_category_rel', 'lead_id', 'category_id', 'Tags', \
+            domain="['|',('section_id','=',section_id),('section_id','=',False), ('object_id.model', '=', 'crm.lead')]",help="Classify and analyse your lead/opportunities category like: Training, Service"),
         'type_id': fields.many2one('crm.case.resource.type', 'Campaign', \
             domain="['|',('section_id','=',section_id),('section_id','=',False)]", help="From which campaign (seminar, marketing campaign, mass mailing, ...) did this contact come from?"),
         'channel_id': fields.many2one('crm.case.channel', 'Channel', help="Communication channel (mail, direct, phone, ...)"),

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 66f1e33..baaeaa1 100644 (file)
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -436,7 +436,7 @@
                             </group>
                             <group>
                                 <field name="categ_ids"
-                                    string="Categories" widget="many2many_tags"
+                                    widget="many2many_tags"
                                     context="{'object_name': 'crm.lead'}"
                                     domain="[('object_id.model', '=', 'crm.lead')]"/>
 

diff --git a/addons/sale_crm/sale_crm.py b/addons/sale_crm/sale_crm.py
index 9bcb5ad..5195080 100644 (file)
--- a/addons/sale_crm/sale_crm.py
+++ b/addons/sale_crm/sale_crm.py
@@ -43,8 +43,8 @@ class sale_order(osv.osv):
     _inherit = 'sale.order'
     _columns = {
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
-        'categ_ids': fields.many2many('crm.case.categ', 'sale_order_category_rel', 'order_id', 'category_id', 'Categories', \
-            domain="['|',('section_id','=',section_id),('section_id','=',False), ('object_id.model', '=', 'crm.lead')]", context="{'object_name': 'crm.lead'}")
+        'categ_ids': fields.many2many('crm.case.categ', 'sale_order_category_rel', 'order_id', 'category_id', 'Tags', \
+            domain="['|',('section_id','=',section_id),('section_id','=',False), ('object_id.model', '=', 'crm.lead')]", context="{'object_name': 'crm.lead'}",help="Classify and analyse your lead/opportunities category like: Training, Service")
     }
 
     def _get_default_section_id(self, cr, uid, context=None):