pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port branch saas-6 up to 671864e72b

Browse Source
This commit is contained in:
Christophe Simonis
2017-05-02 12:07:05 +02:00
parent 32ea5ad690 671864e72b
commit c66e454f06
4 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/auth_signup/auth_signup_data.xml
+2 -2
View File
@@ -22,7 +22,7 @@
<record id="reset_password_email" model="mail.template">
<field name="name">Reset Password</field>
<field name="model_id" ref="base.model_res_users"/>
<field name="email_from"><![CDATA[${object.company_id.name} <${(object.company_id.email or user.email)|safe}>]]></field>
<field name="email_from"><![CDATA["${object.company_id.name|safe}" <${(object.company_id.email or user.email)|safe}>]]></field>
<field name="email_to">${object.email|safe}</field>
<field name="subject">Password reset</field>
<field name="body_html"><![CDATA[
@@ -37,7 +37,7 @@
<record id="set_password_email" model="mail.template">
<field name="name">Odoo Enterprise Connection</field>
<field name="model_id" ref="base.model_res_users"/>
<field name="email_from"><![CDATA[${object.company_id.name} <${(object.company_id.email or user.email)|safe}>]]></field>
<field name="email_from"><![CDATA["${object.company_id.name|safe}" <${(object.company_id.email or user.email)|safe}>]]></field>
<field name="email_to">${object.email|safe}</field>
<field name="subject"><![CDATA[${object.company_id.name} invitation to connect on Odoo]]></field>
<field name="body_html">
addons/web/static/src/js/views/form_common.js
+2 -2
View File
@@ -274,7 +274,7 @@ var CompletionFieldMixin = {
// all search/create popup handling
_search_create_popup: function(view, ids, context) {
var self = this;
new SelectCreateDialog(this, {
new SelectCreateDialog(this, _.extend({}, (this.options || {}), {
res_model: self.field.relation,
domain: self.build_domain(),
context: new data.CompoundContext(self.build_context(), context || {}),
@@ -286,7 +286,7 @@ var CompletionFieldMixin = {
self.add_id(element_ids[0]);
self.focus();
}
}).open();
})).open();
},
/**
* To implement.
addons/website_forum/data/forum_data.xml
+1 -1
View File
@@ -138,7 +138,7 @@
<record id="validation_email" model="mail.template">
<field name="name">Email Verification</field>
<field name="model_id" ref="base.model_res_users"/>
<field name="email_from"><![CDATA[${object.company_id.name} <${(object.company_id.email or user.email)|safe}>]]></field>
<field name="email_from"><![CDATA["${object.company_id.name|safe}" <${(object.company_id.email or user.email)|safe}>]]></field>
<field name="email_to">${object.email|safe}</field>
<field name="subject"><![CDATA[${object.company_id.name} Forums validation]]></field>
<field name="body_html"><![CDATA[
doc/cla/corporate/boolit.md
+16
View File
@@ -0,0 +1,16 @@
Lithuania, 2017-01-26
Boolit JSC agrees to the terms of the Odoo Corporate Contributor License
Agreement v1.0.
I declare that I am authorized and able to make this agreement and sign this
declaration.
Signed,
Andrius Laukavičius dev@boolit.eu https://github.com/oerp-odoo
List of contributors:
Dainius Kaniava dka@boolit.eu https://github.com/boolit-dka
Andrius Laukavičius dev@boolit.eu https://github.com/oerp-odoo