From 58da4f7688b6bbdd229cce8be3aff387955ebbd5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 20 Jul 2012 11:26:20 +0200 Subject: [PATCH] [REF] mail: res.partner inheritance: removed unnecessary 'emails' column, as this is managed by Chatter. Also updated partner_id -> partner_ids. bzr revid: tde@openerp.com-20120720092620-o94cxdi2hxthd5y1 --- addons/mail/res_partner.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/addons/mail/res_partner.py b/addons/mail/res_partner.py index ceb9004..aeec9a5 100644 --- a/addons/mail/res_partner.py +++ b/addons/mail/res_partner.py @@ -22,21 +22,18 @@ from osv import osv from osv import fields -class res_partner(osv.osv): +class res_partner_mail(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)]), - } def message_search_get_domain(self, cr, uid, ids, context=None): """ Override of message_search_get_domain for partner discussion page. The purpose is to add messages directly sent to the partner. """ - initial_domain = super(res_partner, self).message_search_get_domain(cr, uid, ids, context=context) + initial_domain = super(res_partner_mail, self).message_search_get_domain(cr, uid, ids, context=context) if self._name == 'res.partner': # to avoid models inheriting from res.partner - search_domain = ['|'] + initial_domain + [('partner_id', 'in', ids)] + search_domain = ['|'] + initial_domain + [('partner_ids', 'in', ids)] return search_domain # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: -- 1.7.10.4