From 2178b49425b0bbffbf40008dd1594f5725ac91f3 Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Mon, 23 Apr 2012 15:14:52 +0530 Subject: [PATCH 01/10] [IMP]res_partner: override message_load_ids bzr revid: kjo@tinyerp.com-20120423094452-bfj2nq5vsjtr5nk4 --- addons/crm/res_partner.py | 19 ++++++++++++++++++- addons/crm/res_partner_view.xml | 3 +++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/addons/crm/res_partner.py b/addons/crm/res_partner.py index 3d43bc76022..b3df689b5e0 100644 --- a/addons/crm/res_partner.py +++ b/addons/crm/res_partner.py @@ -23,7 +23,8 @@ from osv import fields,osv class res_partner(osv.osv): """ Inherits partner and adds CRM information in the partner form """ - _inherit = 'res.partner' + _name = "res.partner" + _inherit = ['res.partner', 'mail.thread'] _columns = { 'section_id': fields.many2one('crm.case.section', 'Sales Team'), 'opportunity_ids': fields.one2many('crm.lead', 'partner_id',\ @@ -68,6 +69,22 @@ class res_partner(osv.osv): }, context=context) opportunity_ids[partner_id] = opportunity_id return opportunity_ids + + def message_load_ids(self, cr, uid, ids, limit=100, offset=0, domain=[], ascent=False, root_ids=[False], context=None): + """ Override of message_load_ids + User discussion page : + - messages posted on res.partner, partner_id = user.id + - messages directly sent to partner + """ + if context is None: + context = {} + msg_obj = self.pool.get('mail.message') + msg_ids = [] + for user in self.browse(cr, uid, ids, context=context): + msg_ids += msg_obj.search(cr, uid, [('partner_id', '=', user.id)] + domain, + limit=limit, offset=offset, context=context) + if (ascent): msg_ids = self._message_add_ancestor_ids(cr, uid, ids, msg_ids, root_ids, context=context) + return msg_ids res_partner() diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml index 8e01d9d6bea..e44d6ed5816 100644 --- a/addons/crm/res_partner_view.xml +++ b/addons/crm/res_partner_view.xml @@ -14,6 +14,9 @@ + + + From ce1d6b0a59b941ddf3fa8243118fffe3589a2bcf Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Thu, 3 May 2012 10:54:30 +0530 Subject: [PATCH 02/10] [IMP] crm: rename message_ids_social to message_ids bzr revid: tpa@tinyerp.com-20120503052430-fym0jeutnofmmsvz --- addons/crm/res_partner_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml index e44d6ed5816..c2059acd681 100644 --- a/addons/crm/res_partner_view.xml +++ b/addons/crm/res_partner_view.xml @@ -15,7 +15,7 @@ groups="base.group_extended"/> - + From 6affbbe19b6957f0183c78b6bda1b34429eeaeec Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Mon, 7 May 2012 17:24:32 +0530 Subject: [PATCH 03/10] [IMP] remove code from crm and add in to mail bzr revid: tpa@tinyerp.com-20120507115432-bh4xbm1ys2njo2wa --- addons/crm/res_partner.py | 19 +------------------ addons/crm/res_partner_view.xml | 3 --- addons/mail/res_partner.py | 19 ++++++++++++++++++- addons/mail/res_partner_view.xml | 3 +++ 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/addons/crm/res_partner.py b/addons/crm/res_partner.py index b3df689b5e0..df46bf22ed8 100644 --- a/addons/crm/res_partner.py +++ b/addons/crm/res_partner.py @@ -23,8 +23,7 @@ from osv import fields,osv class res_partner(osv.osv): """ Inherits partner and adds CRM information in the partner form """ - _name = "res.partner" - _inherit = ['res.partner', 'mail.thread'] + _inherit = 'res.partner' _columns = { 'section_id': fields.many2one('crm.case.section', 'Sales Team'), 'opportunity_ids': fields.one2many('crm.lead', 'partner_id',\ @@ -70,22 +69,6 @@ class res_partner(osv.osv): opportunity_ids[partner_id] = opportunity_id return opportunity_ids - def message_load_ids(self, cr, uid, ids, limit=100, offset=0, domain=[], ascent=False, root_ids=[False], context=None): - """ Override of message_load_ids - User discussion page : - - messages posted on res.partner, partner_id = user.id - - messages directly sent to partner - """ - if context is None: - context = {} - msg_obj = self.pool.get('mail.message') - msg_ids = [] - for user in self.browse(cr, uid, ids, context=context): - msg_ids += msg_obj.search(cr, uid, [('partner_id', '=', user.id)] + domain, - limit=limit, offset=offset, context=context) - if (ascent): msg_ids = self._message_add_ancestor_ids(cr, uid, ids, msg_ids, root_ids, context=context) - return msg_ids -res_partner() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml index c2059acd681..8e01d9d6bea 100644 --- a/addons/crm/res_partner_view.xml +++ b/addons/crm/res_partner_view.xml @@ -14,9 +14,6 @@ - - - diff --git a/addons/mail/res_partner.py b/addons/mail/res_partner.py index 637922ff75c..23f3f6f02b0 100644 --- a/addons/mail/res_partner.py +++ b/addons/mail/res_partner.py @@ -24,11 +24,28 @@ from osv import fields class res_partner(osv.osv): """ Inherits partner and adds CRM information in the partner form """ - _inherit = 'res.partner' + _inherit = ['res.partner', 'mail.thread'] _columns = { 'emails': fields.one2many('mail.message', 'partner_id', 'Emails', readonly=True, domain=[('email_from','!=',False)]), } + def message_load_ids(self, cr, uid, ids, limit=100, offset=0, domain=[], ascent=False, root_ids=[False], context=None): + """ Override of message_load_ids + User discussion page : + - messages posted on res.partner, partner_id = user.id + - messages directly sent to partner + """ + if context is None: + context = {} + msg_obj = self.pool.get('mail.message') + msg_ids = [] + for user in self.browse(cr, uid, ids, context=context): + msg_ids += msg_obj.search(cr, uid, [('partner_id', '=', user.id)] + domain, + limit=limit, offset=offset, context=context) + if (ascent): msg_ids = self._message_add_ancestor_ids(cr, uid, ids, msg_ids, root_ids, context=context) + return msg_ids +res_partner() + res_partner() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/mail/res_partner_view.xml b/addons/mail/res_partner_view.xml index 21da7d735b7..f74b2f80452 100644 --- a/addons/mail/res_partner_view.xml +++ b/addons/mail/res_partner_view.xml @@ -13,6 +13,9 @@ False + + + res.partner.emails.info.inherit From a26d521a912e9b5d61dfb1768523a5f494c990f9 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Mon, 7 May 2012 18:04:25 +0530 Subject: [PATCH 04/10] [IMP] improved code bzr revid: tpa@tinyerp.com-20120507123425-0ur7p4qztedo56yf --- addons/crm/res_partner.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm/res_partner.py b/addons/crm/res_partner.py index df46bf22ed8..3d43bc76022 100644 --- a/addons/crm/res_partner.py +++ b/addons/crm/res_partner.py @@ -68,7 +68,7 @@ class res_partner(osv.osv): }, context=context) opportunity_ids[partner_id] = opportunity_id return opportunity_ids - +res_partner() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From ab7ea53f4f177d5392d20be08aee8969dec5487e Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Mon, 7 May 2012 18:12:27 +0530 Subject: [PATCH 05/10] [FIX] give name to calss. bzr revid: tpa@tinyerp.com-20120507124227-enfbyvfkjt4w0bov --- addons/mail/res_partner.py | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/mail/res_partner.py b/addons/mail/res_partner.py index 23f3f6f02b0..53d72bb6461 100644 --- a/addons/mail/res_partner.py +++ b/addons/mail/res_partner.py @@ -24,6 +24,7 @@ from osv import fields class res_partner(osv.osv): """ Inherits partner and adds CRM information in the partner form """ + _name = "res.partner" _inherit = ['res.partner', 'mail.thread'] _columns = { 'emails': fields.one2many('mail.message', 'partner_id', 'Emails', readonly=True, domain=[('email_from','!=',False)]), From 38164fb5ed15805b31f5da242b9a16713ade516e Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Tue, 8 May 2012 10:59:25 +0530 Subject: [PATCH 06/10] [IMP] Improved code bzr revid: tpa@tinyerp.com-20120508052925-s6p3792ejf525c0u --- addons/mail/res_partner.py | 1 - addons/mail/res_partner_view.xml | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/addons/mail/res_partner.py b/addons/mail/res_partner.py index 53d72bb6461..4e6edd011c8 100644 --- a/addons/mail/res_partner.py +++ b/addons/mail/res_partner.py @@ -45,7 +45,6 @@ class res_partner(osv.osv): limit=limit, offset=offset, context=context) if (ascent): msg_ids = self._message_add_ancestor_ids(cr, uid, ids, msg_ids, root_ids, context=context) return msg_ids -res_partner() res_partner() diff --git a/addons/mail/res_partner_view.xml b/addons/mail/res_partner_view.xml index f74b2f80452..76b4980ecb0 100644 --- a/addons/mail/res_partner_view.xml +++ b/addons/mail/res_partner_view.xml @@ -12,10 +12,10 @@ False + + + - - - res.partner.emails.info.inherit From cf4aae948855300940013565d5e37e895e1eb2e7 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Tue, 8 May 2012 16:15:37 +0530 Subject: [PATCH 07/10] [IMP] changed condition. bzr revid: tpa@tinyerp.com-20120508104537-xg6upj2n55xcf0ku --- addons/mail/res_partner.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/mail/res_partner.py b/addons/mail/res_partner.py index 4e6edd011c8..d2d4e7d4824 100644 --- a/addons/mail/res_partner.py +++ b/addons/mail/res_partner.py @@ -41,7 +41,7 @@ class res_partner(osv.osv): msg_obj = self.pool.get('mail.message') msg_ids = [] for user in self.browse(cr, uid, ids, context=context): - msg_ids += msg_obj.search(cr, uid, [('partner_id', '=', user.id)] + domain, + msg_ids += msg_obj.search(cr, uid, ['|',('partner_id', '=', user.id), '&', ('res_id', '=', user.id), ('model', '=', self._name)] + domain, limit=limit, offset=offset, context=context) if (ascent): msg_ids = self._message_add_ancestor_ids(cr, uid, ids, msg_ids, root_ids, context=context) return msg_ids From a7821d366a053c956a12decdc5b80aa0e10a24a2 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Wed, 9 May 2012 14:20:20 +0530 Subject: [PATCH 08/10] [IMP] improved variable name bzr revid: tpa@tinyerp.com-20120509085020-icjjwpkipbxcr7lb --- addons/mail/res_partner.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/mail/res_partner.py b/addons/mail/res_partner.py index d2d4e7d4824..0729132fe27 100644 --- a/addons/mail/res_partner.py +++ b/addons/mail/res_partner.py @@ -32,16 +32,16 @@ class res_partner(osv.osv): def message_load_ids(self, cr, uid, ids, limit=100, offset=0, domain=[], ascent=False, root_ids=[False], context=None): """ Override of message_load_ids - User discussion page : - - messages posted on res.partner, partner_id = user.id + partner discussion page : + - messages posted on res.partner, partner_id = partner.id - messages directly sent to partner """ if context is None: context = {} msg_obj = self.pool.get('mail.message') msg_ids = [] - for user in self.browse(cr, uid, ids, context=context): - msg_ids += msg_obj.search(cr, uid, ['|',('partner_id', '=', user.id), '&', ('res_id', '=', user.id), ('model', '=', self._name)] + domain, + for partner in self.browse(cr, uid, ids, context=context): + msg_ids += msg_obj.search(cr, uid, ['|',('partner_id', '=', partner.id), '&', ('res_id', '=', partner.id), ('model', '=', self._name)] + domain, limit=limit, offset=offset, context=context) if (ascent): msg_ids = self._message_add_ancestor_ids(cr, uid, ids, msg_ids, root_ids, context=context) return msg_ids From b19b70c19075dde11e50b16fc20967dfc2307396 Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Mon, 14 May 2012 16:45:21 +0530 Subject: [PATCH 09/10] [ADD]mail: add mail_partner rst file bzr revid: kjo@tinyerp.com-20120514111521-ykyk6fq5piwy1gkd --- addons/mail/doc/index.rst.inc | 1 + addons/mail/doc/mail_partner.rst | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 addons/mail/doc/mail_partner.rst diff --git a/addons/mail/doc/index.rst.inc b/addons/mail/doc/index.rst.inc index 4679cd56fdf..822d855d5b4 100644 --- a/addons/mail/doc/index.rst.inc +++ b/addons/mail/doc/index.rst.inc @@ -9,3 +9,4 @@ Mail Module documentation topics mail_thread mail_openchatter_howto mail_needaction_howto + mail_partner diff --git a/addons/mail/doc/mail_partner.rst b/addons/mail/doc/mail_partner.rst new file mode 100644 index 00000000000..baf025b8d8d --- /dev/null +++ b/addons/mail/doc/mail_partner.rst @@ -0,0 +1,9 @@ +what is shown +============== + - for every opportunities, sale orders and invoices which are related to partner show in the partner view + + +how it is done +=============== + - _inherit = 'mail.thread' + - Override def message_load_ids method based on search by the partner_id and res_id From f199eef6369fa7f1f596ce9987d376c0d311e2ae Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Mon, 14 May 2012 17:16:12 +0530 Subject: [PATCH 10/10] [ADD]mail: change the mail_partner.rst bzr revid: kjo@tinyerp.com-20120514114612-7tfvg4fb0rd74p7p --- addons/mail/doc/mail_partner.rst | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/addons/mail/doc/mail_partner.rst b/addons/mail/doc/mail_partner.rst index baf025b8d8d..a99246395d7 100644 --- a/addons/mail/doc/mail_partner.rst +++ b/addons/mail/doc/mail_partner.rst @@ -1,9 +1,10 @@ -what is shown +What is shown ============== - - for every opportunities, sale orders and invoices which are related to partner show in the partner view + - for every module which are related to partner show apporopriate message in the partner view like opportunities, sale orders and invoices. -how it is done +How it is done =============== - _inherit = 'mail.thread' - - Override def message_load_ids method based on search by the partner_id and res_id + + - Override def message_load_ids(self, cr, uid, ids, limit=100, offset=0, domain=[], ascent=False, root_ids=[], context=None) search by the partner