[REF] Odooification

diff --git a/addons/google_calendar/res_config.py b/addons/google_calendar/res_config.py
index ec0f2e4..180a53d 100644 (file)
--- 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 2a8bf60..303d398 100644 (file)
--- 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 <jobs@example.my.openerp.com>",),
+            help="The name of the email alias, e.g. 'jobs' if you want to catch emails for <jobs@example.odoo.com>",),
         '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 d3797ba..6f75667 100644 (file)
--- a/addons/mail/res_config_view.xml
+++ b/addons/mail/res_config_view.xml
@@ -9,7 +9,7 @@
                 <xpath expr="//div[@name='email']" position='inside'>
                     <div>
                         <label for="alias_domain" class="oe_inline"/>
-                        <field name="alias_domain" placeholder="mycompany.my.openerp.com" class="oe_inline"/>
+                        <field name="alias_domain" placeholder="mycompany.odoo.com" class="oe_inline"/>
                     </div>
                 </xpath>
             </field>

diff --git a/openerp/addons/base/tests/test_mail_examples.py b/openerp/addons/base/tests/test_mail_examples.py
index 6886ce8..0760bd3 100644 (file)
--- a/openerp/addons/base/tests/test_mail_examples.py
+++ b/openerp/addons/base/tests/test_mail_examples.py
@@ -897,7 +897,7 @@ BUG2 = """
               <th nowrap="" valign="BASELINE" align="RIGHT">Répondre
 
                 à&nbsp;: </th>
-              <td><a class="moz-txt-link-abbreviated" href="mailto:catchall@openerp.my.openerp.com">catchall@openerp.my.openerp.com</a></td>
+              <td><a class="moz-txt-link-abbreviated" href="mailto:catchall@mail.odoo.com">catchall@mail.odoo.com</a></td>
             </tr>
             <tr>
               <th nowrap="" valign="BASELINE" align="RIGHT">Pour&nbsp;: