Divyesh Makwana(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-home_terminology-mdi into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-home_terminology-mdi/+merge/128658
Hello Sir,
I have improved the terminologies.
Thanks,
Divyesh
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-home_terminology-mdi/+merge/128658
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-home_terminology-mdi.
=== modified file 'mail/mail_message.py'
--- mail/mail_message.py 2012-10-04 04:46:24 +0000
+++ mail/mail_message.py 2012-10-09 09:32:44 +0000
@@ -580,11 +580,16 @@
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 :')
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': _('Partners email addresses not found'),
+ 'title': _('Email not found'),
'message': warning_msg,
}
}
=== modified file 'mail/mail_thread_view.xml'
--- mail/mail_thread_view.xml 2012-10-03 15:33:06 +0000
+++ mail/mail_thread_view.xml 2012-10-09 09:32:44 +0000
@@ -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">
=== modified file 'mail/wizard/mail_compose_message_view.xml'
--- mail/wizard/mail_compose_message_view.xml 2012-09-27 17:23:17 +0000
+++ mail/wizard/mail_compose_message_view.xml 2012-10-09 09:32:44 +0000
@@ -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..."
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
