From 4c287b29a904e4d720cf8836dda5113e9653862f Mon Sep 17 00:00:00 2001 From: "Amit Vora (OpenERP Trainee)" Date: Thu, 23 Jan 2014 15:30:58 +0530 Subject: [PATCH 1/3] [IMP] improve Homogenize the terms bzr revid: voraamitr@gmail.com-20140123100058-lhcd5a95wkwi5jj0 --- addons/crm/crm_lead.py | 4 ++-- addons/crm/crm_lead_view.xml | 2 +- addons/sale_crm/sale_crm.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 770b32d84fd..7691b82446a 100644 --- 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 66f1e33c3a9..baaeaa1ef5c 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -436,7 +436,7 @@ diff --git a/addons/sale_crm/sale_crm.py b/addons/sale_crm/sale_crm.py index 9bcb5adf6ae..519508037ed 100644 --- 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): From 168ca32323c33b185e075a139b8a0e83b9680b15 Mon Sep 17 00:00:00 2001 From: "Amit Vora (OpenERP Trainee)" Date: Fri, 24 Jan 2014 10:54:23 +0530 Subject: [PATCH 2/3] [IMP] changes set Tag term instead of category bzr revid: voraamitr@gmail.com-20140124052423-22qu8005g1nooort --- addons/crm/crm_lead_view.xml | 4 ++-- addons/sale_crm/sale_crm.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index baaeaa1ef5c..c94835cc059 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -325,7 +325,7 @@ - + @@ -543,7 +543,7 @@ - + diff --git a/addons/sale_crm/sale_crm.py b/addons/sale_crm/sale_crm.py index 519508037ed..50ec4e69739 100644 --- a/addons/sale_crm/sale_crm.py +++ b/addons/sale_crm/sale_crm.py @@ -44,7 +44,7 @@ class sale_order(osv.osv): _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', '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") + domain="['|',('section_id','=',section_id),('section_id','=',False), ('object_id.model', '=', 'crm.lead')]", context="{'object_name': 'crm.lead'}") } def _get_default_section_id(self, cr, uid, context=None): From 2a732812817755cec4a11da05e0b52fcf142f1a7 Mon Sep 17 00:00:00 2001 From: "Amit Vora (OpenERP)" Date: Wed, 26 Feb 2014 19:02:22 +0530 Subject: [PATCH 3/3] [IMP] improve code according to PEP8 bzr revid: voraamitr@gmail.com-20140226133222-9poyk5squ291iyyf --- addons/crm/crm_lead.py | 2 +- addons/crm/crm_lead_view.xml | 4 ++-- addons/sale_crm/sale_crm.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index a7f51c1aecc..4322a4d9279 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -232,7 +232,7 @@ class crm_lead(format_address, osv.osv): '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', '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"), + domain="['|', ('section_id', '=', section_id), ('section_id', '=', False), ('object_id.model', '=', 'crm.lead')]", help="Classify and analyze your lead/opportunity categories 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 13c93c9e2fe..6c15c6f603b 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -325,7 +325,7 @@ - + @@ -544,7 +544,7 @@ - + diff --git a/addons/sale_crm/sale_crm.py b/addons/sale_crm/sale_crm.py index 50ec4e69739..739b70c8588 100644 --- a/addons/sale_crm/sale_crm.py +++ b/addons/sale_crm/sale_crm.py @@ -44,7 +44,7 @@ class sale_order(osv.osv): _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', 'Tags', \ - domain="['|',('section_id','=',section_id),('section_id','=',False), ('object_id.model', '=', 'crm.lead')]", context="{'object_name': 'crm.lead'}") + domain="['|', ('section_id', '=', section_id), ('section_id', '=', False), ('object_id.model', '=', 'crm.lead')]", context="{'object_name': 'crm.lead'}") } def _get_default_section_id(self, cr, uid, context=None):