From 6e1e4f084bc4ee04bba1cd03ea805eda6e00c42a Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Thu, 22 Nov 2012 10:47:59 +0530 Subject: [PATCH] [IMP]improve code for tracking field and add code for tracked it bzr revid: sgo@tinyerp.com-20121122051759-lks3ykule5w5om6x --- addons/crm/crm_lead.py | 8 ++++---- addons/mail/mail_thread.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 0a824aef83e..d3795c39d34 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -197,7 +197,7 @@ class crm_lead(base_stage, format_address, osv.osv): 'date_action_next': fields.datetime('Next Action', readonly=1), 'email_from': fields.char('Email', size=128, help="Email address of the contact", select=1), 'section_id': fields.many2one('crm.case.section', 'Sales Team', \ - select=True, help='When sending mails, the default email address is taken from the sales team.'), + select=True, tracked=True, help='When sending mails, the default email address is taken from the sales team.'), 'create_date': fields.datetime('Creation Date' , readonly=True), 'email_cc': fields.text('Global CC', size=252 , 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'), @@ -213,9 +213,9 @@ class crm_lead(base_stage, format_address, osv.osv): 'type':fields.selection([ ('lead','Lead'), ('opportunity','Opportunity'), ],'Type', help="Type is used to separate Leads and Opportunities"), 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True), 'date_closed': fields.datetime('Closed', readonly=True), - 'stage_id': fields.many2one('crm.case.stage', 'Stage', + 'stage_id': fields.many2one('crm.case.stage', 'Stage',tracked=True, domain="['&', ('fold', '=', False), '&', '|', ('section_ids', '=', section_id), ('case_default', '=', True), '|', ('type', '=', type), ('type', '=', 'both')]"), - 'user_id': fields.many2one('res.users', 'Salesperson'), + 'user_id': fields.many2one('res.users', 'Salesperson',tracked=True), 'referred': fields.char('Referred By', size=64), 'date_open': fields.datetime('Opened', readonly=True), 'day_open': fields.function(_compute_day, string='Days to Open', \ @@ -228,7 +228,7 @@ class crm_lead(base_stage, format_address, osv.osv): # Only used for type opportunity 'probability': fields.float('Success Rate (%)',group_operator="avg"), - 'planned_revenue': fields.float('Expected Revenue'), + 'planned_revenue': fields.float('Expected Revenue',tracked=True), 'ref': fields.reference('Reference', selection=crm._links_get, size=128), 'ref2': fields.reference('Reference 2', selection=crm._links_get, size=128), 'phone': fields.char("Phone", size=64), diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index a90dc9b3a2b..4d98ecbdc97 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -295,7 +295,7 @@ class mail_thread(osv.AbstractModel): return false_value(f) if f._type == 'many2one': if not isinstance(v, browse_record): - v = self.pool[f.relation].browse(cr, SUPERUSER_ID, v) + v = self.pool[f._obj].browse(cr, SUPERUSER_ID, v) return v.name_get()[0][1] if f._type == 'selection': # TODO get translated value