From abfa5612f5f3d12953285ca48ba232bb08d5af9b Mon Sep 17 00:00:00 2001 From: Jigar Amin - OpenERP Date: Mon, 25 Jun 2012 18:02:06 +0530 Subject: [PATCH 1/7] [USB] renamed e-mail to email *.py bzr revid: jam@tinyerp.com-20120625123206-2nwfjc9mpbuk4mn1 --- openerp/addons/base/ir/ir_mail_server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/ir/ir_mail_server.py b/openerp/addons/base/ir/ir_mail_server.py index 04156411e48..971fd6596ce 100644 --- a/openerp/addons/base/ir/ir_mail_server.py +++ b/openerp/addons/base/ir/ir_mail_server.py @@ -396,7 +396,7 @@ class ir_mail_server(osv.osv): 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) From 0473afaca6ac81fa6b2a6aa0bd0e8f5391d2d7e8 Mon Sep 17 00:00:00 2001 From: Jigar Amin - OpenERP Date: Mon, 25 Jun 2012 18:27:00 +0530 Subject: [PATCH 2/7] [REN] e-mail to email bzr revid: jam@tinyerp.com-20120625125700-7jr8aeqp2kn9uggu --- openerp/addons/base/ir/ir_mail_server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/ir/ir_mail_server.py b/openerp/addons/base/ir/ir_mail_server.py index 971fd6596ce..276bfd618e3 100644 --- a/openerp/addons/base/ir/ir_mail_server.py +++ b/openerp/addons/base/ir/ir_mail_server.py @@ -161,7 +161,7 @@ def encode_rfc2822_address_header(header_text): 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 = { From c8f8bd9cea5e66c27439d1e4a6c872032d63b6fd Mon Sep 17 00:00:00 2001 From: Jigar Amin - OpenERP Date: Mon, 25 Jun 2012 18:32:01 +0530 Subject: [PATCH 3/7] [FIX] ren E-mail to Email bzr revid: jam@tinyerp.com-20120625130201-d9032tey5ddu1pqu --- openerp/addons/base/i18n/base.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/i18n/base.pot b/openerp/addons/base/i18n/base.pot index 83c982e76b9..19cd9c7efa5 100644 --- a/openerp/addons/base/i18n/base.pot +++ b/openerp/addons/base/i18n/base.pot @@ -9455,7 +9455,7 @@ msgstr "" #. module: base #: field:res.partner,email:0 -msgid "E-mail" +msgid "Email msgstr "" #. module: base From f5bc4540431023577ded90a60d8ca7228e048dc1 Mon Sep 17 00:00:00 2001 From: Jigar Amin - OpenERP Date: Mon, 25 Jun 2012 18:36:52 +0530 Subject: [PATCH 4/7] [FIX] renmae E-mail, E-Mail to Email bzr revid: jam@tinyerp.com-20120625130652-ini3czg6a8qd71n2 --- openerp/addons/base/i18n/base.pot | 4 ++-- openerp/addons/base/res/res_bank.py | 2 +- openerp/addons/base/res/res_partner.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/openerp/addons/base/i18n/base.pot b/openerp/addons/base/i18n/base.pot index 19cd9c7efa5..646fbd800ff 100644 --- a/openerp/addons/base/i18n/base.pot +++ b/openerp/addons/base/i18n/base.pot @@ -467,7 +467,7 @@ msgstr "" #. module: base #: field:res.bank,email:0 #: field:res.partner.address,email:0 -msgid "E-Mail" +msgid "Email msgstr "" #. module: base @@ -7592,7 +7592,7 @@ msgstr "" #. module: base #: model:ir.module.module,shortdesc:base.module_email_template -msgid "E-Mail Templates" +msgid "Email Templates msgstr "" #. module: base diff --git a/openerp/addons/base/res/res_bank.py b/openerp/addons/base/res/res_bank.py index 48b5973cf64..c9010b64319 100644 --- a/openerp/addons/base/res/res_bank.py +++ b/openerp/addons/base/res/res_bank.py @@ -35,7 +35,7 @@ class Bank(osv.osv): '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'), diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py index 14acbceb91c..625d6b7d3b5 100644 --- a/openerp/addons/base/res/res_partner.py +++ b/openerp/addons/base/res/res_partner.py @@ -163,7 +163,7 @@ class res_partner(osv.osv): '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), @@ -448,7 +448,7 @@ class res_partner_address(osv.osv): '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), From 5b339753b140f68bc0f20665446a05e99eb88d25 Mon Sep 17 00:00:00 2001 From: Jigar Amin - OpenERP Date: Mon, 25 Jun 2012 18:41:58 +0530 Subject: [PATCH 5/7] [FIX] usa fix bzr revid: jam@tinyerp.com-20120625131158-qeggwyomms20zm1f --- openerp/addons/base/ir/ir_mail_server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/ir/ir_mail_server.py b/openerp/addons/base/ir/ir_mail_server.py index 276bfd618e3..7b63430c1d8 100644 --- a/openerp/addons/base/ir/ir_mail_server.py +++ b/openerp/addons/base/ir/ir_mail_server.py @@ -396,7 +396,7 @@ class ir_mail_server(osv.osv): 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 email + 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) From 8d00222f8b6b810283e94023e411be9cc387c848 Mon Sep 17 00:00:00 2001 From: Jigar Amin - OpenERP Date: Mon, 25 Jun 2012 19:14:14 +0530 Subject: [PATCH 6/7] [FIX] usa fix bzr revid: jam@tinyerp.com-20120625134414-jfztjo8by5kbgqg0 --- openerp/addons/base/ir/ir_mail_server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/ir/ir_mail_server.py b/openerp/addons/base/ir/ir_mail_server.py index 7b63430c1d8..6099c68a0fb 100644 --- a/openerp/addons/base/ir/ir_mail_server.py +++ b/openerp/addons/base/ir/ir_mail_server.py @@ -396,7 +396,7 @@ class ir_mail_server(osv.osv): 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 email"" + 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) From f86ccd2f4e3a546fb601679cfaaa93c8f4720a43 Mon Sep 17 00:00:00 2001 From: Jigar Amin - OpenERP Date: Tue, 26 Jun 2012 11:54:28 +0530 Subject: [PATCH 7/7] [FIX] followup to follow-up bzr revid: jam@tinyerp.com-20120626062428-d42lj4sf4a4almja --- openerp/addons/base/i18n/base.pot | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/openerp/addons/base/i18n/base.pot b/openerp/addons/base/i18n/base.pot index 646fbd800ff..b4d28052ba8 100644 --- a/openerp/addons/base/i18n/base.pot +++ b/openerp/addons/base/i18n/base.pot @@ -544,16 +544,16 @@ msgid "\n" "==========================================================================\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" "" @@ -12688,7 +12688,7 @@ msgstr "" #. module: base #: model:ir.module.module,shortdesc:base.module_account_followup -msgid "Followup Management" +msgid "Follow-up Management" msgstr "" #. module: base