From a1c29dd85b6ea86550b12080fa2f9d9d9c5d253a Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Mon, 8 Oct 2012 14:35:29 +0530 Subject: [PATCH] [IMP] mail : Partners should always be replaced with Customer, Supplier, or Contact (if it can be both). bzr revid: mdi@tinyerp.com-20121008090529-pi43dm3zxc1jsqbm --- addons/mail/mail_message.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py index 61ea9fb9f6b..68e40ef705c 100644 --- a/addons/mail/mail_message.py +++ b/addons/mail/mail_message.py @@ -580,8 +580,13 @@ class mail_message(osv.Model): partner_wo_email_lst.append(partner) if not partner_wo_email_lst: return {} - warning_msg = _('The following contacts do not have an email address specified.') for partner in partner_wo_email_lst: + terminology = 'Contact' + if partner.customer and not partner.supplier: + terminology = 'Customer' + elif partner.supplier and not partner.customer: + terminology = 'Supplier' + warning_msg = _('The following %s do not have an email address specified.') % (terminology,) warning_msg += '\n- %s' % (partner.name) return {'warning': { 'title': _('Email not found'),