Antony Lesuisse (OpenERP) has proposed merging
lp:~openerp-dev/openobject-server/trunk-ren-email into lp:openobject-server.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-ren-email/+merge/112325
--
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-ren-email/+merge/112325
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/trunk-ren-email.
=== modified file 'openerp/addons/base/i18n/base.pot'
--- openerp/addons/base/i18n/base.pot 2012-05-10 09:35:27 +0000
+++ openerp/addons/base/i18n/base.pot 2012-06-27 10:56:19 +0000
@@ -467,7 +467,7 @@
#. module: base
#: field:res.bank,email:0
#: field:res.partner.address,email:0
-msgid "E-Mail"
+msgid "Email
msgstr ""
#. module: base
@@ -544,16 +544,16 @@
"==========================================================================\n"
"\n"
"You can define your multiple levels of recall through the menu:\n"
-" Accounting/Configuration/Miscellaneous/Follow-Ups\n"
+" Accounting/Configuration/Miscellaneous/Follow-ups\n"
"\n"
"Once it is defined, you can automatically print recalls every day through simply clicking on the menu:\n"
-" Accounting/Periodical Processing/Billing/Send followups\n"
+" Accounting/Periodical Processing/Billing/Send follow-ups\n"
"\n"
"It will generate a PDF with all the letters according to the the\n"
"different levels of recall defined. You can define different policies\n"
"for different companies. You can also send mail to the customer.\n"
"\n"
-"Note that if you want to check the followup level for a given partner/account entry, you can do from in the menu:\n"
+"Note that if you want to check the follow-up level for a given partner/account entry, you can do from in the menu:\n"
" Accounting/Reporting/Generic Reporting/Partners/Follow-ups Sent\n"
"\n"
""
@@ -7592,7 +7592,7 @@
#. module: base
#: model:ir.module.module,shortdesc:base.module_email_template
-msgid "E-Mail Templates"
+msgid "Email Templates
msgstr ""
#. module: base
@@ -9455,7 +9455,7 @@
#. module: base
#: field:res.partner,email:0
-msgid "E-mail"
+msgid "Email
msgstr ""
#. module: base
@@ -12688,7 +12688,7 @@
#. module: base
#: model:ir.module.module,shortdesc:base.module_account_followup
-msgid "Followup Management"
+msgid "Follow-up Management"
msgstr ""
#. module: base
=== modified file 'openerp/addons/base/ir/ir_mail_server.py'
--- openerp/addons/base/ir/ir_mail_server.py 2012-03-16 13:20:22 +0000
+++ openerp/addons/base/ir/ir_mail_server.py 2012-06-27 10:56:19 +0000
@@ -161,7 +161,7 @@
class ir_mail_server(osv.osv):
- """Represents an SMTP server, able to send outgoing e-mails, with SSL and TLS capabilities."""
+ """Represents an SMTP server, able to send outgoing emails, with SSL and TLS capabilities."""
_name = "ir.mail_server"
_columns = {
@@ -396,7 +396,7 @@
MailDeliveryException and logs root cause.
"""
smtp_from = message['Return-Path'] or message['From']
- assert smtp_from, "The Return-Path or From header is required for any outbound e-mail"
+ assert smtp_from, "The Return-Path or From header is required for any outbound email"
# The email's "Envelope From" (Return-Path), and all recipient addresses must only contain ASCII characters.
from_rfc2822 = extract_rfc2822_addresses(smtp_from)
=== modified file 'openerp/addons/base/res/res_bank.py'
--- openerp/addons/base/res/res_bank.py 2012-04-23 10:32:27 +0000
+++ openerp/addons/base/res/res_bank.py 2012-06-27 10:56:19 +0000
@@ -35,7 +35,7 @@
'state': fields.many2one("res.country.state", 'Fed. State',
domain="[('country_id', '=', country)]"),
'country': fields.many2one('res.country', 'Country'),
- 'email': fields.char('E-Mail', size=64),
+ 'email': fields.char('Email', size=64),
'phone': fields.char('Phone', size=64),
'fax': fields.char('Fax', size=64),
'active': fields.boolean('Active'),
=== modified file 'openerp/addons/base/res/res_partner.py'
--- openerp/addons/base/res/res_partner.py 2012-06-27 10:39:00 +0000
+++ openerp/addons/base/res/res_partner.py 2012-06-27 10:56:19 +0000
@@ -163,7 +163,7 @@
'state_id': fields.many2one("res.country.state", 'State', domain="[('country_id','=',country_id)]"),
'country_id': fields.many2one('res.country', 'Country'),
'country': fields.related('country_id', type='many2one', relation='res.country', string='Country'), # for backward compatibility
- 'email': fields.char('E-Mail', size=240),
+ 'email': fields.char('Email', size=240),
'phone': fields.char('Phone', size=64),
'fax': fields.char('Fax', size=64),
'mobile': fields.char('Mobile', size=64),
@@ -446,7 +446,7 @@
'city': fields.char('City', size=128),
'state_id': fields.many2one("res.country.state", 'Fed. State', domain="[('country_id','=',country_id)]"),
'country_id': fields.many2one('res.country', 'Country'),
- 'email': fields.char('E-Mail', size=240),
+ 'email': fields.char('Email', size=240),
'phone': fields.char('Phone', size=64),
'fax': fields.char('Fax', size=64),
'mobile': fields.char('Mobile', size=64),
_______________________________________________
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
