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

5 files changed, 24 insertions, 8 deletions

diff --git a/addons/auth_signup/data/auth_signup_data.xml b/addons/auth_signup/data/auth_signup_data.xml
index b3f887608ad..807b2e669bf 100644
--- a/addons/auth_signup/data/auth_signup_data.xml
+++ b/addons/auth_signup/data/auth_signup_data.xml
@@ -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[
diff --git a/addons/sale/models/account_invoice.py b/addons/sale/models/account_invoice.py
index 4fa848f2e79..b3d0085280d 100644
--- a/addons/sale/models/account_invoice.py
+++ b/addons/sale/models/account_invoice.py
@@ -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)
diff --git a/addons/web_calendar/static/src/js/web_calendar.js b/addons/web_calendar/static/src/js/web_calendar.js
index 3a0dfe11196..d197d0c2794 100644
--- a/addons/web_calendar/static/src/js/web_calendar.js
+++ b/addons/web_calendar/static/src/js/web_calendar.js
@@ -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);
         }
diff --git a/addons/website_forum/data/forum_data.xml b/addons/website_forum/data/forum_data.xml
index df39faa0371..2384cbe10de 100644
--- a/addons/website_forum/data/forum_data.xml
+++ b/addons/website_forum/data/forum_data.xml
@@ -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[
diff --git a/doc/cla/corporate/boolit.md b/doc/cla/corporate/boolit.md
new file mode 100644
index 00000000000..855d545d408
--- /dev/null
+++ b/doc/cla/corporate/boolit.md
@@ -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