From 09e5d404df56c542e7f9f8b6256d77183797b9ba Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 8 Oct 2012 14:18:04 +0530
Subject: [PATCH 1/6] [IMP] mail : Improved the terminologies.

bzr revid: mdi@tinyerp.com-20121008084804-9mmxzdlyxhyarf0j
---
 addons/mail/mail_message.py                      | 4 ++--
 addons/mail/mail_thread_view.xml                 | 2 +-
 addons/mail/wizard/mail_compose_message_view.xml | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index bbf68509277..61ea9fb9f6b 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -580,11 +580,11 @@ class mail_message(osv.Model):
                 partner_wo_email_lst.append(partner)
         if not partner_wo_email_lst:
             return {}
-        warning_msg = _('The following partners chosen as recipients for the email have no email address linked :')
+        warning_msg = _('The following contacts do not have an email address specified.')
         for partner in partner_wo_email_lst:
             warning_msg += '\n- %s' % (partner.name)
         return {'warning': {
-                    'title': _('Partners email addresses not found'),
+                    'title': _('Email not found'),
                     'message': warning_msg,
                     }
                 }
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index 3507e7c449f..5f504f3c3da 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -9,7 +9,7 @@
           sequence="10"/>
 
         <!-- Left-side menu: Feeds -->
-        <menuitem id="mail_feeds" name="Feeds" parent="mail.mail_feeds_main" groups="base.group_user" sequence="10"/>
+        <menuitem id="mail_feeds" name="Feed" parent="mail.mail_feeds_main" groups="base.group_user" sequence="10"/>
         <menuitem id="mail_my_stuff" name="Organizer" parent="mail.mail_feeds_main"/>
 
         <record id="mail_inboxfeeds" model="ir.ui.menu">
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 0f384dc5a0d..c7b9ed36a39 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -58,10 +58,10 @@
                         <field name="subject" colspan="2" nolabel="1" placeholder="Subject..."
                                 class="oe_mail_compose_message_subject"
                                 attrs="{'invisible':[('content_subtype', '=', 'plain')]}"/>
-                        <field name="body_text" colspan="2" nolabel="1" placeholder="What are you working on ?"
+                        <field name="body_text" colspan="2" nolabel="1" placeholder="What are you working on?"
                                 class="oe_mail_compose_message_body"
                                 attrs="{'invisible':[('content_subtype', '=', 'html')]}"/>
-                        <field name="body" colspan="2" nolabel="1" placeholder="What are you working on ?"
+                        <field name="body" colspan="2" nolabel="1" placeholder="What are you working on?"
                                 class="oe_mail_compose_message_body_html"
                                 attrs="{'invisible':[('content_subtype', '=', 'plain')]}"/>
                         <field name="partner_ids" colspan="2" nolabel="1" widget="many2many_tags" placeholder="Add contacts to notify..."

From a1c29dd85b6ea86550b12080fa2f9d9d9c5d253a Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 8 Oct 2012 14:35:29 +0530
Subject: [PATCH 2/6] [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'),

From 65e70487c2842b72a2236876650a3dc4e595808f Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 8 Oct 2012 14:40:18 +0530
Subject: [PATCH 3/6] [IMP] mail : Partners should always be replaced with
 Customer, Supplier, or Contact (if it can be both).

bzr revid: mdi@tinyerp.com-20121008091018-s116zi83vwfqkngy
---
 addons/mail/mail_message.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 68e40ef705c..df169f94404 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -581,11 +581,11 @@ class mail_message(osv.Model):
         if not partner_wo_email_lst:
             return {}
         for partner in partner_wo_email_lst:
-            terminology = 'Contact'
+            terminology = 'contact'
             if partner.customer and not partner.supplier:
-                terminology = 'Customer'
+                terminology = 'customer'
             elif partner.supplier and not partner.customer:
-                terminology = 'Supplier'
+                terminology = 'supplier'
             warning_msg = _('The following %s do not have an email address specified.') % (terminology,)
             warning_msg += '\n- %s' % (partner.name)
         return {'warning': {

From c1fdc5b3662b1a2bb23da2d2005dc176a4430c21 Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Thu, 11 Oct 2012 19:05:06 +0530
Subject: [PATCH 4/6] [IMP] mail: rename variable and improve msg

bzr revid: psi@tinyerp.com-20121011133506-knjykwttndmwawc7
---
 addons/mail/mail_message.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index b7176e3dc40..34a9116216e 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -580,12 +580,12 @@ class mail_message(osv.Model):
         if not partner_wo_email_lst:
             return {}
         for partner in partner_wo_email_lst:
-            terminology = 'contact'
+            recipients = "contacts"
             if partner.customer and not partner.supplier:
-                terminology = 'customer'
+                recipients = "customers"
             elif partner.supplier and not partner.customer:
-                terminology = 'supplier'
-            warning_msg = _('The following %s do not have an email address specified.') % (terminology,)
+                recipients = "suppliers"
+            warning_msg = _('The following %s do not have an email address specified.') % (recipients,)
             warning_msg += '\n- %s' % (partner.name)
         return {'warning': {
                     'title': _('Email not found'),

From 68baa0e49e5d524ece0aa2127bfa99cf6aa19eec Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Fri, 12 Oct 2012 17:34:33 +0530
Subject: [PATCH 5/6] [IMP] stock : Improved the label for 'partner_id' in
 Incoming Shipment and Delivery Order.

bzr revid: mdi@tinyerp.com-20121012120433-1tubvg3wmyijd1qd
---
 addons/stock/stock_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 329425148c5..1cbfaeac9c9 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -875,7 +875,7 @@
             <field name="arch" type="xml">
                 <tree colors="blue:state == 'draft';grey:state == 'cancel';red:state not in ('cancel', 'done') and min_date &lt; current_date" string="Delivery Orders">
                     <field name="name"/>
-                    <field name="partner_id"/>
+                    <field name="partner_id" string="Customer"/>
                     <field name="origin"/>
                     <field name="min_date"/>
                     <field name="date"/>
@@ -1006,7 +1006,7 @@
             <field name="arch" type="xml">
                 <tree colors="blue:state == 'draft';grey:state == 'done';red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
                     <field name="name"/>
-                    <field name="partner_id"/>
+                    <field name="partner_id" string="Supplier"/>
                     <field name="backorder_id"/>
                     <field name="origin"/>
                     <field name="date"/>

From 3f31313d46b9b4da1d41bf8dcf174b872cc49fe3 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 16 Oct 2012 12:38:16 +0530
Subject: [PATCH 6/6] [IMP] base_calendar : Partners should always be replaced
 with Customer, Supplier, or Contact (if it can be both).

bzr revid: mdi@tinyerp.com-20121016070816-1w25cevujbmvhu0m
---
 addons/base_calendar/crm_meeting.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py
index 9ceaea671ca..df97df2f6b8 100644
--- a/addons/base_calendar/crm_meeting.py
+++ b/addons/base_calendar/crm_meeting.py
@@ -91,11 +91,16 @@ class crm_meeting(base_state, osv.Model):
                 partner_wo_email_lst.append(partner)
         if not partner_wo_email_lst:
             return {}
-        warning_msg = _('The following contacts have no email address :')
         for partner in partner_wo_email_lst:
+            recipients = "contacts"
+            if partner.customer and not partner.supplier:
+                recipients = "customers"
+            elif partner.supplier and not partner.customer:
+                recipients = "suppliers"
+            warning_msg = _('The following %s do not have an email address specified.') % (recipients,)
             warning_msg += '\n- %s' % (partner.name)
         return {'warning': {
-                    'title': _('Email addresses not found'),
+                    'title': _('Email not found'),
                     'message': warning_msg,
                     }
                 }