[REF] Odooification
This commit is contained in:
parent
6d2fb3e3ae
commit
ee7a9c7621
|
@ -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_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)
|
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)
|
return dict(cal_client_id=cal_client_id,cal_client_secret=cal_client_secret,server_uri=server_uri)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -66,7 +66,7 @@ class mail_alias(osv.Model):
|
||||||
|
|
||||||
_columns = {
|
_columns = {
|
||||||
'alias_name': fields.char('Alias Name',
|
'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",
|
'alias_model_id': fields.many2one('ir.model', 'Aliased Model', required=True, ondelete="cascade",
|
||||||
help="The model (Odoo Document Kind) to which this alias "
|
help="The model (Odoo Document Kind) to which this alias "
|
||||||
"corresponds. Any incoming email that does not reply to an "
|
"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):
|
def name_get(self, cr, uid, ids, context=None):
|
||||||
"""Return the mail alias display alias_name, including the implicit
|
"""Return the mail alias display alias_name, including the implicit
|
||||||
mail catchall domain if exists from config otherwise "New Alias".
|
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 = []
|
res = []
|
||||||
for record in self.browse(cr, uid, ids, context=context):
|
for record in self.browse(cr, uid, ids, context=context):
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
<xpath expr="//div[@name='email']" position='inside'>
|
<xpath expr="//div[@name='email']" position='inside'>
|
||||||
<div>
|
<div>
|
||||||
<label for="alias_domain" class="oe_inline"/>
|
<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>
|
</div>
|
||||||
</xpath>
|
</xpath>
|
||||||
</field>
|
</field>
|
||||||
|
|
|
@ -897,7 +897,7 @@ BUG2 = """
|
||||||
<th nowrap="" valign="BASELINE" align="RIGHT">Répondre
|
<th nowrap="" valign="BASELINE" align="RIGHT">Répondre
|
||||||
|
|
||||||
à : </th>
|
à : </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>
|
||||||
<tr>
|
<tr>
|
||||||
<th nowrap="" valign="BASELINE" align="RIGHT">Pour :
|
<th nowrap="" valign="BASELINE" align="RIGHT">Pour :
|
||||||
|
|
Loading…
Reference in New Issue