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

[MERGE] forward port branch saas-11 up to 73527d0fc6

Browse Source
This commit is contained in:
Christophe Simonis
2017-05-02 17:05:42 +02:00
parent 279b3a8ac1 73527d0fc6
commit cc7ae17bd5
5 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/auth_signup/data/auth_signup_data.xml
+2 -2
View File
@@ -20,7 +20,7 @@
<record id="reset_password_email" model="mail.template">
<field name="name">Auth Signup: 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[
@@ -56,7 +56,7 @@
<record id="set_password_email" model="mail.template">
<field name="name">Auth Signup: Odoo 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"><![CDATA[
addons/sale/models/account_invoice.py
+1 -1
View File
@@ -101,4 +101,4 @@ class AccountInvoiceLine(models.Model):
layout_category_id = fields.Many2one('sale.layout_category', string='Section')
layout_category_sequence = fields.Integer(
related='layout_category_id.sequence',
string='Layout Sequence', store=True, default=0)
string='Layout Sequence', store=True)
addons/web_calendar/static/src/js/web_calendar.js
+4 -4
View File
@@ -697,17 +697,17 @@ var CalendarView = View.extend({
date_start_day = new Date(event.start.getFullYear(),event.start.getMonth(),event.start.getDate(),7);
date_stop_day = new Date(event_end.getFullYear(),event_end.getMonth(),event_end.getDate(),19);
}
data[this.date_start] = time.datetime_to_str(date_start_day);
data[this.date_start] = time.auto_date_to_str(date_start_day, this.fields[this.date_start].type);
if (this.date_stop) {
data[this.date_stop] = time.datetime_to_str(date_stop_day);
data[this.date_stop] = time.auto_date_to_str(date_stop_day, this.fields[this.date_stop].type);
}
diff_seconds = Math.round((date_stop_day.getTime() - date_start_day.getTime()) / 1000);
}
else {
data[this.date_start] = time.datetime_to_str(event.start);
data[this.date_start] = time.auto_date_to_str(event.start, this.fields[this.date_start].type);
if (this.date_stop) {
data[this.date_stop] = time.datetime_to_str(event_end);
data[this.date_stop] = time.auto_date_to_str(event_end, this.fields[this.date_stop].type);
}
diff_seconds = Math.round((event_end.getTime() - event.start.getTime()) / 1000);
}
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">Forum: 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