From 8322c7c7316a25025ab10827b3ae96f6a1851c48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=BF=97=E4=BA=AE?= <zhilight@gmail.com>
Date: Tue, 8 Jan 2019 07:36:02 +0000
Subject: [PATCH 01/66] [CLA] alexcn signs cla

closes odoo/odoo#30010
---
 doc/cla/individual/alexcn.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 doc/cla/individual/alexcn.md

diff --git a/doc/cla/individual/alexcn.md b/doc/cla/individual/alexcn.md
new file mode 100644
index 00000000000..fb0cf0d8232
--- /dev/null
+++ b/doc/cla/individual/alexcn.md
@@ -0,0 +1,9 @@
+China, 2019-01-08
+
+I hereby agree to the terms of the Odoo Individual Contributor License Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this declaration.
+
+Signed,
+
+Alex Zhang zhilight@gmail.com https://github.com/Alexcn
\ No newline at end of file

From 91882dd97238a006ef711b33a96ba88acb862847 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@odoo.com>
Date: Tue, 8 Jan 2019 09:16:49 +0000
Subject: [PATCH 02/66] [FIX] base: delete linked record only if last external
 id

In case a record is no longer referenced in the updated module, its external id
is deleted.
If the linked record still exists, it is deleted as well.

This last clause was incorrect as the record may still be referenced in other
modules.

If a field is declared in module A

class FooA(models.Model):
    _name = 'foo'
    bar = fields.Char()

and overriden in module B

class FooB(models.Model:
    _inherit = 'foo'
    bar = fields.Char(translate=True)

In case the field is no longer inherited in module B (code change, moved to
another module,...), the ir.model.field record for bar was deleted.

Two external ids are linked to field bar:
A.field_foo__bar
B.field_foo__bar

The ir.model.field record should be dropped only if both ir.model.data entries
are no longer loaded.
Otherwise, only the ir.model.data entry should be deleted (i.e. B.field_foo__bar
in the above example).

Fixes odoo/odoo#29820

closes odoo/odoo#30018
---
 odoo/addons/base/models/ir_model.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/odoo/addons/base/models/ir_model.py b/odoo/addons/base/models/ir_model.py
index 533654004ac..38ecd83888a 100644
--- a/odoo/addons/base/models/ir_model.py
+++ b/odoo/addons/base/models/ir_model.py
@@ -1624,6 +1624,16 @@ class IrModelData(models.Model):
         for (id, xmlid, model, res_id) in self._cr.fetchall():
             if xmlid not in loaded_xmlids:
                 if model in self.env:
+                    if self.search_count([
+                        ("model", "=", model),
+                        ("res_id", "=", res_id),
+                        ("id", "!=", id),
+                        ("id", "not in", bad_imd_ids),
+                    ]):
+                        # another external id is still linked to the same record, only deleting the old imd
+                        bad_imd_ids.append(id)
+                        continue
+
                     _logger.info('Deleting %s@%s (%s)', res_id, model, xmlid)
                     record = self.env[model].browse(res_id)
                     if record.exists():

From d0d8b7b4de78aa2c38c91257af2a07caf1107d1c Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Tue, 8 Jan 2019 14:37:02 +0000
Subject: [PATCH 03/66] [FIX] mrp: BoM Structure report

Send the context for proper translation of the report.

opw-1908220

closes odoo/odoo#30038
---
 addons/mrp/static/src/js/mrp_bom_report.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/mrp/static/src/js/mrp_bom_report.js b/addons/mrp/static/src/js/mrp_bom_report.js
index 77d57dcf01e..fa505b5a052 100644
--- a/addons/mrp/static/src/js/mrp_bom_report.js
+++ b/addons/mrp/static/src/js/mrp_bom_report.js
@@ -25,7 +25,8 @@ var MrpBomReport = stock_report_generic.extend({
         return this._rpc({
                 model: 'report.mrp.report_bom_structure',
                 method: 'get_html',
-                args: args
+                args: args,
+                context: this.given_context,
             })
             .then(function (result) {
                 self.data = result;

From 270171752f6b9cb9ad87644cb36ab16c9e84f4f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Veikko=20Va=CC=88a=CC=88ta=CC=88ja=CC=88?=
 <veikko.vaataja@gmail.com>
Date: Tue, 8 Jan 2019 16:49:10 +0000
Subject: [PATCH 04/66] [FIX] doc: fix numbered list in guidelines

Fix rst-formating for numbered list under heading "Inherited XML".

closes odoo/odoo#30043
---
 doc/reference/guidelines.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/reference/guidelines.rst b/doc/reference/guidelines.rst
index 10bd221a51e..5710bd36ff6 100644
--- a/doc/reference/guidelines.rst
+++ b/doc/reference/guidelines.rst
@@ -281,6 +281,7 @@ Inherited XML
 ~~~~~~~~~~~~~
 
 The naming pattern of inherited view is
+
 #. Extension mode: Use the same xml id than the original view you are extending, and suffix it by :samp:`{_inherit}` . For instance, the view :samp:`project.project_view_form` can be extended by :samp:`project_forecast.project_view_form_inherit`.
 #. Primary mode: Keep the original xml id.
 

From 171d1e7bc3bf1df28c6c4aaf8e39abb3e0e9b75e Mon Sep 17 00:00:00 2001
From: Jorge Pinna Puissant <jpp@odoo.com>
Date: Mon, 7 Jan 2019 10:43:40 +0000
Subject: [PATCH 05/66] [FIX] web_editor: Media dialog next btn reload page
 opw-1910505

Before this commit, the next button in the media dialog widget reloaded
the page and opened only the iframe of the widget.

Now, the button only update the media dialog widget.

closes odoo/odoo#29981
---
 addons/web_editor/static/src/js/widgets/widgets.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/web_editor/static/src/js/widgets/widgets.js b/addons/web_editor/static/src/js/widgets/widgets.js
index 7c33ab53b97..30de8171e53 100644
--- a/addons/web_editor/static/src/js/widgets/widgets.js
+++ b/addons/web_editor/static/src/js/widgets/widgets.js
@@ -1288,6 +1288,7 @@ var MediaDialog = Dialog.extend({
      * @private
      */
     _onPagerClick: function (ev) {
+        ev.preventDefault();
         this.active.goToPage(this.active.page + ($(ev.currentTarget).hasClass('previous') ? -1 : 1));
         this._updateControlPanel();
     },

From 59956805424808beed82f1afa5c5e6996e34eb13 Mon Sep 17 00:00:00 2001
From: Jorge Pinna Puissant <jpp@odoo.com>
Date: Fri, 4 Jan 2019 16:07:39 +0000
Subject: [PATCH 06/66] [FIX] hr_holidays: validation_type same behavior
 opw-1919744

Before this commit, the user in the leave_type had the choice between
three validations : 'hr', 'manager' and 'both'. The behaviour of the
application was exactly the same if 'hr' or 'manager' was chosen.

In this commit, a computed field was added only to hide this choice,
and restrict the user to choice between the 'double validation'
or the normal validation.

This commit must be reverted once the fonctional part is implemented.

closes odoo/odoo#29952
---
 addons/hr_holidays/i18n/hr_holidays.pot       |  5 ++++
 addons/hr_holidays/models/hr_leave_type.py    | 28 +++++++++++++++++++
 .../hr_holidays/views/hr_leave_type_views.xml |  6 ++--
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/addons/hr_holidays/i18n/hr_holidays.pot b/addons/hr_holidays/i18n/hr_holidays.pot
index 5628d1427d4..7f60f82ba22 100644
--- a/addons/hr_holidays/i18n/hr_holidays.pot
+++ b/addons/hr_holidays/i18n/hr_holidays.pot
@@ -661,6 +661,11 @@ msgstr ""
 msgid "Analyze from"
 msgstr ""
 
+#. module: hr_holidays
+#: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_type__double_validation
+msgid "Apply Double Validation"
+msgstr ""
+
 #. module: hr_holidays
 #: model_terms:ir.ui.view,arch_db:hr_holidays.view_evaluation_report_graph
 msgid "Appraisal Analysis"
diff --git a/addons/hr_holidays/models/hr_leave_type.py b/addons/hr_holidays/models/hr_leave_type.py
index f0d8eddd1a0..1911faf2d88 100644
--- a/addons/hr_holidays/models/hr_leave_type.py
+++ b/addons/hr_holidays/models/hr_leave_type.py
@@ -65,6 +65,15 @@ class HolidaysType(models.Model):
         ('hr', 'Human Resource officer'),
         ('manager', 'Employee Manager'),
         ('both', 'Double Validation')], default='hr', string='Validation By')
+    
+    # TODO: remove me in master, the behavior is exactly the same if you choose 'hr' or 'manager'
+    # in the validation_type field. This field is used only to hide this possibility to the user
+    # to avoid misunderstandings. This field and its corresponding's functions must be removed once
+    # the functional part is implemented.
+    double_validation = fields.Boolean(string='Apply Double Validation',
+        compute='_compute_validation_type', inverse='_inverse_validation_type',
+        help="When selected, the Allocation/Leave Requests for this type require a second validation to be approved.")
+    
     allocation_type = fields.Selection([
         ('fixed', 'Fixed by HR'),
         ('fixed_allocation', 'Fixed by HR + allocation request'),
@@ -84,6 +93,25 @@ class HolidaysType(models.Model):
         default='day', string='Take Leaves in', required=True)
     unpaid = fields.Boolean('Is Unpaid', default=False)
 
+    # TODO: remove me in master
+    @api.depends('validation_type')
+    def _compute_validation_type(self):
+        for holiday_type in self:
+            if holiday_type.validation_type == 'both':
+                holiday_type.double_validation = True
+            else:
+                holiday_type.double_validation = False
+
+    # TODO: remove me in master
+    def _inverse_validation_type(self):
+        for holiday_type in self:
+            if holiday_type.double_validation == True:
+                holiday_type.validation_type = 'both'
+            else:
+                #IF to preserve the information (hr or manager)
+                if holiday_type.validation_type == 'both':
+                    holiday_type.validation_type = 'hr'
+
     @api.multi
     @api.constrains('validity_start', 'validity_stop')
     def _check_validity_dates(self):
diff --git a/addons/hr_holidays/views/hr_leave_type_views.xml b/addons/hr_holidays/views/hr_leave_type_views.xml
index 759972e36ea..d0c30a22c48 100644
--- a/addons/hr_holidays/views/hr_leave_type_views.xml
+++ b/addons/hr_holidays/views/hr_leave_type_views.xml
@@ -47,7 +47,8 @@
                             <field name="time_type" groups="base.group_no_one"/>
                         </group>
                         <group name="validation" string="Validation">
-                            <field name="validation_type" widget="radio"/>
+                            <field name="validation_type" widget="radio" invisible="1"/>
+                            <field name="double_validation"/>
                         </group>
                         <group name="visibility" string="Allocation">
                             <field name="allocation_type" widget="radio" force_save="1"/>
@@ -97,7 +98,8 @@
                 <field name="sequence" widget="handle"/>
                 <field name="display_name"/>
                 <field name="allocation_type"/>
-                <field name="validation_type"/>
+                <field name="validation_type" invisible="1"/>
+                <field name="double_validation"/>
                 <field name="validity_start"/>
                 <field name="validity_stop"/>
             </tree>

From e95b4e959433db45bc5c227f67763cd509fee333 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Mon, 7 Jan 2019 09:25:12 +0000
Subject: [PATCH 07/66] [FIX] web: graph view translation

The control labels 'Grouped' and 'Stacked' are not translated since they
are default values from nvd3.

opw-1908220

closes odoo/odoo#29975
---
 addons/web/i18n/web.pot                            | 14 ++++++++++++++
 .../static/src/js/views/graph/graph_renderer.js    |  4 ++++
 2 files changed, 18 insertions(+)

diff --git a/addons/web/i18n/web.pot b/addons/web/i18n/web.pot
index 9210c9bb81a..9cb0f0b9ba7 100644
--- a/addons/web/i18n/web.pot
+++ b/addons/web/i18n/web.pot
@@ -1603,6 +1603,13 @@ msgstr ""
 msgid "Group by: %s"
 msgstr ""
 
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views/graph/graph_renderer.js:214
+#, python-format
+msgid "Grouped"
+msgstr ""
+
 #. module: web
 #: model:ir.model,name:web.model_ir_http
 msgid "HTTP Routing"
@@ -3004,6 +3011,13 @@ msgstr ""
 msgid "Special:"
 msgstr ""
 
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views/graph/graph_renderer.js:215
+#, python-format
+msgid "Stacked"
+msgstr ""
+
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/core/misc.js:14
diff --git a/addons/web/static/src/js/views/graph/graph_renderer.js b/addons/web/static/src/js/views/graph/graph_renderer.js
index 5deba9d69bd..5ec89635dc8 100644
--- a/addons/web/static/src/js/views/graph/graph_renderer.js
+++ b/addons/web/static/src/js/views/graph/graph_renderer.js
@@ -210,6 +210,10 @@ return AbstractRenderer.extend({
           margin: {left: 80, bottom: 100, top: 80, right: 0},
           delay: 100,
           transition: 10,
+          controlLabels: {
+            'grouped': _t('Grouped'),
+            'stacked': _t('Stacked'),
+          },
           showLegend: _.size(data) <= MAX_LEGEND_LENGTH,
           showXAxis: true,
           showYAxis: true,

From 69f6b9510db36570698e472f797ef5e4e3685d2e Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Tue, 8 Jan 2019 13:15:16 +0000
Subject: [PATCH 08/66] [FIX] web: decimal separator of percentage

When a percentage if formatted, the decimal separator used is always
`.`, while it should be the decimal separator of the language.

opw-1908220

closes odoo/odoo#30030
---
 .../web/static/src/js/fields/field_utils.js   |  2 +-
 .../static/tests/fields/field_utils_tests.js  | 30 +++++++++++++++++--
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/fields/field_utils.js b/addons/web/static/src/js/fields/field_utils.js
index bbdee83c4f9..ec99f4fa0f6 100644
--- a/addons/web/static/src/js/fields/field_utils.js
+++ b/addons/web/static/src/js/fields/field_utils.js
@@ -363,7 +363,7 @@ function formatPercentage(value, field, options) {
     if (options.humanReadable && options.humanReadable(value * 100)) {
         return result + "%";
     }
-    return parseFloat(result) + "%";
+    return (parseFloat(result) + "%").replace('.', _t.database.parameters.decimal_point);
 }
 /**
  * Returns a string representing the value of the selection.
diff --git a/addons/web/static/tests/fields/field_utils_tests.js b/addons/web/static/tests/fields/field_utils_tests.js
index 6b7cda13264..940f5674780 100644
--- a/addons/web/static/tests/fields/field_utils_tests.js
+++ b/addons/web/static/tests/fields/field_utils_tests.js
@@ -135,7 +135,9 @@ QUnit.test('format binary', function (assert) {
 });
 
 QUnit.test('format percentage', function (assert) {
-    assert.expect(9);
+    assert.expect(11);
+
+    var originalParameters = _.clone(core._t.database.parameters);
 
     assert.strictEqual(fieldUtils.format.percentage(0), '0%');
     assert.strictEqual(fieldUtils.format.percentage(0.5), '50%');
@@ -151,6 +153,16 @@ QUnit.test('format percentage', function (assert) {
     assert.strictEqual(fieldUtils.format.percentage(50, null,
         {humanReadable: function (val) {return true;}}), '5k%'
     );
+
+    _.extend(core._t.database.parameters, {
+        grouping: [3, 0],
+        decimal_point: ',',
+        thousands_sep: '.'
+    });
+    assert.strictEqual(fieldUtils.format.percentage(0.125), '12,5%');
+    assert.strictEqual(fieldUtils.format.percentage(0.666666), '66,67%');
+
+    core._t.database.parameters = originalParameters;
 });
 
 QUnit.test('parse float', function(assert) {
@@ -262,7 +274,9 @@ QUnit.test('parse monetary', function(assert) {
 });
 
 QUnit.test('parse percentage', function(assert) {
-    assert.expect(7);
+    assert.expect(9);
+
+    var originalParameters = _.clone(core._t.database.parameters);
 
     assert.strictEqual(fieldUtils.parse.percentage(""), 0);
     assert.strictEqual(fieldUtils.parse.percentage("0"), 0);
@@ -271,6 +285,18 @@ QUnit.test('parse percentage', function(assert) {
     assert.strictEqual(fieldUtils.parse.percentage("1"), 1);
     assert.strictEqual(fieldUtils.parse.percentage("2%"), 0.02);
     assert.strictEqual(fieldUtils.parse.percentage("100%"), 1);
+
+    _.extend(core._t.database.parameters, {
+        grouping: [3, 0],
+        decimal_point: ',',
+        thousands_sep: '.'
+    });
+
+    assert.strictEqual(fieldUtils.parse.percentage("0,04"), 0.04);
+    assert.strictEqual(fieldUtils.parse.percentage("6,02%"), 0.0602);
+
+    core._t.database.parameters = originalParameters;
+
 })
 
 });

From 07befd19a7b9ffb4b8174502c124bb5e97112fa8 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Mon, 7 Jan 2019 13:06:38 +0000
Subject: [PATCH 09/66] [FIX] web: make pie chart title translatable

The Pie Chart title is not translatable, since a string defined in a
`t-att-` cannot be translated.

We use the attribute `title` instead.

Tests are adapted in https://github.com/odoo/enterprise/pull/3379

opw-1908220

closes odoo/odoo#29991
---
 addons/web/static/src/js/widgets/pie_chart.js | 1 +
 addons/web/static/src/xml/pie_chart.xml       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/widgets/pie_chart.js b/addons/web/static/src/js/widgets/pie_chart.js
index 663e2b4cc98..c483c23c73d 100644
--- a/addons/web/static/src/js/widgets/pie_chart.js
+++ b/addons/web/static/src/js/widgets/pie_chart.js
@@ -31,6 +31,7 @@ var PieChart = Widget.extend({
             Domain.prototype.stringToArray(modifiers.domain || '[]'));
         var arch = qweb.render('web.PieChart', {
             modifiers: modifiers,
+            title: node.attrs.title || modifiers.title || modifiers.measure,
         });
 
         this.subViewParams = {
diff --git a/addons/web/static/src/xml/pie_chart.xml b/addons/web/static/src/xml/pie_chart.xml
index 5c3411bc882..d45bef7af6f 100644
--- a/addons/web/static/src/xml/pie_chart.xml
+++ b/addons/web/static/src/xml/pie_chart.xml
@@ -1,7 +1,7 @@
 <template>
 
 <t t-name="web.PieChart">
-    <graph type="pie" t-att-title="modifiers.title || modifiers.measure">
+    <graph type="pie" t-att-title="title">
         <field t-att-name="modifiers.groupby.split(':')[0]" t-att-interval="modifiers.groupby.split(':')[1]"/>
         <field t-if="modifiers.measure" t-att-name="modifiers.measure" type="measure"/>
     </graph>

From 00fb73fa220febad7eb5fab4343d286ae766ab19 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@odoo.com>
Date: Wed, 9 Jan 2019 09:02:21 +0000
Subject: [PATCH 10/66] [FIX] barcodes: JS documenter fails to infer
 BarcodeEvents

As a result, parsing the JS fails and so does the doc compilation.

Fixes odoo/odoo#29197
Fixes odoo/odoo#29961

closes odoo/odoo#30057
---
 addons/barcodes/static/src/js/barcode_field.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/barcodes/static/src/js/barcode_field.js b/addons/barcodes/static/src/js/barcode_field.js
index ca5baa90b49..d8a7a1c853e 100644
--- a/addons/barcodes/static/src/js/barcode_field.js
+++ b/addons/barcodes/static/src/js/barcode_field.js
@@ -4,7 +4,7 @@ odoo.define('barcodes.field', function(require) {
 var AbstractField = require('web.AbstractField');
 var basicFields = require('web.basic_fields');
 var fieldRegistry = require('web.field_registry');
-var is_special_key = require('barcodes.BarcodeEvents').BarcodeEvents.is_special_key;
+var BarcodeEvents = require('barcodes.BarcodeEvents').BarcodeEvents;
 
 // Field in which the user can both type normally and scan barcodes
 
@@ -42,7 +42,7 @@ var FieldFloatScannable = basicFields.FieldFloat.extend({
     _onKeypress: function (e) {
         /* only simulate a keypress if it has been previously prevented */
         if (e.dispatched_by_barcode_reader !== true) {
-            if (!is_special_key(e)) {
+            if (!BarcodeEvents.is_special_key(e)) {
                 e.preventDefault();
             }
             return;

From 1e9ed52052f9537a210bcc9025c056c5b40e59b2 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@odoo.com>
Date: Wed, 9 Jan 2019 09:16:02 +0000
Subject: [PATCH 11/66] [FIX] mail, sale: indentation & spacing in docstrings

rST is somewhat unforgiving when it comes to whitespace. The extra
indentation on list would generate (nested) blockquotes instead of
just paragraphs & list items, and the missing empty lines would make
rST parse the entire block as a single paragraph rather than a
paragraph followed by a list.

closes odoo/odoo#30058
---
 .../thread_typing_mixin/thread_typing_mixin.js       | 12 ++++++------
 .../static/src/js/thread_windows/thread_window.js    |  6 +++---
 .../sale/static/src/js/product_configurator_mixin.js |  1 +
 .../static/src/js/product_configurator_renderer.js   |  1 +
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/addons/mail/static/src/js/models/threads/thread_typing_mixin/thread_typing_mixin.js b/addons/mail/static/src/js/models/threads/thread_typing_mixin/thread_typing_mixin.js
index fb1a3a91cd1..39721d3f783 100644
--- a/addons/mail/static/src/js/models/threads/thread_typing_mixin/thread_typing_mixin.js
+++ b/addons/mail/static/src/js/models/threads/thread_typing_mixin/thread_typing_mixin.js
@@ -94,17 +94,17 @@ var ThreadTypingMixin = {
      * Get the text to display when some partners are typing something on the
      * thread:
      *
-     *   - single typing partner:
+     * - single typing partner:
      *
-     *          A is typing...
+     *   A is typing...
      *
-     *   - two typing partners:
+     * - two typing partners:
      *
-     *          A and B are typing...
+     *   A and B are typing...
      *
-     *   - three or more typing partners:
+     * - three or more typing partners:
      *
-     *          A, B and more are typing...
+     *   A, B and more are typing...
      *
      * The choice of the members name for display is not random: it displays
      * the user that have been typing for the longest time. Also, this function
diff --git a/addons/mail/static/src/js/thread_windows/thread_window.js b/addons/mail/static/src/js/thread_windows/thread_window.js
index 62468e9ea16..37cd673b053 100644
--- a/addons/mail/static/src/js/thread_windows/thread_window.js
+++ b/addons/mail/static/src/js/thread_windows/thread_window.js
@@ -128,9 +128,9 @@ var ThreadWindow = AbstractThreadWindow.extend({
      *
      * Do not display the input in the following cases:
      *
-     *      - no thread related to this window
-     *      - window of a mailbox (temp: let us have mailboxes in window mode)
-     *      - window of a thread with mass mailing
+     * - no thread related to this window
+     * - window of a mailbox (temp: let us have mailboxes in window mode)
+     * - window of a thread with mass mailing
      *
      * Any other threads show the input in the window.
      *
diff --git a/addons/sale/static/src/js/product_configurator_mixin.js b/addons/sale/static/src/js/product_configurator_mixin.js
index 458dd5a580c..1a74764aacc 100644
--- a/addons/sale/static/src/js/product_configurator_mixin.js
+++ b/addons/sale/static/src/js/product_configurator_mixin.js
@@ -281,6 +281,7 @@ var ProductConfiguratorMixin = {
 
     /**
      * Will return a deferred:
+     *
      * - If the product already exists, immediately resolves it with the product_id
      * - If the product does not exist yet ("dynamic" variant creation), this method will
      *   create the product first and then resolve the deferred with the created product's id
diff --git a/addons/sale/static/src/js/product_configurator_renderer.js b/addons/sale/static/src/js/product_configurator_renderer.js
index 9a613501a2f..899656c8065 100644
--- a/addons/sale/static/src/js/product_configurator_renderer.js
+++ b/addons/sale/static/src/js/product_configurator_renderer.js
@@ -28,6 +28,7 @@ var ProductConfiguratorFormRenderer = FormRenderer.extend(ProductConfiguratorMix
      * Renders the product configurator within the form
      *
      * Will also:
+     *
      * - add events handling for variant changes
      * - trigger variant change to compute the price and other
      *   variant specific changes

From 6be112ac2c5486815fcf7c291ade83c9e22ac2f9 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Wed, 9 Jan 2019 09:51:52 +0000
Subject: [PATCH 12/66] [I18N] website: export missing translations

Following https://github.com/odoo/odoo/commit/7f8631a913de7aebb9b954

opw-1908220

closes odoo/odoo#30060
---
 addons/website/i18n/website.pot | 40 +++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/addons/website/i18n/website.pot b/addons/website/i18n/website.pot
index d8763796e5d..0fc00d20431 100644
--- a/addons/website/i18n/website.pot
+++ b/addons/website/i18n/website.pot
@@ -532,6 +532,26 @@ msgstr ""
 msgid "<i class=\"fa fa-trash-o\"/>Remove Slide"
 msgstr ""
 
+#. module: website
+#: model_terms:ir.ui.view,arch_db:website.list_website_pages
+msgid "<i title=\"Is the page SEO optimized?\" class=\"fa fa-search\"/>"
+msgstr ""
+
+#. module: website
+#: model_terms:ir.ui.view,arch_db:website.list_website_pages
+msgid "<i title=\"Is the page included in the main menu?\" class=\"fa fa-thumb-tack\"/>"
+msgstr ""
+
+#. module: website
+#: model_terms:ir.ui.view,arch_db:website.list_website_pages
+msgid "<i title=\"Is the page indexed by search engines?\" class=\"fa fa-globe\"/>"
+msgstr ""
+
+#. module: website
+#: model_terms:ir.ui.view,arch_db:website.list_website_pages
+msgid "<i title=\"Is the page published?\" class=\"fa fa-eye\"/>"
+msgstr ""
+
 #. module: website
 #: model_terms:ir.ui.view,arch_db:website.s_comparisons
 msgid "<i>Instant setup, satisfied or reimbursed.</i>"
@@ -569,6 +589,16 @@ msgid "<span class=\"carousel-control-prev-icon\"/>\n"
 "            <span class=\"sr-only\">Previous</span>"
 msgstr ""
 
+#. module: website
+#: model_terms:ir.ui.view,arch_db:website.res_config_settings_view_form
+msgid "<span class=\"fa fa-lg fa-globe\" title=\"Values set here are website-specific.\" groups=\"website.group_multi_website\"/>"
+msgstr ""
+
+#. module: website
+#: model_terms:ir.ui.view,arch_db:website.company_description
+msgid "<span class=\"fa fa-map-marker fa-fw mt16\" role=\"img\" aria-label=\"Address\" title=\"Address\"/>"
+msgstr ""
+
 #. module: website
 #: model_terms:ir.ui.view,arch_db:website.user_navbar
 msgid "<span class=\"fa fa-pencil\"/>Edit"
@@ -579,6 +609,11 @@ msgstr ""
 msgid "<span class=\"fa fa-plus\"/>New"
 msgstr ""
 
+#. module: website
+#: model_terms:ir.ui.view,arch_db:website.list_website_pages
+msgid "<span class=\"fa fa-sort fa-lg\" role=\"img\" aria-label=\"Sort\" title=\"Sort\"/>"
+msgstr ""
+
 #. module: website
 #: model_terms:ir.ui.view,arch_db:website.s_facebook_page
 msgid "<span class=\"o_add_facebook_page\">\n"
@@ -617,6 +652,11 @@ msgstr ""
 msgid "<span class=\"sr-only\">Toggle Dropdown</span>"
 msgstr ""
 
+#. module: website
+#: model_terms:ir.ui.view,arch_db:website.user_navbar
+msgid "<span title=\"Mobile preview\" role=\"img\" aria-label=\"Mobile preview\" class=\"fa fa-mobile\"/>"
+msgstr ""
+
 #. module: website
 #: model_terms:ir.ui.view,arch_db:website.user_navbar
 msgid "<span/>\n"

From ccb2fffc6556ffbc940d4a92c89bf06bec1656cd Mon Sep 17 00:00:00 2001
From: Priyanka Kakadiya <pka@odoo.com>
Date: Fri, 23 Nov 2018 06:42:05 +0000
Subject: [PATCH 13/66] [FIX] web: prevent crash in kanban in some cases

Before this commit, if a user tries to group a kanban view by a date or
a datetime interval, then tries to drag and drop a record from one column to
another, then the web client crashes.  This is actually an invalid
operation, and is supposed to be disallowed.  There is already some code
that properly handle the situation.  However, the field attribute was
not properly read in the case of fields of type date/datetime.

Related to Issue: #1911975

Co-authored-by: Mohammed Shekha <msh@openerp.com>

closes odoo/odoo#30029
---
 .../src/js/views/kanban/kanban_renderer.js    |  3 +-
 addons/web/static/tests/views/kanban_tests.js | 39 +++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/views/kanban/kanban_renderer.js b/addons/web/static/src/js/views/kanban/kanban_renderer.js
index 3dc0cae5540..3e17c65ef66 100644
--- a/addons/web/static/src/js/views/kanban/kanban_renderer.js
+++ b/addons/web/static/src/js/views/kanban/kanban_renderer.js
@@ -436,7 +436,8 @@ var KanbanRenderer = BasicRenderer.extend({
     _setState: function (state) {
         this.state = state;
 
-        var groupByField = state.groupedBy[0];
+        // split groupedBy field with ':' as it can be date/datetime field
+        var groupByField = state.groupedBy.length && state.groupedBy[0].split(":")[0];
         var groupByFieldAttrs = state.fields[groupByField];
         var groupByFieldInfo = state.fieldsInfo.kanban[groupByField];
         // Deactivate the drag'n'drop if the groupedBy field:
diff --git a/addons/web/static/tests/views/kanban_tests.js b/addons/web/static/tests/views/kanban_tests.js
index 0591ede9188..87e4ebd2748 100644
--- a/addons/web/static/tests/views/kanban_tests.js
+++ b/addons/web/static/tests/views/kanban_tests.js
@@ -2470,6 +2470,45 @@ QUnit.module('Views', {
         kanban.destroy();
     });
 
+    QUnit.test('prevent drag and drop if grouped by date/datetime field', function (assert) {
+        assert.expect(5);
+
+        this.data.partner.records[0].date = '2017-01-08';
+        this.data.partner.records[1].date = '2017-01-09';
+        this.data.partner.records[2].date = '2017-02-08';
+        this.data.partner.records[3].date = '2017-02-10';
+
+        var kanban = createView({
+            View: KanbanView,
+            model: 'partner',
+            data: this.data,
+            arch: '<kanban class="o_kanban_test">' +
+                        '<field name="bar"/>' +
+                        '<templates><t t-name="kanban-box">' +
+                        '<div><field name="foo"/></div>' +
+                    '</t></templates></kanban>',
+            groupBy: ['date:month'],
+        });
+
+        assert.strictEqual(kanban.$('.o_kanban_group').length, 2, "should have 2 columns");
+        assert.strictEqual(kanban.$('.o_kanban_group:nth-child(1) .o_kanban_record').length, 2,
+                        "1st column should contain 2 records of January month");
+        assert.strictEqual(kanban.$('.o_kanban_group:nth-child(2) .o_kanban_record').length , 2,
+                        "2nd column should contain 2 records of February month");
+
+        // drag&drop a record in another column
+        var $record = kanban.$('.o_kanban_group:nth-child(1) .o_kanban_record:first');
+        var $group = kanban.$('.o_kanban_group:nth-child(2)');
+        testUtils.dragAndDrop($record, $group);
+
+        // should not drag&drop record
+        assert.strictEqual(kanban.$('.o_kanban_group:nth-child(1) .o_kanban_record').length , 2,
+                        "Should remain same records in first column(2 records)");
+        assert.strictEqual(kanban.$('.o_kanban_group:nth-child(2) .o_kanban_record').length , 2,
+                        "Should remain same records in 2nd column(2 record)");
+        kanban.destroy();
+    });
+
     QUnit.test('kanban view with default_group_by', function (assert) {
         assert.expect(7);
         this.data.partner.records.product_id = 1;

From d927dd51bbb182fb998d49ff0b08cfecce27dfb2 Mon Sep 17 00:00:00 2001
From: Romain Derie <rde@odoo.com>
Date: Mon, 24 Dec 2018 15:08:17 +0000
Subject: [PATCH 14/66] [FIX] website_sale_delivery: allow to restrict delivery
 to a website

Before this commit, website_id field would not be added in form view, making it
impossible to set a website on a delivery method and so impossible to restrict
a delivery method to a specific website.

Now, adding this field will be enough as we already search() on
website_published carrier and the delivery.carrier model has the
'website.published.multi.mixin' mixin that will filter accessible website when
searching on website_published field.

+ add missing groups on website_id field
+ remove useless website_published

opw-1918189

closes odoo/odoo#29749
---
 addons/website_blog/views/website_blog_views.xml              | 2 +-
 addons/website_sale_delivery/models/delivery.py               | 1 -
 addons/website_sale_delivery/models/sale_order.py             | 1 +
 .../views/website_sale_delivery_views.xml                     | 4 ++++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/website_blog/views/website_blog_views.xml b/addons/website_blog/views/website_blog_views.xml
index 85386651ec1..a3cc6916d43 100644
--- a/addons/website_blog/views/website_blog_views.xml
+++ b/addons/website_blog/views/website_blog_views.xml
@@ -47,7 +47,7 @@
                     <field name="name"/>
                     <field name="active" invisible="1"/>
                     <field name="blog_id"/>
-                    <field name="website_id"/>
+                    <field name="website_id" groups="website.group_multi_website"/>
                     <field name="visits"/>
                     <field name="create_uid" invisible="1"/>
                     <field name="write_uid"/>
diff --git a/addons/website_sale_delivery/models/delivery.py b/addons/website_sale_delivery/models/delivery.py
index 5a7270c7f1c..6b14ba8004e 100644
--- a/addons/website_sale_delivery/models/delivery.py
+++ b/addons/website_sale_delivery/models/delivery.py
@@ -9,4 +9,3 @@ class DeliveryCarrier(models.Model):
     _inherit = ['delivery.carrier', 'website.published.multi.mixin']
 
     website_description = fields.Text(related='product_id.description_sale', string='Description for Online Quotations', readonly=False)
-    website_published = fields.Boolean(default=False)
diff --git a/addons/website_sale_delivery/models/sale_order.py b/addons/website_sale_delivery/models/sale_order.py
index 4cf21e3b587..3103fb06ab3 100644
--- a/addons/website_sale_delivery/models/sale_order.py
+++ b/addons/website_sale_delivery/models/sale_order.py
@@ -75,6 +75,7 @@ class SaleOrder(models.Model):
 
     def _get_delivery_methods(self):
         address = self.partner_shipping_id
+        # searching on website_published will also search for available website (_search method on computed field)
         return self.env['delivery.carrier'].sudo().search([('website_published', '=', True)]).available_carriers(address)
 
     @api.multi
diff --git a/addons/website_sale_delivery/views/website_sale_delivery_views.xml b/addons/website_sale_delivery/views/website_sale_delivery_views.xml
index 0e60a35fb70..976b0971d7f 100644
--- a/addons/website_sale_delivery/views/website_sale_delivery_views.xml
+++ b/addons/website_sale_delivery/views/website_sale_delivery_views.xml
@@ -6,6 +6,9 @@
         <field name="model">delivery.carrier</field>
         <field name="inherit_id" ref="delivery.view_delivery_carrier_form"/>
         <field name="arch" type="xml">
+            <field name="company_id" position='after'>
+                <field name="website_id" groups="website.group_multi_website" options="{'no_open': True, 'no_create_edit': True}"/>
+            </field>
             <xpath expr="//page[@name='destination']" position='after'>
                 <page string="Description">
                     <field name="website_description"  placeholder="Description displayed on the eCommerce and on online quotations."/>
@@ -26,6 +29,7 @@
         <field name="arch" type="xml">
             <field name="delivery_type" position="after">
                 <field name="website_published"/>
+                <field name="website_id" groups="website.group_multi_website"/>
             </field>
         </field>
     </record>

From 0600253f223b34f20294c5da9c59b2439feafb6d Mon Sep 17 00:00:00 2001
From: Laurent Smet <las@odoo.com>
Date: Thu, 3 Jan 2019 11:34:42 +0000
Subject: [PATCH 15/66] [IMP] account: Search res.partner.bank without partner
 in reconciliation

Search bank account without partner to handle the case the res.partner.bank already exists but is set
on a different partner. Without this commit, the error 'An account with the same number already exists'
was raised.
---
 addons/account/models/account_bank_statement.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/account/models/account_bank_statement.py b/addons/account/models/account_bank_statement.py
index daaff117e79..c51e464ba9e 100644
--- a/addons/account/models/account_bank_statement.py
+++ b/addons/account/models/account_bank_statement.py
@@ -667,8 +667,9 @@ class AccountBankStatementLine(models.Model):
 
         #create the res.partner.bank if needed
         if self.account_number and self.partner_id and not self.bank_account_id:
-            bank_account = self.env['res.partner.bank'].search(
-                [('acc_number', '=', self.account_number), ('partner_id', '=', self.partner_id.id)])
+            # Search bank account without partner to handle the case the res.partner.bank already exists but is set
+            # on a different partner.
+            bank_account = self.env['res.partner.bank'].search([('acc_number', '=', self.account_number)])
             if not bank_account:
                 bank_account = self.env['res.partner.bank'].create({
                     'acc_number': self.account_number, 'partner_id': self.partner_id.id

From 57c6dab075a02a267fcc38ad94f0303a898a3346 Mon Sep 17 00:00:00 2001
From: Laurent Smet <las@odoo.com>
Date: Thu, 3 Jan 2019 12:17:36 +0000
Subject: [PATCH 16/66] [FIX] account: Fix payment's move_name when cancelling

Create a paiement, post it, cancel it, set it to draft, post it again:
The move_name has been incremented instead of staying the same as before.

-opw: 1919241
---
 addons/account/models/account_payment.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/account/models/account_payment.py b/addons/account/models/account_payment.py
index ae3a7862d4e..48bd0c7ddc9 100644
--- a/addons/account/models/account_payment.py
+++ b/addons/account/models/account_payment.py
@@ -736,12 +736,15 @@ class account_payment(models.Model):
         """ Return dict to create the payment move
         """
         journal = journal or self.journal_id
-        return {
+        move_vals = {
             'date': self.payment_date,
             'ref': self.communication or '',
             'company_id': self.company_id.id,
             'journal_id': journal.id,
         }
+        if self.move_name:
+            move_vals['name'] = self.move_name
+        return move_vals
 
     def _get_shared_move_line_vals(self, debit, credit, amount_currency, move_id, invoice_id=False):
         """ Returns values common to both move lines (except for debit, credit and amount_currency which are reversed)

From f24d5dd2b6c2db1726f41f36fb748f93de76dbdf Mon Sep 17 00:00:00 2001
From: Laurent Smet <las@odoo.com>
Date: Thu, 3 Jan 2019 12:27:56 +0000
Subject: [PATCH 17/66] [FIX] account: Fix missing cancel option in Misc.
 journal form

Introduced by:
https://github.com/odoo/odoo/commit/73fc643057958edd37e385148dcf22c768e3cc01

-opw: 1921034

closes odoo/odoo#29885
---
 addons/account/views/account_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/views/account_view.xml b/addons/account/views/account_view.xml
index 6acca695062..92436671b63 100644
--- a/addons/account/views/account_view.xml
+++ b/addons/account/views/account_view.xml
@@ -291,7 +291,7 @@
                                         <field name="inbound_payment_method_ids" widget="many2many_checkboxes"/>
                                         <field name="outbound_payment_method_ids" widget="many2many_checkboxes"/>
                                     </group>
-                                    <group string="Accounting App Options" attrs="{'invisible': [('type', 'not in', ['sale', 'purchase', 'bank', 'cash'])]}">
+                                    <group string="Accounting App Options">
                                         <field name="profit_account_id" attrs="{'invisible': [('type', '!=', 'cash')]}"/>
                                         <field name="loss_account_id" attrs="{'invisible': [('type', '!=', 'cash')]}"/>
                                         <field name="group_invoice_lines" attrs="{'invisible': [('type', 'not in', ['sale', 'purchase'])]}"/>

From 8c5ec851fcc42887d5cf4f2d17ba29136f33f5b7 Mon Sep 17 00:00:00 2001
From: Nans Lefebvre <len@odoo.com>
Date: Tue, 8 Jan 2019 13:43:36 +0000
Subject: [PATCH 18/66] [FIX] website: fix menus unlinking

Fine-tuning of commit b48d2b6b5e3aa0f74.
The call to unlink inside the unlink can recurse infinitely
in case there is a copy of a menu.
We replace that direct call by an accumulator so no recursion occurs.

opw 1922448

closes odoo/odoo#30032
---
 addons/website/models/website.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index 3bddbe532ed..16b6a597969 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -1152,9 +1152,12 @@ class Menu(models.Model):
     @api.multi
     def unlink(self):
         default_menu = self.env.ref('website.main_menu', raise_if_not_found=False)
+        menus_to_remove = self
         for menu in self.filtered(lambda m: default_menu and m.parent_id.id == default_menu.id):
-            self.env['website.menu'].search([('url', '=', menu.url), ('id', '!=', menu.id)]).unlink()
-        return super(Menu, self).unlink()
+            menus_to_remove |= self.env['website.menu'].search([('url', '=', menu.url),
+                                                                ('website_id', '!=', False),
+                                                                ('id', '!=', menu.id)])
+        return super(Menu, menus_to_remove).unlink()
 
     @api.one
     def _compute_visible(self):

From a323b86ecbcad3ede67d8d656655d40bcdc9e6e9 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Wed, 9 Jan 2019 09:27:17 +0000
Subject: [PATCH 19/66] [FIX] l10n_nl: incorrect tax template

Following forward-port.

closes odoo/odoo#30056
---
 addons/l10n_nl/data/account_fiscal_position_tax_template.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_nl/data/account_fiscal_position_tax_template.xml b/addons/l10n_nl/data/account_fiscal_position_tax_template.xml
index c026f355bbb..e59c852ef24 100644
--- a/addons/l10n_nl/data/account_fiscal_position_tax_template.xml
+++ b/addons/l10n_nl/data/account_fiscal_position_tax_template.xml
@@ -112,7 +112,7 @@
         <record id="position_tax_intracom_2_9" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_eu"/>
             <field name="tax_src_id" ref="btw_9"/>
-            <field name="tax_dest_id" ref="btw_X0"/>
+            <field name="tax_dest_id" ref="btw_X0_diensten"/>
         </record>
         <record id="position_tax_intracom_3" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_eu"/>

From ad40ed029ce0cf7cafec4454b4e9ca3a8db33d55 Mon Sep 17 00:00:00 2001
From: Pierre Masereel <pim@odoo.com>
Date: Wed, 9 Jan 2019 12:52:01 +0000
Subject: [PATCH 20/66] [FIX] delivery: weight computation without quant

The weight computation was not working anymore on packages that don't
have any quant, because they are fresh ones.

We fix this by setting back the behaviour with the picking id in
context and adapt the function to find the corresponding move lines.

closes odoo/odoo#30071
---
 addons/delivery/models/stock_picking.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/addons/delivery/models/stock_picking.py b/addons/delivery/models/stock_picking.py
index a9afc258004..e8a1344cb08 100644
--- a/addons/delivery/models/stock_picking.py
+++ b/addons/delivery/models/stock_picking.py
@@ -16,8 +16,13 @@ class StockQuantPackage(models.Model):
     @api.depends('quant_ids')
     def _compute_weight(self):
         weight = 0.0
-        for quant in self.quant_ids:
-            weight += quant.quantity * quant.product_id.weight
+        if self.env.context.get('picking_id'):
+            current_picking_move_line_ids = self.env['stock.move.line'].search([('result_package_id', '=', self.id), ('picking_id', '=', self.env.context['picking_id'])])
+            for ml in current_picking_move_line_ids:
+                weight += ml.product_uom_id._compute_quantity(ml.qty_done,ml.product_id.uom_id) * ml.product_id.weight
+        else:
+            for quant in self.quant_ids:
+                weight += quant.quantity * quant.product_id.weight
         self.weight = weight
 
     weight = fields.Float(compute='_compute_weight', help="Weight computed based on the sum of the weights of the products.")

From 8d6bb22298ed2980124831118a805d3a6a9622f9 Mon Sep 17 00:00:00 2001
From: RomainLibert <rli@odoo.com>
Date: Wed, 9 Jan 2019 15:50:14 +0000
Subject: [PATCH 21/66] [FIX] hr_holidays: use a better heuristic when mode !=
 employee

closes odoo/odoo#30082
---
 addons/hr_holidays/models/hr_leave.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/hr_holidays/models/hr_leave.py b/addons/hr_holidays/models/hr_leave.py
index f597cdc9cb4..9eae41ba5a2 100644
--- a/addons/hr_holidays/models/hr_leave.py
+++ b/addons/hr_holidays/models/hr_leave.py
@@ -431,8 +431,7 @@ class HolidaysRequest(models.Model):
             employee = self.env['hr.employee'].browse(employee_id)
             return employee.get_work_days_data(date_from, date_to)['days']
 
-        time_delta = date_to - date_from
-        return math.ceil(time_delta.days + float(time_delta.seconds) / 86400)
+        return self.env.user.company_id.resource_calendar_id.get_work_hours_count() / HOURS_PER_DAY
 
     ####################################################
     # ORM Overrides methods
@@ -602,7 +601,7 @@ class HolidaysRequest(models.Model):
             'date_from': self.date_from,
             'date_to': self.date_to,
             'notes': self.notes,
-            'number_of_days': self.number_of_days,
+            'number_of_days': employee.get_work_days_data(self.date_from, self.date_to)['days'],
             'parent_id': self.id,
             'employee_id': employee.id
         }

From d73c4e583afbb3fbe2c236c718c04ded7a5e127d Mon Sep 17 00:00:00 2001
From: Romain Derie <rde@odoo.com>
Date: Fri, 21 Dec 2018 13:47:58 +0000
Subject: [PATCH 22/66] [FIX] website_*: prevent record to be unpublished on
 website change

Before this commit, when changing the website field in a record form view,
the is_published field would be force to false, ending unpublishing the record
if it was published.

That behavior was coming from the fact that is_published field is missing from
the form view. Thus, onchange on website is triggering a recompute server side
without is_published as the JS framework is not sending the field.
The ORM is then fallbacking on default Boolean value (False) for is_published
when sending back the onchange result.

This would only appear on object with 'website.published.multi.mixin' and with
website_id in the form view.

task-1919689

closes odoo/odoo#29707
---
 addons/website_event/views/event_views.xml                   | 1 +
 addons/website_hr/views/hr_employee_views.xml                | 1 +
 addons/website_hr_recruitment/views/hr_recruitment_views.xml | 1 +
 addons/website_sale/views/product_views.xml                  | 1 +
 addons/website_slides/views/website_slides_backend.xml       | 1 +
 5 files changed, 5 insertions(+)

diff --git a/addons/website_event/views/event_views.xml b/addons/website_event/views/event_views.xml
index 7e4df97c36a..37391294ebc 100644
--- a/addons/website_event/views/event_views.xml
+++ b/addons/website_event/views/event_views.xml
@@ -40,6 +40,7 @@
                         class="oe_stat_button"
                         icon="fa-globe">
                     <field name="website_published" widget="website_button"/>
+                    <field name="is_published" invisible="1"/>
                 </button>
             </button>
             <label for="is_online" position="after">
diff --git a/addons/website_hr/views/hr_employee_views.xml b/addons/website_hr/views/hr_employee_views.xml
index e48c6e6b38d..85dc0039676 100644
--- a/addons/website_hr/views/hr_employee_views.xml
+++ b/addons/website_hr/views/hr_employee_views.xml
@@ -10,6 +10,7 @@
                 <button class="oe_stat_button" name="website_publish_button"
                     type="object" icon="fa-globe" groups="hr.group_hr_user">
                     <field name="website_published" widget="website_button"/>
+                    <field name="is_published" invisible="1"/>
                 </button>
             </button>
             <xpath expr="//page[@name='public']/group" position="inside">
diff --git a/addons/website_hr_recruitment/views/hr_recruitment_views.xml b/addons/website_hr_recruitment/views/hr_recruitment_views.xml
index b74351b389a..059041a31b5 100644
--- a/addons/website_hr_recruitment/views/hr_recruitment_views.xml
+++ b/addons/website_hr_recruitment/views/hr_recruitment_views.xml
@@ -20,6 +20,7 @@
                 <button class="oe_stat_button" name="website_publish_button"
                     type="object" icon="fa-globe">
                     <field name="website_published" widget="website_button"/>
+                    <field name="is_published" invisible="1"/>
                 </button>
             </div>
         </field>
diff --git a/addons/website_sale/views/product_views.xml b/addons/website_sale/views/product_views.xml
index d3f3fbd2a81..52b57be8deb 100644
--- a/addons/website_sale/views/product_views.xml
+++ b/addons/website_sale/views/product_views.xml
@@ -88,6 +88,7 @@
                 <button class="oe_stat_button" name="website_publish_button"
                     type="object" icon="fa-globe" attrs="{'invisible': [('sale_ok','=',False)]}">
                     <field name="website_published" widget="website_button"/>
+                    <field name="is_published" invisible="1"/>
                 </button>
             </xpath>
             <xpath expr="//page[@name='sales']" position="after">
diff --git a/addons/website_slides/views/website_slides_backend.xml b/addons/website_slides/views/website_slides_backend.xml
index cf496a3d24b..ff0049de680 100644
--- a/addons/website_slides/views/website_slides_backend.xml
+++ b/addons/website_slides/views/website_slides_backend.xml
@@ -212,6 +212,7 @@
                             <button class="oe_stat_button" name="website_publish_button"
                                     type="object" icon="fa-globe">
                                 <field name="website_published" widget="website_button"/>
+                                <field name="is_published" invisible="1"/>
                             </button>
                             <button name="toggle_active" type="object" confirm="(Un)archiving a channel automatically (un)archives its slides. Do you want to proceed?" class="oe_stat_button" icon="fa-archive">
                                 <field name="active" widget="boolean_button" options='{"terminology": "archive"}'/>

From 42230ed22efdbc58fbaf3fdfb753560b1c4cdb2a Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Thu, 20 Dec 2018 12:01:53 +0100
Subject: [PATCH 23/66] [FIX] website_sale: make eCommerce animations work in
 all browsers

The eCommerce sometimes animates product images when they are put in
the cart / wishlist / comparison panel. Those animations did not work
on Firefox and IE and made strange scrollbars appear instead.
---
 addons/website_sale/static/src/css/website_sale.css  | 2 +-
 addons/website_sale/static/src/css/website_sale.sass | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website_sale/static/src/css/website_sale.css b/addons/website_sale/static/src/css/website_sale.css
index 8f71e5bbfbd..78c6e86126e 100644
--- a/addons/website_sale/static/src/css/website_sale.css
+++ b/addons/website_sale/static/src/css/website_sale.css
@@ -643,7 +643,7 @@ a.no-decoration {
 
 .o_website_sale_animate {
   opacity: 0.7;
-  position: absolute;
+  position: absolute !important;
   height: 150px;
   width: 150px;
   z-index: 1020;
diff --git a/addons/website_sale/static/src/css/website_sale.sass b/addons/website_sale/static/src/css/website_sale.sass
index 3c1abfeb323..3bf9b0e8c97 100644
--- a/addons/website_sale/static/src/css/website_sale.sass
+++ b/addons/website_sale/static/src/css/website_sale.sass
@@ -567,7 +567,7 @@ a.no-decoration
 
 .o_website_sale_animate
     opacity: 0.7
-    position: absolute
+    position: absolute !important
     height: 150px
     width: 150px
     z-index: 1020

From b131658966a347ec0058b713610e123347799cd7 Mon Sep 17 00:00:00 2001
From: Jorge Pinna Puissant <jpp@odoo.com>
Date: Tue, 8 Jan 2019 10:48:20 +0000
Subject: [PATCH 24/66] [FIX] account: error in Base amount tax opw-1917605

Before this commit, when accounting is set to global rounding, the base
amount per tax is not correctly calculated.

Now, the Base amount per tax is calculated adding the rounded lines.

To test this issue, you need to set to global rounding and create a
customer invoice with the following lines :
line 1 = Qty:40; unit price:2.27; tax:15%; discount: 10%
line 2 = Qty:21; unit price:2.77; tax:15%; discount: 10%
line 3 = Qty:21; unit price:2.77; tax:15%; discount: 10%

When the invoce is printed, you would notice that the amount is 186.43
and it should be 186.42.

closes odoo/odoo#30021
---
 addons/account/models/account_invoice.py      |  4 +-
 .../tests/test_account_customer_invoice.py    | 63 +++++++++++++++++++
 2 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/addons/account/models/account_invoice.py b/addons/account/models/account_invoice.py
index 240d63ea7fc..aff495072ce 100644
--- a/addons/account/models/account_invoice.py
+++ b/addons/account/models/account_invoice.py
@@ -642,6 +642,7 @@ class AccountInvoice(models.Model):
     @api.multi
     def get_taxes_values(self):
         tax_grouped = {}
+        round_curr = self.currency_id.round
         for line in self.invoice_line_ids:
             price_unit = line.price_unit * (1 - (line.discount or 0.0) / 100.0)
             taxes = line.invoice_line_tax_ids.compute_all(price_unit, self.currency_id, line.quantity, line.product_id, self.partner_id)['taxes']
@@ -651,9 +652,10 @@ class AccountInvoice(models.Model):
 
                 if key not in tax_grouped:
                     tax_grouped[key] = val
+                    tax_grouped[key]['base'] = round_curr(val['base'])
                 else:
                     tax_grouped[key]['amount'] += val['amount']
-                    tax_grouped[key]['base'] += val['base']
+                    tax_grouped[key]['base'] += round_curr(val['base'])
         return tax_grouped
 
     @api.multi
diff --git a/addons/account/tests/test_account_customer_invoice.py b/addons/account/tests/test_account_customer_invoice.py
index 0c559892644..12a164cd3cb 100644
--- a/addons/account/tests/test_account_customer_invoice.py
+++ b/addons/account/tests/test_account_customer_invoice.py
@@ -107,3 +107,66 @@ class TestAccountCustomerInvoice(AccountTestUsers):
 
         # I clicked on refund button.
         self.account_invoice_refund_0.invoice_refund()
+
+    def test_customer_invoice_tax(self):
+
+        self.env.user.company_id.tax_calculation_rounding_method = 'round_globally'
+
+        payment_term = self.env.ref('account.account_payment_term_advance')
+        journalrec = self.env['account.journal'].search([('type', '=', 'sale')])[0]
+        partner3 = self.env.ref('base.res_partner_3')
+        account_id = self.env['account.account'].search([('user_type_id', '=', self.env.ref('account.data_account_type_revenue').id)], limit=1).id
+
+        tax = self.env['account.tax'].create({
+            'name': 'Tax 15.0',
+            'amount': 15.0,
+            'amount_type': 'percent',
+            'type_tax_use': 'sale',
+        })
+
+        invoice_line_data = [
+            (0, 0,
+                {
+                    'product_id': self.env.ref('product.product_product_1').id,
+                    'quantity': 40.0,
+                    'account_id': account_id,
+                    'name': 'product test 1',
+                    'discount' : 10.00,
+                    'price_unit': 2.27,
+                    'invoice_line_tax_ids': [(6, 0, [tax.id])],
+                }
+             ),
+              (0, 0,
+                {
+                    'product_id': self.env.ref('product.product_product_2').id,
+                    'quantity': 21.0,
+                    'account_id': self.env['account.account'].search([('user_type_id', '=', self.env.ref('account.data_account_type_revenue').id)], limit=1).id,
+                    'name': 'product test 2',
+                    'discount' : 10.00,
+                    'price_unit': 2.77,
+                    'invoice_line_tax_ids': [(6, 0, [tax.id])],
+                }
+             ),
+             (0, 0,
+                {
+                    'product_id': self.env.ref('product.product_product_3').id,
+                    'quantity': 21.0,
+                    'account_id': self.env['account.account'].search([('user_type_id', '=', self.env.ref('account.data_account_type_revenue').id)], limit=1).id,
+                    'name': 'product test 3',
+                    'discount' : 10.00,
+                    'price_unit': 2.77,
+                    'invoice_line_tax_ids': [(6, 0, [tax.id])],
+                }
+             )
+        ]
+
+        invoice = self.env['account.invoice'].create(dict(
+            name="Test Customer Invoice",
+            reference_type="none",
+            payment_term_id=payment_term.id,
+            journal_id=journalrec.id,
+            partner_id=partner3.id,
+            invoice_line_ids=invoice_line_data
+        ))
+
+        self.assertEquals(invoice.amount_untaxed, sum([x.base for x in invoice.tax_line_ids]))

From 3929e419ffdbf49ed9b0c1370a2538e86e2aac34 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Fri, 4 Jan 2019 13:41:17 +0000
Subject: [PATCH 25/66] [FIX] stock: assign partner

- Create a SO with a stockable product, validate
- On the corresponding picking, change the partner
- Print the 'Picking Operations' or 'Delivery Slip'

The partner printed is the partner of the SO, not of the picking.

This was reported many times in the past, and is quite confusing. It
happens because the partner on the `stock.move` remains the partner set
on the SO.

We shouldn't change the reports, nor automatically propagate the change
since it might cause issues, e.g. in case on dropshipping or manual
creation of the picking.

Therefore, we add an action which allows to set the partner on the stock
move manually.

opw-1917851

closes odoo/odoo#29939
---
 addons/stock/i18n/stock.pot                | 10 ++++++++++
 addons/stock/models/stock_picking.py       |  4 ++++
 addons/stock/views/stock_picking_views.xml |  3 +++
 3 files changed, 17 insertions(+)

diff --git a/addons/stock/i18n/stock.pot b/addons/stock/i18n/stock.pot
index 39533e3c765..845d5707750 100644
--- a/addons/stock/i18n/stock.pot
+++ b/addons/stock/i18n/stock.pot
@@ -716,6 +716,16 @@ msgstr ""
 msgid "Assign Owner"
 msgstr ""
 
+#. module: stock
+#: model:ir.ui.view,arch_db:stock.view_picking_form
+msgid "Assign Partner"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.view,arch_db:stock.view_picking_form
+msgid "Assign the partner to the Operations. Use only if the partner is manually changed!"
+msgstr ""
+
 #. module: stock
 #: model:ir.ui.view,arch_db:stock.view_picking_internal_search
 msgid "Assigned Moves"
diff --git a/addons/stock/models/stock_picking.py b/addons/stock/models/stock_picking.py
index 6be5cd8b26a..47e0fcceaec 100644
--- a/addons/stock/models/stock_picking.py
+++ b/addons/stock/models/stock_picking.py
@@ -547,6 +547,10 @@ class Picking(models.Model):
     def action_assign_owner(self):
         self.move_line_ids.write({'owner_id': self.owner_id.id})
 
+    def action_assign_partner(self):
+        for picking in self:
+            picking.move_lines.write({'partner_id': picking.partner_id.id})
+
     @api.multi
     def do_print_picking(self):
         self.write({'printed': True})
diff --git a/addons/stock/views/stock_picking_views.xml b/addons/stock/views/stock_picking_views.xml
index 4c459ad2d9c..a39c5794652 100644
--- a/addons/stock/views/stock_picking_views.xml
+++ b/addons/stock/views/stock_picking_views.xml
@@ -242,6 +242,9 @@
                     <group>
                         <group>
                             <field name="partner_id" attrs="{'invisible': [('picking_type_code', '=', 'internal')]}"/>
+                            <button name="action_assign_partner" string="Assign Partner" type="object" help="Assign the partner to the Operations. Use only if the partner is manually changed!"
+                                    attrs="{'invisible': ['|', '|', ('move_line_exist', '=', False), ('state', 'not in', ('draft', 'assigned', 'confirmed')), ('picking_type_code', '=', 'internal')]}"
+                                    class="oe_link oe_edit_only"/>
                             <field name="location_id" groups="stock.group_stock_multi_locations" attrs="{'invisible': [('picking_type_code', '=', 'incoming')]}"/>
                             <field name="location_dest_id" groups="stock.group_stock_multi_locations" attrs="{'invisible': [('picking_type_code', '=', 'outgoing')]}"/>
                             <field name="backorder_id" readonly="1" attrs="{'invisible': [('backorder_id','=',False)]}"/>

From 5efec7ccdd8ca3f15fad5df8de7c23154c23a7d9 Mon Sep 17 00:00:00 2001
From: Romain Estievenart <res@odoo.com>
Date: Fri, 4 Jan 2019 13:26:08 +0000
Subject: [PATCH 26/66] [FIX] sale_timesheet: responsive table

On small screens, when we click on the overview of a task
inside the "project" app, the displayed table doesn't fit the screen.

This commit only add missing parent "div.table-responsive" to add
responsive support.

A better fix has been merged in master, see:
https://github.com/odoo/odoo/commit/dc017d17e9170d3fc0a5104ab9dc84f748bc097a

opw-1907877

closes odoo/odoo#29971
---
 addons/sale_timesheet/static/src/js/timesheet_plan.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/addons/sale_timesheet/static/src/js/timesheet_plan.js b/addons/sale_timesheet/static/src/js/timesheet_plan.js
index 2aa8dd7b631..72309b3d705 100644
--- a/addons/sale_timesheet/static/src/js/timesheet_plan.js
+++ b/addons/sale_timesheet/static/src/js/timesheet_plan.js
@@ -105,7 +105,13 @@ var PlanAction = Widget.extend(ControlPanelMixin, {
      * @private
      */
     _refreshPlan: function(dom){
-        this.$el.html(dom);
+        // TODO: Not forward port this fix on master
+        var $dom = $(dom);
+        $dom.find('div.o_timesheet_plan_sale_timesheet_dashboard > table.table, ' +
+            'div.o_timesheet_plan_sale_timesheet_people_time > table.table, ' +
+            'div.o_project_plan_project_timesheet_forecast > table.table')
+            .wrap('<div class="table-responsive"></div>');
+        this.$el.html($dom);
     },
     /**
      * Call controller to get the html content

From 313b133878579d146582f9e481267f1ef00736ac Mon Sep 17 00:00:00 2001
From: Gert Pellin <gpe@odoo.com>
Date: Tue, 8 Jan 2019 10:02:04 +0000
Subject: [PATCH 27/66] [FIX] point_of_sale: Correct move amount lot

Before this fix, if 2 or more sale lines have the same product with different
lot-numbers the amount for each move will be set to the total amount of the
product.

This fix resolves this problem and will only count the amount sold of
each lot.

Resolves https://github.com/odoo/odoo/issues/30006

closes odoo/odoo#30019
---
 addons/point_of_sale/models/pos_order.py | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/addons/point_of_sale/models/pos_order.py b/addons/point_of_sale/models/pos_order.py
index 78ade683b51..f2787fc3bac 100644
--- a/addons/point_of_sale/models/pos_order.py
+++ b/addons/point_of_sale/models/pos_order.py
@@ -834,21 +834,18 @@ class PosOrder(models.Model):
                 lots_necessary = True
                 if picking_type:
                     lots_necessary = picking_type and picking_type.use_existing_lots
-                qty = 0
                 qty_done = 0
                 pack_lots = []
                 pos_pack_lots = PosPackOperationLot.search([('order_id', '=', order.id), ('product_id', '=', move.product_id.id)])
-                pack_lot_names = [pos_pack.lot_name for pos_pack in pos_pack_lots]
 
-                if pack_lot_names and lots_necessary:
-                    for lot_name in list(set(pack_lot_names)):
-                        stock_production_lot = StockProductionLot.search([('name', '=', lot_name), ('product_id', '=', move.product_id.id)])
+                if pos_pack_lots and lots_necessary:
+                    for pos_pack_lot in pos_pack_lots:
+                        stock_production_lot = StockProductionLot.search([('name', '=', pos_pack_lot.lot_name), ('product_id', '=', move.product_id.id)])
                         if stock_production_lot:
+                            # a serialnumber always has a quantity of 1 product, a lot number takes the full quantity of the order line
+                            qty = 1.0
                             if stock_production_lot.product_id.tracking == 'lot':
-                                # if a lot nr is set through the frontend it will refer to the full quantity
-                                qty = move.product_uom_qty
-                            else: # serial numbers
-                                qty = 1.0
+                                qty = pos_pack_lot.pos_order_line_id.qty
                             qty_done += qty
                             pack_lots.append({'lot_id': stock_production_lot.id, 'qty': qty})
                         else:

From 13e47f508fe37f986a6f72eb3551d859cac99a83 Mon Sep 17 00:00:00 2001
From: Jorge Pinna Puissant <jpp@odoo.com>
Date: Wed, 9 Jan 2019 13:44:06 +0000
Subject: [PATCH 28/66] [FIX] payment_authorize: customer profile without email
 opw-1920083

Before this commit, an error arrived when creating a customer profile
without email.
Now, if the email don't exists we send an empty string to Authorize.

closes odoo/odoo#30075
---
 addons/payment_authorize/models/authorize_request.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/payment_authorize/models/authorize_request.py b/addons/payment_authorize/models/authorize_request.py
index 8a7b07c3b29..e23735fe037 100644
--- a/addons/payment_authorize/models/authorize_request.py
+++ b/addons/payment_authorize/models/authorize_request.py
@@ -134,7 +134,7 @@ class AuthorizeAPI():
         root = self._base_tree('createCustomerProfileRequest')
         profile = etree.SubElement(root, "profile")
         etree.SubElement(profile, "merchantCustomerId").text = 'ODOO-%s-%s' % (partner.id, uuid4().hex[:8])
-        etree.SubElement(profile, "email").text = partner.email
+        etree.SubElement(profile, "email").text = partner.email or ''
         payment_profile = etree.SubElement(profile, "paymentProfiles")
         etree.SubElement(payment_profile, "customerType").text = 'business' if partner.is_company else 'individual'
         billTo = etree.SubElement(payment_profile, "billTo")

From 9246375b25f4e90000bb6e578aceb8a116dfc28a Mon Sep 17 00:00:00 2001
From: Gert Pellin <gpe@odoo.com>
Date: Tue, 8 Jan 2019 13:17:16 +0000
Subject: [PATCH 29/66] [fix] point_of_sale: payment screen backspace

before the fix if hitting the backspace in point of paiment screen would
triger the keypress event twice.

removed the double eventhandler

resolves https://github.com/odoo/odoo/issues/29911

closes odoo/odoo#30031
---
 addons/point_of_sale/static/src/js/screens.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js
index f4ff433bf71..139a05459f7 100644
--- a/addons/point_of_sale/static/src/js/screens.js
+++ b/addons/point_of_sale/static/src/js/screens.js
@@ -1959,16 +1959,11 @@ var PaymentScreenWidget = ScreenWidget.extend({
         $('body').keypress(this.keyboard_handler);
         // that one comes from the pos, but we prefer to cover all the basis
         $('body').keydown(this.keyboard_keydown_handler);
-        // legacy vanilla JS listeners
-        window.document.body.addEventListener('keypress',this.keyboard_handler);
-        window.document.body.addEventListener('keydown',this.keyboard_keydown_handler);
         this._super();
     },
     hide: function(){
         $('body').off('keypress', this.keyboard_handler);
         $('body').off('keydown', this.keyboard_keydown_handler);
-        window.document.body.removeEventListener('keypress',this.keyboard_handler);
-        window.document.body.removeEventListener('keydown',this.keyboard_keydown_handler);
         this._super();
     },
     // sets up listeners to watch for order changes

From e8a01ddc8870702e62cc23b7efce53ae42fe04dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Theys?= <seb@odoo.com>
Date: Wed, 9 Jan 2019 11:46:48 +0000
Subject: [PATCH 30/66] [FIX] product,sale,website_sale: fix currency
 conversion of product
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In commit f8dad1bb4b712d8f34035420ef1f6e484c638f5b, we tried to fix the currency
conversion of products by always using the currency of the product as the base.
This is still correct.

However, the conversion method also needs to know the company (to find the
correct currency rate), and it was assumed the company was also always set on
the product. This is of course not correct when using multi-company.

In this commit we fix that issue by falling back if no company is set on the
product. The order of the fallback is: product website company, given website
company, given pricelist company, current user company.

closes #29905
closes #29946
closes #30046

Co-authored-by: Sébastien Theys <seb@odoo.com>
Co-authored-by: Wolfgang Taferner <wolfgang.taferner@wt-io-it.at>
---
 addons/product/models/product_template.py     | 30 +++++++++++++++++++
 addons/sale/models/product_template.py        | 10 ++++++-
 ...est_sale_product_attribute_value_config.py |  5 ++++
 addons/website_sale/controllers/main.py       |  7 +++--
 addons/website_sale/models/product.py         |  8 +++++
 5 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/addons/product/models/product_template.py b/addons/product/models/product_template.py
index 7c4bb62ddd3..bf0b9786623 100644
--- a/addons/product/models/product_template.py
+++ b/addons/product/models/product_template.py
@@ -909,6 +909,36 @@ class ProductTemplate(models.Model):
                 return result
             combination = combination[:-1]
 
+    @api.multi
+    def _get_current_company(self, **kwargs):
+        """Get the most appropriate company for this product.
+
+        If the company is set on the product, directly return it. Otherwise,
+        fallback to a contextual company.
+
+        :param kwargs: kwargs forwarded to the fallback method.
+
+        :return: the most appropriate company for this product
+        :rtype: recordset of one `res.company`
+        """
+        self.ensure_one()
+        return self.company_id or self._get_current_company_fallback(**kwargs)
+
+    @api.multi
+    def _get_current_company_fallback(self, **kwargs):
+        """Fallback to get the most appropriate company for this product.
+
+        This should only be called from `_get_current_company` but is defined
+        separately to allow override.
+
+        The final fallback will be the current user's company.
+
+        :return: the fallback company for this product
+        :rtype: recordset of one `res.company`
+        """
+        self.ensure_one()
+        return self.env.user.company_id
+
     @api.model
     def get_empty_list_help(self, help):
         self = self.with_context(
diff --git a/addons/sale/models/product_template.py b/addons/sale/models/product_template.py
index 8daa24e9f37..b0cd6345784 100644
--- a/addons/sale/models/product_template.py
+++ b/addons/sale/models/product_template.py
@@ -258,7 +258,7 @@ class ProductTemplate(models.Model):
 
         if pricelist and pricelist.currency_id != product_template.currency_id:
             list_price = product_template.currency_id._convert(
-                list_price, pricelist.currency_id, product_template.company_id,
+                list_price, pricelist.currency_id, product_template._get_current_company(pricelist=pricelist),
                 fields.Date.today()
             )
 
@@ -293,3 +293,11 @@ class ProductTemplate(models.Model):
             return False
         combination = self._get_first_possible_combination(parent_combination)
         return True if combination else self._is_combination_possible(combination, parent_combination)
+
+    @api.multi
+    def _get_current_company_fallback(self, **kwargs):
+        """Override: if a pricelist is given, fallback to the company of the
+        pricelist if it is set, otherwise use the one from parent method."""
+        res = super(ProductTemplate, self)._get_current_company_fallback(**kwargs)
+        pricelist = kwargs.get('pricelist')
+        return pricelist and pricelist.company_id or res
diff --git a/addons/sale/tests/test_sale_product_attribute_value_config.py b/addons/sale/tests/test_sale_product_attribute_value_config.py
index dd36a916778..95b1814f50e 100644
--- a/addons/sale/tests/test_sale_product_attribute_value_config.py
+++ b/addons/sale/tests/test_sale_product_attribute_value_config.py
@@ -185,6 +185,11 @@ class TestSaleProductAttributeValueConfig(TestSaleProductAttributeValueSetup):
         do_test(self)
 
     def test_02_get_combination_info(self):
+        # If using multi-company, company_id will be False, and this code should
+        # still work.
+        # The case with a company_id will be implicitly tested on website_sale.
+        self.computer.company_id = False
+
         computer_ssd_256 = self._get_product_template_attribute_value(self.ssd_256)
         computer_ram_8 = self._get_product_template_attribute_value(self.ram_8)
         computer_hdd_1 = self._get_product_template_attribute_value(self.hdd_1)
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index aec6d3b17ed..80b50fa61db 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -150,9 +150,10 @@ class WebsiteSale(ProductConfiguratorController):
         return pricelist_context, pricelist
 
     def _get_compute_currency(self, pricelist, product=None):
-        from_currency = (product or request.env.user.company_id).currency_id
+        company = product and product._get_current_company(pricelist=pricelist, website=request.website) or pricelist.company_id or request.website.company_id
+        from_currency = (product or company).currency_id
         to_currency = pricelist.currency_id
-        return lambda price: from_currency._convert(price, to_currency, (product or request.env.user).company_id, fields.Date.today())
+        return lambda price: from_currency._convert(price, to_currency, company, fields.Date.today())
 
     def _get_search_order(self, post):
         # OrderBy will be parsed in orm and so no direct sql injection
@@ -312,7 +313,7 @@ class WebsiteSale(ProductConfiguratorController):
         pricelist = request.website.get_current_pricelist()
 
         def compute_currency(price):
-            return product.currency_id._convert(price, pricelist.currency_id, product.company_id, fields.Date.today())
+            return product.currency_id._convert(price, pricelist.currency_id, product._get_current_company(pricelist=pricelist, website=request.website), fields.Date.today())
 
         if not product_context.get('pricelist'):
             product_context['pricelist'] = pricelist.id
diff --git a/addons/website_sale/models/product.py b/addons/website_sale/models/product.py
index db7d9d9cd96..db0ac30f060 100644
--- a/addons/website_sale/models/product.py
+++ b/addons/website_sale/models/product.py
@@ -286,6 +286,14 @@ class ProductTemplate(models.Model):
         """
         return self._create_product_variant(self._get_first_possible_combination(), log_warning)
 
+    @api.multi
+    def _get_current_company_fallback(self, **kwargs):
+        """Override: if a website is set on the product or given, fallback to
+        the company of the website. Otherwise use the one from parent method."""
+        res = super(ProductTemplate, self)._get_current_company_fallback(**kwargs)
+        website = self.website_id or kwargs.get('website')
+        return website and website.company_id or res
+
     def _default_website_sequence(self):
         self._cr.execute("SELECT MIN(website_sequence) FROM %s" % self._table)
         min_sequence = self._cr.fetchone()[0]

From 82ea843585fe6c22108532e2c7918077f11a15d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Theys?= <seb@odoo.com>
Date: Wed, 9 Jan 2019 14:38:17 +0000
Subject: [PATCH 31/66] [FIX] base,product,website_sale: default to main
 company currency

When using multi-company, the base currency of a product is the currency of the
main company, not a contextual company.

closes #29905
closes #29946
closes #30046
---
 addons/product/models/product_template.py | 5 +----
 addons/website_sale/controllers/main.py   | 2 +-
 odoo/addons/base/models/res_company.py    | 9 +++++++++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/addons/product/models/product_template.py b/addons/product/models/product_template.py
index bf0b9786623..1fcc1afacc7 100644
--- a/addons/product/models/product_template.py
+++ b/addons/product/models/product_template.py
@@ -153,10 +153,7 @@ class ProductTemplate(models.Model):
 
     @api.multi
     def _compute_currency_id(self):
-        try:
-            main_company = self.sudo().env.ref('base.main_company')
-        except ValueError:
-            main_company = self.env['res.company'].sudo().search([], limit=1, order="id")
+        main_company = self.env['res.company']._get_main_company()
         for template in self:
             template.currency_id = template.company_id.sudo().currency_id.id or main_company.currency_id.id
 
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 80b50fa61db..0b5ed81a6e5 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -151,7 +151,7 @@ class WebsiteSale(ProductConfiguratorController):
 
     def _get_compute_currency(self, pricelist, product=None):
         company = product and product._get_current_company(pricelist=pricelist, website=request.website) or pricelist.company_id or request.website.company_id
-        from_currency = (product or company).currency_id
+        from_currency = (product or request.env['res.company']._get_main_company()).currency_id
         to_currency = pricelist.currency_id
         return lambda price: from_currency._convert(price, to_currency, company, fields.Date.today())
 
diff --git a/odoo/addons/base/models/res_company.py b/odoo/addons/base/models/res_company.py
index 64fb3ee6fb2..d62096fe561 100644
--- a/odoo/addons/base/models/res_company.py
+++ b/odoo/addons/base/models/res_company.py
@@ -296,3 +296,12 @@ class Company(models.Model):
     def action_save_onboarding_company_step(self):
         if bool(self.street):
             self.set_onboarding_step_done('base_onboarding_company_state')
+
+    @api.model
+    def _get_main_company(self):
+        try:
+            main_company = self.sudo().env.ref('base.main_company')
+        except ValueError:
+            main_company = self.env['res.company'].sudo().search([], limit=1, order="id")
+
+        return main_company

From ed99544dfa88fa5769574a0b6db677e8f31edcd1 Mon Sep 17 00:00:00 2001
From: Nicolas Lempereur <nle@odoo.com>
Date: Tue, 8 Jan 2019 13:36:55 +0000
Subject: [PATCH 32/66] [FIX] translate.py: really generate missing terms

With 12.0's (#28297) empty translations were no longer added by default
with the idea that if needed the "Generate Missing Terms" wizard should
be used.

But that wizard itself used what was modified so also did not added
empty translation.

With this changeset, empty translations are added when using the
"Generate Missing Terms" wizard.

fixes #29184
closes #30037
---
 odoo/addons/base/models/ir_translation.py            | 12 ++++++++----
 odoo/addons/base/wizard/base_update_translations.py  |  3 ++-
 .../test_translation_import/tests/test_term_count.py | 12 +++++++++---
 odoo/tools/translate.py                              |  4 ++--
 4 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/odoo/addons/base/models/ir_translation.py b/odoo/addons/base/models/ir_translation.py
index 4bc659ef6bd..15d03256ea5 100644
--- a/odoo/addons/base/models/ir_translation.py
+++ b/odoo/addons/base/models/ir_translation.py
@@ -141,7 +141,8 @@ class IrTranslationImport(object):
                            WHERE type = 'code'
                            AND noupdate IS NOT TRUE
                            ON CONFLICT (type, lang, md5(src)) WHERE type = 'code'
-                            DO UPDATE SET (name, lang, res_id, src, type, value, module, state, comments) = (EXCLUDED.name, EXCLUDED.lang, EXCLUDED.res_id, EXCLUDED.src, EXCLUDED.type, EXCLUDED.value, EXCLUDED.module, EXCLUDED.state, EXCLUDED.comments);
+                            DO UPDATE SET (name, lang, res_id, src, type, value, module, state, comments) = (EXCLUDED.name, EXCLUDED.lang, EXCLUDED.res_id, EXCLUDED.src, EXCLUDED.type, EXCLUDED.value, EXCLUDED.module, EXCLUDED.state, EXCLUDED.comments)
+                            WHERE EXCLUDED.value IS NOT NULL AND EXCLUDED.value != '';
                        """ % (self._model_table, self._table))
             count += cr.rowcount
             cr.execute(""" INSERT INTO %s(name, lang, res_id, src, type, value, module, state, comments)
@@ -150,7 +151,8 @@ class IrTranslationImport(object):
                            WHERE type = 'model'
                            AND noupdate IS NOT TRUE
                            ON CONFLICT (type, lang, name, res_id) WHERE type = 'model'
-                            DO UPDATE SET (name, lang, res_id, src, type, value, module, state, comments) = (EXCLUDED.name, EXCLUDED.lang, EXCLUDED.res_id, EXCLUDED.src, EXCLUDED.type, EXCLUDED.value, EXCLUDED.module, EXCLUDED.state, EXCLUDED.comments);
+                            DO UPDATE SET (name, lang, res_id, src, type, value, module, state, comments) = (EXCLUDED.name, EXCLUDED.lang, EXCLUDED.res_id, EXCLUDED.src, EXCLUDED.type, EXCLUDED.value, EXCLUDED.module, EXCLUDED.state, EXCLUDED.comments)
+                            WHERE EXCLUDED.value IS NOT NULL AND EXCLUDED.value != '';
                        """ % (self._model_table, self._table))
             count += cr.rowcount
             cr.execute(""" INSERT INTO %s(name, lang, res_id, src, type, value, module, state, comments)
@@ -159,7 +161,8 @@ class IrTranslationImport(object):
                            WHERE type IN ('selection', 'constraint', 'sql_constraint')
                            AND noupdate IS NOT TRUE
                            ON CONFLICT (type, lang, name, md5(src)) WHERE type IN ('selection', 'constraint', 'sql_constraint')
-                            DO UPDATE SET (name, lang, res_id, src, type, value, module, state, comments) = (EXCLUDED.name, EXCLUDED.lang, EXCLUDED.res_id, EXCLUDED.src, EXCLUDED.type, EXCLUDED.value, EXCLUDED.module, EXCLUDED.state, EXCLUDED.comments);
+                            DO UPDATE SET (name, lang, res_id, src, type, value, module, state, comments) = (EXCLUDED.name, EXCLUDED.lang, EXCLUDED.res_id, EXCLUDED.src, EXCLUDED.type, EXCLUDED.value, EXCLUDED.module, EXCLUDED.state, EXCLUDED.comments)
+                            WHERE EXCLUDED.value IS NOT NULL AND EXCLUDED.value != '';
                        """ % (self._model_table, self._table))
             count += cr.rowcount
             cr.execute(""" INSERT INTO %s(name, lang, res_id, src, type, value, module, state, comments)
@@ -168,7 +171,8 @@ class IrTranslationImport(object):
                            WHERE type = 'model_terms'
                            AND noupdate IS NOT TRUE
                            ON CONFLICT (type, name, lang, res_id, md5(src))
-                            DO UPDATE SET (name, lang, res_id, src, type, value, module, state, comments) = (EXCLUDED.name, EXCLUDED.lang, EXCLUDED.res_id, EXCLUDED.src, EXCLUDED.type, EXCLUDED.value, EXCLUDED.module, EXCLUDED.state, EXCLUDED.comments);
+                            DO UPDATE SET (name, lang, res_id, src, type, value, module, state, comments) = (EXCLUDED.name, EXCLUDED.lang, EXCLUDED.res_id, EXCLUDED.src, EXCLUDED.type, EXCLUDED.value, EXCLUDED.module, EXCLUDED.state, EXCLUDED.comments)
+                            WHERE EXCLUDED.value IS NOT NULL AND EXCLUDED.value != '';
                        """ % (self._model_table, self._table))
             count += cr.rowcount
         cr.execute(""" INSERT INTO %s(name, lang, res_id, src, type, value, module, state, comments)
diff --git a/odoo/addons/base/wizard/base_update_translations.py b/odoo/addons/base/wizard/base_update_translations.py
index f1dc7a10ca4..0bbfc17ab24 100644
--- a/odoo/addons/base/wizard/base_update_translations.py
+++ b/odoo/addons/base/wizard/base_update_translations.py
@@ -32,5 +32,6 @@ class BaseUpdateTranslations(models.TransientModel):
         lang_name = self._get_lang_name(this.lang)
         with tempfile.NamedTemporaryFile() as buf:
             tools.trans_export(this.lang, ['all'], buf, 'po', self._cr)
-            tools.trans_load_data(self._cr, buf, 'po', this.lang, lang_name=lang_name)
+            context = {'create_empty_translation': True}
+            tools.trans_load_data(self._cr, buf, 'po', this.lang, lang_name=lang_name, context=context)
         return {'type': 'ir.actions.act_window_close'}
diff --git a/odoo/addons/test_translation_import/tests/test_term_count.py b/odoo/addons/test_translation_import/tests/test_term_count.py
index 8a4976e1771..bde7bceac4f 100644
--- a/odoo/addons/test_translation_import/tests/test_term_count.py
+++ b/odoo/addons/test_translation_import/tests/test_term_count.py
@@ -92,17 +92,23 @@ class TestTermCount(common.TransactionCase):
     def test_export_empty_string(self):
         """When the string and the translation is equal the translation is empty"""
         # Export the translations
-        def update_translations():
+        def update_translations(context=None):
+            context = dict(context or {}, overwrite=True)
             with closing(io.BytesIO()) as bufferobj:
                 odoo.tools.trans_export('fr_FR', ['test_translation_import'], bufferobj, 'po', self.cr)
                 bufferobj.name = 'test_translation_import/i18n/fr.po'
-                odoo.tools.trans_load_data(self.cr, bufferobj, 'po', 'fr_FR', verbose=False, context={'overwrite': True})
+                odoo.tools.trans_load_data(self.cr, bufferobj, 'po', 'fr_FR', verbose=False, context=context)
 
-        # Check if the not translated key is empty string
+        # Check that the not translated key is not created
         update_translations()
         translation = self.env['ir.translation'].search_count([('src', '=', 'Efgh'), ('value', '=', '')])
         self.assertFalse(translation, 'An empty translation is not imported')
 
+        # Check that "Generate Missing Terms" create empty string for not translated key
+        update_translations({'create_empty_translation': True})
+        translation = self.env['ir.translation'].search_count([('src', '=', 'Efgh'), ('value', '=', '')])
+        self.assertTrue(translation, 'The translation of "Efgh" should be empty')
+
         # Modify the value translated for the equal value of the key
         menu = self.env.ref('test_translation_import.menu_test_translation_import')
         menu.name = "New Name"
diff --git a/odoo/tools/translate.py b/odoo/tools/translate.py
index ae552b6535e..e5e26799086 100644
--- a/odoo/tools/translate.py
+++ b/odoo/tools/translate.py
@@ -1098,8 +1098,8 @@ def trans_load_data(cr, fileobj, fileformat, lang, lang_name=None, verbose=True,
             dic['lang'] = lang
             dic.update(pycompat.izip(fields, row))
 
-            # ignore empty value that may be set from base language
-            if not dic['value']:
+            # do not import empty values
+            if not env.context.get('create_empty_translation', False) and not dic['value']:
                 return
 
             if use_pot_reference:

From 3b14a7daa6c5a4d92b04c4bd4d2d21cd63296eff Mon Sep 17 00:00:00 2001
From: Iryna Vyshnevska <i.vyshnevska@mobilunity.com>
Date: Wed, 9 Jan 2019 13:42:50 +0000
Subject: [PATCH 33/66] [CLA] signature for i-vyshnevska

closes odoo/odoo#30074
---
 doc/cla/individual/ivyshnevska.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 doc/cla/individual/ivyshnevska.md

diff --git a/doc/cla/individual/ivyshnevska.md b/doc/cla/individual/ivyshnevska.md
new file mode 100644
index 00000000000..0df4e78944d
--- /dev/null
+++ b/doc/cla/individual/ivyshnevska.md
@@ -0,0 +1,9 @@
+Ukraine, 2019-01-09
+
+I hereby agree to the terms of the Odoo Individual Contributor License Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this declaration.
+
+Signed,
+
+Vyshnevska Iryna i.vyshnevska@mobilunity.com https://github.com/i-vyshnevska/
\ No newline at end of file

From 9c5f930ff48e96dac87d94fd85285a964cc90443 Mon Sep 17 00:00:00 2001
From: Yannick Tivisse <yti@odoo.com>
Date: Wed, 9 Jan 2019 14:51:01 +0000
Subject: [PATCH 34/66] [FIX] l10n_be_hr_payroll: Compute 13th month from
 wage_with_holidays

closes odoo/odoo#30078
---
 addons/l10n_be_hr_payroll/models/l10n_be_hr_payroll.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/l10n_be_hr_payroll/models/l10n_be_hr_payroll.py b/addons/l10n_be_hr_payroll/models/l10n_be_hr_payroll.py
index 312ae7c25b3..607bb2a9da8 100644
--- a/addons/l10n_be_hr_payroll/models/l10n_be_hr_payroll.py
+++ b/addons/l10n_be_hr_payroll/models/l10n_be_hr_payroll.py
@@ -206,11 +206,11 @@ class HrContract(models.Model):
         for contract in self:
             contract.monthly_yearly_costs = contract.final_yearly_costs / 12.0
 
-    @api.depends('wage')
+    @api.depends('wage_with_holidays')
     def _compute_holidays_advantages(self):
         for contract in self:
-            contract.double_holidays = contract.wage * 0.92
-            contract.thirteen_month = contract.wage
+            contract.double_holidays = contract.wage_with_holidays * 0.92
+            contract.thirteen_month = contract.wage_with_holidays
 
     @api.onchange('transport_mode_car', 'transport_mode_public', 'transport_mode_others')
     def _onchange_transport_mode(self):

From edcaaba53c0c060f95c7a289381915161ac62e82 Mon Sep 17 00:00:00 2001
From: Nicolas Lempereur <nle@odoo.com>
Date: Wed, 9 Jan 2019 17:16:30 +0000
Subject: [PATCH 35/66] [FIX] mail: typo connect notification error

In 12.0 commit f2302dfb2 the method openDmWindow was renamed
openDMChatWindowFromBlankThreadWindow but it called openDmWindow at one
location which caused click on user connection notification to cause an
error instead of opening a chat window.

opw-1910521
closes #30084
---
 addons/mail/static/src/js/services/mail_notification_manager.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/static/src/js/services/mail_notification_manager.js b/addons/mail/static/src/js/services/mail_notification_manager.js
index 8b698b3e04e..a179fddfde7 100644
--- a/addons/mail/static/src/js/services/mail_notification_manager.js
+++ b/addons/mail/static/src/js/services/mail_notification_manager.js
@@ -464,7 +464,7 @@ MailManager.include({
         var self = this;
         var partnerID = data.partner_id;
         this.call('bus_service', 'sendNotification', data.title, data.message, function ( ){
-            self.call('mail_service', 'openDmWindow', partnerID);
+            self.call('mail_service', 'openDMChatWindowFromBlankThreadWindow', partnerID);
         });
     },
     /**

From f1df5f352d4e39c0d1fc35930e75079236e36bd5 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@odoo.com>
Date: Mon, 7 Jan 2019 13:09:29 +0000
Subject: [PATCH 36/66] [FIX] base: make cache tests more specific

closes odoo/odoo#29998
---
 odoo/addons/base/tests/test_cache.py | 70 ++++++++++++++++------------
 1 file changed, 40 insertions(+), 30 deletions(-)

diff --git a/odoo/addons/base/tests/test_cache.py b/odoo/addons/base/tests/test_cache.py
index 5ae2e8abaea..baa4bc2ab70 100644
--- a/odoo/addons/base/tests/test_cache.py
+++ b/odoo/addons/base/tests/test_cache.py
@@ -2,7 +2,9 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 import os
+import platform
 import psutil
+import unittest
 
 from odoo.exceptions import CacheMiss
 from odoo.tests.common import TransactionCase
@@ -51,33 +53,35 @@ class TestRecordCache(TransactionCase):
         self.assertCountEqual(cache.get_missing_ids(foo2 + bar2, name), [1, 2])
 
         # set values in one environment only
-        for rec in [foo1, bar1]:
-            cache.set(rec, name, 'NAME1')
-            cache.set(rec, ref, 'REF1')
-        check(foo1, 'NAME1', 'REF1')
+        cache.set(foo1, name, 'FOO1_NAME')
+        cache.set(foo1, ref, 'FOO1_REF')
+        cache.set(bar1, name, 'BAR1_NAME')
+        cache.set(bar1, ref, 'BAR1_REF')
+        check(foo1, 'FOO1_NAME', 'FOO1_REF')
         check(foo2, None, None)
-        check(bar1, 'NAME1', 'REF1')
+        check(bar1, 'BAR1_NAME', 'BAR1_REF')
         check(bar2, None, None)
         self.assertCountEqual(cache.get_missing_ids(foo1 + bar1, name), [])
         self.assertCountEqual(cache.get_missing_ids(foo2 + bar2, name), [1, 2])
 
         # set values in both environments
-        for rec in [foo2, bar2]:
-            cache.set(rec, name, 'NAME2')
-            cache.set(rec, ref, 'REF2')
-        check(foo1, 'NAME1', 'REF1')
-        check(foo2, 'NAME2', 'REF2')
-        check(bar1, 'NAME1', 'REF1')
-        check(bar2, 'NAME2', 'REF2')
+        cache.set(foo2, name, 'FOO2_NAME')
+        cache.set(foo2, ref, 'FOO2_REF')
+        cache.set(bar2, name, 'BAR2_NAME')
+        cache.set(bar2, ref, 'BAR2_REF')
+        check(foo1, 'FOO1_NAME', 'FOO1_REF')
+        check(foo2, 'FOO2_NAME', 'FOO2_REF')
+        check(bar1, 'BAR1_NAME', 'BAR1_REF')
+        check(bar2, 'BAR2_NAME', 'BAR2_REF')
         self.assertCountEqual(cache.get_missing_ids(foo1 + bar1, name), [])
         self.assertCountEqual(cache.get_missing_ids(foo2 + bar2, name), [])
 
         # remove value in one environment
         cache.remove(foo1, name)
-        check(foo1, None, 'REF1')
-        check(foo2, 'NAME2', 'REF2')
-        check(bar1, 'NAME1', 'REF1')
-        check(bar2, 'NAME2', 'REF2')
+        check(foo1, None, 'FOO1_REF')
+        check(foo2, 'FOO2_NAME', 'FOO2_REF')
+        check(bar1, 'BAR1_NAME', 'BAR1_REF')
+        check(bar2, 'BAR2_NAME', 'BAR2_REF')
         self.assertCountEqual(cache.get_missing_ids(foo1 + bar1, name), [1])
         self.assertCountEqual(cache.get_missing_ids(foo2 + bar2, name), [])
 
@@ -85,8 +89,8 @@ class TestRecordCache(TransactionCase):
         cache.invalidate([(name, None), (ref, foo1.ids)])
         check(foo1, None, None)
         check(foo2, None, None)
-        check(bar1, None, 'REF1')
-        check(bar2, None, 'REF2')
+        check(bar1, None, 'BAR1_REF')
+        check(bar2, None, 'BAR2_REF')
 
         # total invalidation
         cache.invalidate()
@@ -96,28 +100,34 @@ class TestRecordCache(TransactionCase):
         check(bar2, None, None)
 
         # set a special value
-        cache.set_special(foo1, name, lambda: '42')
+        cache.set_special(foo1, name, lambda: 'FOO1_SPECIAL_NAME')
         self.assertTrue(cache.contains(foo1, name))
         self.assertFalse(cache.contains_value(foo1, name))
-        self.assertEqual(cache.get(foo1, name), '42')
+        self.assertEqual(cache.get(foo1, name), 'FOO1_SPECIAL_NAME')
         self.assertIsNone(cache.get_value(foo1, name))
         self.assertIsNotNone(cache.get_special(foo1, name))
 
         # copy cache
-        for rec in [foo1, bar1]:
-            cache.set(rec, name, 'NAME1')
-            cache.set(rec, ref, 'REF1')
-        check(foo1, 'NAME1', 'REF1')
-        check(foo2, None, None)
-        check(bar1, 'NAME1', 'REF1')
+        cache.set(foo1, name, 'FOO1_NAME')
+        cache.set(foo1, ref, 'FOO1_REF')
+        cache.set(bar1, name, 'BAR1_NAME')
+        cache.set(bar1, ref, 'BAR1_REF')
+        cache.set(foo2, name, 'FOO2_NAME')
+        check(foo1, 'FOO1_NAME', 'FOO1_REF')
+        check(foo2, 'FOO2_NAME', None)
+        check(bar1, 'BAR1_NAME', 'BAR1_REF')
         check(bar2, None, None)
 
         cache.copy(foo1 + bar1, foo2.env)
-        check(foo1, 'NAME1', 'REF1')
-        check(foo2, 'NAME1', 'REF1')
-        check(bar1, 'NAME1', 'REF1')
-        check(bar2, 'NAME1', 'REF1')
+        check(foo1, 'FOO1_NAME', 'FOO1_REF')
+        check(foo2, 'FOO1_NAME', 'FOO1_REF')
+        check(bar1, 'BAR1_NAME', 'BAR1_REF')
+        check(bar2, 'BAR1_NAME', 'BAR1_REF')
 
+    @unittest.skipIf(
+        not(platform.system() == 'Linux' and platform.machine() == 'x86_64'),
+        "This test only makes sense on 64-bit Linux-like systems",
+    )
     def test_memory(self):
         """ Check memory consumption of the cache. """
         NB_RECORDS = 100000

From 9918e75b2c73c0823137ecc3db5495120b2bd78a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Theys?= <seb@odoo.com>
Date: Fri, 28 Dec 2018 12:14:14 +0000
Subject: [PATCH 37/66] [FIX] website_theme_install: remove obsolete comment

This comment is not true, we originally wanted to code it this way but we changed
our mind and forgot to remove the comment.

PR: #29753
---
 addons/website_theme_install/models/ir_module_module.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/addons/website_theme_install/models/ir_module_module.py b/addons/website_theme_install/models/ir_module_module.py
index 00514b8fa3f..85a777efa7c 100644
--- a/addons/website_theme_install/models/ir_module_module.py
+++ b/addons/website_theme_install/models/ir_module_module.py
@@ -334,9 +334,6 @@ class IrModuleModule(models.Model):
         """
             Remove any existing theme on the current website and install the theme ``self`` instead.
 
-            The removal of the previous theme will however keep the existing data
-            that will also be used in the new theme.
-
             The actual loading of the theme on the current website will be done
             automatically on ``write`` thanks to the upgrade and/or install.
 

From 9ba8dedbf58935128bf42cd02d7f4feaf8aeb21a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Theys?= <seb@odoo.com>
Date: Fri, 28 Dec 2018 12:14:26 +0000
Subject: [PATCH 38/66] [FIX] base,website: make better comments for view
 helpers

PR: #29753
---
 addons/website/models/ir_ui_view.py   | 15 +++++++++++++++
 addons/website/models/website.py      |  6 ++++++
 odoo/addons/base/models/ir_ui_view.py |  3 +++
 3 files changed, 24 insertions(+)

diff --git a/addons/website/models/ir_ui_view.py b/addons/website/models/ir_ui_view.py
index e2823754069..86c6e82365e 100644
--- a/addons/website/models/ir_ui_view.py
+++ b/addons/website/models/ir_ui_view.py
@@ -144,8 +144,12 @@ class View(models.Model):
             return self.filtered(lambda view: not view.website_id)
 
         for view in self:
+            # specific view: add it if it's for the current website and ignore
+            # it if it's for another website
             if view.website_id and view.website_id.id == current_website_id:
                 most_specific_views |= view
+            # generic view: add it only if, for the current website, there is no
+            # specific view for this view (based on the same `key` attribute)
             elif not view.website_id and not any(view.key == view2.key and view2.website_id and view2.website_id.id == current_website_id for view2 in self):
                 most_specific_views |= view
 
@@ -202,6 +206,17 @@ class View(models.Model):
     @api.model
     @tools.ormcache_context('self._uid', 'xml_id', keys=('website_id',))
     def get_view_id(self, xml_id):
+        """If a website_id is in the context and the given xml_id is not an int
+        then try to get the id of the specific view for that website, but
+        fallback to the id of the generic view if there is no specific.
+
+        If no website_id is in the context, it might randomly return the generic
+        or the specific view, so it's probably not recommanded to use this
+        method. `viewref` is probably more suitable.
+
+        Archived views are ignored (unless the active_test context is set, but
+        then the ormcache_context will not work as expected).
+        """
         if 'website_id' in self._context and not isinstance(xml_id, pycompat.integer_types):
             current_website = self.env['website'].browse(self._context.get('website_id'))
             domain = ['&', ('key', '=', xml_id)] + current_website.website_domain()
diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index 16b6a597969..9a714a1e6e6 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -504,6 +504,12 @@ class Website(models.Model):
     def viewref(self, view_id, raise_if_not_found=True):
         ''' Given an xml_id or a view_id, return the corresponding view record.
             In case of website context, return the most specific one.
+
+            If no website_id is in the context, it will return the generic view,
+            instead of a random one like `get_view_id`.
+
+            Look also for archived views, no matter the context.
+
             :param view_id: either a string xml_id or an integer view_id
             :param raise_if_not_found: should the method raise an error if no view found
             :return: The view record or empty recordset
diff --git a/odoo/addons/base/models/ir_ui_view.py b/odoo/addons/base/models/ir_ui_view.py
index c46b9ba87d2..802711f5f5c 100644
--- a/odoo/addons/base/models/ir_ui_view.py
+++ b/odoo/addons/base/models/ir_ui_view.py
@@ -1174,6 +1174,9 @@ actual arch.
         """ Return the view ID corresponding to ``template``, which may be a
         view ID or an XML ID. Note that this method may be overridden for other
         kinds of template values.
+
+        This method could return the ID of something that is not a view (when
+        using fallback to `xmlid_to_res_id`).
         """
         if isinstance(template, pycompat.integer_types):
             return template

From 6b85cbc8444c9de7b042ddd5ca0a236e2cb89d35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Theys?= <seb@odoo.com>
Date: Fri, 28 Dec 2018 12:14:33 +0000
Subject: [PATCH 39/66] [FIX] website: fix viewref to not raise when
 raise_if_not_found=False

`ref` could raise even if raise_if_not_found was False on `viewref`, now we
prevent that, and rely only on the exception on `viewref`.

Also, when not set to raise, the method could return None instead of a recorset.

PR: #29753
---
 addons/website/models/website.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index 9a714a1e6e6..ee2d4322782 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -515,7 +515,7 @@ class Website(models.Model):
             :return: The view record or empty recordset
         '''
         View = self.env['ir.ui.view']
-        view = None
+        view = View
         if isinstance(view_id, pycompat.string_types):
             if 'website_id' in self._context:
                 domain = [('key', '=', view_id)] + self.env['website'].website_domain(self._context.get('website_id'))
@@ -527,20 +527,20 @@ class Website(models.Model):
             if views:
                 view = views.filter_duplicate()
             else:
-                view = self.env.ref(view_id)
+                # we handle the raise below
+                view = self.env.ref(view_id, raise_if_not_found=False)
                 # self.env.ref might return something else than an ir.ui.view (eg: a theme.ir.ui.view)
-                if view._name != 'ir.ui.view':
-                    view = None
+                if not view or view._name != 'ir.ui.view':
+                    # make sure we always return a recordset
+                    view = View
         elif isinstance(view_id, pycompat.integer_types):
             view = View.browse(view_id)
         else:
             raise ValueError('Expecting a string or an integer, not a %s.' % (type(view_id)))
 
-        if view:
-            return view
-        if raise_if_not_found:
+        if not view and raise_if_not_found:
             raise ValueError('No record found for unique ID %s. It may have been deleted.' % (view_id))
-        return None
+        return view
 
     @api.model
     def get_template(self, template):

From 2e32cc5aa35044e8f0e7c299c8612a8095d9f479 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Theys?= <seb@odoo.com>
Date: Fri, 28 Dec 2018 12:14:39 +0000
Subject: [PATCH 40/66] [FIX] base: remove copies of views when removing module

If a module has a view that has been copied (copy on write, web editor,
customize show, manual copy, ...), currently the copied view will not be deleted
if the module of the original view is removed.

If the copy is not used anymore, it is not a problem (but still polluting the
database), but if the copy is still used (ex. it is an inherit of a view still
in use), then it will crash if that copy references other data (views, fields,
...) that were in the module that is now removed.

Eg.

The view `website_sale_comparison.product_add_to_compare` is inheriting
`website_sale.product` and calls `website_sale_comparison.add_to_compare`.

If the view `website_sale_comparison.product_add_to_compare` is copied (when
using the web editor on the product page -> copy on write is making a copy of
the `product` view and all its tree), then the product page on website will
crash when the module `website_sale_comparison` is removed because
`product_add_to_compare` will call the deleted view `add_to_compare`.

The solution is to also remove copied views when removing a module. Instead of
just using the xml id, we should look for the `key` starting with the module
name currently removed, because copied views don't have an external id.

task-1920005
PR: #29753
---
 .../website_sale_comparison/tests/__init__.py |  4 ++
 .../tests/test_website_sale_comparison.py     | 39 +++++++++++++++++++
 odoo/addons/base/models/ir_module.py          | 16 ++++++++
 3 files changed, 59 insertions(+)
 create mode 100644 addons/website_sale_comparison/tests/__init__.py
 create mode 100644 addons/website_sale_comparison/tests/test_website_sale_comparison.py

diff --git a/addons/website_sale_comparison/tests/__init__.py b/addons/website_sale_comparison/tests/__init__.py
new file mode 100644
index 00000000000..0a54e54e5cf
--- /dev/null
+++ b/addons/website_sale_comparison/tests/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import test_website_sale_comparison
diff --git a/addons/website_sale_comparison/tests/test_website_sale_comparison.py b/addons/website_sale_comparison/tests/test_website_sale_comparison.py
new file mode 100644
index 00000000000..5913b00bb40
--- /dev/null
+++ b/addons/website_sale_comparison/tests/test_website_sale_comparison.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import odoo.tests
+
+
+@odoo.tests.tagged('-at_install', 'post_install')
+class TestWebsiteSaleComparison(odoo.tests.TransactionCase):
+    def test_01_website_sale_comparison_remove(self):
+        """ This tour makes sure the product page still works after the module
+        `website_sale_comparison` has been removed.
+
+        Technically it tests the removal of copied views by the base method
+        `_remove_copied_views`. The problematic view that has to be removed is
+        `product_add_to_compare` because it has a reference to `add_to_compare`.
+        """
+
+        Website0 = self.env['website'].with_context(website_id=None)
+        Website1 = self.env['website'].with_context(website_id=1)
+
+        # Retrieve the generic view
+        product = Website0.viewref('website_sale.product')
+        # Trigger COW to create specific views of the whole tree
+        product.with_context(website_id=1).write({'name': 'Trigger COW'})
+
+        # Verify initial state: the specific views exist
+        self.assertEquals(Website1.viewref('website_sale.product').website_id.id, 1)
+        self.assertEquals(Website1.viewref('website_sale_comparison.product_add_to_compare').website_id.id, 1)
+
+        # Remove the module (use `module_uninstall` because it is enough to test
+        # what we want here, no need/can't use `button_immediate_uninstall`
+        # because it would commit the test transaction)
+        website_sale_comparison = self.env['ir.module.module'].search([('name', '=', 'website_sale_comparison')])
+        website_sale_comparison.module_uninstall()
+
+        # Check that the generic view is correctly removed
+        self.assertFalse(Website0.viewref('website_sale_comparison.product_add_to_compare', raise_if_not_found=False))
+        # Check that the specific view is correctly removed
+        self.assertFalse(Website1.viewref('website_sale_comparison.product_add_to_compare', raise_if_not_found=False))
diff --git a/odoo/addons/base/models/ir_module.py b/odoo/addons/base/models/ir_module.py
index 350b4d7a489..a270a46dfb1 100644
--- a/odoo/addons/base/models/ir_module.py
+++ b/odoo/addons/base/models/ir_module.py
@@ -25,6 +25,7 @@ import lxml.html
 import odoo
 from odoo import api, fields, models, modules, tools, _
 from odoo.exceptions import AccessDenied, UserError
+from odoo.osv import expression
 from odoo.tools.parse_version import parse_version
 from odoo.tools.misc import topological_sort
 from odoo.http import request
@@ -456,9 +457,24 @@ class Module(models.Model):
         """
         modules_to_remove = self.mapped('name')
         self.env['ir.model.data']._module_data_uninstall(modules_to_remove)
+        self._remove_copied_views()
         self.write({'state': 'uninstalled', 'latest_version': False})
         return True
 
+    @api.multi
+    def _remove_copied_views(self):
+        """ Remove the copies of the views installed by the modules in `self`.
+
+        Those copies do not have an external id so they will not be cleaned by
+        `_module_data_uninstall`. This is why we rely on `key` instead.
+
+        It is important to remove these copies because using them will crash if
+        they rely on data that don't exist anymore if the module is removed.
+        """
+        domain = expression.OR([[('key', '=like', m.name + '.%')] for m in self])
+        orphans = self.env['ir.ui.view'].with_context(active_test=False).search(domain)
+        orphans.unlink()
+
     @api.multi
     @api.returns('self')
     def downstream_dependencies(self, known_deps=None,

From c4ee25fb7ff6a6213e5d443756a0e7bc81e870e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Theys?= <seb@odoo.com>
Date: Fri, 28 Dec 2018 13:17:26 +0000
Subject: [PATCH 41/66] [FIX] base,*: add MODULE_UNINSTALL_FLAG to cleanup
 views

* website_theme_install

This commit will add MODULE_UNINSTALL_FLAG to the cleanup methods of themes and
modules.

This is necessary to also unlink inherited views of those we try to unlink.

Before this commit, an error would be raised when trying to delete a view that
still had other inherited views (either created manually by the user, or with
just bad luck in the order of which the views are deleted).

PR: #29753
---
 .../tests/test_website_sale_comparison.py      | 18 ++++++++++++++++++
 .../models/ir_module_module.py                 |  8 +++++---
 odoo/addons/base/models/ir_module.py           |  3 ++-
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/addons/website_sale_comparison/tests/test_website_sale_comparison.py b/addons/website_sale_comparison/tests/test_website_sale_comparison.py
index 5913b00bb40..91c68c7508a 100644
--- a/addons/website_sale_comparison/tests/test_website_sale_comparison.py
+++ b/addons/website_sale_comparison/tests/test_website_sale_comparison.py
@@ -18,6 +18,18 @@ class TestWebsiteSaleComparison(odoo.tests.TransactionCase):
         Website0 = self.env['website'].with_context(website_id=None)
         Website1 = self.env['website'].with_context(website_id=1)
 
+        # Create a generic inherited view, with a key not starting with
+        # `website_sale_comparison` otherwise the unlink will work just based on
+        # the key, but we want to test also for `MODULE_UNINSTALL_FLAG`.
+        product_add_to_compare = Website0.viewref('website_sale_comparison.product_add_to_compare')
+        test_view_key = 'my_test.my_key'
+        self.env['ir.ui.view'].with_context(website_id=None).create({
+            'name': 'test inherited view',
+            'key': test_view_key,
+            'inherit_id': product_add_to_compare.id,
+            'arch': '<div/>',
+        })
+
         # Retrieve the generic view
         product = Website0.viewref('website_sale.product')
         # Trigger COW to create specific views of the whole tree
@@ -26,6 +38,7 @@ class TestWebsiteSaleComparison(odoo.tests.TransactionCase):
         # Verify initial state: the specific views exist
         self.assertEquals(Website1.viewref('website_sale.product').website_id.id, 1)
         self.assertEquals(Website1.viewref('website_sale_comparison.product_add_to_compare').website_id.id, 1)
+        self.assertEquals(Website1.viewref(test_view_key).website_id.id, 1)
 
         # Remove the module (use `module_uninstall` because it is enough to test
         # what we want here, no need/can't use `button_immediate_uninstall`
@@ -37,3 +50,8 @@ class TestWebsiteSaleComparison(odoo.tests.TransactionCase):
         self.assertFalse(Website0.viewref('website_sale_comparison.product_add_to_compare', raise_if_not_found=False))
         # Check that the specific view is correctly removed
         self.assertFalse(Website1.viewref('website_sale_comparison.product_add_to_compare', raise_if_not_found=False))
+
+        # Check that the generic inherited view is correctly removed
+        self.assertFalse(Website0.viewref(test_view_key, raise_if_not_found=False))
+        # Check that the specific inherited view is correctly removed
+        self.assertFalse(Website1.viewref(test_view_key, raise_if_not_found=False))
diff --git a/addons/website_theme_install/models/ir_module_module.py b/addons/website_theme_install/models/ir_module_module.py
index 85a777efa7c..55f77590c6b 100644
--- a/addons/website_theme_install/models/ir_module_module.py
+++ b/addons/website_theme_install/models/ir_module_module.py
@@ -6,6 +6,7 @@ import os
 from collections import OrderedDict
 
 from odoo import api, fields, models
+from odoo.addons.base.models.ir_model import MODULE_UNINSTALL_FLAG
 from odoo.exceptions import MissingError
 from odoo.http import request
 
@@ -206,7 +207,7 @@ class IrModuleModule(models.Model):
 
             for model_name in self._theme_model_names:
                 template = self._get_module_data(model_name)
-                models = template.with_context(active_test=False).mapped('copy_ids').filtered(lambda m: m.website_id == website)
+                models = template.with_context(**{'active_test': False, MODULE_UNINSTALL_FLAG: True}).mapped('copy_ids').filtered(lambda m: m.website_id == website)
                 models.unlink()
                 self._theme_cleanup(model_name, website)
 
@@ -235,8 +236,9 @@ class IrModuleModule(models.Model):
 
         if model_name in ('website.page', 'website.menu'):
             return model
-
-        orphans = model.with_context(active_test=False).search([
+        # use active_test to also unlink archived models
+        # and use MODULE_UNINSTALL_FLAG to also unlink inherited models
+        orphans = model.with_context(**{'active_test': False, MODULE_UNINSTALL_FLAG: True}).search([
             ('key', '=like', self.name + '.%'),
             ('website_id', '=', website.id),
             ('theme_template_id', '=', False),
diff --git a/odoo/addons/base/models/ir_module.py b/odoo/addons/base/models/ir_module.py
index a270a46dfb1..2d24a06362f 100644
--- a/odoo/addons/base/models/ir_module.py
+++ b/odoo/addons/base/models/ir_module.py
@@ -24,6 +24,7 @@ import lxml.html
 
 import odoo
 from odoo import api, fields, models, modules, tools, _
+from odoo.addons.base.models.ir_model import MODULE_UNINSTALL_FLAG
 from odoo.exceptions import AccessDenied, UserError
 from odoo.osv import expression
 from odoo.tools.parse_version import parse_version
@@ -472,7 +473,7 @@ class Module(models.Model):
         they rely on data that don't exist anymore if the module is removed.
         """
         domain = expression.OR([[('key', '=like', m.name + '.%')] for m in self])
-        orphans = self.env['ir.ui.view'].with_context(active_test=False).search(domain)
+        orphans = self.env['ir.ui.view'].with_context(**{'active_test': False, MODULE_UNINSTALL_FLAG: True}).search(domain)
         orphans.unlink()
 
     @api.multi

From 57856c7536bc21c4ed6f1fe4814b165490a850b4 Mon Sep 17 00:00:00 2001
From: qdp-odoo <qdp@odoo.com>
Date: Thu, 10 Jan 2019 09:04:10 +0000
Subject: [PATCH 42/66] [FIX] account: reconcilation widget in multi currency

utils.round_precision() is expecting a float as precision (0.01) whereas utils.round_decimals() is expecting the number of digits to consider after the coma (2).

The previous code was totally wrong in that regard, which led to reconciliation wrongly considered as total in foreign currency, as long as the amount_currency difference was lower than the currency precision digits.

closes odoo/odoo#30091
---
 .../static/src/js/reconciliation/reconciliation_model.js      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/static/src/js/reconciliation/reconciliation_model.js b/addons/account/static/src/js/reconciliation/reconciliation_model.js
index 6d17d4b8aed..344f8521598 100644
--- a/addons/account/static/src/js/reconciliation/reconciliation_model.js
+++ b/addons/account/static/src/js/reconciliation/reconciliation_model.js
@@ -899,11 +899,11 @@ var StatementModel = BasicModel.extend({
             });
             var company_currency = session.get_currency(line.st_line.currency_id);
             var company_precision = company_currency && company_currency.digits[1] || 2;
-            total = utils.round_precision(total*1000, company_precision)/1000 || 0;
+            total = utils.round_decimals(total*1000, company_precision)/1000 || 0;
             if(isOtherCurrencyId){
                 var other_currency = session.get_currency(isOtherCurrencyId);
                 var other_precision = other_currency && other_currency.digits[1] || 2;
-                amount_currency = utils.round_precision(amount_currency, other_precision)
+                amount_currency = utils.round_decimals(amount_currency, other_precision)
             }
             line.balance = {
                 amount: total,

From d76182c58270a3326ff71ae0e63928b7335f1ed5 Mon Sep 17 00:00:00 2001
From: Jairo Llopis <yajo.sk8@gmail.com>
Date: Tue, 13 Nov 2018 13:08:18 +0000
Subject: [PATCH 43/66] [FIX] base: prevent cutting app titles in kanban

closes odoo/odoo#28628
---
 odoo/addons/base/static/src/css/modules.css | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/odoo/addons/base/static/src/css/modules.css b/odoo/addons/base/static/src/css/modules.css
index 0ac3e5cd939..f1156464ed1 100644
--- a/odoo/addons/base/static/src/css/modules.css
+++ b/odoo/addons/base/static/src/css/modules.css
@@ -13,10 +13,6 @@
     padding-left: 80px;
 }
 
-.o_modules_kanban.o_kanban_view h4.o_kanban_record_title {
-    line-height: 1;
-}
-
 .o_modules_kanban.o_kanban_view .o_kanban_record .o_dropdown_kanban {
     visibility: visible;
     opacity: 0.5;

From 07e1a24368fcd968d1a569df547829ec7309c506 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Thu, 10 Jan 2019 12:33:30 +0000
Subject: [PATCH 44/66] [FIX] website: allow to remove jumbotron bg color

In the 'banner' snippet, there is a column using a white jumbotron
component. Those comes with a default background color so when using the
website builder to remove the white background, it did not go away;
it was replaced with the default background color (some gray).

This commit sets the default background color of jumbotron components to
'transparent'.

task-1889341

closes odoo/odoo#30099
---
 addons/website/static/src/scss/bootstrap_overridden.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/website/static/src/scss/bootstrap_overridden.scss b/addons/website/static/src/scss/bootstrap_overridden.scss
index 4dc818b7eea..7424587df13 100644
--- a/addons/website/static/src/scss/bootstrap_overridden.scss
+++ b/addons/website/static/src/scss/bootstrap_overridden.scss
@@ -29,3 +29,7 @@ $font-family-sans-serif: nth($o-theme-fonts, $o-theme-font-number);
 
 $headings-font-family: nth($o-theme-fonts, $o-theme-headings-font-number);
 $headings-color: color('h1');
+
+// Jumbotron
+
+$jumbotron-bg: transparent !default;

From 6e1161e2ee6a5ffb14d2c3a24b696a89e0fba840 Mon Sep 17 00:00:00 2001
From: Jorge Pinna Puissant <jpp@odoo.com>
Date: Thu, 10 Jan 2019 13:35:19 +0000
Subject: [PATCH 45/66] [FIX] account: translate invoce line desc opw-1922531

Before this commit, the product's description for customers was not translated in the
invoice.

Now, the product's description for customers is translated in the invoice.

closes odoo/odoo#30107
---
 addons/account/models/account_invoice.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/account/models/account_invoice.py b/addons/account/models/account_invoice.py
index 1f88ad9b2e2..69a7443f3da 100644
--- a/addons/account/models/account_invoice.py
+++ b/addons/account/models/account_invoice.py
@@ -1712,17 +1712,17 @@ class AccountInvoiceLine(models.Model):
                 self.price_unit = 0.0
             domain['uom_id'] = []
         else:
+            self_lang = self
             if part.lang:
-                product = self.product_id.with_context(lang=part.lang)
-            else:
-                product = self.product_id
-
+                self_lang = self.with_context(lang=part.lang)
+   
+            product = self_lang.product_id
             account = self.get_invoice_line_account(type, product, fpos, company)
             if account:
                 self.account_id = account.id
             self._set_taxes()
 
-            product_name = self._get_invoice_line_name_from_product()
+            product_name = self_lang._get_invoice_line_name_from_product()
             if product_name != None:
                 self.name = product_name
 

From 5f724892e7a7b0f43802bf215bf9c96d4e1030f5 Mon Sep 17 00:00:00 2001
From: Pierre Masereel <pim@odoo.com>
Date: Thu, 10 Jan 2019 09:07:46 +0000
Subject: [PATCH 46/66] [FIX] payment: create payment transaction without
 partner_id

The field partner id is not a required field in payment transaction, and
we try to read its value in the dictionnary given to the create
function, so if a transaction is created without the partner_id, it will
raise a KeyError.

So to fix it, we only complete the pratner values on the payment
transaction if a partner_id is given.
---
 addons/payment/models/payment_acquirer.py | 25 ++++++++++++-----------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/addons/payment/models/payment_acquirer.py b/addons/payment/models/payment_acquirer.py
index 9fa51724678..afed11da38e 100644
--- a/addons/payment/models/payment_acquirer.py
+++ b/addons/payment/models/payment_acquirer.py
@@ -871,24 +871,25 @@ class PaymentTransaction(models.Model):
     def create(self, values):
         # call custom create method if defined (i.e. ogone_create for ogone)
         acquirer = self.env['payment.acquirer'].browse(values['acquirer_id'])
-        partner = self.env['res.partner'].browse(values['partner_id'])
+        if values.get('partner_id'):
+            partner = self.env['res.partner'].browse(values['partner_id'])
 
-        values.update({
-            'partner_name': partner.name,
-            'partner_lang': partner.lang or 'en_US',
-            'partner_email': partner.email,
-            'partner_zip': partner.zip,
-            'partner_address': _partner_format_address(partner.street or '', partner.street2 or ''),
-            'partner_city': partner.city,
-            'partner_country_id': partner.country_id.id or self._get_default_partner_country_id(),
-            'partner_phone': partner.phone,
-        })
+            values.update({
+                'partner_name': partner.name,
+                'partner_lang': partner.lang or 'en_US',
+                'partner_email': partner.email,
+                'partner_zip': partner.zip,
+                'partner_address': _partner_format_address(partner.street or '', partner.street2 or ''),
+                'partner_city': partner.city,
+                'partner_country_id': partner.country_id.id or self._get_default_partner_country_id(),
+                'partner_phone': partner.phone,
+            })
 
         # compute fees
         custom_method_name = '%s_compute_fees' % acquirer.provider
         if hasattr(acquirer, custom_method_name):
             fees = getattr(acquirer, custom_method_name)(
-                values.get('amount', 0.0), values.get('currency_id'), partner.country_id.id)
+                values.get('amount', 0.0), values.get('currency_id'), values['partner_country_id'])
             values['fees'] = fees
 
         # custom create

From 132717c7b17f0e018b5e565646fa842e6227a079 Mon Sep 17 00:00:00 2001
From: Pierre Masereel <pim@odoo.com>
Date: Thu, 10 Jan 2019 09:11:47 +0000
Subject: [PATCH 47/66] [FIX] payment_*: tests

PAYPAL
------

The paypal tests are not working working for two reasons:
- we check that there is no date in pending state on payment
transaction, but since the refactoring in this commit: https://github.com/odoo/odoo/commit/01216345e28374b554bfe95df82d607c591271cf
the date is always set before the validation of transaction.
- Since the changes on dates, the datetime field doesn't return a string
anymore and the comparison fails. So we convert the datetime to string
for the comparison.

BUCKAROO
--------

The buckaroo tests were not working for multiple reasons.

STRIPE
------

The payment stripe tests were not working because:
- The reference set in transactions were not the same as the ones givent
to the payment provider.
- we were checking for a script tag in form that has been removed in
commit https://github.com/odoo/odoo/commit/7c639be4aadce20bf6662ab347470fadf9afd99f

AUTHORIZE
---------

This test cannot be tested on runbot due to its server to server way of
working

closes odoo/odoo#30105
---
 .../payment_authorize/tests/test_authorize.py |  2 +-
 .../payment_buckaroo/tests/test_buckaroo.py   | 36 +++++++++---------
 .../views/payment_buckaroo_templates.xml      | 38 ++++++++++---------
 addons/payment_paypal/tests/test_paypal.py    |  4 +-
 addons/payment_stripe/tests/test_stripe.py    |  6 +--
 5 files changed, 44 insertions(+), 42 deletions(-)

diff --git a/addons/payment_authorize/tests/test_authorize.py b/addons/payment_authorize/tests/test_authorize.py
index 314d4bdd26a..a45275b07d8 100644
--- a/addons/payment_authorize/tests/test_authorize.py
+++ b/addons/payment_authorize/tests/test_authorize.py
@@ -188,7 +188,7 @@ class AuthorizeForm(AuthorizeCommon):
         self.assertEqual(tx.state, 'cancel', 'Authorize: erroneous validation did not put tx into error state')
 
 
-@odoo.tests.tagged('post_install', '-at_install', '-standard', 'external')
+@odoo.tests.tagged('post_install', '-at_install', '-standard')
 class AuthorizeForm(AuthorizeCommon):
     def test_30_authorize_s2s(self):
         # be sure not to do stupid thing
diff --git a/addons/payment_buckaroo/tests/test_buckaroo.py b/addons/payment_buckaroo/tests/test_buckaroo.py
index 925385f402f..e23b1f0c002 100644
--- a/addons/payment_buckaroo/tests/test_buckaroo.py
+++ b/addons/payment_buckaroo/tests/test_buckaroo.py
@@ -32,12 +32,12 @@ class BuckarooForm(BuckarooCommon):
         # ----------------------------------------
 
         form_values = {
-            'add_returndata': None,
+            'add_returndata': '',
             'Brq_websitekey': self.buckaroo.brq_websitekey,
             'Brq_amount': '2240.0',
             'Brq_currency': 'EUR',
             'Brq_invoicenumber': 'SO004',
-            'Brq_signature': '1b8c10074c622d965272a91a9e88b5b3777d2474',  # update me
+            'Brq_signature': 'aa6fe072afdd9d1b463d55f43e6df4b272d3529a',  # update me
             'brq_test': 'True',
             'Brq_return': urls.url_join(base_url, BuckarooController._return_url),
             'Brq_returncancel': urls.url_join(base_url, BuckarooController._cancel_url),
@@ -50,13 +50,14 @@ class BuckarooForm(BuckarooCommon):
         res = self.buckaroo.render(
             'SO004', 2240.0, self.currency_euro.id,
             partner_id=None,
-            partner_values=self.buyer_values)
-
+            values=self.buyer_values)
         # check form result
         tree = objectify.fromstring(res)
-        self.assertEqual(tree.get('action'), 'https://testcheckout.buckaroo.nl/html/', 'Buckaroo: wrong form POST url')
+        data_set = tree.xpath("//input[@name='data_set']")
+        self.assertEqual(len(data_set), 1, 'paypal: Found %d "data_set" input instead of 1' % len(data_set))
+        self.assertEqual(data_set[0].get('data-action-url'), 'https://testcheckout.buckaroo.nl/html/', 'Buckaroo: wrong form POST url')
         for form_input in tree.input:
-            if form_input.get('name') in ['submit']:
+            if form_input.get('name') in ['submit', 'data_set']:
                 continue
             self.assertEqual(
                 form_input.get('value'),
@@ -78,17 +79,18 @@ class BuckarooForm(BuckarooCommon):
         })
 
         # render the button
-        res = self.buckaroo_id.render(
+        res = self.buckaroo.render(
             'should_be_erased', 2240.0, self.currency_euro,
-            tx_id=tx.id,
             partner_id=None,
-            partner_values=self.buyer_values)
+            values=self.buyer_values)
 
         # check form result
         tree = objectify.fromstring(res)
-        self.assertEqual(tree.get('action'), 'https://testcheckout.buckaroo.nl/html/', 'Buckaroo: wrong form POST url')
+        data_set = tree.xpath("//input[@name='data_set']")
+        self.assertEqual(len(data_set), 1, 'paypal: Found %d "data_set" input instead of 1' % len(data_set))
+        self.assertEqual(data_set[0].get('data-action-url'), 'https://testcheckout.buckaroo.nl/html/', 'Buckaroo: wrong form POST url')
         for form_input in tree.input:
-            if form_input.get('name') in ['submit']:
+            if form_input.get('name') in ['submit', 'data_set']:
                 continue
             self.assertEqual(
                 form_input.get('value'),
@@ -116,7 +118,7 @@ class BuckarooForm(BuckarooCommon):
             'BRQ_SERVICE_PAYPAL_PAYERLASTNAME': u'Tester',
             'BRQ_SERVICE_PAYPAL_PAYERMIDDLENAME': u'de',
             'BRQ_SERVICE_PAYPAL_PAYERSTATUS': u'verified',
-            'Brq_signature': u'175d82dd53a02bad393fee32cb1eafa3b6fbbd91',
+            'Brq_signature': u'9e75e51cbcb6fbc798b40d1787cc5b7c36557d56',
             'BRQ_STATUSCODE': u'190',
             'BRQ_STATUSCODE_DETAIL': u'S001',
             'BRQ_STATUSMESSAGE': u'Transaction successfully processed',
@@ -134,7 +136,7 @@ class BuckarooForm(BuckarooCommon):
             'amount': 2240.0,
             'acquirer_id': self.buckaroo.id,
             'currency_id': self.currency_euro.id,
-            'reference': 'SO004-1',
+            'reference': 'SO004',
             'partner_name': 'Norbert Buyer',
             'partner_country_id': self.country_france.id})
 
@@ -153,14 +155,14 @@ class BuckarooForm(BuckarooCommon):
             'partner_name': 'Norbert Buyer',
             'partner_country_id': self.country_france.id})
 
+        buckaroo_post_data['BRQ_INVOICENUMBER'] = 'SO004-2'
         # now buckaroo post is ok: try to modify the SHASIGN
-        buckaroo_post_data['BRQ_SIGNATURE'] = '54d928810e343acf5fb0c3ee75fd747ff159ef7a'
+        buckaroo_post_data['Brq_signature'] = '54d928810e343acf5fb0c3ee75fd747ff159ef7a'
         with self.assertRaises(ValidationError):
             tx.form_feedback(buckaroo_post_data, 'buckaroo')
-
         # simulate an error
-        buckaroo_post_data['BRQ_STATUSCODE'] = 2
-        buckaroo_post_data['BRQ_SIGNATURE'] = '4164b52adb1e6a2221d3d8a39d8c3e18a9ecb90b'
+        buckaroo_post_data['BRQ_STATUSCODE'] = '2'
+        buckaroo_post_data['Brq_signature'] = '9138e2bf09a708a4eb485ce7777e5406898b689d'
         tx.form_feedback(buckaroo_post_data, 'buckaroo')
 
         # check state
diff --git a/addons/payment_buckaroo/views/payment_buckaroo_templates.xml b/addons/payment_buckaroo/views/payment_buckaroo_templates.xml
index 95f1aa0ce9e..7b0749923c9 100644
--- a/addons/payment_buckaroo/views/payment_buckaroo_templates.xml
+++ b/addons/payment_buckaroo/views/payment_buckaroo_templates.xml
@@ -2,24 +2,26 @@
 <odoo>
     <data noupdate="1">
         <template id="buckaroo_form">
-            <input type="hidden" name="data_set" t-att-data-action-url="tx_url" data-remove-me=""/>
-            <input type="hidden" name="Brq_websitekey" t-att-value="Brq_websitekey"/>
-            <input type="hidden" name="Brq_amount" t-att-value="Brq_amount"/>
-            <input type="hidden" name="Brq_currency" t-att-value="Brq_currency"/>
-            <input type="hidden" name="Brq_invoicenumber" t-att-value="Brq_invoicenumber"/>
-            <input type="hidden" name="Brq_signature" t-att-value="Brq_signature"/>
-            <input type="hidden" name="brq_test" t-att-value="brq_test"/>
-            <input type="hidden" name="Brq_culture" t-att-value="Brq_culture"/>
-            <!-- URLs -->
-            <input t-if="Brq_return" type="hidden" name='Brq_return'
-                t-att-value="Brq_return"/>
-            <input t-if="Brq_returncancel" type="hidden" name='Brq_returncancel'
-                t-att-value="Brq_returncancel"/>
-            <input t-if="Brq_returnerror" type="hidden" name='Brq_returnerror'
-                t-att-value="Brq_returnerror"/>
-            <input t-if="Brq_returnreject" type="hidden" name='Brq_returnreject'
-                t-att-value="Brq_returnreject"/>
-            <input type="hidden" name='add_returndata' t-att-value="add_returndata"/>
+            <div>
+                <input type="hidden" name="data_set" t-att-data-action-url="tx_url" data-remove-me=""/>
+                <input type="hidden" name="Brq_websitekey" t-att-value="Brq_websitekey"/>
+                <input type="hidden" name="Brq_amount" t-att-value="Brq_amount"/>
+                <input type="hidden" name="Brq_currency" t-att-value="Brq_currency"/>
+                <input type="hidden" name="Brq_invoicenumber" t-att-value="Brq_invoicenumber"/>
+                <input type="hidden" name="Brq_signature" t-att-value="Brq_signature"/>
+                <input type="hidden" name="brq_test" t-att-value="brq_test"/>
+                <input type="hidden" name="Brq_culture" t-att-value="Brq_culture"/>
+                <!-- URLs -->
+                <input t-if="Brq_return" type="hidden" name='Brq_return'
+                    t-att-value="Brq_return"/>
+                <input t-if="Brq_returncancel" type="hidden" name='Brq_returncancel'
+                    t-att-value="Brq_returncancel"/>
+                <input t-if="Brq_returnerror" type="hidden" name='Brq_returnerror'
+                    t-att-value="Brq_returnerror"/>
+                <input t-if="Brq_returnreject" type="hidden" name='Brq_returnreject'
+                    t-att-value="Brq_returnreject"/>
+                <input type="hidden" name='add_returndata' t-att-value="add_returndata"/>
+            </div>
         </template>
     </data>
 </odoo>
diff --git a/addons/payment_paypal/tests/test_paypal.py b/addons/payment_paypal/tests/test_paypal.py
index b43aed25fcf..e70129f9333 100644
--- a/addons/payment_paypal/tests/test_paypal.py
+++ b/addons/payment_paypal/tests/test_paypal.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+from odoo import fields
 from odoo.addons.payment.models.payment_acquirer import ValidationError
 from odoo.addons.payment.tests.common import PaymentAcquirerCommon
 from odoo.addons.payment_paypal.controllers.main import PaypalController
@@ -182,7 +183,6 @@ class PaypalForm(PaypalCommon):
         self.assertEqual(tx.state, 'pending', 'paypal: wrong state after receiving a valid pending notification')
         self.assertEqual(tx.state_message, 'multi_currency', 'paypal: wrong state message after receiving a valid pending notification')
         self.assertEqual(tx.acquirer_reference, '08D73520KX778924N', 'paypal: wrong txn_id after receiving a valid pending notification')
-        self.assertFalse(tx.date, 'paypal: validation date should not be updated whenr receiving pending notification')
 
         # update tx
         tx.write({
@@ -196,4 +196,4 @@ class PaypalForm(PaypalCommon):
         # check
         self.assertEqual(tx.state, 'done', 'paypal: wrong state after receiving a valid pending notification')
         self.assertEqual(tx.acquirer_reference, '08D73520KX778924N', 'paypal: wrong txn_id after receiving a valid pending notification')
-        self.assertEqual(tx.date, '2013-11-18 11:21:19', 'paypal: wrong validation date')
+        self.assertEqual(fields.Datetime.to_string(tx.date), '2013-11-18 11:21:19', 'paypal: wrong validation date')
diff --git a/addons/payment_stripe/tests/test_stripe.py b/addons/payment_stripe/tests/test_stripe.py
index 5308f54dbe0..1ef883de93f 100644
--- a/addons/payment_stripe/tests/test_stripe.py
+++ b/addons/payment_stripe/tests/test_stripe.py
@@ -59,9 +59,6 @@ class StripeTest(StripeCommon):
 
         # render the button
         res = self.stripe.render('SO404', 320.0, self.currency_euro.id, values=self.buyer_values).decode('utf-8')
-        popup_script_src = 'script src="https://checkout.stripe.com/checkout.js"'
-        # check form result
-        self.assertIn(popup_script_src, res, "Stripe: popup script not found in template render")
         # Generated and received
         self.assertIn(self.buyer_values.get('partner_email'), res, 'Stripe: email input not found in rendered template')
 
@@ -87,7 +84,7 @@ class StripeTest(StripeCommon):
             u'id': u'ch_172xfnGMfVJxozLwEjSfpfxD',
             u'invoice': None,
             u'livemode': False,
-            u'metadata': {u'reference': u'SO100'},
+            u'metadata': {u'reference': u'SO100-1'},
             u'object': u'charge',
             u'paid': True,
             u'receipt_email': None,
@@ -137,6 +134,7 @@ class StripeTest(StripeCommon):
         tx.form_feedback(stripe_post_data, 'stripe')
         self.assertEqual(tx.state, 'done', 'Stripe: validation did not put tx into done state')
         self.assertEqual(tx.acquirer_reference, stripe_post_data.get('id'), 'Stripe: validation did not update tx id')
+        stripe_post_data['metadata']['reference'] = u'SO100-2'
         # reset tx
         tx = self.env['payment.transaction'].create({
             'amount': 4700,

From 5e1b874cd8904311cbe82391c7baff0783dd307c Mon Sep 17 00:00:00 2001
From: "Lucas Perais (lpe)" <lpe@odoo.com>
Date: Thu, 3 Jan 2019 10:51:08 +0000
Subject: [PATCH 48/66] [FIX] account: cash basis reconciliation on many amls

Make an expense report containing 2 expenses
one of them has tax exigible on payment

Validate the whole thing and make a payment

Before this commit, the journal entries were wrong
this was because:
-  there were 2 move lines in the payable account
Each of them wanting to reconcile with the payment, and each of them trying
to create an cash basis entry
-  the amounts were incorrect too, as the matched percentage was computed
on move lines that were not in a payable/receivable, but in taxes accounts

OPW 1912247

closes odoo/odoo#29878
---
 addons/account/models/account_move.py       |  19 +-
 addons/account/tests/test_reconciliation.py | 337 ++++++++++++++++++++
 2 files changed, 348 insertions(+), 8 deletions(-)

diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py
index 7d31fd812aa..4c6853b4221 100644
--- a/addons/account/models/account_move.py
+++ b/addons/account/models/account_move.py
@@ -784,7 +784,7 @@ class AccountMoveLine(models.Model):
             (multiple_currency and float_compare(total_debit, total_credit, precision_rounding=digits_rounding_precision) == 0):
             exchange_move_id = False
             # Eventually create a journal entry to book the difference due to foreign currency's exchange rate that fluctuates
-            if to_balance and any([residual for aml, residual in to_balance.values()]):
+            if to_balance and any([not float_is_zero(residual, precision_rounding=digits_rounding_precision) for aml, residual in to_balance.values()]):
                 exchange_move = self.env['account.move'].create(
                     self.env['account.full.reconcile']._prepare_exchange_diff_move(move_date=maxdate, company=amls[0].company_id))
                 part_reconcile = self.env['account.partial.reconcile']
@@ -813,7 +813,7 @@ class AccountMoveLine(models.Model):
         (debit_moves + credit_moves).read([field])
         to_create = []
         cash_basis = debit_moves and debit_moves[0].account_id.internal_type in ('receivable', 'payable') or False
-        cash_basis_percentage_before_rec = []
+        cash_basis_percentage_before_rec = {}
         while (debit_moves and credit_moves):
             debit_move = debit_moves[0]
             credit_move = credit_moves[0]
@@ -848,7 +848,7 @@ class AccountMoveLine(models.Model):
 
             if cash_basis:
                 tmp_set = debit_move | credit_move
-                cash_basis_percentage_before_rec.append(tmp_set._get_matched_percentage())
+                cash_basis_percentage_before_rec.update(tmp_set._get_matched_percentage())
 
             to_create.append({
                 'debit_move_id': debit_move.id,
@@ -859,14 +859,12 @@ class AccountMoveLine(models.Model):
             })
 
         part_rec = self.env['account.partial.reconcile']
-        index = 0
         with self.env.norecompute():
             for partial_rec_dict in to_create:
                 new_rec = self.env['account.partial.reconcile'].create(partial_rec_dict)
                 part_rec += new_rec
                 if cash_basis:
-                    new_rec.create_tax_cash_basis_entry(cash_basis_percentage_before_rec[index])
-                    index += 1
+                    new_rec.create_tax_cash_basis_entry(cash_basis_percentage_before_rec)
         self.recompute()
 
         return debit_moves+credit_moves
@@ -1477,10 +1475,14 @@ class AccountPartialReconcile(models.Model):
             #move_date is the max of the 2 reconciled items
             if move_date < move.date:
                 move_date = move.date
+            percentage_before = percentage_before_rec[move.id]
+            percentage_after = move.line_ids[0]._get_matched_percentage()[move.id]
+            # update the percentage before as the move can be part of
+            # multiple partial reconciliations
+            percentage_before_rec[move.id] = percentage_after
+
             for line in move.line_ids:
                 if not line.tax_exigible:
-                    percentage_before = percentage_before_rec[move.id]
-                    percentage_after = line._get_matched_percentage()[move.id]
                     #amount is the current cash_basis amount minus the one before the reconciliation
                     amount = line.balance * percentage_after - line.balance * percentage_before
                     rounded_amt = self._get_amount_tax_cash_basis(amount, line)
@@ -1552,6 +1554,7 @@ class AccountPartialReconcile(models.Model):
                                 'amount_currency': self.amount_currency and line.currency_id.round(-line.amount_currency * amount / line.balance) or 0.0,
                                 'partner_id': line.partner_id.id,
                             })
+
         if newly_created_move:
             if move_date > (self.company_id.period_lock_date or date.min) and newly_created_move.date != move_date:
                 # The move date should be the maximum date between payment and invoice (in case
diff --git a/addons/account/tests/test_reconciliation.py b/addons/account/tests/test_reconciliation.py
index be446c818a5..970989a970f 100644
--- a/addons/account/tests/test_reconciliation.py
+++ b/addons/account/tests/test_reconciliation.py
@@ -49,6 +49,58 @@ class TestReconciliation(AccountingTestCase):
             'payment_type': 'inbound',
         })
 
+        self.expense_account = self.env['account.account'].create({
+            'name': 'EXP',
+            'code': 'EXP',
+            'user_type_id': self.env.ref('account.data_account_type_expenses').id,
+            'company_id': company.id,
+        })
+        # cash basis intermediary account
+        self.tax_waiting_account = self.env['account.account'].create({
+            'name': 'TAX_WAIT',
+            'code': 'TWAIT',
+            'user_type_id': self.env.ref('account.data_account_type_current_liabilities').id,
+            'reconcile': True,
+            'company_id': company.id,
+        })
+        # cash basis final account
+        self.tax_final_account = self.env['account.account'].create({
+            'name': 'TAX_TO_DEDUCT',
+            'code': 'TDEDUCT',
+            'user_type_id': self.env.ref('account.data_account_type_current_assets').id,
+            'company_id': company.id,
+        })
+        self.tax_base_amount_account = self.env['account.account'].create({
+            'name': 'TAX_BASE',
+            'code': 'TBASE',
+            'user_type_id': self.env.ref('account.data_account_type_current_assets').id,
+            'company_id': company.id,
+        })
+
+        # Journals
+        self.purchase_journal = self.env['account.journal'].create({
+            'name': 'purchase',
+            'code': 'PURCH',
+            'type': 'purchase',
+        })
+        self.cash_basis_journal = self.env['account.journal'].create({
+            'name': 'CABA',
+            'code': 'CABA',
+            'type': 'general',
+        })
+
+        # Tax Cash Basis
+        self.tax_cash_basis = self.env['account.tax'].create({
+            'name': 'cash basis 20%',
+            'type_tax_use': 'purchase',
+            'company_id': company.id,
+            'amount': 20,
+            'account_id': self.tax_waiting_account.id,
+            'tax_exigibility': 'on_payment',
+            'cash_basis_account_id': self.tax_final_account.id,
+            'cash_basis_base_account_id': self.tax_base_amount_account.id,
+        })
+
     def create_invoice(self, type='out_invoice', invoice_amount=50, currency_id=None):
         #we create an invoice in given currency
         invoice = self.account_invoice_model.create({'partner_id': self.partner_agrolait_id,
@@ -1107,3 +1159,288 @@ class TestReconciliation(AccountingTestCase):
 
         receivable_lines = invoice.move_id.line_ids.filtered(lambda line: line.account_id == self.account_rcv).sorted('date_maturity')[0]
         self.assertTrue(receivable_lines.matched_credit_ids)
+
+    def test_reconciliation_cash_basis01(self):
+        # Simulates an expense made up by 2 lines
+        # one is subject to a cash basis tax
+        # the other is not subject to tax
+
+        company = self.env.ref('base.main_company')
+        company.tax_cash_basis_journal_id = self.cash_basis_journal
+
+        AccountMoveLine = self.env['account.move.line'].with_context(check_move_validity=False)
+
+        # Purchase
+        purchase_move = self.env['account.move'].create({
+            'name': 'purchase',
+            'journal_id': self.purchase_journal.id,
+        })
+
+        purchase_payable_line0 = AccountMoveLine.create({
+            'account_id': self.account_rsa.id,
+            'credit': 100,
+            'move_id': purchase_move.id,
+        })
+        purchase_payable_line1 = AccountMoveLine.create({
+            'account_id': self.account_rsa.id,
+            'credit': 50,
+            'move_id': purchase_move.id,
+        })
+        AccountMoveLine.create({
+            'name': 'expensNoTax',
+            'account_id': self.expense_account.id,
+            'debit': 50,
+            'move_id': purchase_move.id,
+        })
+        AccountMoveLine.create({
+            'name': 'expenseTaxed',
+            'account_id': self.expense_account.id,
+            'debit': 83.33,
+            'move_id': purchase_move.id,
+            'tax_ids': [(4, self.tax_cash_basis.id, False)],
+        })
+        tax_line = AccountMoveLine.create({
+            'name': 'TaxLine',
+            'account_id': self.tax_waiting_account.id,
+            'debit': 16.67,
+            'move_id': purchase_move.id,
+            'tax_line_id': self.tax_cash_basis.id,
+        })
+        purchase_move.post()
+
+        # Payment Move
+        payment_move = self.env['account.move'].create({
+            'name': 'payment',
+            'journal_id': self.bank_journal_euro.id,
+        })
+        payment_payable_line = AccountMoveLine.create({
+            'account_id': self.account_rsa.id,
+            'debit': 150,
+            'move_id': payment_move.id,
+        })
+        AccountMoveLine.create({
+            'account_id': self.account_euro.id,
+            'credit': 150,
+            'move_id': payment_move.id,
+        })
+        payment_move.post()
+
+        to_reconcile = (purchase_move + payment_move).mapped('line_ids').filtered(lambda l: l.account_id.internal_type == 'payable')
+        to_reconcile.reconcile()
+
+        cash_basis_moves = self.env['account.move'].search([('journal_id', '=', self.cash_basis_journal.id)])
+
+        self.assertEqual(len(cash_basis_moves), 2)
+        self.assertTrue(cash_basis_moves.exists())
+
+        # check reconciliation in Payable account
+        self.assertTrue(purchase_payable_line0.full_reconcile_id.exists())
+        self.assertEqual(purchase_payable_line0.full_reconcile_id.reconciled_line_ids,
+            purchase_payable_line0 + purchase_payable_line1 + payment_payable_line)
+
+        cash_basis_aml_ids = cash_basis_moves.mapped('line_ids')
+        # check reconciliation in the tax waiting account
+        self.assertTrue(tax_line.full_reconcile_id.exists())
+        self.assertEqual(tax_line.full_reconcile_id.reconciled_line_ids,
+            cash_basis_aml_ids.filtered(lambda l: l.account_id == self.tax_waiting_account) + tax_line)
+
+        self.assertEqual(len(cash_basis_aml_ids), 8)
+
+        # check amounts
+        cash_basis_move1 = cash_basis_moves.filtered(lambda m: m.amount == 33.34)
+        cash_basis_move2 = cash_basis_moves.filtered(lambda m: m.amount == 66.66)
+
+        self.assertTrue(cash_basis_move1.exists())
+        self.assertTrue(cash_basis_move2.exists())
+
+        # For first move
+        move_lines = cash_basis_move1.line_ids
+        base_amount_tax_lines = move_lines.filtered(lambda l: l.account_id == self.tax_base_amount_account)
+        self.assertEqual(len(base_amount_tax_lines), 2)
+        self.assertAlmostEqual(sum(base_amount_tax_lines.mapped('credit')), 27.78)
+        self.assertAlmostEqual(sum(base_amount_tax_lines.mapped('debit')), 27.78)
+
+        self.assertAlmostEqual((move_lines - base_amount_tax_lines).filtered(lambda l: l.account_id == self.tax_waiting_account).credit,
+            5.56)
+        self.assertAlmostEqual((move_lines - base_amount_tax_lines).filtered(lambda l: l.account_id == self.tax_final_account).debit,
+            5.56)
+
+        # For second move
+        move_lines = cash_basis_move2.line_ids
+        base_amount_tax_lines = move_lines.filtered(lambda l: l.account_id == self.tax_base_amount_account)
+        self.assertEqual(len(base_amount_tax_lines), 2)
+        self.assertAlmostEqual(sum(base_amount_tax_lines.mapped('credit')), 55.55)
+        self.assertAlmostEqual(sum(base_amount_tax_lines.mapped('debit')), 55.55)
+
+        self.assertAlmostEqual((move_lines - base_amount_tax_lines).filtered(lambda l: l.account_id == self.tax_waiting_account).credit,
+            11.11)
+        self.assertAlmostEqual((move_lines - base_amount_tax_lines).filtered(lambda l: l.account_id == self.tax_final_account).debit,
+            11.11)
+
+    def test_reconciliation_cash_basis02(self):
+        # Simulates an invoice made up by 2 lines
+        # both subjected to cash basis taxes
+        # with 2 payment terms
+        # And partial payment not martching any payment term
+
+        company = self.env.ref('base.main_company')
+        company.tax_cash_basis_journal_id = self.cash_basis_journal
+        tax_cash_basis10percent = self.tax_cash_basis.copy({'amount': 10})
+        tax_waiting_account10 = self.tax_waiting_account.copy({
+            'name': 'TAX WAIT 10',
+            'code': 'TWAIT1',
+        })
+
+
+        AccountMoveLine = self.env['account.move.line'].with_context(check_move_validity=False)
+
+        # Purchase
+        purchase_move = self.env['account.move'].create({
+            'name': 'invoice',
+            'journal_id': self.purchase_journal.id,
+        })
+
+        purchase_payable_line0 = AccountMoveLine.create({
+            'account_id': self.account_rsa.id,
+            'credit': 105,
+            'move_id': purchase_move.id,
+        })
+        purchase_payable_line1 = AccountMoveLine.create({
+            'account_id': self.account_rsa.id,
+            'credit': 50,
+            'move_id': purchase_move.id,
+        })
+        AccountMoveLine.create({
+            'name': 'expenseTaxed 10%',
+            'account_id': self.expense_account.id,
+            'debit': 50,
+            'move_id': purchase_move.id,
+            'tax_ids': [(4, tax_cash_basis10percent.id, False)],
+        })
+        tax_line0 = AccountMoveLine.create({
+            'name': 'TaxLine0',
+            'account_id': tax_waiting_account10.id,
+            'debit': 5,
+            'move_id': purchase_move.id,
+            'tax_line_id': tax_cash_basis10percent.id,
+        })
+        AccountMoveLine.create({
+            'name': 'expenseTaxed 20%',
+            'account_id': self.expense_account.id,
+            'debit': 83.33,
+            'move_id': purchase_move.id,
+            'tax_ids': [(4, self.tax_cash_basis.id, False)],
+        })
+        tax_line1 = AccountMoveLine.create({
+            'name': 'TaxLine1',
+            'account_id': self.tax_waiting_account.id,
+            'debit': 16.67,
+            'move_id': purchase_move.id,
+            'tax_line_id': self.tax_cash_basis.id,
+        })
+        purchase_move.post()
+
+        # Payment Move
+        payment_move0 = self.env['account.move'].create({
+            'name': 'payment',
+            'journal_id': self.bank_journal_euro.id,
+        })
+        payment_payable_line0 = AccountMoveLine.create({
+            'account_id': self.account_rsa.id,
+            'debit': 40,
+            'move_id': payment_move0.id,
+        })
+        AccountMoveLine.create({
+            'account_id': self.account_euro.id,
+            'credit': 40,
+            'move_id': payment_move0.id,
+        })
+        payment_move0.post()
+
+        # Payment Move
+        payment_move1 = self.env['account.move'].create({
+            'name': 'payment',
+            'journal_id': self.bank_journal_euro.id,
+        })
+        payment_payable_line1 = AccountMoveLine.create({
+            'account_id': self.account_rsa.id,
+            'debit': 115,
+            'move_id': payment_move1.id,
+        })
+        AccountMoveLine.create({
+            'account_id': self.account_euro.id,
+            'credit': 115,
+            'move_id': payment_move1.id,
+        })
+        payment_move1.post()
+
+        (purchase_move + payment_move0).mapped('line_ids').filtered(lambda l: l.account_id.internal_type == 'payable').reconcile()
+        (purchase_move + payment_move1).mapped('line_ids').filtered(lambda l: l.account_id.internal_type == 'payable').reconcile()
+
+        cash_basis_moves = self.env['account.move'].search([('journal_id', '=', self.cash_basis_journal.id)])
+
+        self.assertEqual(len(cash_basis_moves), 3)
+        self.assertTrue(cash_basis_moves.exists())
+
+        # check reconciliation in Payable account
+        self.assertTrue(purchase_payable_line0.full_reconcile_id.exists())
+        self.assertEqual(purchase_payable_line0.full_reconcile_id.reconciled_line_ids,
+            purchase_payable_line0 + purchase_payable_line1 + payment_payable_line0 + payment_payable_line1)
+
+        cash_basis_aml_ids = cash_basis_moves.mapped('line_ids')
+
+        # check reconciliation in the tax waiting account
+        self.assertTrue(tax_line0.full_reconcile_id.exists())
+        self.assertEqual(tax_line0.full_reconcile_id.reconciled_line_ids,
+            cash_basis_aml_ids.filtered(lambda l: l.account_id == tax_waiting_account10) + tax_line0)
+
+        self.assertTrue(tax_line1.full_reconcile_id.exists())
+        self.assertEqual(tax_line1.full_reconcile_id.reconciled_line_ids,
+            cash_basis_aml_ids.filtered(lambda l: l.account_id == self.tax_waiting_account) + tax_line1)
+
+        self.assertEqual(len(cash_basis_aml_ids), 24)
+
+        # check amounts
+        expected_move_amounts = [
+            {'base_20': 56.45, 'tax_20': 11.29, 'base_10': 33.87, 'tax_10': 3.39},
+            {'base_20': 21.50, 'tax_20': 4.30, 'base_10': 12.90, 'tax_10': 1.29},
+            {'base_20': 5.38, 'tax_20': 1.08, 'base_10': 3.23, 'tax_10': 0.32},
+        ]
+
+        index = 0
+        for cb_move in cash_basis_moves.sorted('amount', reverse=True):
+            expected = expected_move_amounts[index]
+            move_lines = cb_move.line_ids
+            base_amount_tax_lines20per = move_lines.filtered(lambda l: l.account_id == self.tax_base_amount_account and '20%' in l.name)
+            base_amount_tax_lines10per = move_lines.filtered(lambda l: l.account_id == self.tax_base_amount_account and '10%' in l.name)
+            self.assertEqual(len(base_amount_tax_lines20per), 2)
+
+            self.assertAlmostEqual(sum(base_amount_tax_lines20per.mapped('credit')), expected['base_20'])
+            self.assertAlmostEqual(sum(base_amount_tax_lines20per.mapped('debit')), expected['base_20'])
+
+            self.assertEqual(len(base_amount_tax_lines10per), 2)
+            self.assertAlmostEqual(sum(base_amount_tax_lines10per.mapped('credit')), expected['base_10'])
+            self.assertAlmostEqual(sum(base_amount_tax_lines10per.mapped('debit')), expected['base_10'])
+
+            self.assertAlmostEqual(
+                (move_lines - base_amount_tax_lines20per - base_amount_tax_lines10per)
+                .filtered(lambda l: l.account_id == self.tax_waiting_account).credit,
+                expected['tax_20']
+            )
+            self.assertAlmostEqual(
+                (move_lines - base_amount_tax_lines20per - base_amount_tax_lines10per)
+                .filtered(lambda l: 'TaxLine1' in l.name).debit,
+                expected['tax_20']
+            )
+
+            self.assertAlmostEqual(
+                (move_lines - base_amount_tax_lines20per - base_amount_tax_lines10per)
+                .filtered(lambda l: l.account_id == tax_waiting_account10).credit,
+                expected['tax_10']
+            )
+            self.assertAlmostEqual(
+                (move_lines - base_amount_tax_lines20per - base_amount_tax_lines10per)
+                .filtered(lambda l: 'TaxLine0' in l.name).debit,
+                expected['tax_10']
+            )
+            index += 1

From 46f6a26acbea524319e173ab6028f6f3611b2043 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Warnon?= <awa@odoo.com>
Date: Tue, 8 Jan 2019 08:52:13 +0000
Subject: [PATCH 49/66] [FIX] website_slides: add missing class to show
 discussion tab panel

Task #1923443

Purpose
=======

Probably due to the migration to bootstrap 4, the active tab panel in the 'slide_detail_view' was not displayed
on page loading (and only when switching back and forth in the tabs).

partly closes #29901
---
 addons/website_slides/views/website_slides.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website_slides/views/website_slides.xml b/addons/website_slides/views/website_slides.xml
index d11a897b487..e4f90b69ea9 100644
--- a/addons/website_slides/views/website_slides.xml
+++ b/addons/website_slides/views/website_slides.xml
@@ -508,7 +508,7 @@
                                 </li>
                             </ul>
                             <div class="tab-content" style="padding: 20px 5px 5px 5px; word-wrap: break-word;">
-                                <div role="tabpanel" t-att-class="not comments and 'tab-pane fade active in' or 'tab-pane fade'" id="about">
+                                <div role="tabpanel" t-att-class="not comments and 'tab-pane fade in show active' or 'tab-pane fade'" id="about">
                                     <div t-field="slide.description"/>
                                 </div>
                                 <div role="tabpanel" class="tab-pane fade" t-if="slide.website_published" id="share">
@@ -529,7 +529,7 @@
                                         The social sharing module will be unlocked when a moderator will allow your publication.
                                     </h4>
                                 </div>
-                                <div role="tabpanel" t-att-class="comments and 'tab-pane fade active in' or 'tab-pane fade'" id="discuss">
+                                <div role="tabpanel" t-att-class="comments and 'tab-pane fade in show active' or 'tab-pane fade'" id="discuss">
                                     <t t-call="portal.message_thread">
                                         <t t-set="object" t-value="slide"/>
                                     </t>

From ba925fb06d07a8ff58b1e558fe1a3c3bbb205eaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Warnon?= <awa@odoo.com>
Date: Tue, 8 Jan 2019 09:31:24 +0000
Subject: [PATCH 50/66] [FIX] website_slides: fix UI glitch when adding
 like/dislike to slide

Task #1923443

Purpose
=======

When adding a like/dislike to a slide, the like/dislike counter was not properly updated.

partly closes #29901

closes odoo/odoo#30027
---
 addons/website_slides/static/src/js/slides.js  | 2 +-
 addons/website_slides/views/website_slides.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/website_slides/static/src/js/slides.js b/addons/website_slides/static/src/js/slides.js
index e869f607d6e..d1a7dd216e8 100644
--- a/addons/website_slides/static/src/js/slides.js
+++ b/addons/website_slides/static/src/js/slides.js
@@ -55,7 +55,7 @@ var page_widgets = {};
             if(is_public){
                 this.popover_alert(button, _.str.sprintf(_t('Please <a href="/web?redirect=%s">login</a> to vote this slide'), (document.URL)));
             }else{
-                var target = button.find('.fa');
+                var target = button.find('.o_wslides_like_dislike_count');
                 if (local_storage.getItem('slide_vote_' + slide_id) !== user_id.toString()) {
                     ajax.jsonRpc(href, 'call', {slide_id: slide_id}).then(function (data) {
                         target.text(data);
diff --git a/addons/website_slides/views/website_slides.xml b/addons/website_slides/views/website_slides.xml
index e4f90b69ea9..21133691134 100644
--- a/addons/website_slides/views/website_slides.xml
+++ b/addons/website_slides/views/website_slides.xml
@@ -462,7 +462,7 @@
                                             tabindex="0"
                                             data-toggle="popover">
                                             <i class="fa fa-thumbs-up fa-1x" role="img" aria-label="Likes" title="Likes"/>
-                                            <t t-esc="slide.likes"/>
+                                            <span class="o_wslides_like_dislike_count" t-esc="slide.likes"/>
                                         </span>
                                         <span
                                             class="oe_slide_js_unlike"
@@ -473,7 +473,7 @@
                                             tabindex="0"
                                             data-toggle="popover">
                                             <i class="fa fa-thumbs-down fa-1x" role="img" aria-label="Dislikes" title="Dislikes"/>
-                                            <t t-esc="slide.dislikes"/>
+                                            <span class="o_wslides_like_dislike_count" t-esc="slide.dislikes"/>
                                         </span>
                                     </div>
                                 </div>

From f69fde6e2c2b6e5e037853d5c6d61703caa4ff52 Mon Sep 17 00:00:00 2001
From: Jorge Pinna Puissant <jpp@odoo.com>
Date: Tue, 8 Jan 2019 14:32:34 +0000
Subject: [PATCH 51/66] [FIX] product: report product labels price opw-1916965

Before this commit, the price printed in the product label was the
list_price (catalog price) it didn't take into account the extra price
of the variants.

Now, the price printed is the lst_price (catalog value + extra).

closes odoo/odoo#30039
---
 addons/product/report/product_product_templates.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/product/report/product_product_templates.xml b/addons/product/report/product_product_templates.xml
index bf8d0acfc10..2a612f556bc 100644
--- a/addons/product/report/product_product_templates.xml
+++ b/addons/product/report/product_product_templates.xml
@@ -12,7 +12,7 @@
                     <tr>
                         <td>
                             <strong>Price:</strong>
-                            <strong t-field="product.list_price" t-options="{'widget': 'monetary', 'display_currency': product.company_id.currency_id}"/>
+                            <strong t-field="product.lst_price" t-options="{'widget': 'monetary', 'display_currency': product.company_id.currency_id}"/>
                         </td>
                     </tr>
                       <t t-if="product.barcode">

From b87879c1f64c91a925f4814a03687d717791346c Mon Sep 17 00:00:00 2001
From: "Lucas Perais (lpe)" <lpe@odoo.com>
Date: Wed, 9 Jan 2019 14:32:04 +0000
Subject: [PATCH 52/66] [FIX] web_editor: icon widget complies to api

the search method should return a Deferred as explicit in MediaDialog

OPW 1919549

closes odoo/odoo#30077
---
 addons/web_editor/static/src/js/widgets/widgets.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/web_editor/static/src/js/widgets/widgets.js b/addons/web_editor/static/src/js/widgets/widgets.js
index 3fe18ab503e..b9e2a3289a0 100644
--- a/addons/web_editor/static/src/js/widgets/widgets.js
+++ b/addons/web_editor/static/src/js/widgets/widgets.js
@@ -724,6 +724,7 @@ var IconWidget = MediaWidget.extend({
         this.$('div.font-icons-icons').html(
             QWeb.render('web_editor.dialog.font-icons.icons', {iconsParser: iconsParser})
         );
+        return $.when();
     },
 
     //--------------------------------------------------------------------------

From 2b9f8452227f8cca9cd43d78c189accfc46dd16a Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Thu, 10 Jan 2019 14:49:41 +0000
Subject: [PATCH 53/66] [FIX] base: correct translation synchronisation

Avoid matching terms that will be discarded when synchronising
translations.

opw-1921639
opw-1923669
opw-1921933
opw-1921509
opw-1919989
opw-1917321
opw-1916782
opw-1915683
opw-1900821
opw-1891187

closes odoo/odoo#30114
---
 odoo/addons/base/models/ir_translation.py |  2 ++
 odoo/addons/base/tests/test_translate.py  | 28 +++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/odoo/addons/base/models/ir_translation.py b/odoo/addons/base/models/ir_translation.py
index 15d03256ea5..940708ea0b7 100644
--- a/odoo/addons/base/models/ir_translation.py
+++ b/odoo/addons/base/models/ir_translation.py
@@ -488,6 +488,8 @@ class IrTranslation(models.Model):
             for translation in translations:
                 if translation.src == translation.value:
                     discarded += translation
+                    # consider it done to avoid being matched against another term
+                    done.add((translation.src, translation.lang))
                 elif translation.src in terms:
                     done.add((translation.src, translation.lang))
                 else:
diff --git a/odoo/addons/base/tests/test_translate.py b/odoo/addons/base/tests/test_translate.py
index a6cbcc2d52a..2d3275142f1 100644
--- a/odoo/addons/base/tests/test_translate.py
+++ b/odoo/addons/base/tests/test_translate.py
@@ -406,3 +406,31 @@ class TestXMLTranslation(TransactionCase):
         self.assertEqual(view.with_env(env_en).arch_db, archf % terms_en)
         self.assertEqual(view.with_env(env_fr).arch_db, archf % terms_fr)
         self.assertEqual(view.with_env(env_nl).arch_db, archf % terms_nl)
+
+    def test_sync_update(self):
+        """ Check translations after minor change in source terms. """
+        archf = '<form string="X"><div>%s</div><div>%s</div></form>'
+        terms_src = ('Subtotal', 'Subtotal:')
+        terms_en = ('Subtotal', 'Sub total:')
+        view = self.create_view(archf, terms_src, en_US=terms_en)
+
+        translations = self.env['ir.translation'].search([
+            ('type', '=', 'model_terms'),
+            ('name', '=', "ir.ui.view,arch_db"),
+            ('res_id', '=', view.id),
+        ])
+        self.assertEqual(len(translations), 2)
+
+        # modifying the arch should sync existing translations without errors
+        view.write({
+            "arch": archf % ('Subtotal', 'Subtotal:<br/>')
+        })
+
+        translations = self.env['ir.translation'].search([
+            ('type', '=', 'model_terms'),
+            ('name', '=', "ir.ui.view,arch_db"),
+            ('res_id', '=', view.id),
+        ])
+        # 'Subtotal' being src==value, it will be discared
+        # 'Subtotal:' will be discarded as it match 'Subtotal' instead of 'Subtotal:<br/>'
+        self.assertEqual(len(translations), 0)

From ec2263080abba3b5385b13d381e8c934ef8f5657 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@odoo.com>
Date: Thu, 10 Jan 2019 14:47:10 +0000
Subject: [PATCH 54/66] [FIX] fields: inherited fields keep parent's modules

On a field created through a _inherits, the fields on the child model did not
benefit from the parent _modules information.

If two models are created in module base

class Partner(models.Model):
    _name = 'res.partner'

class User(models.Model):
    _inherits = {'res.partner': 'partner_id'}

   partner_id = fields.Many2one('res.partner')

and a second module auth_signup adds a field on the parent model

class ResPartner(models.Model):
    _inherit = 'res.partner'

    signup_token = fields.Char()

Both res.users and res.partner should have an ir.model.data create

base_setup.field_res_partner__signup_token was correctly created but
base_setup.field_res_users__signup_token was not created

The reason is was, in the call to _reflect_model, since 574f4c3deb2671b7, the
creation of ir.model.data is based on the field._modules
However, the field res.partner.signup_token did not propagate its _modules value
to the related field res.users.signup_token

With this patch, both ir.model.data are created.

This allow a proper uninstallation of fields as well as translation.
---
 odoo/fields.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/odoo/fields.py b/odoo/fields.py
index 1ea869f46a2..f054bf5a90c 100644
--- a/odoo/fields.py
+++ b/odoo/fields.py
@@ -560,6 +560,9 @@ class Field(MetaField('DummyField', (object,), {})):
         if self.inherited and field.required:
             self.required = True
 
+        if self.inherited:
+            self._modules.update(field._modules)
+
     def traverse_related(self, record):
         """ Traverse the fields of the related field `self` except for the last
         one, and return it as a pair `(last_record, last_field)`. """

From 73ebe68486bb6892d001f15e9ed4a8bf4aee8766 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@odoo.com>
Date: Wed, 9 Jan 2019 13:45:02 +0000
Subject: [PATCH 55/66] [ADD] test_inherits_depends: new test module

This commit adds a test to test the scenario fixed in the parent commit.

Creating a new test module is necessary as the bug is only revealed when the
current module is different than the model._original_module (cf c9837ac5dcb)

Before that commit, was failing only the second search of
test_ir_model_data_inherits_depends.
Add other test to avoid regression of the bugs corrected at 574f4c3d and c9837ac

closes odoo/odoo#30116
---
 .../test_inherits/tests/test_inherits.py      | 11 +++++++
 odoo/addons/test_inherits_depends/__init__.py |  3 ++
 .../test_inherits_depends/__manifest__.py     | 12 ++++++++
 odoo/addons/test_inherits_depends/models.py   | 10 +++++++
 .../test_inherits_depends/tests/__init__.py   |  3 ++
 .../tests/test_inherits.py                    | 29 +++++++++++++++++++
 6 files changed, 68 insertions(+)
 create mode 100644 odoo/addons/test_inherits_depends/__init__.py
 create mode 100644 odoo/addons/test_inherits_depends/__manifest__.py
 create mode 100644 odoo/addons/test_inherits_depends/models.py
 create mode 100644 odoo/addons/test_inherits_depends/tests/__init__.py
 create mode 100644 odoo/addons/test_inherits_depends/tests/test_inherits.py

diff --git a/odoo/addons/test_inherits/tests/test_inherits.py b/odoo/addons/test_inherits/tests/test_inherits.py
index 246222b14ff..85396de5441 100644
--- a/odoo/addons/test_inherits/tests/test_inherits.py
+++ b/odoo/addons/test_inherits/tests/test_inherits.py
@@ -26,3 +26,14 @@ class test_inherits(common.TransactionCase):
         pallet = self.env.ref('test_inherits.pallet_a')
         pallet.write({'name': 'C'})
         self.assertEqual(pallet.name, 'C')
+
+    def test_ir_model_data_inherits(self):
+        """ Check the existence of the correct ir.model.data """
+        IrModelData = self.env['ir.model.data']
+        field = IrModelData.search([('name', '=', 'field_test_unit__name')])
+        self.assertEqual(len(field), 1)
+        self.assertEqual(field.module, 'test_inherits')
+
+        field = IrModelData.search([('name', '=', 'field_test_box__name')])
+        self.assertEqual(len(field), 1)
+        self.assertEqual(field.module, 'test_inherits')
diff --git a/odoo/addons/test_inherits_depends/__init__.py b/odoo/addons/test_inherits_depends/__init__.py
new file mode 100644
index 00000000000..d6210b1285d
--- /dev/null
+++ b/odoo/addons/test_inherits_depends/__init__.py
@@ -0,0 +1,3 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import models
diff --git a/odoo/addons/test_inherits_depends/__manifest__.py b/odoo/addons/test_inherits_depends/__manifest__.py
new file mode 100644
index 00000000000..335fdee1362
--- /dev/null
+++ b/odoo/addons/test_inherits_depends/__manifest__.py
@@ -0,0 +1,12 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+{
+    'name': 'test-inherits-depends',
+    'version': '0.1',
+    'category': 'Tests',
+    'description': """A module to verify the inheritance using _inherits in non-original modules.""",
+    'depends': ['test_inherits'],
+    'data': [],
+    'installable': True,
+    'auto_install': False,
+}
diff --git a/odoo/addons/test_inherits_depends/models.py b/odoo/addons/test_inherits_depends/models.py
new file mode 100644
index 00000000000..77ad3ad1206
--- /dev/null
+++ b/odoo/addons/test_inherits_depends/models.py
@@ -0,0 +1,10 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import models, fields
+
+
+# We add a field on this model
+class Unit(models.Model):
+    _inherit = 'test.unit'
+
+    second_name = fields.Char()
diff --git a/odoo/addons/test_inherits_depends/tests/__init__.py b/odoo/addons/test_inherits_depends/tests/__init__.py
new file mode 100644
index 00000000000..5a5bb8a95f3
--- /dev/null
+++ b/odoo/addons/test_inherits_depends/tests/__init__.py
@@ -0,0 +1,3 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import test_inherits
diff --git a/odoo/addons/test_inherits_depends/tests/test_inherits.py b/odoo/addons/test_inherits_depends/tests/test_inherits.py
new file mode 100644
index 00000000000..c758b47f8de
--- /dev/null
+++ b/odoo/addons/test_inherits_depends/tests/test_inherits.py
@@ -0,0 +1,29 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo.tests import common
+
+
+class test_inherits(common.TransactionCase):
+
+    def test_ir_model_data_inherits_again(self):
+        """ Re-run test_inherits test to make sure another imd hasn't been created """
+        IrModelData = self.env['ir.model.data']
+        field = IrModelData.search([('name', '=', 'field_test_unit__name')])
+        self.assertEqual(len(field), 1)
+        self.assertEqual(field.module, 'test_inherits')
+
+        field = IrModelData.search([('name', '=', 'field_test_box__name')])
+        self.assertEqual(len(field), 1)
+        self.assertEqual(field.module, 'test_inherits')
+
+
+    def test_ir_model_data_inherits_depends(self):
+        """ Check the existence of the correct ir.model.data """
+        IrModelData = self.env['ir.model.data']
+        field = IrModelData.search([('name', '=', 'field_test_unit__second_name')])
+        self.assertEqual(len(field), 1)
+        self.assertEqual(field.module, 'test_inherits_depends')
+
+        field = IrModelData.search([('name', '=', 'field_test_box__second_name')])
+        self.assertEqual(len(field), 1)
+        self.assertEqual(field.module, 'test_inherits_depends')

From 2ce4ccd0865e05d8fe6b079fecb319caf65c2d2e Mon Sep 17 00:00:00 2001
From: Jorge Pinna Puissant <jpp@odoo.com>
Date: Fri, 11 Jan 2019 10:11:43 +0000
Subject: [PATCH 56/66] [FIX] mail: Failed mail notification wrong title
 opw-1921686

The failed mail notification group all the records of the same
model that failed to send an email.

Before this commit, the failed mail notification displayed as
title the name of the last record that failed to send an email.

Now, the notification displays as title the model name.

closes odoo/odoo#30134
---
 addons/mail/static/src/js/models/mail_failure.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/static/src/js/models/mail_failure.js b/addons/mail/static/src/js/models/mail_failure.js
index 390b195f8d9..438430c752f 100644
--- a/addons/mail/static/src/js/models/mail_failure.js
+++ b/addons/mail/static/src/js/models/mail_failure.js
@@ -83,7 +83,7 @@ var MailFailure = Class.extend(Mixins.EventDispatcherMixin, ServicesMixin, {
             documentModel: this._documentModel,
             id: 'mail_failure',
             imageSRC: this._moduleIcon,
-            title: this._recordName,
+            title: this._modelName,
         };
         return preview;
     },

From 295a6542833599fe4d05fea4f5cc4e360bcf98c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20K=C3=BChn?= <aku@odoo.com>
Date: Fri, 11 Jan 2019 10:49:50 +0000
Subject: [PATCH 57/66] [FIX] mail: chat window positioning with discuss open

Before this commit, the process of positioning chat windows
could fail if one of the tabs had discuss open.

When a chat window was hidden and become visible, the algorithm
was not updating the state of the chat window to "visible" when
discuss was open. As a result, it was always trying to make it
visible, resulting in an infinite loop and raising the following
error message:

`Uncaught RangeError: Maximum call stack size exceeded`

This commit ensures it works even when discuss is open.

opw-1919327

closes odoo/odoo#30137
---
 addons/mail/static/src/js/services/mail_window_manager.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/addons/mail/static/src/js/services/mail_window_manager.js b/addons/mail/static/src/js/services/mail_window_manager.js
index 79ea668e55e..008b6cf7a6d 100644
--- a/addons/mail/static/src/js/services/mail_window_manager.js
+++ b/addons/mail/static/src/js/services/mail_window_manager.js
@@ -532,9 +532,6 @@ MailManager.include({
      * @private
      */
     _repositionThreadWindows: function () {
-        if (this._areAllThreadWindowsHidden()) {
-            return;
-        }
         this._computeAvailableSlotsForThreadWindows();
 
         this._repositionVisibleThreadWindows();
@@ -576,9 +573,6 @@ MailManager.include({
      *   the focus is on the thread window.
      */
     _updateThreadWindowsFromMessage: function (message, options) {
-        if (this._areAllThreadWindowsHidden()) {
-            return;
-        }
         _.each(this._threadWindows, function (threadWindow) {
             if (_.contains(message.getThreadIDs(), threadWindow.getID())) {
                 threadWindow.update(options);

From a46dbae071999902e8519af91674a84aa660f762 Mon Sep 17 00:00:00 2001
From: Nans Lefebvre <len@odoo.com>
Date: Mon, 7 Jan 2019 10:01:49 +0000
Subject: [PATCH 58/66] [FIX] base: disable prefetching during module uninstall

During uninstallation of a module, recompute operations may be triggered.
The prefetch might thus try to read a column that has already been deleted.

Install CRM, create an opportunity then schedule a meeting
(itself a calendar event linked to the opportunity).
Note that the CRM module adds an opportunity_id field on events.
When you try to uninstall the module, the bug is triggered.
The calendar model contains a res_model field, which is related to res_model_id.
Its recompute triggers the prefetching of the opportunity_id field,
which has already been removed.

opw 1917354

closes odoo/odoo#29979
---
 odoo/addons/base/models/ir_model.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/odoo/addons/base/models/ir_model.py b/odoo/addons/base/models/ir_model.py
index 38ecd83888a..49dda7f249b 100644
--- a/odoo/addons/base/models/ir_model.py
+++ b/odoo/addons/base/models/ir_model.py
@@ -1539,7 +1539,8 @@ class IrModelData(models.Model):
             raise AccessError(_('Administrator access is required to uninstall a module'))
 
         # enable model/field deletion
-        self = self.with_context(**{MODULE_UNINSTALL_FLAG: True})
+        # we deactivate prefetching to not try to read a column that has been deleted
+        self = self.with_context(**{MODULE_UNINSTALL_FLAG: True, 'prefetch_fields': False})
 
         datas = self.search([('module', 'in', modules_to_remove)])
         to_unlink = tools.OrderedSet()

From 5f12e244f6e57b8edb56788147774150e2ae134d Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Thu, 10 Jan 2019 13:48:40 +0000
Subject: [PATCH 59/66] [IMP] base: compute implied groups in SQL

SQL improve the speed of the implied group
VS the orm version.

closes odoo/odoo#30108
---
 odoo/addons/base/res/res_users.py | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/odoo/addons/base/res/res_users.py b/odoo/addons/base/res/res_users.py
index 8c7194d4279..12b31da37ec 100644
--- a/odoo/addons/base/res/res_users.py
+++ b/odoo/addons/base/res/res_users.py
@@ -657,8 +657,26 @@ class GroupsImplied(models.Model):
         if values.get('users') or values.get('implied_ids'):
             # add all implied groups (to all users of each group)
             for group in self:
-                vals = {'users': zip(repeat(4), group.with_context(active_test=False).users.ids)}
-                super(GroupsImplied, group.trans_implied_ids).write(vals)
+                self._cr.execute("""
+                    WITH RECURSIVE group_imply(gid, hid) AS (
+                        SELECT gid, hid
+                          FROM res_groups_implied_rel
+                         UNION
+                        SELECT i.gid, r.hid
+                          FROM res_groups_implied_rel r
+                          JOIN group_imply i ON (i.hid = r.gid)
+                    )
+                    INSERT INTO res_groups_users_rel (gid, uid)
+                         SELECT i.hid, r.uid
+                           FROM group_imply i, res_groups_users_rel r
+                          WHERE r.gid = i.gid
+                            AND i.gid = %(gid)s
+                         EXCEPT
+                         SELECT r.gid, r.uid
+                           FROM res_groups_users_rel r
+                           JOIN group_imply i ON (r.gid = i.hid)
+                          WHERE i.gid = %(gid)s
+                """, dict(gid=group.id))
         return res
 
 

From e033114879cfe4a487549c0abbe37ec18bc151c9 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Thu, 10 Jan 2019 18:54:48 +0100
Subject: [PATCH 60/66] [FIX] sale_timesheet: correct test

Since 5efec7ccdd8ca3f15fad5df8de7c23154c23a7d9, ProjectPlan widget
expect actual html.
---
 addons/sale_timesheet/static/tests/timesheet_plan_tests.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale_timesheet/static/tests/timesheet_plan_tests.js b/addons/sale_timesheet/static/tests/timesheet_plan_tests.js
index d1d71c4face..12ccea8e53b 100644
--- a/addons/sale_timesheet/static/tests/timesheet_plan_tests.js
+++ b/addons/sale_timesheet/static/tests/timesheet_plan_tests.js
@@ -48,7 +48,7 @@ QUnit.module('Timesheet Plan', {
             mockRPC: function (route) {
                 assert.step(route);
                 if (route === '/timesheet/plan') {
-                    return $.when({html_content: 'Banach-Tarski'});
+                    return $.when({html_content: '<p>Banach-Tarski</p>'});
                 }
                 return this._super.apply(this, arguments);
             },
@@ -81,7 +81,7 @@ QUnit.module('Timesheet Plan', {
             action: {name: 'Fibonacci'},
             mockRPC: function (route) {
                 if (route === '/timesheet/plan') {
-                    return $.when({html_content: 'Banach-Tarski'});
+                    return $.when({html_content: '<p>Banach-Tarski</p>'});
                 }
                 return this._super.apply(this, arguments);
             },

From be6f1aa179ab252b0a75dcb872d30fcc1a8196b8 Mon Sep 17 00:00:00 2001
From: Romain Derie <rde@odoo.com>
Date: Fri, 11 Jan 2019 12:26:04 +0000
Subject: [PATCH 61/66] [FIX] website: fix the card collapse opening on debug
 error 500

Since panel collapse became card collapse while migrating from BS3 to BS4 with
commit 59237ea81988, it is impossible to open the card content.

Indeed, there was already data-parent attribut pointing to inexisting DOM
element. This was not an issue in BS3 but BS4 is not working with it.

closes odoo/odoo#30142
---
 addons/website/views/website_templates.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 614c9f1971f..46c463d3b02 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -844,7 +844,7 @@
     <div class="container accordion mb32 mt32" id="debug_infos">
         <div class="card" t-if="exception">
             <h4 class="card-header">
-                <a data-toggle="collapse" data-parent="#debug_infos" href="#error_main">Error</a>
+                <a data-toggle="collapse" href="#error_main">Error</a>
             </h4>
             <div id="error_main" class="collapse in">
                 <div class="card-body">
@@ -858,7 +858,7 @@
         </div>
         <div class="card" t-if="qweb_exception">
             <h4 class="card-header">
-                <a data-toggle="collapse" data-parent="#adebug_infos" href="#error_qweb">QWeb</a>
+                <a data-toggle="collapse" href="#error_qweb">QWeb</a>
             </h4>
             <div id="error_qweb" class="collapse">
                 <div class="card-body">
@@ -878,7 +878,7 @@
         </div>
         <div class="card" t-if="traceback">
             <h4 class="card-header">
-                <a data-toggle="collapse" data-parent="#adebug_infos" href="#error_traceback">Traceback</a>
+                <a data-toggle="collapse" href="#error_traceback">Traceback</a>
             </h4>
             <div id="error_traceback" class="collapse">
                 <div class="card-body">

From adb52c5d08899cf44067b8ae8d92b9802e96a9aa Mon Sep 17 00:00:00 2001
From: Nicolas Lempereur <nle@odoo.com>
Date: Thu, 10 Jan 2019 11:00:20 +0000
Subject: [PATCH 62/66] [FIX] web: show page number in report

Following 4a3fd02af4 on the portal when displaying an invoice we may get
a report_type variable (with value 'html' or 'pdf') on the portal.

This was used to not display the page number when checking the report,
but when the report is printed in the backend this report_type was unset
so the page number was mistakenly removed too.

With this changeset, the report alway know if he is pdf, html or text
and only print the page number if it is of type pdf.

opw-1924729
closes #30095
---
 addons/web/views/report_templates.xml        | 2 +-
 odoo/addons/base/models/ir_actions_report.py | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/addons/web/views/report_templates.xml b/addons/web/views/report_templates.xml
index d18ce1e5699..477e63ae80d 100644
--- a/addons/web/views/report_templates.xml
+++ b/addons/web/views/report_templates.xml
@@ -281,7 +281,7 @@
                     <h4 class="mt0 mb0 text-uppercase" t-field="company.report_header"/>
                 </div>
                 <div class="col-1">
-                    <ul t-if="report_type != 'html'" class="list-inline pagenumber float-right text-center">
+                    <ul t-if="report_type == 'pdf'" class="list-inline pagenumber float-right text-center">
                         <li class="list-inline-item"><strong><span class="page"/></strong></li>
                     </ul>
                 </div>
diff --git a/odoo/addons/base/models/ir_actions_report.py b/odoo/addons/base/models/ir_actions_report.py
index 629c0560f53..bbf46ee5df8 100644
--- a/odoo/addons/base/models/ir_actions_report.py
+++ b/odoo/addons/base/models/ir_actions_report.py
@@ -606,6 +606,7 @@ class IrActionsReport(models.Model):
     def render_qweb_pdf(self, res_ids=None, data=None):
         if not data:
             data = {}
+        data.setdefault('report_type', 'pdf')
 
         # remove editor feature in pdf generation
         data.update(enable_editor=False)
@@ -700,6 +701,9 @@ class IrActionsReport(models.Model):
 
     @api.model
     def render_qweb_text(self, docids, data=None):
+        if not data:
+            data = {}
+        data.setdefault('report_type', 'text')
         data = self._get_rendering_context(docids, data)
         return self.render_template(self.report_name, data), 'text'
 
@@ -707,6 +711,9 @@ class IrActionsReport(models.Model):
     def render_qweb_html(self, docids, data=None):
         """This method generates and returns html version of a report.
         """
+        if not data:
+            data = {}
+        data.setdefault('report_type', 'html')
         data = self._get_rendering_context(docids, data)
         return self.render_template(self.report_name, data), 'html'
 

From 7825d008279702b3a5017196aa0345a0e48810c9 Mon Sep 17 00:00:00 2001
From: Jorge Pinna Puissant <jpp@odoo.com>
Date: Thu, 10 Jan 2019 09:41:18 +0000
Subject: [PATCH 63/66] [FIX] sale: standardise SO addresses btw portan and
 report opw-1918789

Before this commit, the addresses (invoicing and shipping) in the SO wasn't displayed in the
same way in the portal and in the report.

Now, the addresses are displayed in the same way in both the portal and the report.

closes odoo/odoo#30093
---
 addons/sale/i18n/sale.pot                   |  5 +++++
 addons/sale/views/sale_portal_templates.xml | 13 ++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/addons/sale/i18n/sale.pot b/addons/sale/i18n/sale.pot
index 2a2cf239207..9aa3702357d 100644
--- a/addons/sale/i18n/sale.pot
+++ b/addons/sale/i18n/sale.pot
@@ -1637,6 +1637,11 @@ msgstr ""
 msgid "Invoicing address:"
 msgstr ""
 
+#. module: sale
+#: model_terms:ir.ui.view,arch_db:sale.sale_order_portal_content
+msgid "Invoicing and Shipping Address"
+msgstr ""
+
 #. module: sale
 #: model_terms:ir.ui.view,arch_db:sale.report_saleorder_document
 msgid "Invoicing and shipping address:"
diff --git a/addons/sale/views/sale_portal_templates.xml b/addons/sale/views/sale_portal_templates.xml
index 5155e4eff31..b9e7ff3ca52 100644
--- a/addons/sale/views/sale_portal_templates.xml
+++ b/addons/sale/views/sale_portal_templates.xml
@@ -386,13 +386,16 @@
                 </div>
                 <div class="row">
                     <div class="col-lg-6">
-                        <strong class="d-block mb-1">Invoicing Address</strong>
+                        <strong t-if="sale_order.partner_shipping_id == sale_order.partner_invoice_id" class="d-block mb-1">Invoicing and Shipping Address</strong>
+                        <strong t-if="sale_order.partner_shipping_id != sale_order.partner_invoice_id" class="d-block mb-1">Invoicing Address</strong>
                         <address t-field="sale_order.partner_invoice_id" t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}'/>
                     </div>
-                    <div id="shipping_address" class="col-lg-6" groups="sale.group_delivery_invoice_address">
-                        <strong class="d-block mb-1">Shipping Address</strong>
-                        <address t-field="sale_order.partner_shipping_id" t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}'/>
-                    </div>
+                     <t t-if="sale_order.partner_shipping_id != sale_order.partner_invoice_id">
+                        <div id="shipping_address" class="col-lg-6">
+                            <strong class="d-block mb-1">Shipping Address</strong>
+                            <address t-field="sale_order.partner_shipping_id" t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}'/>
+                        </div>
+                    </t>
                 </div>
 
                 <t t-set="invoices" t-value="[i for i in sale_order.invoice_ids if i.state not in ['draft', 'cancel']]"/>

From 9172d634247320c00a45ce27481b1d9480d3c51a Mon Sep 17 00:00:00 2001
From: Yannick Tivisse <yti@odoo.com>
Date: Fri, 11 Jan 2019 14:25:42 +0000
Subject: [PATCH 64/66] [FIX] l10n_be_hr_payroll: Fix 9c5f930

Purpose
=======

Since 9c5f930, the double holiday is computed from the wage with holidays.

When we compute the employer costs, we should take the original wage,
not the adapted one, to keep fix employer costs, whatever the amount
of days the employee takes.

closes odoo/odoo#30149
---
 addons/l10n_be_hr_payroll/models/l10n_be_hr_payroll.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/l10n_be_hr_payroll/models/l10n_be_hr_payroll.py b/addons/l10n_be_hr_payroll/models/l10n_be_hr_payroll.py
index 607bb2a9da8..a3f3c3a611e 100644
--- a/addons/l10n_be_hr_payroll/models/l10n_be_hr_payroll.py
+++ b/addons/l10n_be_hr_payroll/models/l10n_be_hr_payroll.py
@@ -153,13 +153,13 @@ class HrContract(models.Model):
             )
 
     @api.depends('yearly_cost_before_charges', 'social_security_contributions', 'wage',
-        'social_security_contributions', 'double_holidays', 'warrants_cost', 'meal_voucher_paid_by_employer')
+        'social_security_contributions', 'warrants_cost', 'meal_voucher_paid_by_employer')
     def _compute_final_yearly_costs(self):
         for contract in self:
             contract.final_yearly_costs = (
                 contract.yearly_cost_before_charges +
                 contract.social_security_contributions +
-                contract.double_holidays +
+                contract.wage * 0.92 +
                 contract.warrants_cost +
                 (220.0 * contract.meal_voucher_paid_by_employer)
             )

From 700191514e5791cab38b39b6d1572c4012f332d8 Mon Sep 17 00:00:00 2001
From: Pierre Rousseau <pro@odoo.com>
Date: Fri, 11 Jan 2019 15:03:05 +0000
Subject: [PATCH 65/66] [FIX] partner_autocomplete: ignored field is sent to
 view

The field ignored is set in javascript on company object to filter the
ones we want to show. As it is not an odoo field, it triggers a
traceback when the trigger_up 'field_changed' is called.

OPW-1921568

closes odoo/odoo#30153
---
 .../static/src/js/partner_autocomplete_core.js                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/partner_autocomplete/static/src/js/partner_autocomplete_core.js b/addons/partner_autocomplete/static/src/js/partner_autocomplete_core.js
index 30a0974a74a..c16e163df7b 100644
--- a/addons/partner_autocomplete/static/src/js/partner_autocomplete_core.js
+++ b/addons/partner_autocomplete/static/src/js/partner_autocomplete_core.js
@@ -101,7 +101,7 @@ return {
      */
     getCreateData: function (company) {
         var removeUselessFields = function (company) {
-            var fields = 'label,description,domain,logo,legal_name'.split(',');
+            var fields = 'label,description,domain,logo,legal_name,ignored'.split(',');
             fields.forEach(function (field) {
                 delete company[field];
             });

From 57ccf70a32f677a9076ec2973100c1025f412d85 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Fri, 11 Jan 2019 18:35:32 +0100
Subject: [PATCH 66/66] [DOC] install: update info about wkhtmltopdf

Followup of 3b85900fafc9469dca6e7c01fca6dac4f55d20f5

Courtesy of Swapnesh Shah (@sswapnesh)
---
 doc/setup/install.rst | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/doc/setup/install.rst b/doc/setup/install.rst
index 28bcfdfc674..d5dc77edcf1 100644
--- a/doc/setup/install.rst
+++ b/doc/setup/install.rst
@@ -121,10 +121,13 @@ PostgreSQL server :
   # apt-get install postgresql -y
 
 In order to print PDF reports, you must install wkhtmltopdf_ yourself:
-the version of wkhtmltopdf_ available in debian repositories does not support
-headers and footers so it can not be installed automatically.
-The recommended version is 0.12.1 and is available on `the wkhtmltopdf download page`_,
-in the archive section.
+the version of wkhtmltopdf_ available in Debian repositories does
+not support headers and footers so it is not used as a direct dependency.
+The recommended version is 0.12.5 and is available on
+`the wkhtmltopdf download page`_, in the archive section. Previously
+recommended version 0.12.1 is a good alternative.
+More details on the various versions and their respective quirks can be
+found in our `wiki <https://github.com/odoo/odoo/wiki/Wkhtmltopdf>`_.
 
 Repository
 ^^^^^^^^^^