From ee7a9c76217b1a632b08678e9f4875ba7a49cbf7 Mon Sep 17 00:00:00 2001 From: Richard Mathot Date: Thu, 24 Jul 2014 11:27:32 +0200 Subject: [PATCH] [REF] Odooification --- addons/google_calendar/res_config.py | 2 +- addons/mail/mail_alias.py | 4 ++-- addons/mail/res_config_view.xml | 2 +- openerp/addons/base/tests/test_mail_examples.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/google_calendar/res_config.py b/addons/google_calendar/res_config.py index ec0f2e4d95b..180a53d4d8a 100644 --- a/addons/google_calendar/res_config.py +++ b/addons/google_calendar/res_config.py @@ -22,7 +22,7 @@ class calendar_config_settings(osv.TransientModel): cal_client_id = params.get_param(cr, uid, 'google_calendar_client_id',default='',context=context) cal_client_secret = params.get_param(cr, uid, 'google_calendar_client_secret',default='',context=context) - server_uri= "%s/google_account/authentication" % params.get_param(cr, uid, 'web.base.url',default="http://yourcompany.my.openerp.com",context=context) + server_uri= "%s/google_account/authentication" % params.get_param(cr, uid, 'web.base.url',default="http://yourcompany.odoo.com",context=context) return dict(cal_client_id=cal_client_id,cal_client_secret=cal_client_secret,server_uri=server_uri) diff --git a/addons/mail/mail_alias.py b/addons/mail/mail_alias.py index 2a8bf60666e..303d398dfb9 100644 --- a/addons/mail/mail_alias.py +++ b/addons/mail/mail_alias.py @@ -66,7 +66,7 @@ class mail_alias(osv.Model): _columns = { 'alias_name': fields.char('Alias Name', - help="The name of the email alias, e.g. 'jobs' if you want to catch emails for ",), + help="The name of the email alias, e.g. 'jobs' if you want to catch emails for ",), 'alias_model_id': fields.many2one('ir.model', 'Aliased Model', required=True, ondelete="cascade", help="The model (Odoo Document Kind) to which this alias " "corresponds. Any incoming email that does not reply to an " @@ -132,7 +132,7 @@ class mail_alias(osv.Model): def name_get(self, cr, uid, ids, context=None): """Return the mail alias display alias_name, including the implicit mail catchall domain if exists from config otherwise "New Alias". - e.g. `jobs@openerp.my.openerp.com` or `jobs` or 'New Alias' + e.g. `jobs@mail.odoo.com` or `jobs` or 'New Alias' """ res = [] for record in self.browse(cr, uid, ids, context=context): diff --git a/addons/mail/res_config_view.xml b/addons/mail/res_config_view.xml index d3797ba2dcc..6f756679ed9 100644 --- a/addons/mail/res_config_view.xml +++ b/addons/mail/res_config_view.xml @@ -9,7 +9,7 @@
diff --git a/openerp/addons/base/tests/test_mail_examples.py b/openerp/addons/base/tests/test_mail_examples.py index 6886ce86baa..0760bd38bf8 100644 --- a/openerp/addons/base/tests/test_mail_examples.py +++ b/openerp/addons/base/tests/test_mail_examples.py @@ -897,7 +897,7 @@ BUG2 = """ Répondre à : - catchall@openerp.my.openerp.com + catchall@mail.odoo.com Pour :