From 98142f731d38aecf87d7e7900e6eeff8c047a9eb Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Fri, 2 Jun 2017 11:03:40 +0200
Subject: [PATCH 01/40] [FIX] web: BasicModel: default_get: fetch x2manys of
 x2manys

Suppose that a default_get returns the value [[6, 0, [1]] for an
x2many field (i.e. put id 1 in the relation). A read is performed
to fetch record of the comodel whose id is 1. Suppose that there
is another x2many field of the comodel. This x2many has to be
fetched (if not empty), and processed by the BasicModel (i.e. a
dataPoint must be created for it) as well.

Before this rev., the second x2many wasn't fetched nor processed,
and it produced a traceback for example in Expenses app, when
clicking on 'Submit to manager' from an expense form view.
---
 .../static/src/js/views/basic/basic_model.js  |  6 ++-
 .../static/tests/views/basic_model_tests.js   | 49 +++++++++++++++++++
 2 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/views/basic/basic_model.js b/addons/web/static/src/js/views/basic/basic_model.js
index 60abfde4344..61c285d6581 100644
--- a/addons/web/static/src/js/views/basic/basic_model.js
+++ b/addons/web/static/src/js/views/basic/basic_model.js
@@ -1841,7 +1841,6 @@ var BasicModel = AbstractModel.extend({
                         return d.res_id === res_id;
                     });
                     m2mList.data.push(dataPoint.id);
-                    m2mList.count++;
                 });
             });
         });
@@ -2476,7 +2475,10 @@ var BasicModel = AbstractModel.extend({
                                 // REPLACE_WITH
                                 x2manyList.res_ids = value[2];
                                 x2manyList.count = x2manyList.res_ids.length;
-                                defs.push(self._readUngroupedList(x2manyList));
+                                var def = self._readUngroupedList(x2manyList).then(function () {
+                                    return self._fetchX2ManysBatched(x2manyList);
+                                });
+                                defs.push(def);
                             }
                         });
 
diff --git a/addons/web/static/tests/views/basic_model_tests.js b/addons/web/static/tests/views/basic_model_tests.js
index 582e06ba62b..fefc7231e5b 100644
--- a/addons/web/static/tests/views/basic_model_tests.js
+++ b/addons/web/static/tests/views/basic_model_tests.js
@@ -1165,6 +1165,54 @@ QUnit.module('Views', {
         model.destroy();
     });
 
+    QUnit.test('default_get: fetch x2manys inside x2manys', function (assert) {
+        assert.expect(3);
+
+        this.data.partner.fields.o2m = {
+            string: "O2M", type: 'one2many', relation: 'partner', default: [[6, 0, [1]]],
+        };
+
+        var model = createModel({
+            Model: BasicModel,
+            data: this.data,
+        });
+
+        var params = {
+            fieldNames: ['o2m'],
+            fields: this.data.partner.fields,
+            fieldsInfo: {
+                form: {
+                    o2m: {
+                        relatedFields: this.data.partner.fields,
+                        fieldsInfo: {
+                            list: {
+                                category: {
+                                    relatedFields: { display_name: {} },
+                                },
+                            },
+                        },
+                        viewType: 'list',
+                    },
+                },
+            },
+            modelName: 'partner',
+            type: 'record',
+            viewType: 'form',
+        };
+
+        model.load(params).then(function (resultID) {
+            var record = model.get(resultID);
+            assert.strictEqual(record.data.o2m.count, 1, "o2m field should contain 1 record");
+            var categoryList = record.data.o2m.data[0].data.category;
+            assert.strictEqual(categoryList.count, 1,
+                "category field should contain 1 record");
+            assert.strictEqual(categoryList.data[0].data.display_name,
+                'gold', "category records should have been fetched");
+        });
+
+        model.destroy();
+    });
+
     QUnit.test('contexts and domains can be properly fetched', function (assert) {
         assert.expect(8);
 
@@ -1448,6 +1496,7 @@ QUnit.module('Views', {
             fieldsInfo: {
                 form: {
                     product_ids: {
+                        relatedFields: this.data.product.fields,
                         fieldsInfo: { list: { name: {}, date: {} } },
                         viewType: 'list',
                     }

From e9de309511d64897444645f8a9ea4bf701709bb8 Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Fri, 2 Jun 2017 14:28:07 +0200
Subject: [PATCH 02/40] [FIX] web: editable list: setRowMode returns a deferred

This function should return a deferred, as indicated in the
docstring. However, in some cases, it doesn't. It then crashed
as the FieldX2Many tries to call done() on undefined.

This happens for instance on the customer invoice form view:
create a new record, select a partner, add a line, select a
product, directly click on the invoice date field (this will
trigger an onchange which will totally override the value of the
one2many). The FielX2Many calls setRowMode to switch the edited
row back to readonly, but this row doesn't exist anymore as the
one2many value has been overriden by the onchange, so setRowMode
wrongly returns nothing, and it crashes.
---
 .../js/views/list/list_editable_renderer.js   |  2 +-
 .../tests/fields/relational_fields_tests.js   | 55 +++++++++++++++++++
 2 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/views/list/list_editable_renderer.js b/addons/web/static/src/js/views/list/list_editable_renderer.js
index 9364d1ba9fe..08b9e7f1602 100644
--- a/addons/web/static/src/js/views/list/list_editable_renderer.js
+++ b/addons/web/static/src/js/views/list/list_editable_renderer.js
@@ -155,7 +155,7 @@ ListRenderer.include({
         var self = this;
         var rowIndex = _.findIndex(this.state.data, {id: recordID});
         if (rowIndex < 0) {
-            return;
+            return $.when();
         }
         var editMode = (mode === 'edit');
         var record = this.state.data[rowIndex];
diff --git a/addons/web/static/tests/fields/relational_fields_tests.js b/addons/web/static/tests/fields/relational_fields_tests.js
index 4f326e14f98..1c2a0ab86d3 100644
--- a/addons/web/static/tests/fields/relational_fields_tests.js
+++ b/addons/web/static/tests/fields/relational_fields_tests.js
@@ -3852,6 +3852,61 @@ QUnit.module('relational_fields', {
         form.destroy();
     });
 
+    QUnit.test('editable list: value reset by an onchange', function (assert) {
+        // this test reproduces a subtle behavior that may occur in a form view:
+        // the user adds a record in a one2many field, and directly clicks on a
+        // datetime field of the form view which has an onchange, which totally
+        // overrides the value of the one2many (commands 5 and 0). The handler
+        // that switches the edited row to readonly is then called after the
+        // new value of the one2many field is applied (the one returned by the
+        // onchange), so the row that must go to readonly doesn't exist anymore.
+        assert.expect(2);
+
+        this.data.partner.onchanges = {
+            datetime: function (obj) {
+                obj.turtles = [[5], [0, 0, {display_name: 'new'}]];
+            },
+        };
+
+        var def;
+        var form = createView({
+            View: FormView,
+            model: 'partner',
+            data: this.data,
+            arch: '<form string="Partners">' +
+                    '<field name="datetime"/>' +
+                    '<field name="turtles">' +
+                        '<tree editable="bottom">' +
+                            '<field name="display_name"/>' +
+                        '</tree>' +
+                    '</field>' +
+                '</form>',
+            mockRPC: function (route, args) {
+                var result = this._super.apply(this, arguments);
+                if (args.method === 'onchange') {
+                    return $.when(def).then(_.constant(result));
+                }
+                return result;
+            },
+        });
+
+        // trigger the two onchanges
+        form.$('.o_field_x2many_list_row_add a').click();
+        form.$('.o_data_row .o_field_widget').val('a name').trigger('input');
+        def = $.Deferred();
+        form.$('.o_datepicker_input').click(); // focusout o2m and set value to today
+
+        // resolve the onchange def
+        def.resolve();
+
+        assert.strictEqual(form.$('.o_data_row').length, 1,
+            "should have one record in the o2m");
+        assert.strictEqual(form.$('.o_data_row .o_data_cell').text(), 'new',
+            "should be the record created by the onchange");
+
+        form.destroy();
+    });
+
     QUnit.module('FieldMany2Many');
 
     QUnit.test('many2many kanban: edition', function (assert) {

From 67747e6fa5f4c1b27eed5dfd7231001e98fb34c1 Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Fri, 2 Jun 2017 15:35:29 +0200
Subject: [PATCH 03/40] [FIX] web: FieldOne2Many: re-activate 'Add an item'

The 'Add an item' button of one2many editable lists is deactivated
once clicked (since rev. f9a1241) to prevent concurrent record
creation. It is re-activated when the record has been created.
Unfortunately, it might happen that the record is actually not
created, so in this case the button is never re-activated.

This happens for example on the customer invoice form view, if
the user tries to add a line before selecting a partner.
---
 .../static/src/js/fields/abstract_field.js    | 11 ++--
 .../static/src/js/fields/relational_fields.js |  5 +-
 .../src/js/views/field_manager_mixin.js       |  4 +-
 .../tests/fields/relational_fields_tests.js   | 54 +++++++++++++++++++
 4 files changed, 68 insertions(+), 6 deletions(-)

diff --git a/addons/web/static/src/js/fields/abstract_field.js b/addons/web/static/src/js/fields/abstract_field.js
index 5908f7f5a8b..137d2954993 100644
--- a/addons/web/static/src/js/fields/abstract_field.js
+++ b/addons/web/static/src/js/fields/abstract_field.js
@@ -351,12 +351,13 @@ var AbstractField = Widget.extend({
      * @param {Object} [options]
      * @param {boolean} [options.forceChange=false] if true, the change event will be
      *   triggered even if the new value is the same as the old one
+     * @returns {Deferred}
      */
     _setValue: function (value, options) {
         // we try to avoid doing useless work, if the value given has not
         // changed.  Note that we compare the unparsed values.
         if (this.lastSetValue === value || (this.value === false && value === '')) {
-            return;
+            return $.when();
         }
         this.lastSetValue = value;
         try {
@@ -364,18 +365,22 @@ var AbstractField = Widget.extend({
             this._isValid = true;
         } catch (e) {
             this._isValid = false;
-            return;
+            return $.Deferred().reject();
         }
         if (!(options && options.forceChange) && this._isSameValue(value)) {
-            return;
+            return $.when();
         }
+        var def = $.Deferred();
         var changes = {};
         changes[this.name] = value;
         this.trigger_up('field_changed', {
             dataPointID: this.dataPointID,
             changes: changes,
             viewType: this.viewType,
+            onSuccess: def.resolve.bind(def),
+            onFailure: def.reject.bind(def),
         });
+        return def;
     },
 
     //--------------------------------------------------------------------------
diff --git a/addons/web/static/src/js/fields/relational_fields.js b/addons/web/static/src/js/fields/relational_fields.js
index e13c3d29004..e9af73c1343 100644
--- a/addons/web/static/src/js/fields/relational_fields.js
+++ b/addons/web/static/src/js/fields/relational_fields.js
@@ -964,7 +964,6 @@ var FieldOne2Many = FieldX2Many.extend({
                     var index = self.editable === 'top' ? 0 : self.value.data.length - 1;
                     var newID = self.value.data[index].id;
                     self.renderer.editRecord(newID);
-                    self.creatingRecord = false;
                 }
             }
         });
@@ -1014,6 +1013,7 @@ var FieldOne2Many = FieldX2Many.extend({
      *   in the kanban view
      */
     _onAddRecord: function (ev) {
+        var self = this;
         // we don't want interference with the components upstream.
         ev.stopPropagation();
 
@@ -1023,10 +1023,11 @@ var FieldOne2Many = FieldX2Many.extend({
                 this._setValue({
                     operation: 'CREATE',
                     position: this.editable,
+                }).always(function () {
+                    self.creatingRecord = false;
                 });
             }
         } else {
-            var self = this;
             this._openFormDialog({
                 on_saved: function (record) {
                     self._setValue({ operation: 'ADD', id: record.id });
diff --git a/addons/web/static/src/js/views/field_manager_mixin.js b/addons/web/static/src/js/views/field_manager_mixin.js
index 9578e568558..422af121d96 100644
--- a/addons/web/static/src/js/views/field_manager_mixin.js
+++ b/addons/web/static/src/js/views/field_manager_mixin.js
@@ -99,7 +99,9 @@ var FieldManagerMixin = {
         // subrecord's form view), otherwise it bubbles up to the main form view
         // but its model doesn't have any data related to the given dataPointID
         event.stopPropagation();
-        this._applyChanges(event.data.dataPointID, event.data.changes, event);
+        this._applyChanges(event.data.dataPointID, event.data.changes, event)
+            .done(event.data.onSuccess || function () {})
+            .fail(event.data.onFailure || function () {});
     },
     /**
      * Some widgets need to trigger a reload of their data.  For example, a
diff --git a/addons/web/static/tests/fields/relational_fields_tests.js b/addons/web/static/tests/fields/relational_fields_tests.js
index 1c2a0ab86d3..09b22baa02f 100644
--- a/addons/web/static/tests/fields/relational_fields_tests.js
+++ b/addons/web/static/tests/fields/relational_fields_tests.js
@@ -3907,6 +3907,60 @@ QUnit.module('relational_fields', {
         form.destroy();
     });
 
+    QUnit.test('editable list: onchange that returns a warning', function (assert) {
+        assert.expect(5);
+
+        this.data.turtle.onchanges = {
+            display_name: function () {},
+        };
+
+        var form = createView({
+            View: FormView,
+            model: 'partner',
+            data: this.data,
+            arch: '<form string="Partners">' +
+                    '<field name="turtles">' +
+                        '<tree editable="bottom">' +
+                            '<field name="display_name"/>' +
+                        '</tree>' +
+                    '</field>' +
+                '</form>',
+            res_id: 1,
+            mockRPC: function (route, args) {
+                if (args.method === 'onchange') {
+                    assert.step(args.method);
+                    return $.when({
+                        value: {},
+                        warning: {
+                            title: "Warning",
+                            message: "You must first select a partner"
+                        },
+                    });
+                }
+                return this._super.apply(this, arguments);
+            },
+            viewOptions: {
+                mode: 'edit',
+            },
+            intercepts: {
+                warning: function () {
+                    assert.step('warning');
+                },
+            },
+        });
+
+        // add a line (this should trigger an onchange and a warning)
+        form.$('.o_field_x2many_list_row_add a').click();
+
+        // check if 'Add an item' still works (this should trigger an onchange
+        // and a warning again)
+        form.$('.o_field_x2many_list_row_add a').click();
+
+        assert.verifySteps(['onchange', 'warning', 'onchange', 'warning']);
+
+        form.destroy();
+    });
+
     QUnit.module('FieldMany2Many');
 
     QUnit.test('many2many kanban: edition', function (assert) {

From 25e701465081477a1bd31f448c1c4feb533f4a09 Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Tue, 6 Jun 2017 09:55:56 +0200
Subject: [PATCH 04/40] [FIX] web: Form: correctly autofocus fields

The autofocus worked fine when switching from 'readonly' to 'edit',
but not when clicking on 'Create' from the multi-record view. This
was because in this case, we were trying to focus the field while
the view wasn't in the DOM yet. This rev. ensures that we wait for
the view to be appended to the DOM before trying to set the focus
on the default field.

Also ensures that the first visible field is correctly focused.
Before this rev., if the first field was invisible (or simply
not focusable), no field was focused.

Credit goes to @msh-odoo for the preliminary work.
---
 .../static/src/js/fields/abstract_field.js    | 13 +++++-
 .../src/js/views/form/form_controller.js      | 14 +++++--
 .../static/src/js/views/form/form_renderer.js | 33 +++++++++++----
 .../web/static/src/js/views/view_dialogs.js   | 13 ++++--
 addons/web/static/tests/helpers/test_utils.js | 10 ++++-
 addons/web/static/tests/views/form_tests.js   | 40 ++++++++++++++++++-
 6 files changed, 104 insertions(+), 19 deletions(-)

diff --git a/addons/web/static/src/js/fields/abstract_field.js b/addons/web/static/src/js/fields/abstract_field.js
index 137d2954993..492d9f26552 100644
--- a/addons/web/static/src/js/fields/abstract_field.js
+++ b/addons/web/static/src/js/fields/abstract_field.js
@@ -176,8 +176,8 @@ var AbstractField = Widget.extend({
      *                    focusable element was not found or invisible
      */
     activate: function (options) {
-        var $focusable = this.getFocusableElement();
-        if ($focusable.length && $focusable.is(':visible')) {
+        if (this.isFocusable()) {
+            var $focusable = this.getFocusableElement();
             $focusable.focus();
             if ($focusable.is('input[type="text"], textarea')) {
                 $focusable[0].selectionStart = $focusable[0].selectionEnd = $focusable[0].value.length;
@@ -211,6 +211,15 @@ var AbstractField = Widget.extend({
     getFocusableElement: function () {
         return $();
     },
+    /**
+     * Returns true iff the widget has a visible element that can take the focus
+     *
+     * @returns {boolean}
+     */
+    isFocusable: function () {
+        var $focusable = this.getFocusableElement();
+        return $focusable.length && $focusable.is(':visible');
+    },
     /**
      * this method is used to determine if the field value is set to a meaningful
      * value.  This is useful to determine if a field should be displayed as empty
diff --git a/addons/web/static/src/js/views/form/form_controller.js b/addons/web/static/src/js/views/form/form_controller.js
index 6adb474303d..464cd06e44d 100644
--- a/addons/web/static/src/js/views/form/form_controller.js
+++ b/addons/web/static/src/js/views/form/form_controller.js
@@ -39,12 +39,10 @@ var FormController = BasicController.extend({
     //--------------------------------------------------------------------------
 
     /**
-     * This method is supposed to focus the first active control, I think. It
-     * is currently only called by the FormViewDialog.
-     *
-     * @todo To be implemented
+     * Calls autofocus on the renderer
      */
     autofocus: function () {
+        this.renderer.autofocus();
     },
     /**
      * This method switches the form view in edit mode, with a new record.
@@ -92,6 +90,14 @@ var FormController = BasicController.extend({
         var dataPoint = this.model.get(this.handle, {raw: true});
         return dataPoint.data.display_name || _t('New');
     },
+    /**
+     * Called each time the form view is attached into the DOM
+     *
+     * @todo convert to new style
+     */
+    on_attach_callback: function () {
+        this.autofocus();
+    },
     /**
      * Render buttons for the control panel.  The form view can be rendered in
      * a dialog, and in that case, if we have buttons defined in the footer, we
diff --git a/addons/web/static/src/js/views/form/form_renderer.js b/addons/web/static/src/js/views/form/form_renderer.js
index ddd77ee5dc6..b15e6b80131 100644
--- a/addons/web/static/src/js/views/form/form_renderer.js
+++ b/addons/web/static/src/js/views/form/form_renderer.js
@@ -25,6 +25,29 @@ var FormRenderer = BasicRenderer.extend({
     // Public
     //--------------------------------------------------------------------------
 
+    /**
+     * Focuses the field having attribute 'default_focus' set, if any, or the
+     * first focusable field otherwise.
+     */
+    autofocus: function () {
+        if (this.mode === 'readonly') {
+            return;
+        }
+        var focusWidget = this.defaultFocusField;
+        if (!focusWidget || !focusWidget.isFocusable()) {
+            var widgets = this.allFieldWidgets[this.state.id];
+            for (var i = 0; i < (widgets ? widgets.length : 0); i++) {
+                var widget = widgets[i];
+                if (widget.isFocusable()) {
+                    focusWidget = widget;
+                    break;
+                }
+            }
+        }
+        if (focusWidget) {
+            focusWidget.activate({noselect: true});
+        }
+    },
     /**
      * Extend the method so that labels also receive the 'o_field_invalid' class
      * if necessary.
@@ -769,20 +792,16 @@ var FormRenderer = BasicRenderer.extend({
         core.bus.trigger('DOM_updated');
 
         // Attach the tooltips on the fields' label
-        var focusWidget = this.defaultFocusField;
         _.each(this.allFieldWidgets[this.state.id], function (widget) {
-            if (!focusWidget) {
-                focusWidget = widget;
-            }
             if (core.debug || widget.attrs.help || widget.field.help) {
                 var idForLabel = self.idsForLabels[widget.name];
                 var $label = idForLabel ? self.$('label[for=' + idForLabel + ']') : $();
                 self._addFieldTooltip(widget, $label);
             }
         });
-        if (focusWidget) {
-            focusWidget.activate({noselect: true});
-        }
+
+        // Focus the default field (in edit mode)
+        self.autofocus();
     },
     /**
      * Sets id attribute of given widget to idForLabel
diff --git a/addons/web/static/src/js/views/view_dialogs.js b/addons/web/static/src/js/views/view_dialogs.js
index b84d60d5b7c..a19e440913e 100644
--- a/addons/web/static/src/js/views/view_dialogs.js
+++ b/addons/web/static/src/js/views/view_dialogs.js
@@ -4,6 +4,7 @@ odoo.define('web.view_dialogs', function (require) {
 var core = require('web.core');
 var data = require('web.data');
 var Dialog = require('web.Dialog');
+var dom = require('web.dom');
 var ListController = require('web.ListController');
 var ListView = require('web.ListView');
 var pyeval = require('web.pyeval');
@@ -194,8 +195,10 @@ var FormViewDialog = ViewDialog.extend({
                     if ($buttons.children().length) {
                         self.$footer.empty().append($buttons.contents());
                     }
-                    _super().$el.append(fragment);
-                    self.form_view.autofocus();
+                    dom.append(_super().$el, fragment, {
+                        callbacks: [{widget: self.form_view}],
+                        in_DOM: true,
+                    });
                 });
         });
 
@@ -281,6 +284,7 @@ var SelectCreateDialog = ViewDialog.extend({
         if(this.options.initial_view !== "search") {
             return this.create_edit_record();
         }
+        var self = this;
         var user_context = this.getSession().user_context;
 
         var _super = this._super.bind(this);
@@ -298,7 +302,10 @@ var SelectCreateDialog = ViewDialog.extend({
         this.loadViews(this.dataset.model, this.dataset.get_context(), [[false, 'list'], [false, 'search']], {})
             .then(this.setup.bind(this, search_defaults))
             .then(function (fragment) {
-                _super().$el.append(fragment);
+                dom.append(_super().$el, fragment, {
+                    callbacks: [{widget: self.list_controller}],
+                    in_DOM: true,
+                });
             });
         return this;
     },
diff --git a/addons/web/static/tests/helpers/test_utils.js b/addons/web/static/tests/helpers/test_utils.js
index eae31e68e80..3632e251a33 100644
--- a/addons/web/static/tests/helpers/test_utils.js
+++ b/addons/web/static/tests/helpers/test_utils.js
@@ -13,6 +13,7 @@ odoo.define('web.test_utils', function (require) {
 var basic_fields = require('web.basic_fields');
 var config = require('web.config');
 var core = require('web.core');
+var dom = require('web.dom');
 var session = require('web.session');
 var MockServer = require('web.MockServer');
 var Widget = require('web.Widget');
@@ -172,7 +173,14 @@ function createAsyncView(params) {
             widget.destroy();
             $('#qunit-fixture').off('DOMNodeInserted.removeSRC');
         };
-        return view.appendTo($view_manager).then(function () {
+        // render the view in a fragment as they must be able to render correctly
+        // without being in the DOM
+        var fragment = document.createDocumentFragment();
+        return view.appendTo(fragment).then(function () {
+            dom.append($view_manager, fragment, {
+                callbacks: [{widget: view}],
+                in_DOM: true,
+            });
             view.$el.on('click', 'a', function (ev) {
                 ev.preventDefault();
             });
diff --git a/addons/web/static/tests/views/form_tests.js b/addons/web/static/tests/views/form_tests.js
index 5f7f34a2cc7..2d23f4a9cb4 100644
--- a/addons/web/static/tests/views/form_tests.js
+++ b/addons/web/static/tests/views/form_tests.js
@@ -3736,7 +3736,7 @@ QUnit.module('Views', {
         });
         form.$buttons.find('.o_form_button_edit').click();
 
-        assert.strictEqual(form.$('input[name="foo"]')[0], document.activeElement,
+        assert.strictEqual(document.activeElement, form.$('input[name="foo"]')[0],
             "foo field should have focus");
         assert.strictEqual(form.$('input[name="foo"]')[0].selectionStart, 3,
             "cursor should be at the end");
@@ -3758,7 +3758,25 @@ QUnit.module('Views', {
             res_id: 1,
         });
         form.$buttons.find('.o_form_button_edit').click();
-        assert.strictEqual(form.$('input[name="foo"]')[0], document.activeElement,
+        assert.strictEqual(document.activeElement, form.$('input[name="foo"]')[0],
+            "foo field should have focus");
+
+        form.destroy();
+    });
+
+    QUnit.test('in create mode, autofocus fields are focused', function (assert) {
+        assert.expect(1);
+
+        var form = createView({
+            View: FormView,
+            model: 'partner',
+            data: this.data,
+            arch: '<form string="Partners">' +
+                        '<field name="int_field"/>' +
+                        '<field name="foo" default_focus="1"/>' +
+                '</form>',
+        });
+        assert.strictEqual(document.activeElement, form.$('input[name="foo"]')[0],
             "foo field should have focus");
 
         form.destroy();
@@ -3787,6 +3805,24 @@ QUnit.module('Views', {
         form.destroy();
     });
 
+    QUnit.test('autofocus first visible field', function (assert) {
+        assert.expect(1);
+
+        var form = createView({
+            View: FormView,
+            model: 'partner',
+            data: this.data,
+            arch: '<form string="Partners">' +
+                        '<field name="int_field" invisible="1"/>' +
+                        '<field name="foo"/>' +
+                '</form>',
+        });
+        assert.strictEqual(document.activeElement, form.$('input[name="foo"]')[0],
+            "foo field should have focus");
+
+        form.destroy();
+    });
+
     QUnit.test('open one2many form containing many2many_tags', function (assert) {
             assert.expect(4);
 

From cb9a8bdc79ef6bd6a9fbd43afc73e14825bc3923 Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Tue, 6 Jun 2017 15:30:20 +0200
Subject: [PATCH 05/40] [FIX] web: ModelFieldSelector: less tweaks

---
 addons/web/static/src/less/model_field_selector.less | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/web/static/src/less/model_field_selector.less b/addons/web/static/src/less/model_field_selector.less
index 124c15cb8e5..aee5bd17867 100644
--- a/addons/web/static/src/less/model_field_selector.less
+++ b/addons/web/static/src/less/model_field_selector.less
@@ -7,6 +7,10 @@
         .o-flex-flow(row, wrap);
         .o-align-items(center);
         height: 100%;
+        min-height: 20px; // needed when there is no value in it and used standalone
+        &:active, &:focus, &:active:focus {
+            outline: none;
+        }
 
         > .o_field_selector_chain_part {
             padding: 0px 1px;

From 5aa1cf189039f4bbfdb5f6f66a1c1604c8bb243b Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Wed, 7 Jun 2017 08:28:00 +0200
Subject: [PATCH 06/40] [FIX] web: re-introduce wow effect

When clicking on buttons with classname o_wow (e.g. when marking
an opportunity as won).
---
 .../src/js/chrome/abstract_web_client.js      | 17 +++++++++
 .../src/js/views/form/form_controller.js      |  6 ++--
 .../static/src/js/views/form/form_renderer.js |  2 +-
 addons/web/static/tests/views/form_tests.js   | 35 +++++++++++++++++++
 4 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/src/js/chrome/abstract_web_client.js b/addons/web/static/src/js/chrome/abstract_web_client.js
index 155690f9663..9efb2a3c937 100644
--- a/addons/web/static/src/js/chrome/abstract_web_client.js
+++ b/addons/web/static/src/js/chrome/abstract_web_client.js
@@ -81,6 +81,7 @@ var AbstractWebClient = Widget.extend(mixins.ServiceProvider, {
                 }
             });
         },
+        show_wow: '_onShowWow',
     },
     init: function (parent) {
         this.client_options = {};
@@ -313,6 +314,22 @@ var AbstractWebClient = Widget.extend(mixins.ServiceProvider, {
             this.notification_manager.warn(e.data.title, e.data.message, e.data.sticky);
         }
     },
+    /**
+     * Displays a thumb up, heart or peace image (randomly) for a moment (e.g.
+     * used when an opportunity is won)
+     *
+     * @private
+     */
+    _onShowWow: function () {
+        var className = 'o_wow_thumbs';
+        if (Math.random() > 0.9) {
+            var otherClasses = ['o_wow_peace', 'o_wow_heart'];
+            className = otherClasses[Math.floor(Math.random()*otherClasses.length)];
+        }
+        var $body = $('body');
+        $body.addClass(className);
+        setTimeout($body.removeClass.bind($body, className), 1000);
+    },
 });
 
 return AbstractWebClient;
diff --git a/addons/web/static/src/js/views/form/form_controller.js b/addons/web/static/src/js/views/form/form_controller.js
index 464cd06e44d..27d85778431 100644
--- a/addons/web/static/src/js/views/form/form_controller.js
+++ b/addons/web/static/src/js/views/form/form_controller.js
@@ -380,10 +380,8 @@ var FormController = BasicController.extend({
             });
         }
 
-        if (event.data.show_wow) {
-            def.then(function () {
-                self.show_wow();
-            });
+        if (event.data.showWow) {
+            def.then(this.trigger_up.bind(this, 'show_wow'));
         }
 
         def.always(this._enableButtons.bind(this));
diff --git a/addons/web/static/src/js/views/form/form_renderer.js b/addons/web/static/src/js/views/form/form_renderer.js
index b15e6b80131..2eda699c5d3 100644
--- a/addons/web/static/src/js/views/form/form_renderer.js
+++ b/addons/web/static/src/js/views/form/form_renderer.js
@@ -206,7 +206,7 @@ var FormRenderer = BasicRenderer.extend({
             self.trigger_up('button_clicked', {
                 attrs: node.attrs,
                 record: self.state,
-                show_wow: self.$el.hasClass('o_wow'),  // TODO: implement this (in view)
+                showWow: $el.hasClass('o_wow'),
             });
         });
     },
diff --git a/addons/web/static/tests/views/form_tests.js b/addons/web/static/tests/views/form_tests.js
index 2d23f4a9cb4..5643b2c92ca 100644
--- a/addons/web/static/tests/views/form_tests.js
+++ b/addons/web/static/tests/views/form_tests.js
@@ -4895,5 +4895,40 @@ QUnit.module('Views', {
         form.destroy();
     });
 
+    QUnit.test('wow effect', function (assert) {
+        assert.expect(3);
+
+        this.data.partner.fields.model_name = { string: "Model name", type: "char" };
+
+        var clickCount = 0;
+        var form = createView({
+            View: FormView,
+            model: 'partner',
+            data: this.data,
+            arch: '<form string="Partners">' +
+                    '<button name="test" string="Mark Won" type="object" class="o_wow"/>' +
+                '</form>',
+            intercepts: {
+                execute_action: function (event) {
+                    if (clickCount === 0) {
+                        event.data.on_success();
+                    } else {
+                        event.data.on_fail();
+                    }
+                    clickCount++;
+                },
+                show_wow: function () {
+                    assert.step('wow');
+                },
+            },
+        });
+
+        form.$('button.o_wow').click();
+        assert.verifySteps(['wow']);
+        form.$('button.o_wow').click();
+        assert.verifySteps(['wow']);
+
+        form.destroy();
+    });
 });
 });

From 20ed57f874176161a043dee834b25c7f0b3dc175 Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Tue, 6 Jun 2017 16:48:38 +0200
Subject: [PATCH 07/40] [FIX] calendar: _get_recurrent_date_by_event

Let's create in google calendar a reccurent event with all day
set and a end date.

When synchronising google calendar with Odoo(by clicking on button
"Sync with Google"). It raised on error because the start date had
a time zone but not the end date(the UNTIL in the rrule).

opw:745665
---
 addons/calendar/models/calendar.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/addons/calendar/models/calendar.py b/addons/calendar/models/calendar.py
index 8db6909b847..8c18fe2e24b 100644
--- a/addons/calendar/models/calendar.py
+++ b/addons/calendar/models/calendar.py
@@ -553,15 +553,18 @@ class Meeting(models.Model):
         if not event_date:
             event_date = datetime.now()
 
-        # Convert the event date to saved timezone (or context tz) as it'll
-        # define the correct hour/day asked by the user to repeat for recurrence.
-        event_date = event_date.astimezone(timezone)  # transform "+hh:mm" timezone
-        rset1 = rrule.rrulestr(str(self.rrule), dtstart=event_date, forceset=True)
+        if self.allday and self.rrule and 'Z' not in self.rrule:
+            rset1 = rrule.rrulestr(str(self.rrule), dtstart=event_date.replace(tzinfo=None), forceset=True, ignoretz=True)
+        else:
+            # Convert the event date to saved timezone (or context tz) as it'll
+            # define the correct hour/day asked by the user to repeat for recurrence.
+            event_date = event_date.astimezone(timezone)  # transform "+hh:mm" timezone
+            rset1 = rrule.rrulestr(str(self.rrule), dtstart=event_date, forceset=True, tzinfos={})
         recurring_meetings = self.search([('recurrent_id', '=', self.id), '|', ('active', '=', False), ('active', '=', True)])
 
         for meeting in recurring_meetings:
             rset1._exdate.append(todate(meeting.recurrent_id_date))
-        return [d.astimezone(pytz.UTC) for d in rset1]
+        return [d.astimezone(pytz.UTC) if d.tzinfo else d for d in rset1]
 
     @api.multi
     def _get_recurrency_end_date(self):

From ac1fad575e8e6b668e4fb7d42340af8b0058b952 Mon Sep 17 00:00:00 2001
From: ppr-odoo <ppr@odoo.com>
Date: Wed, 7 Jun 2017 13:31:33 +0530
Subject: [PATCH 08/40] [FIX] web: apply modifiers on separator in FormRenderer

Before this commit, the separator tag ignored all modifiers.
---
 .../static/src/js/views/form/form_renderer.js |  5 ++++-
 addons/web/static/tests/views/form_tests.js   | 22 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/views/form/form_renderer.js b/addons/web/static/src/js/views/form/form_renderer.js
index 2eda699c5d3..08f28438368 100644
--- a/addons/web/static/src/js/views/form/form_renderer.js
+++ b/addons/web/static/src/js/views/form/form_renderer.js
@@ -732,7 +732,10 @@ var FormRenderer = BasicRenderer.extend({
      * @returns {jQueryElement}
      */
     _renderTagSeparator: function (node) {
-        return $('<div/>').addClass('o_horizontal_separator').text(node.attrs.string);
+        var $separator = $('<div/>').addClass('o_horizontal_separator').text(node.attrs.string);
+        this._handleAttributes($separator, node);
+        this._registerModifiers(node, this.state, $separator);
+        return $separator;
     },
     /**
      * @private
diff --git a/addons/web/static/tests/views/form_tests.js b/addons/web/static/tests/views/form_tests.js
index 5643b2c92ca..21dd1ba32aa 100644
--- a/addons/web/static/tests/views/form_tests.js
+++ b/addons/web/static/tests/views/form_tests.js
@@ -837,6 +837,28 @@ QUnit.module('Views', {
         form.destroy();
     });
 
+    QUnit.test('invisible attrs on separators', function (assert) {
+        assert.expect(1);
+
+        var form = createView({
+            View: FormView,
+            model: 'partner',
+            data: this.data,
+            arch: '<form string="Partners">' +
+                    '<sheet>' +
+                        '<group>' +
+                            '<separator string="Geolocation" attrs=\'{"invisible": [["bar", "=", True]]}\'/>'+
+                            '<field name="bar"/>' +
+                        '</group>' +
+                    '</sheet>' +
+                '</form>',
+            res_id: 1,
+        });
+        assert.strictEqual(form.$('div.o_horizontal_separator').hasClass('o_invisible_modifier'), true,
+                "separator div should be hidden");
+        form.destroy();
+    });
+
     QUnit.test('buttons in form view', function (assert) {
         assert.expect(7);
 

From 922a04dbd2acbd547c0279b046099647c5f9eb3f Mon Sep 17 00:00:00 2001
From: Harshad Modi <hmo@odoo.com>
Date: Wed, 7 Jun 2017 13:45:04 +0530
Subject: [PATCH 09/40] [FIX] project: fix traceback while setting cover image

 from project task kanban view (PR #17165)
---
 addons/project/static/src/js/project.js       |  23 ++-
 addons/project/static/src/xml/project.xml     |   2 +-
 addons/project/static/tests/project_tests.js  | 133 ++++++++++++++++++
 addons/project/views/project_templates.xml    |   5 +
 .../web/static/src/js/fields/basic_fields.js  |  22 ++-
 addons/web/static/src/xml/base.xml            |   5 -
 6 files changed, 175 insertions(+), 15 deletions(-)
 create mode 100644 addons/project/static/tests/project_tests.js

diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js
index 5da3151aa68..a1ca1a60302 100644
--- a/addons/project/static/src/js/project.js
+++ b/addons/project/static/src/js/project.js
@@ -51,19 +51,23 @@ KanbanRecord.include({
         }
 
         function open_cover_images_dialog(attachment_ids) {
-            var cover_id = self.record.displayed_image_id.raw_value[0];
+            var coverID = self.record.displayed_image_id && self.record.displayed_image_id.raw_value[0];
             var $content = $(QWeb.render("project.SetCoverModal", {
-                cover_id: cover_id,
+                cover_id: coverID,
                 attachment_ids: attachment_ids,
             }));
             var $imgs = $content.find('img');
-
             var dialog = new Dialog(self, {
                 title: _t("Set a Cover Image"),
-                buttons: [{text: _t("Select"), classes: 'btn-primary', close: true, disabled: !cover_id, click: function () {
-                    self._updateRecord({displayed_image_id: $imgs.filter('.o_selected').data('id')});
+                buttons: [{text: _t("Select"), classes: 'btn-primary', close: true, disabled: !coverID, click: function () {
+                    var $img = $imgs.filter('.o_selected');
+                    var data = {
+                        id: $img.data('id'),
+                        display_name: $img.data('name')
+                    };
+                    self._updateRecord({displayed_image_id: data});
                 }}, {text: _t("Remove Cover Image"), close: true, click: function () {
-                    self._updateRecord({displayed_image_id: 0});
+                    self._updateRecord({displayed_image_id: false});
                 }}, {text: _t("Discard"), close: true}],
                 $content: $content,
             }).open();
@@ -75,7 +79,12 @@ KanbanRecord.include({
             });
 
             $content.on('dblclick', 'img', function (ev) {
-                self._updateRecord({displayed_image_id: $(ev.currentTarget).data('id')});
+                var $img  = $(ev.currentTarget);
+                var data = {
+                    id: $img.data('id'),
+                    display_name: $img.data('name')
+                };
+                self._updateRecord({displayed_image_id: data});
                 dialog.close();
             });
         }
diff --git a/addons/project/static/src/xml/project.xml b/addons/project/static/src/xml/project.xml
index d9c4f3fa675..a2d222784b9 100644
--- a/addons/project/static/src/xml/project.xml
+++ b/addons/project/static/src/xml/project.xml
@@ -2,7 +2,7 @@
 <templates id="template" xml:space="preserve">
     <t t-name="project.SetCoverModal">
         <div t-if="attachment_ids.length > 0" class="o_kanban_task_cover_image">
-            <img t-foreach="attachment_ids" t-as="attachment" t-attf-class="img-responsive#{cover_id == attachment['id'] ? ' o_selected' : ''}" t-attf-src="/web/image/#{attachment['id']}?unique=1" t-att-data-id="attachment['id']"/>
+            <img t-foreach="attachment_ids" t-as="attachment" t-attf-class="img-responsive#{cover_id == attachment['id'] ? ' o_selected' : ''}" t-attf-src="/web/image/#{attachment['id']}?unique=1" t-att-data-id="attachment['id']" t-att-data-name="attachment['name']"/>
         </div>
         <div t-if="attachment_ids.length == 0">There is no available image to be set as cover. Send a message on the task with an attached image.</div>
     </t>
diff --git a/addons/project/static/tests/project_tests.js b/addons/project/static/tests/project_tests.js
new file mode 100644
index 00000000000..fa92415684e
--- /dev/null
+++ b/addons/project/static/tests/project_tests.js
@@ -0,0 +1,133 @@
+odoo.define('project.project_kanban_tests', function (require) {
+"use strict";
+
+var KanbanView = require('web.KanbanView');
+var testUtils = require('web.test_utils');
+
+var createView = testUtils.createView;
+
+QUnit.module('project', {
+    beforeEach: function () {
+        this.data = {
+            'ir.attachment': {
+                fields: {
+                    name: {
+                        string: "Name",
+                        type: "char"
+                    },
+                },
+                records: [{
+                        id: 1,
+                        name: "1.png"
+                    },
+                    {
+                        id: 2,
+                        name: "2.png"
+                    },
+                ]
+            },
+            'project.task': {
+                fields: {
+                    name: {
+                        string: "Task Title",
+                        type: "char"
+                    },
+                    sequence: {
+                        string: "sequence",
+                        type: "integer"
+                    },
+                    displayed_image_id: {
+                        string: "cover",
+                        type: "many2one",
+                        relation: "ir.attachment"
+                    },
+                    kanban_state: {
+                        string: "State",
+                        type: "selection",
+                        selection: [
+                            ["abc", "ABC"],
+                            ["def", "DEF"],
+                            ["ghi", "GHI"]
+                        ]
+                    },
+                },
+                records: [{
+                        id: 1,
+                        name: "task1",
+                        sequence: 1,
+                        kanban_state: "abc"
+                    },
+                    {
+                        id: 2,
+                        name: "task2",
+                        sequence: 2,
+                        kanban_state: "abc"
+                    },
+                ]
+            },
+        };
+    }
+}, function () {
+    QUnit.module('image test');
+
+    QUnit.test('cover_image_test', function (assert) {
+        assert.expect(6);
+        var kanban = createView({
+            View: KanbanView,
+            model: 'project.task',
+            data: this.data,
+            arch: '<kanban class="o_kanban_test">' +
+                    '<templates>' +
+                        '<t t-name="kanban-box">' +
+                            '<div>' +
+                                '<field name="name"/>' +
+                                '<div class="o_dropdown_kanban dropdown">' +
+                                    '<a class="dropdown-toggle btn" data-toggle="dropdown" href="#">' +
+                                        '<span class="fa fa-bars fa-lg"/>' +
+                                    '</a>' +
+                                    '<ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">' +
+                                        '<li>' +
+                                            '<a type="set_cover">Set Cover Image</a>'+
+                                        '</li>' +
+                                    '</ul>' +
+                                '</div>' +
+                                '<div>'+
+                                    '<field name="displayed_image_id" widget="attachment_image"/>'+
+                                '</div>'+
+                            '</div>' +
+                        '</t>' +
+                    '</templates>' +
+                '</kanban>',
+            mockRPC: function(route, args) {
+                if (args.model === 'ir.attachment' && args.method === 'search_read') {
+                    return $.when([{
+                        id: 1,
+                        name: "1.png"
+                    },{
+                        id: 2,
+                        name: "2.png"
+                    }]);
+                }
+                if (args.model === 'project.task' && args.method === 'write') {
+                    assert.step(args.args[0][0]);
+                    return this._super(route, args);
+                }
+                return this._super(route, args);
+            },
+        });
+        assert.strictEqual(kanban.$('img').length, 0, "Initially there is no image.");
+        kanban.$('.o_dropdown_kanban [data-type=set_cover]').eq(0).click();
+        // single click on image
+        $('.modal').find("img[data-id='1']").click();
+        $('.modal-footer .btn-primary').click();
+        assert.strictEqual(kanban.$('img[src*="/web/image/1"]').length, 1, "Image inserted in record");
+        $('.o_dropdown_kanban [data-type=set_cover]').eq(1).click();
+        // double click on image
+        $('.modal').find("img[data-id='2']").dblclick();
+        assert.strictEqual(kanban.$('img[src*="/web/image/2"]').length, 1, "Image inserted after double click");
+        // varify write on both kanban record
+        assert.verifySteps([1,2]);
+        kanban.destroy();
+    });
+});
+});
diff --git a/addons/project/views/project_templates.xml b/addons/project/views/project_templates.xml
index 3806674c4b9..8baab3b7657 100644
--- a/addons/project/views/project_templates.xml
+++ b/addons/project/views/project_templates.xml
@@ -10,4 +10,9 @@
                 <script type="text/javascript" src="/project/static/src/js/web_planner_project.js"></script>
             </xpath>
         </template>
+        <template id="qunit_suite" name="project_test" inherit_id="web.qunit_suite">
+             <xpath expr="//t[@t-set='head']" position="inside">
+                 <script type="text/javascript" src="/project/static/tests/project_tests.js"></script>
+            </xpath>
+        </template>
 </odoo>
diff --git a/addons/web/static/src/js/fields/basic_fields.js b/addons/web/static/src/js/fields/basic_fields.js
index a5ceba50d3f..d4013a8bcdb 100644
--- a/addons/web/static/src/js/fields/basic_fields.js
+++ b/addons/web/static/src/js/fields/basic_fields.js
@@ -1281,8 +1281,26 @@ var PriorityWidget = AbstractField.extend({
     },
 });
 
-var AttachmentImage =  AbstractField.extend({
-    template: 'AttachmentImage',
+var AttachmentImage = AbstractField.extend({
+    className: 'o_attachment_image',
+
+    //--------------------------------------------------------------------------
+    // Private
+    //--------------------------------------------------------------------------
+
+    /**
+     * Reset cover image when widget value change
+     *
+     * @private
+     */
+    _render: function () {
+        if (this.value) {
+            this.$el.empty().append($('<img>/', {
+                src: "/web/image/" + this.value.data.id + "?unique=1",
+                title: this.value.data.display_name
+            }));
+        }
+    }
 });
 
 var StateSelectionWidget = AbstractField.extend({
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index ccbf030ff1b..c4a3cc3939f 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -835,11 +835,6 @@
         t-att-width="widget.node.attrs.img_width || widget.node.attrs.width"
         t-att-height="widget.node.attrs.img_height || widget.node.attrs.height"/>
 </t>
-<t t-name="AttachmentImage">
-    <div class="o_attachment_image">
-        <img t-att-src="'/web/image/' + widget.value + '?unique=1'"/>
-    </div>
-</t>
 <t t-name="FieldBinaryFile">
     <a t-if="widget.mode === 'readonly'" href="javascript:void(0)" class="o_form_uri"/>
 

From c638fbdf232b39585749405fe7d7d5a225041ad9 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Wed, 7 Jun 2017 11:18:56 +0200
Subject: [PATCH 10/40] [FIX] stock: ACL for product attributes for Inventory
 managers

If only Inventory is installed,
only the admin could create new product attributes
for products variants. Other managers couldn't.

This revision adds the ACL according to what is done in other modules,
such as in `sale`.

Mostlikely, we should create a product manager group, for which
this rights are given, and make the other groups (sales manager, inventory manager)
inherit from this one.

opw-745735
---
 addons/stock/security/ir.model.access.csv | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index 3eef34a4bda..0f540b9aeb1 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -75,3 +75,7 @@ access_barcode_rule_stock_manager,barcode.rule.stock.manager,barcodes.model_barc
 access_stock_forecast_user,report.stock.forecast.user,model_report_stock_forecast,stock.group_stock_user,1,0,0,0
 access_stock_forecast_manager,report.stock.forecast.manager,model_report_stock_forecast,stock.group_stock_manager,1,1,1,1
 access_stock_scrap_user,stock.scrap.user,model_stock_scrap,stock.group_stock_user,1,1,1,0
+access_product_attribute_manager,product.attribute manager,product.model_product_attribute,stock.group_stock_manager,1,1,1,1
+access_product_attribute_value_manager,product.attribute manager value,product.model_product_attribute_value,stock.group_stock_manager,1,1,1,1
+access_product_attribute_price_manager,product.attribute manager price,product.model_product_attribute_price,stock.group_stock_manager,1,1,1,1
+access_product_attribute_line_manager,product.attribute manager line,product.model_product_attribute_line,stock.group_stock_manager,1,1,1,1

From 86a0d31251a701da8bd1dbcb5580b958d932b33a Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Wed, 7 Jun 2017 13:29:58 +0200
Subject: [PATCH 11/40] [FIX] account: Validating a statement with old posted
 moves

When validating a statement with old posted moves, the lock date
was checked by function, _check_lock_date and then it was impossible
to validate the statement even if all the moves were already posted.
---
 addons/account/models/account_bank_statement.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/models/account_bank_statement.py b/addons/account/models/account_bank_statement.py
index 857ffc3e71d..1728aecbe33 100644
--- a/addons/account/models/account_bank_statement.py
+++ b/addons/account/models/account_bank_statement.py
@@ -241,7 +241,7 @@ class AccountBankStatement(models.Model):
                 for aml in st_line.journal_entry_ids:
                     moves |= aml.move_id
             if moves:
-                moves.post()
+                moves.filtered(lambda m: m.state != 'posted').post()
             statement.message_post(body=_('Statement %s confirmed, journal items were created.') % (statement.name,))
         statements.link_bank_to_partner()
         statements.write({'state': 'confirm', 'date_done': time.strftime("%Y-%m-%d %H:%M:%S")})

From 7b210167604d4450d0b52dfddd39ca3ccc672564 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Tue, 6 Jun 2017 20:25:59 +0200
Subject: [PATCH 12/40] [FIX] stock: unlink scrap

Forbids to unlink a done scrap.

opw-746294
---
 addons/stock/i18n/stock.pot        | 8 +++++++-
 addons/stock/models/stock_scrap.py | 6 ++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/addons/stock/i18n/stock.pot b/addons/stock/i18n/stock.pot
index e7182b88541..e01b6291165 100644
--- a/addons/stock/i18n/stock.pot
+++ b/addons/stock/i18n/stock.pot
@@ -6566,7 +6566,13 @@ msgid "You cannot cancel a stock move that has been set to 'Done'."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/models/stock_inventory.py:352
+#: code:addons/stock/models/stock_scrap.py:72
+#, python-format
+msgid "You cannot delete a scrap which is done."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/models/stock_inventory.py:374
 #, python-format
 msgid "You cannot have two inventory adjustements in state 'in Progess' with the same product(%s), same location(%s), same package, same owner and same lot. Please first validatethe first inventory adjustement with this product before creating another one."
 msgstr ""
diff --git a/addons/stock/models/stock_scrap.py b/addons/stock/models/stock_scrap.py
index 355f0139d04..16be4d9b73b 100644
--- a/addons/stock/models/stock_scrap.py
+++ b/addons/stock/models/stock_scrap.py
@@ -66,6 +66,12 @@ class StockScrap(models.Model):
         scrap.do_scrap()
         return scrap
 
+    @api.multi
+    def unlink(self):
+        if 'done' in self.mapped('state'):
+            raise UserError(_('You cannot delete a scrap which is done.'))
+        return super(StockScrap, self).unlink()
+
     def _get_origin_moves(self):
         return self.picking_id and self.picking_id.move_lines.filtered(lambda x: x.product_id == self.product_id)
 

From 2332df6bc7380e742e7d3dfb945124e21078087d Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Thu, 18 May 2017 09:55:41 +0200
Subject: [PATCH 13/40] [FIX] mrp: Post inventory button without finished
 product

Let's consider P1, P2 and P3 with a cost=1$, three stockable products where
P1 and P2 are in the same product category PC1 with a Stock valuation
account = SVA1 and P3 is in the product category PC2 with a Stock valuation
accout = SVA2. PC1 and PC2 are set with costing method in real price and
Inventory valuation = perpetual(automated).

Steps to reproduce this issue:

-Create a BOM where P3 is composed by 1 P1 and 1 P2
-Create a PO for P1 and P2 with a cost of 5$ for each one
-Create a MO to produce 1 P3
-Check availability
-Insert manually the consumed product(1 P1 and 1 P2)
-The button "Post Inventory" appeared, clicked on it
-Check the general ledger, two moves with debit=5$ has been created
for P1 and P2 in PC1(it's ok)
-Produce the MO and click on "Post Inventory" again
-Check the general ledger, two moves have been created, one with a credit of 2$
on PC1 and one of debit of 2$ on PC2(it was wrong)

The expected moves for the last step is:
a credit of 10$ on PC1 and a debit of 10$ on PC2 because the purchase price must be
considered as P1 and P2 are in real price.

NB: Everything is ok if the button "Post Inventory" is clicked after the production.

opw:741748
---
 addons/mrp/models/mrp_production.py    | 7 +++++--
 addons/stock/models/product.py         | 3 +++
 addons/stock_account/models/product.py | 3 +++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/models/mrp_production.py b/addons/mrp/models/mrp_production.py
index 8b0b7c48dea..097876b0b6b 100644
--- a/addons/mrp/models/mrp_production.py
+++ b/addons/mrp/models/mrp_production.py
@@ -208,8 +208,11 @@ class MrpProduction(models.Model):
     @api.depends('move_raw_ids.quantity_done', 'move_finished_ids.quantity_done')
     def _compute_post_visible(self):
         for order in self:
-            order.post_visible = any(order.move_raw_ids.filtered(lambda x: (x.quantity_done) > 0 and (x.state not in ['done', 'cancel']))) or \
-                any(order.move_finished_ids.filtered(lambda x: (x.quantity_done) > 0 and (x.state not in ['done', 'cancel'])))
+            if order.product_tmpl_id._is_cost_method_standard():
+                order.post_visible = any((x.quantity_done > 0 and x.state not in ['done', 'cancel']) for x in order.move_raw_ids) or \
+                    any((x.quantity_done > 0 and x.state not in ['done' 'cancel']) for x in order.move_finished_ids)
+            else:
+                order.post_visible = any((x.quantity_done > 0 and x.state not in ['done' 'cancel']) for x in order.move_finished_ids)
 
     @api.multi
     @api.depends('workorder_ids.state', 'move_finished_ids')
diff --git a/addons/stock/models/product.py b/addons/stock/models/product.py
index b48d4f8570d..5a71c1fccf1 100644
--- a/addons/stock/models/product.py
+++ b/addons/stock/models/product.py
@@ -416,6 +416,9 @@ class ProductTemplate(models.Model):
         relation="stock.location.route", string="Category Routes",
         related='categ_id.total_route_ids')
 
+    def _is_cost_method_standard(self):
+        return True
+
     def _compute_quantities(self):
         res = self._compute_quantities_dict()
         for template in self:
diff --git a/addons/stock_account/models/product.py b/addons/stock_account/models/product.py
index 1e4ac7ffbe1..1b15d2aa066 100644
--- a/addons/stock_account/models/product.py
+++ b/addons/stock_account/models/product.py
@@ -51,6 +51,9 @@ class ProductTemplate(models.Model):
     def _compute_cost_method(self):
         self.cost_method = self.property_cost_method or self.categ_id.property_cost_method
 
+    def _is_cost_method_standard(self):
+        return self.property_cost_method == 'standard'
+
     @api.one
     def _set_cost_method(self):
         return self.write({'property_cost_method': self.cost_method})

From c0f81be3359eb87bbaf0fceee9282c0f68f740c5 Mon Sep 17 00:00:00 2001
From: Denis Vermylen <dve@odoo.com>
Date: Wed, 7 Jun 2017 11:36:35 +0200
Subject: [PATCH 14/40] [FIX] hr_holidays: add short name_get possibility

it will be used for the gantt view in enterprise
---
 addons/hr_holidays/models/hr_holidays.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/hr_holidays/models/hr_holidays.py b/addons/hr_holidays/models/hr_holidays.py
index 9fba509ecbf..fe979d21a43 100644
--- a/addons/hr_holidays/models/hr_holidays.py
+++ b/addons/hr_holidays/models/hr_holidays.py
@@ -331,9 +331,12 @@ class Holidays(models.Model):
         res = []
         for leave in self:
             if leave.type == 'remove':
-                res.append((leave.id, _("%s on %s : %.2f day(s)") % (leave.employee_id.name or leave.category_id.name, leave.holiday_status_id.name, leave.number_of_days_temp)))
+                if self.env.context.get('short_name'):
+                    res.append((leave.id, _("%s : %.2f day(s)") % (leave.name or leave.holiday_status_id.name, leave.number_of_days_temp)))
+                else:
+                    res.append((leave.id, _("%s on %s : %.2f day(s)") % (leave.employee_id.name or leave.category_id.name, leave.holiday_status_id.name, leave.number_of_days_temp)))
             else:
-                res.append((leave.id, _("Allocation of %s : %.2f day(s) To %s") % (leave.holiday_status_id.name, leave.number_of_days_temp,leave.employee_id.name)))
+                res.append((leave.id, _("Allocation of %s : %.2f day(s) To %s") % (leave.holiday_status_id.name, leave.number_of_days_temp, leave.employee_id.name)))
         return res
 
     def _check_state_access_right(self, vals):

From 3741603495532e218b66f3cfa0272e4536f1cf2c Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Wed, 7 Jun 2017 14:11:23 +0200
Subject: [PATCH 15/40] [FIX] web: restore broken datepicker since lib update

There were two main problems with the datepicker since the lib was
updated:
- it appeared broken in the search view "Filters" menu
- it did not overflow the parent which scrolls

Indeed, before the update, the datepicker was placed in the <body/>.
Now this is a lib option. Unfortunately, the option is broken (I don't
know why they broke it since it worked before the lib update...). As the
lib does not expose its internal functions, the only found workaround was
to patch the lib code itself.

opw-745311
opw-745625
---
 .../src/js/bootstrap-datetimepicker.js                      | 6 ++++++
 addons/web/static/src/js/widgets/date_picker.js             | 1 +
 addons/web/static/src/less/webclient.less                   | 1 +
 3 files changed, 8 insertions(+)

diff --git a/addons/web/static/lib/bootstrap-datetimepicker/src/js/bootstrap-datetimepicker.js b/addons/web/static/lib/bootstrap-datetimepicker/src/js/bootstrap-datetimepicker.js
index 807bdff70dd..8f0724bbb00 100644
--- a/addons/web/static/lib/bootstrap-datetimepicker/src/js/bootstrap-datetimepicker.js
+++ b/addons/web/static/lib/bootstrap-datetimepicker/src/js/bootstrap-datetimepicker.js
@@ -421,6 +421,12 @@
                     element.children().first().after(widget);
                 }
 
+                // !! ODOO FIX START !!
+                var parentOffset = parent.offset();
+                position.top = offset.top - parentOffset.top;
+                position.left = offset.left - parentOffset.left;
+                // !! ODOO FIX END !!
+
                 // Top and bottom logic
                 if (vertical === 'auto') {
                     if (offset.top + widget.height() * 1.5 >= $(window).height() + $(window).scrollTop() &&
diff --git a/addons/web/static/src/js/widgets/date_picker.js b/addons/web/static/src/js/widgets/date_picker.js
index bd9416a278a..b148473413c 100644
--- a/addons/web/static/src/js/widgets/date_picker.js
+++ b/addons/web/static/src/js/widgets/date_picker.js
@@ -39,6 +39,7 @@ var DateWidget = Widget.extend({
             locale : moment.locale(),
             allowInputToggle: true,
             keyBinds: null,
+            widgetParent: 'body',
         });
     },
     start: function() {
diff --git a/addons/web/static/src/less/webclient.less b/addons/web/static/src/less/webclient.less
index 2f9878fbdc3..5e84d74b599 100644
--- a/addons/web/static/src/less/webclient.less
+++ b/addons/web/static/src/less/webclient.less
@@ -12,6 +12,7 @@ a {
 //  General
 // ------------------------------------------------------------------
 .o_web_client {
+    position: relative; // normally useless but required by bootstrap-datepicker
     background-color: @odoo-webclient-background-color;
 }
 .o_text_overflow {

From 506ac455376d605bc360764ae958835b3da195e9 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Wed, 7 Jun 2017 11:24:44 +0200
Subject: [PATCH 16/40] [FIX] resource: get working hours

- Use the demo resource calendar (40h/week)
- Create a project forecast for the Administrator
- Set the 'Start date' and 'End date' to 2017-07-07
- Plan 8 hours

The % of time should be 100 %, but it's not always the case.

The core of the issue comes from `get_working_hours`.

Case 1:
Call with start_dt = end_dt = 2017-07-07 00:00:00
`get_working_hours_of_date` is called twice with the following start/end
dt:
- 2017-06-07 00:00:00, 2017-06-07 00:00:00        => 0 hours
- 2017-06-08 00:00:00, 2017-06-08 23:59:59.999999 => 8 hours

This is obviously not correct, we don't care about what happens on
2017-06-08. The number of hours is correct in total, but it comes from
the wrong day.

Case 2:
Call with start_dt = 2017-07-07 00:00:00 and end_dt = 2017-07-07 23:59:59
`get_working_hours_of_date` is called twice with the following start/end
dt:
- 2017-06-07 00:00:00, 2017-06-07 23:59:59.999999 => 8 hours
- 2017-06-08 00:00:00, 2017-06-08 23:59:59.999999 => 8 hours

This is obviously not correct either...

We change how the `until` parameter is computed. This way, the correct
call is the second call (Case 2), and `get_working_hours_of_date` is
calld once with the following start/end dt:
- 2017-06-07 00:00:00, 2017-06-07 23:59:59.999999 => 8 hours

opw-745253
---
 addons/resource/models/resource.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/resource/models/resource.py b/addons/resource/models/resource.py
index 5551d1c6838..cb0270b7bfa 100644
--- a/addons/resource/models/resource.py
+++ b/addons/resource/models/resource.py
@@ -369,7 +369,7 @@ class ResourceCalendar(models.Model):
                           resource_id=None, default_interval=None):
         hours = 0.0
         for day in rrule.rrule(rrule.DAILY, dtstart=start_dt,
-                               until=(end_dt + timedelta(days=1)).replace(hour=0, minute=0, second=0, microsecond=0),
+                               until=end_dt.replace(hour=23, minute=59, second=59, microsecond=999999),
                                byweekday=self.get_weekdays()):
             day_start_dt = day.replace(hour=0, minute=0, second=0, microsecond=0)
             if start_dt and day.date() == start_dt.date():

From 65e49baedeeab52ad9ba9c1e001449527118197a Mon Sep 17 00:00:00 2001
From: Richard Mathot <rim@odoo.com>
Date: Wed, 7 Jun 2017 16:09:42 +0200
Subject: [PATCH 17/40] [DOC] website_event_sale: think multicurrency when
 writing tests

---
 .../website_event_sale/static/src/js/website.tour.event_sale.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_event_sale/static/src/js/website.tour.event_sale.js b/addons/website_event_sale/static/src/js/website.tour.event_sale.js
index de23a9b4b67..327afe03a56 100644
--- a/addons/website_event_sale/static/src/js/website.tour.event_sale.js
+++ b/addons/website_event_sale/static/src/js/website.tour.event_sale.js
@@ -75,7 +75,7 @@ tour.register('event_buy_tickets', {
             trigger: 'a[href="/shop/confirm_order"]:contains("Confirm")',
         },
         {
-            content: "Check that the subtotal is 5,500.00",
+            content: "Check that the subtotal is 5,500.00 USD", // this test will fail if the currency of the main company is not USD
             trigger: '#order_total_untaxed .oe_currency_value:contains("5,500.00")',
             run: function () {}, // it's a check
         },

From c6b9b69f6a483e7ccebf0b823240b71a8f426fd3 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 7 Jun 2017 22:46:25 +0200
Subject: [PATCH 18/40] [FIX] base_import_module: allow selective access to
 module files

As a consequence of rev. 76cd8d2558d2a1fc11681dbc4a134ba06fb698c0,
imported modules were unable to access their resource files during
import.

Rather than further modifying the file_open API to whitelist paths
(the whole thing needs a redesign in master), we temporarily
whitelist the temporary directory by including it in the global
addons_paths, making sure to undo it afterwards.

This gives all lower level function access the resource files via
file_open, without having to pass around whitelisted paths
through many different calls.
---
 addons/base_import_module/models/ir_module.py | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/addons/base_import_module/models/ir_module.py b/addons/base_import_module/models/ir_module.py
index e81035bda31..b8be8f11865 100644
--- a/addons/base_import_module/models/ir_module.py
+++ b/addons/base_import_module/models/ir_module.py
@@ -96,18 +96,23 @@ class view(osv.osv):
                     raise osv.except_osv(_('Error !'), msg % zf.filename)
 
             with openerp.tools.osutil.tempdir() as module_dir:
-                z.extractall(module_dir)
-                dirs = [d for d in os.listdir(module_dir) if os.path.isdir(opj(module_dir, d))]
-                for mod_name in dirs:
-                    module_names.append(mod_name)
-                    try:
-                        # assert mod_name.startswith('theme_')
-                        path = opj(module_dir, mod_name)
-                        self.import_module(cr, uid, mod_name, path, force=force, context=context)
-                        success.append(mod_name)
-                    except Exception, e:
-                        _logger.exception('Error while importing module')
-                        errors[mod_name] = tools.ustr(e)
+                import openerp.modules as addons
+                try:
+                    addons.module.ad_paths.append(module_dir)
+                    z.extractall(module_dir)
+                    dirs = [d for d in os.listdir(module_dir) if os.path.isdir(opj(module_dir, d))]
+                    for mod_name in dirs:
+                        module_names.append(mod_name)
+                        try:
+                            # assert mod_name.startswith('theme_')
+                            path = opj(module_dir, mod_name)
+                            self.import_module(cr, uid, mod_name, path, force=force, context=context)
+                            success.append(mod_name)
+                        except Exception, e:
+                            _logger.exception('Error while importing module')
+                            errors[mod_name] = tools.ustr(e)
+                finally:
+                    addons.module.ad_paths.remove(module_dir)
         r = ["Successfully imported module '%s'" % mod for mod in success]
         for mod, error in errors.items():
             r.append("Error while importing module '%s': %r" % (mod, error))

From 3d1fe33a362422b3df8ece8b94a896379c3f4071 Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Thu, 8 Jun 2017 10:17:01 +0200
Subject: [PATCH 19/40] [FIX] calendar: _get_recurrent_date_by_event

Let's create in google calendar a reccurent event with all day
set and a end date.

When synchronising google calendar with Odoo(by clicking on button
"Sync with Google"). It raised on error because the start date had
a time zone but not the end date(the UNTIL in the rrule).

Fine tuning of 20ed57f874176161a043dee834b25c7f0b3dc175

opw:746549
---
 addons/calendar/models/calendar.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/calendar/models/calendar.py b/addons/calendar/models/calendar.py
index 8c18fe2e24b..145614fc045 100644
--- a/addons/calendar/models/calendar.py
+++ b/addons/calendar/models/calendar.py
@@ -553,7 +553,7 @@ class Meeting(models.Model):
         if not event_date:
             event_date = datetime.now()
 
-        if self.allday and self.rrule and 'Z' not in self.rrule:
+        if self.allday and self.rrule and 'UNTIL' in self.rrule and 'Z' not in self.rrule:
             rset1 = rrule.rrulestr(str(self.rrule), dtstart=event_date.replace(tzinfo=None), forceset=True, ignoretz=True)
         else:
             # Convert the event date to saved timezone (or context tz) as it'll

From b4863378efa6a30acc507fd05dc977195c3ff254 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Thu, 8 Jun 2017 10:23:37 +0200
Subject: [PATCH 20/40] [FIX] website, website_sale: product website price and
 pricelist without request

Attempting to read the field `website_price` directly
with the XMLRPC API failed because, in such a case,
the request is unbound, and attempting to read
anything from it (`request.session` whatever)
resulted to the raise of an exception.

e.g.
This prevented to perform a `search_read`
with all fields on the `product.product` model

Closes #14939
opw-745733
---
 addons/website/models/website.py         |  5 +++--
 addons/website_sale/models/sale_order.py | 10 +++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index 0a64d587bcb..6145fe13132 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -392,9 +392,10 @@ class Website(models.Model):
 
     @api.model
     def get_current_website(self):
-        domain_name = request.httprequest.environ.get('HTTP_HOST', '').split(':')[0]
+        domain_name = request and request.httprequest.environ.get('HTTP_HOST', '').split(':')[0] or None
         website_id = self._get_current_website_id(domain_name)
-        request.context = dict(request.context, website_id=website_id)
+        if request:
+            request.context = dict(request.context, website_id=website_id)
         return self.browse(website_id)
 
     @tools.cache('domain_name')
diff --git a/addons/website_sale/models/sale_order.py b/addons/website_sale/models/sale_order.py
index 59b6432e3a6..6f31edc7a68 100644
--- a/addons/website_sale/models/sale_order.py
+++ b/addons/website_sale/models/sale_order.py
@@ -244,19 +244,19 @@ class Website(models.Model):
         :param bool show_visible: if True, we don't display pricelist where selectable is False (Eg: Code promo)
         :returns: pricelist recordset
         """
-        website = request.website
-        if not request.website:
+        website = request and request.website or None
+        if not website:
             if self.env.context.get('website_id'):
                 website = self.browse(self.env.context['website_id'])
             else:
                 website = self.search([], limit=1)
-        isocountry = request.session.geoip and request.session.geoip.get('country_code') or False
+        isocountry = request and request.session.geoip and request.session.geoip.get('country_code') or False
         partner = self.env.user.partner_id
         order_pl = partner.last_website_so_id and partner.last_website_so_id.state == 'draft' and partner.last_website_so_id.pricelist_id
         partner_pl = partner.property_product_pricelist
         pricelists = website._get_pl_partner_order(isocountry, show_visible,
                                                    website.user_id.sudo().partner_id.property_product_pricelist.id,
-                                                   request.session.get('website_sale_current_pl'),
+                                                   request and request.session.get('website_sale_current_pl') or None,
                                                    website.pricelist_ids,
                                                    partner_pl=partner_pl and partner_pl.id or None,
                                                    order_pl=order_pl and order_pl.id or None)
@@ -280,7 +280,7 @@ class Website(models.Model):
         available_pricelists = self.get_pricelist_available()
         pl = None
         partner = self.env.user.partner_id
-        if request.session.get('website_sale_current_pl'):
+        if request and request.session.get('website_sale_current_pl'):
             # `website_sale_current_pl` is set only if the user specifically chose it:
             #  - Either, he chose it from the pricelist selection
             #  - Either, he entered a coupon code

From 99ae418bf24171fbc6bb27584059c27efb857e77 Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Wed, 7 Jun 2017 12:56:21 +0200
Subject: [PATCH 21/40] [FIX] web: Many2one: wait for name_create before saving

The problem occurred in form views with a many2one field, when the
user reproduced the following steps:
 - type some text in the many2one
 - click on 'Create ...' in the many2one dropdown to quick create
   (name_create RPC) the record
 - before the name_create returns, click on 'Save'.

When this happened, the record was saved before the many2one was
updated with its new value. So the record was incorrectly saved,
and the view was again dirty as soon as the name_create returned,
even if it was in 'readonly'. So after saving, a 'Changes will be
discarded' dialog opened when the user tried to leave the form.

We fix this issue by making the controller wait for the name_create
to return, and for the many2one to update its value, before saving.

This issue could also occur in list views.
---
 .../static/src/js/fields/relational_fields.js |  25 +--
 .../src/js/views/basic/basic_controller.js    |   8 +-
 .../tests/fields/relational_fields_tests.js   | 177 ++++++++++++++++++
 3 files changed, 197 insertions(+), 13 deletions(-)

diff --git a/addons/web/static/src/js/fields/relational_fields.js b/addons/web/static/src/js/fields/relational_fields.js
index e9af73c1343..ae3b06d3a02 100644
--- a/addons/web/static/src/js/fields/relational_fields.js
+++ b/addons/web/static/src/js/fields/relational_fields.js
@@ -213,17 +213,20 @@ var FieldMany2One = AbstractField.extend({
         var self = this;
         var slowCreate = this._searchCreatePopup.bind(this, "form", false, this._createContext(name));
         if (this.nodeOptions.quick_create) {
-            return this._rpc({
-                    model: this.field.relation,
-                    method: 'name_create',
-                    args: [name],
-                    context: this.record.getContext(this.recordParams),
-                })
-                .then(function (result) {
-                    if (self.mode === "edit") {
-                        self.reinitialize({id: result[0], display_name: result[1]});
-                    }
-                }, slowCreate);
+            this.trigger_up('mutexify', {
+                action: function () {
+                    return self._rpc({
+                        model: self.field.relation,
+                        method: 'name_create',
+                        args: [name],
+                        context: self.record.getContext(self.recordParams),
+                    }).then(function (result) {
+                        if (self.mode === "edit") {
+                            self.reinitialize({id: result[0], display_name: result[1]});
+                        }
+                    }, slowCreate);
+                },
+            });
         } else {
             slowCreate();
         }
diff --git a/addons/web/static/src/js/views/basic/basic_controller.js b/addons/web/static/src/js/views/basic/basic_controller.js
index 53e5be8ff6e..4f6cf5e2ebb 100644
--- a/addons/web/static/src/js/views/basic/basic_controller.js
+++ b/addons/web/static/src/js/views/basic/basic_controller.js
@@ -186,8 +186,12 @@ var BasicController = AbstractController.extend(FieldManagerMixin, {
         // user if some discarding has to be made). This operation must also be
         // mutex-protected as commitChanges function of x2m has to be aware of
         // all final changes made to a row.
-        this.mutex.exec(this.renderer.commitChanges.bind(this.renderer, recordID || this.handle)); // TODO write a test for this
-        return this.mutex.exec(this._saveRecord.bind(this, recordID, options));
+        var self = this;
+        return this.mutex
+            .exec(this.renderer.commitChanges.bind(this.renderer, recordID || this.handle))
+            .then(function () {
+                return self.mutex.exec(self._saveRecord.bind(self, recordID, options));
+            });
     },
     /**
      * @override
diff --git a/addons/web/static/tests/fields/relational_fields_tests.js b/addons/web/static/tests/fields/relational_fields_tests.js
index 09b22baa02f..127d5761fd2 100644
--- a/addons/web/static/tests/fields/relational_fields_tests.js
+++ b/addons/web/static/tests/fields/relational_fields_tests.js
@@ -482,6 +482,183 @@ QUnit.module('relational_fields', {
     //     assert.strictEqual(form.$('input').eq(1).val(), 'xphone', "onchange should have been applied");
     // });
 
+    QUnit.test('form: quick create then save directly', function (assert) {
+        var done = assert.async();
+        assert.expect(5);
+
+        var M2O_DELAY = relationalFields.FieldMany2One.prototype.AUTOCOMPLETE_DELAY;
+        relationalFields.FieldMany2One.prototype.AUTOCOMPLETE_DELAY = 0;
+
+        var def = $.Deferred();
+        var newRecordID;
+        var form = createView({
+            View: FormView,
+            model: 'partner',
+            data: this.data,
+            arch: '<form>' +
+                    '<field name="trululu"/>' +
+                '</form>',
+            mockRPC: function (route, args) {
+                var result = this._super.apply(this, arguments);
+                if (args.method === 'name_create') {
+                    assert.step('name_create');
+                    return def.then(_.constant(result)).then(function (nameGet) {
+                        newRecordID = nameGet[0];
+                        return nameGet;
+                    });
+                }
+                if (args.method === 'create') {
+                    assert.step('create');
+                    assert.strictEqual(args.args[0].trululu, newRecordID,
+                        "should create with the correct m2o id");
+                }
+                return result;
+            },
+        });
+
+        var $dropdown = form.$('.o_field_many2one input').autocomplete('widget');
+        form.$('.o_field_many2one input').val('b').trigger('keydown');
+        concurrency.delay(0).then(function () {
+            $dropdown.find('li:first()').click(); // quick create 'b'
+            form.$buttons.find('.o_form_button_save').click();
+
+            assert.verifySteps(['name_create'],
+                "should wait for the name_create before creating the record");
+
+            def.resolve();
+
+            assert.verifySteps(['name_create', 'create']);
+
+            relationalFields.FieldMany2One.prototype.AUTOCOMPLETE_DELAY = M2O_DELAY;
+            form.destroy();
+            done();
+        });
+    });
+
+    QUnit.test('list: quick create then save directly', function (assert) {
+        var done = assert.async();
+        assert.expect(8);
+
+        var M2O_DELAY = relationalFields.FieldMany2One.prototype.AUTOCOMPLETE_DELAY;
+        relationalFields.FieldMany2One.prototype.AUTOCOMPLETE_DELAY = 0;
+
+        var def = $.Deferred();
+        var newRecordID;
+        var list = createView({
+            View: ListView,
+            model: 'partner',
+            data: this.data,
+            arch: '<tree editable="top">' +
+                    '<field name="trululu"/>' +
+                '</tree>',
+            mockRPC: function (route, args) {
+                var result = this._super.apply(this, arguments);
+                if (args.method === 'name_create') {
+                    assert.step('name_create');
+                    return def.then(_.constant(result)).then(function (nameGet) {
+                        newRecordID = nameGet[0];
+                        return nameGet;
+                    });
+                }
+                if (args.method === 'create') {
+                    assert.step('create');
+                    assert.strictEqual(args.args[0].trululu, newRecordID,
+                        "should create with the correct m2o id");
+                }
+                return result;
+            },
+        });
+
+        list.$buttons.find('.o_list_button_add').click();
+
+        var $dropdown = list.$('.o_field_many2one input').autocomplete('widget');
+        list.$('.o_field_many2one input').val('b').trigger('keydown');
+        concurrency.delay(0).then(function () {
+            $dropdown.find('li:first()').click(); // quick create 'b'
+            list.$buttons.find('.o_list_button_add').click();
+
+            assert.verifySteps(['name_create'],
+                "should wait for the name_create before creating the record");
+            assert.strictEqual(list.$('.o_data_row').length, 4,
+                "should wait for the name_create before adding the new row");
+
+            def.resolve();
+
+            assert.verifySteps(['name_create', 'create']);
+            assert.strictEqual(list.$('.o_data_row:nth(1) .o_data_cell').text(), 'b',
+                "created row should have the correct m2o value");
+            assert.strictEqual(list.$('.o_data_row').length, 5,
+                "should have added the fifth row");
+
+            relationalFields.FieldMany2One.prototype.AUTOCOMPLETE_DELAY = M2O_DELAY;
+            list.destroy();
+            done();
+        });
+    });
+
+    QUnit.test('list in form: quick create then save directly', function (assert) {
+        var done = assert.async();
+        assert.expect(6);
+
+        var M2O_DELAY = relationalFields.FieldMany2One.prototype.AUTOCOMPLETE_DELAY;
+        relationalFields.FieldMany2One.prototype.AUTOCOMPLETE_DELAY = 0;
+
+        var def = $.Deferred();
+        var newRecordID;
+        var form = createView({
+            View: FormView,
+            model: 'partner',
+            data: this.data,
+            arch: '<form>' +
+                    '<sheet>' +
+                        '<field name="p">' +
+                            '<tree editable="bottom">' +
+                                '<field name="trululu"/>' +
+                            '</tree>' +
+                        '</field>' +
+                    '</sheet>' +
+                '</form>',
+            mockRPC: function (route, args) {
+                var result = this._super.apply(this, arguments);
+                if (args.method === 'name_create') {
+                    assert.step('name_create');
+                    return def.then(_.constant(result)).then(function (nameGet) {
+                        newRecordID = nameGet[0];
+                        return nameGet;
+                    });
+                }
+                if (args.method === 'create') {
+                    assert.step('create');
+                    assert.strictEqual(args.args[0].p[0][2].trululu, newRecordID,
+                        "should create with the correct m2o id");
+                }
+                return result;
+            },
+        });
+
+        form.$('.o_field_x2many_list_row_add a').click();
+
+        var $dropdown = form.$('.o_field_many2one input').autocomplete('widget');
+        form.$('.o_field_many2one input').val('b').trigger('keydown');
+        concurrency.delay(0).then(function () {
+            $dropdown.find('li:first()').click(); // quick create 'b'
+            form.$buttons.find('.o_form_button_save').click();
+
+            assert.verifySteps(['name_create'],
+                "should wait for the name_create before creating the record");
+
+            def.resolve();
+
+            assert.verifySteps(['name_create', 'create']);
+            assert.strictEqual(form.$('.o_data_row:first .o_data_cell').text(), 'b',
+                "first row should have the correct m2o value");
+
+            relationalFields.FieldMany2One.prototype.AUTOCOMPLETE_DELAY = M2O_DELAY;
+            form.destroy();
+            done();
+        });
+    });
+
     QUnit.test('autocompletion in a many2one, in form view with a domain', function (assert) {
         assert.expect(1);
 

From 8648d16e458f96c0e313c27e5c2bc28a468c5f17 Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Wed, 7 Jun 2017 14:54:00 +0200
Subject: [PATCH 22/40] [FIX] web: correctly display nocontent helper if
 create='0'

When the root node of the arch has attribute 'create' set to '0',
the generated DOM element must have classname 'o_cannot_create'.
This is used to correctly display the nocontent helper (when there
is no record).

Before this rev., the helper indicated that the user can click on
'Create' to create a new record, even if the create action was
disabled. This was for example the case in Point of Sale > Orders.
---
 .../src/js/views/basic/basic_controller.js    |  3 +++
 addons/web/static/tests/views/list_tests.js   | 23 ++++++++++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/views/basic/basic_controller.js b/addons/web/static/src/js/views/basic/basic_controller.js
index 4f6cf5e2ebb..16a066db495 100644
--- a/addons/web/static/src/js/views/basic/basic_controller.js
+++ b/addons/web/static/src/js/views/basic/basic_controller.js
@@ -46,6 +46,9 @@ var BasicController = AbstractController.extend(FieldManagerMixin, {
      * @returns {Deferred}
      */
     start: function () {
+        // add classname to reflect the (absence of) access rights (used to
+        // correctly display the nocontent helper)
+        this.$el.toggleClass('o_cannot_create', !this.activeActions.create);
         return this._super.apply(this, arguments)
                           .then(this._updateEnv.bind(this));
     },
diff --git a/addons/web/static/tests/views/list_tests.js b/addons/web/static/tests/views/list_tests.js
index e1cfef2b23b..332ba6687f9 100644
--- a/addons/web/static/tests/views/list_tests.js
+++ b/addons/web/static/tests/views/list_tests.js
@@ -84,7 +84,7 @@ QUnit.module('Views', {
     QUnit.module('ListView');
 
     QUnit.test('simple readonly list', function (assert) {
-        assert.expect(9);
+        assert.expect(10);
 
         var list = createView({
             View: ListView,
@@ -93,6 +93,9 @@ QUnit.module('Views', {
             arch: '<tree><field name="foo"/><field name="int_field"/></tree>',
         });
 
+        assert.notOk(list.$el.hasClass('o_cannot_create'),
+            "should not have className 'o_cannot_create'");
+
         // 3 th (1 for checkbox, 2 for columns)
         assert.strictEqual(list.$('th').length, 3, "should have 3 columns");
 
@@ -114,6 +117,24 @@ QUnit.module('Views', {
         list.destroy();
     });
 
+    QUnit.test('list with create="0"', function (assert) {
+        assert.expect(2);
+
+        var list = createView({
+            View: ListView,
+            model: 'foo',
+            data: this.data,
+            arch: '<tree create="0"><field name="foo"/></tree>',
+        });
+
+        assert.ok(list.$el.hasClass('o_cannot_create'),
+            "should have className 'o_cannot_create'");
+        assert.strictEqual(list.$buttons.find('.o_list_button_add').length, 0,
+            "should not have the 'Create' button");
+
+        list.destroy();
+    });
+
     QUnit.test('simple editable rendering', function (assert) {
         assert.expect(9);
 

From 11d6b5e15e812b81d3b136113ab8278137fe01b0 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Thu, 8 Jun 2017 11:13:20 +0200
Subject: [PATCH 23/40] [FIX] account: name search on journal with negative
 operators

In the journal items,
when performing a search
"Journal" "Doesn't contain" "Something"

Both its name AND its code must not contain "Something".
Therefore, with negative operator, the domain must
not be built with a OR connector but with an AND.

Same thing goes for "is equal" and "is not equal".

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

diff --git a/addons/account/models/account.py b/addons/account/models/account.py
index cf4d47a7425..6a2e73160bd 100644
--- a/addons/account/models/account.py
+++ b/addons/account/models/account.py
@@ -510,7 +510,10 @@ class AccountJournal(models.Model):
     @api.model
     def name_search(self, name='', args=None, operator='ilike', limit=100):
         args = args or []
-        recs = self.search(['|', ('code', operator, name), ('name', operator, name)] + args, limit=limit)
+        connector = '|'
+        if operator in expression.NEGATIVE_TERM_OPERATORS:
+            connector = '&'
+        recs = self.search([connector, ('code', operator, name), ('name', operator, name)] + args, limit=limit)
         return recs.name_get()
 
     @api.multi

From 8052869b19aaf2105713e0a8ba0555ca25dc26ef Mon Sep 17 00:00:00 2001
From: nafex <nafex@gmx.net>
Date: Tue, 6 Jun 2017 15:25:42 +0200
Subject: [PATCH 24/40] [FIX] delivery: create_price_rules won't create
 unnecessary rules anymore

When updating a carrier that is not "fixed" or "base_on_rule", this
method was creating unnecessary delivery.price.rule at each write.
This patch fixes this issue.

Closes PR #17443
---
 addons/delivery/models/delivery_carrier.py | 40 +++++++++++-----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/addons/delivery/models/delivery_carrier.py b/addons/delivery/models/delivery_carrier.py
index dad4e8a315f..fa46ef9b5f3 100644
--- a/addons/delivery/models/delivery_carrier.py
+++ b/addons/delivery/models/delivery_carrier.py
@@ -201,26 +201,26 @@ class DeliveryCarrier(models.Model):
             if record.delivery_type == 'fixed':
                 PriceRule.search([('carrier_id', '=', record.id)]).unlink()
 
-            line_data = {
-                'carrier_id': record.id,
-                'variable': 'price',
-                'operator': '>=',
-            }
-            # Create the delivery price rules
-            if record.free_if_more_than:
-                line_data.update({
-                    'max_value': record.amount,
-                    'standard_price': 0.0,
-                    'list_base_price': 0.0,
-                })
-                PriceRule.create(line_data)
-            if record.fixed_price is not False:
-                line_data.update({
-                    'max_value': 0.0,
-                    'standard_price': record.fixed_price,
-                    'list_base_price': record.fixed_price,
-                })
-                PriceRule.create(line_data)
+                line_data = {
+                    'carrier_id': record.id,
+                    'variable': 'price',
+                    'operator': '>=',
+                }
+                # Create the delivery price rules
+                if record.free_if_more_than:
+                    line_data.update({
+                        'max_value': record.amount,
+                        'standard_price': 0.0,
+                        'list_base_price': 0.0,
+                    })
+                    PriceRule.create(line_data)
+                if record.fixed_price is not False:
+                    line_data.update({
+                        'max_value': 0.0,
+                        'standard_price': record.fixed_price,
+                        'list_base_price': record.fixed_price,
+                    })
+                    PriceRule.create(line_data)
         return True
 
     @api.model

From 79e4a1f1b116a447b72fb9d1c846260ae6b3ac2c Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Thu, 8 Jun 2017 10:11:50 +0200
Subject: [PATCH 25/40] [FIX] web: ModelFieldSelector: add a way to clear the
 cache

The ModelFieldSelector keeps an internal cache for the fields_get.
This cache needs to be cleared in the tests environment because
a model with the same name may be defined several times accross the
tests modules, but they may contain different fields.

This could also be a problem with studio: when a field is created,
the ModelFieldSelector cache must be cleared as well (in addition
to the data_manager one).

We thus introduce a new 'clear_cache' event on core.bus. When
triggered, the ModelFieldSelector and the data_manager clear their
respective cache.

We use this event in the test environment to ensure that the cache
is cleared at the end of each test using a mockEnvironment. This
rev. also fixes an infinite loop in the override of destroy() in
the mockEnvironment, which occured when both session and config
were specified in the params.
---
 .../static/src/js/services/data_manager.js    |  1 +
 .../src/js/widgets/model_field_selector.js    |  5 ++
 addons/web/static/tests/helpers/test_utils.js | 63 ++++++++++---------
 3 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/addons/web/static/src/js/services/data_manager.js b/addons/web/static/src/js/services/data_manager.js
index 5131db19028..41fc293e383 100644
--- a/addons/web/static/src/js/services/data_manager.js
+++ b/addons/web/static/src/js/services/data_manager.js
@@ -11,6 +11,7 @@ var utils = require('web.utils');
 return core.Class.extend({
     init: function () {
         this._init_cache();
+        core.bus.on('clear_cache', this, this.invalidate.bind(this));
     },
 
     _init_cache: function () {
diff --git a/addons/web/static/src/js/widgets/model_field_selector.js b/addons/web/static/src/js/widgets/model_field_selector.js
index 279428e8939..6607561a2bb 100644
--- a/addons/web/static/src/js/widgets/model_field_selector.js
+++ b/addons/web/static/src/js/widgets/model_field_selector.js
@@ -16,6 +16,11 @@ var modelFieldsCache = {
     cacheDefs: {},
 };
 
+core.bus.on('clear_cache', null, function () {
+    modelFieldsCache.cache = {};
+    modelFieldsCache.cacheDefs = {};
+});
+
 /**
  * The ModelFieldSelector widget can be used to display/select a particular
  * field chain from a given model.
diff --git a/addons/web/static/tests/helpers/test_utils.js b/addons/web/static/tests/helpers/test_utils.js
index 3632e251a33..bc2cf05f360 100644
--- a/addons/web/static/tests/helpers/test_utils.js
+++ b/addons/web/static/tests/helpers/test_utils.js
@@ -252,52 +252,53 @@ function addMockEnvironment(widget, params) {
         logLevel: params.logLevel,
         currentDate: params.currentDate,
     });
-    var widgetDestroy;
-
     // make sure the debounce value for input fields is set to 0
     var initialDebounce = DebouncedField.prototype.DEBOUNCE;
     DebouncedField.prototype.DEBOUNCE = params.fieldDebounce || 0;
-
+    var initialSession, initialConfig, initialParameters;
     if ('session' in params) {
-        var initialSession = _.extend({}, session);
+        initialSession = _.extend({}, session);
         _.extend(session, params.session);
-        widgetDestroy = widget.destroy;
-        widget.destroy = function () {
-            for (var key in session) {
+    }
+    if ('config' in params) {
+        initialConfig = _.extend({}, config);
+        _.extend(config, params.config);
+    }
+    if ('translateParameters' in params) {
+        initialParameters = _.extend({}, core._t.database.parameters);
+        _.extend(core._t.database.parameters, params.translateParameters);
+    }
+
+    var widgetDestroy = widget.destroy;
+    widget.destroy = function () {
+        // clear the caches (e.g. data_manager, ModelFieldSelector) when the
+        // widget is destroyed, at the end of each test to avoid collisions
+        core.bus.trigger('clear_cache');
+
+        DebouncedField.prototype.DEBOUNCE = initialDebounce;
+
+        var key;
+        if ('session' in params) {
+            for (key in session) {
                 delete session[key];
             }
             _.extend(session, initialSession);
-            widgetDestroy.call(this);
-        };
-    }
-
-    if ('config' in params) {
-        var initialConfig = _.extend({}, config);
-        _.extend(config, params.config);
-        widgetDestroy = widget.destroy;
-        widget.destroy = function () {
-            for (var key in config) {
+        }
+        if ('config' in params) {
+            for (key in config) {
                 delete config[key];
             }
             _.extend(config, initialConfig);
-            DebouncedField.prototype.DEBOUNCE = initialDebounce;
-            widgetDestroy.call(this);
-        };
-    }
-
-    if ('translateParameters' in params) {
-        var initialParameters = _.extend({}, core._t.database.parameters);
-        _.extend(core._t.database.parameters, params.translateParameters);
-        var oldDestroy = widget.destroy;
-        widget.destroy = function () {
-            for (var key in core._t.database.parameters) {
+        }
+        if ('translateParameters' in params) {
+            for (key in core._t.database.parameters) {
                 delete core._t.database.parameters[key];
             }
             _.extend(core._t.database.parameters, initialParameters);
-            oldDestroy.call(this);
-        };
-    }
+        }
 
+        widgetDestroy.call(this);
+    };
 
     intercept(widget, 'call_service', function (event) {
         if (event.data.service === 'ajax') {

From 1612f2cdf797adb1e7639874c8d0138d0d939749 Mon Sep 17 00:00:00 2001
From: xmo-odoo <xmo@odoo.com>
Date: Thu, 8 Jun 2017 11:42:25 +0200
Subject: [PATCH 26/40] [FIX] website_forum: untranslatable strings

OPW-746261
---
 addons/website_forum/i18n/website_forum.pot  | 41 ++++++++++++++++++++
 addons/website_forum/views/website_forum.xml | 38 ++++++++++--------
 2 files changed, 63 insertions(+), 16 deletions(-)

diff --git a/addons/website_forum/i18n/website_forum.pot b/addons/website_forum/i18n/website_forum.pot
index effc13bfb14..1d4b4a567db 100644
--- a/addons/website_forum/i18n/website_forum.pot
+++ b/addons/website_forum/i18n/website_forum.pot
@@ -604,6 +604,7 @@ msgid "Bad Request"
 msgstr ""
 
 #. module: website_forum
+#: model:ir.model.fields,field_description:website_forum.field_res_users_badge_ids
 #: model:ir.ui.view,arch_db:website_forum.badge
 #: model:ir.ui.view,arch_db:website_forum.header
 #: model:ir.ui.view,arch_db:website_forum.user_detail_full
@@ -782,6 +783,7 @@ msgstr ""
 #. openerp-web
 #: code:addons/website_forum/static/src/xml/website_forum_share_templates.xml:46
 #: selection:forum.post,state:0
+#: model:ir.ui.view,arch_db:website_forum.post_description_full
 #, python-format
 msgid "Close"
 msgstr ""
@@ -883,6 +885,16 @@ msgstr ""
 msgid "Convert all answers to comments and vice versa"
 msgstr ""
 
+#. module: website_forum
+#: model:ir.ui.view,arch_db:website_forum.post_answers
+msgid "Convert as a comment"
+msgstr ""
+
+#. module: website_forum
+#: model:ir.ui.view,arch_db:website_forum.post_comment
+msgid "Convert as an answer"
+msgstr ""
+
 #. module: website_forum
 #: model:ir.model.fields,field_description:website_forum.field_forum_post_karma_accept
 msgid "Convert comment to answer"
@@ -968,6 +980,12 @@ msgstr ""
 msgid "Default Post"
 msgstr ""
 
+#. module: website_forum
+#: model:ir.ui.view,arch_db:website_forum.post_answers
+#: model:ir.ui.view,arch_db:website_forum.post_description_full
+msgid "Delete"
+msgstr ""
+
 #. module: website_forum
 #: model:ir.model.fields,field_description:website_forum.field_forum_forum_karma_unlink_all
 msgid "Delete all posts"
@@ -1038,6 +1056,8 @@ msgstr ""
 
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.edit_post
+#: model:ir.ui.view,arch_db:website_forum.post_answers
+#: model:ir.ui.view,arch_db:website_forum.post_description_full
 msgid "Edit"
 msgstr ""
 
@@ -1184,6 +1204,11 @@ msgstr ""
 msgid "First upvote"
 msgstr ""
 
+#. module: website_forum
+#: model:ir.ui.view,arch_db:website_forum.post_description_full
+msgid "Flag"
+msgstr ""
+
 #. module: website_forum
 #: model:ir.model.fields,field_description:website_forum.field_forum_forum_karma_flag
 #: model:ir.model.fields,field_description:website_forum.field_forum_post_karma_flag
@@ -1193,6 +1218,7 @@ msgstr ""
 #. module: website_forum
 #: selection:forum.post,state:0
 #: model:ir.ui.view,arch_db:website_forum.moderation_queue
+#: model:ir.ui.view,arch_db:website_forum.post_description_full
 msgid "Flagged"
 msgstr ""
 
@@ -2012,6 +2038,11 @@ msgstr ""
 msgid "Re: %s"
 msgstr ""
 
+#. module: website_forum
+#: model:ir.ui.view,arch_db:website_forum.post_description_full
+msgid "Reactivate"
+msgstr ""
+
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.header
 msgid "Read Guidelines"
@@ -2064,6 +2095,11 @@ msgstr ""
 msgid "Relevance Computation"
 msgstr ""
 
+#. module: website_forum
+#: model:ir.ui.view,arch_db:website_forum.post_description_full
+msgid "Reopen"
+msgstr ""
+
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.post_answers
 #: model:ir.ui.view,arch_db:website_forum.post_description_full
@@ -2384,6 +2420,11 @@ msgstr ""
 msgid "This post is already flagged"
 msgstr ""
 
+#. module: website_forum
+#: model:ir.ui.view,arch_db:website_forum.post_description_full
+msgid "This post is currently awaiting moderation and not yet published... Do you want <i>Accept</i> or <i>Reject</i> this post ?"
+msgstr ""
+
 #. module: website_forum
 #: model:ir.ui.view,arch_db:website_forum.private_profile
 msgid "This profile is private!"
diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index 06692cc9b2b..5cfeef0670c 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -787,9 +787,10 @@
                     </div>
                 </div>
                 <div class="text-muted mb16">
-                    <i t-if="question.post_type == 'question'" t-attf-class="fa fa-question-circle" t-att-title="question.post_type.capitalize()" />
-                    <i t-if="question.post_type == 'discussion'" t-attf-class="fa fa-comments-o" t-att-title="question.post_type.capitalize()" />
-                    <i t-if="question.post_type == 'link'" t-attf-class="fa fa-link" t-att-title="question.post_type.capitalize()" />
+                    <t t-set="type_labels" t-value="dict(question._fields['post_type']._description_selection(question.env))"/>
+                    <i t-if="question.post_type == 'question'" t-attf-class="fa fa-question-circle" t-att-title="type_labels[question.post_type]" />
+                    <i t-if="question.post_type == 'discussion'" t-attf-class="fa fa-comments-o" t-att-title="type_labels[question.post_type]" />
+                    <i t-if="question.post_type == 'link'" t-attf-class="fa fa-link" t-att-title="type_labels[question.post_type]" />
                     <span>By </span>
                     <a t-att-href="(question.create_uid.id == request.session.uid or question.create_uid.sudo().website_published) and '/forum/%s/user/%s' % (slug(forum), question.create_uid.id) or None"
                         t-field="question.create_uid"
@@ -813,7 +814,7 @@
                     <div class="mt16 mb24 text-center">
                         <t t-call="website_forum.link_button">
                             <t t-set="url" t-value="'/forum/' + slug(forum) + '/question/' + slug(question) + '/reopen'"/>
-                            <t t-set="label" t-value="'Reopen'"/>
+                            <t t-set="label">Reopen</t>
                             <t t-set="classes" t-value="'fa-arrow-right'"/>
                             <t t-set="karma" t-value="not question.can_close and question.karma_close or 0"/>
                         </t>
@@ -826,7 +827,7 @@
                         <li t-if="question.state == 'close'">
                             <t t-call="website_forum.link_button">
                                 <t t-set="url" t-value="'/forum/' + slug(forum) +'/question/' + slug(question) + '/reopen'"/>
-                                <t t-set="label" t-value="'Reopen'"/>
+                                <t t-set="label">Reopen</t>
                                 <t t-set="classes" t-value="'fa-undo'"/>
                                 <t t-set="karma" t-value="not question.can_close and question.karma_close or 0"/>
                             </t>
@@ -834,7 +835,7 @@
                         <li>
                             <t t-call="website_forum.link_button">
                                 <t t-set="url" t-value="'/forum/' + slug(forum) +'/post/' + slug(question) + '/edit'"/>
-                                <t t-set="label" t-value="'Edit'"/>
+                                <t t-set="label">Edit</t>
                                 <t t-set="classes" t-value="'fa-pencil-square-o'"/>
                                 <t t-set="karma" t-value="not question.can_edit and question.karma_edit or 0"/>
                             </t>
@@ -842,7 +843,7 @@
                         <li t-if="question.state != 'close'">
                             <t t-call="website_forum.link_button">
                                 <t t-set="url" t-value="'/forum/' + slug(forum) +'/question/' + slug(question) + '/ask_for_close'"/>
-                                <t t-set="label" t-value="'Close'"/>
+                                <t t-set="label">Close</t>
                                 <t t-set="classes" t-value="'fa-times'"/>
                                 <t t-set="karma" t-value="not question.can_close and question.karma_close or 0"/>
                             </t>
@@ -850,7 +851,7 @@
                         <li t-if="question.active">
                             <t t-call="website_forum.link_button">
                                 <t t-set="url" t-value="'/forum/' + slug(forum) +'/question/' + slug(question) + '/delete'"/>
-                                <t t-set="label" t-value="'Delete'"/>
+                                <t t-set="label">Delete</t>
                                 <t t-set="classes" t-value="'fa-trash-o'"/>
                                 <t t-set="karma" t-value="not question.can_unlink and question.karma_unlink or 0"/>
                             </t>
@@ -858,7 +859,7 @@
                         <li t-if="not question.active and question.state != 'offensive'">
                             <t t-call="website_forum.link_button">
                                 <t t-set="url" t-value="'/forum/' + slug(forum) +'/question/' + slug(question) + '/undelete'"/>
-                                <t t-set="label" t-value="'Reactivate'"/>
+                                <t t-set="label">Reactivate</t>
                                 <t t-set="classes" t-value="'fa-trash-o'"/>
                                 <t t-set="karma" t-value="not question.can_unlink and question.karma_unlink or 0"/>
                             </t>
@@ -866,7 +867,7 @@
                         <li t-if="not question.active and question.state == 'offensive'">
                             <t t-call="website_forum.link_button">
                                 <t t-set="url" t-value="'/forum/' + slug(forum) +'/post/' + slug(question) + '/validate'"/>
-                                <t t-set="label" t-value="'Reactivate'"/>
+                                <t t-set="label">Reactivate</t>
                                 <t t-set="classes" t-value="'fa-trash-o'"/>
                                 <t t-set="karma" t-value="not question.can_moderate and question.forum_id.karma_moderate or 0"/>
                             </t>
@@ -877,7 +878,12 @@
                                 t-attf-data-karma="#{not question.can_flag and question.forum_id.karma_flag or 0}"
                                 t-attf-data-href="/forum/#{slug(forum)}/post/#{slug(question)}/flag"
                                 >
-                                <t class="flag_flagged_label" t-esc="question.state == 'flagged' and 'Flagged' or 'Flag'"/>
+                                <t t-if="question.state == 'flagged'">
+                                    Flagged
+                                </t>
+                                <t t-if="question.state != 'flagged'">
+                                    Flag
+                                </t>
                             </a>
                         </li>
                     </ul>
@@ -964,7 +970,7 @@
                     <li>
                         <t t-call="website_forum.link_button">
                             <t t-set="url" t-value="'/forum/' + slug(forum) + '/post/' + slug(answer) + '/edit'"/>
-                            <t t-set="label" t-value="'Edit'"/>
+                            <t t-set="label">Edit</t>
                             <t t-set="classes" t-value="'fa fa-pencil-square-o'"/>
                             <t t-set="karma" t-value="not answer.can_edit and answer.karma_edit or 0"/>
                         </t>
@@ -972,7 +978,7 @@
                     <li>
                         <t t-call="website_forum.link_button">
                             <t t-set="url" t-value="'/forum/' + slug(forum) + '/post/' + slug(answer) + '/delete'"/>
-                            <t t-set="label" t-value="'Delete'"/>
+                            <t t-set="label">Delete</t>
                             <t t-set="classes" t-value="'fa-trash-o'"/>
                             <t t-set="karma" t-value="not answer.can_unlink and answer.karma_unlink or 0"/>
                         </t>
@@ -989,7 +995,7 @@
                     <li t-if="question.post_type == 'question'">
                         <t t-call="website_forum.link_button">
                             <t t-set="url" t-value="'/forum/' + slug(forum) + '/post/' + slug(answer) + '/convert_to_comment'"/>
-                            <t t-set="label" t-value="'Convert as a comment'"/>
+                            <t t-set="label">Convert as a comment</t>
                             <t t-set="classes" t-value="'fa-magic'"/>
                             <t t-set="karma" t-value="not answer.can_comment_convert and answer.karma_comment_convert or 0"/>
                         </t>
@@ -1057,7 +1063,7 @@
                     <t t-set="required_karma" t-value="message.author_id.id == user.partner_id.id and object.forum_id.karma_comment_unlink_own or object.forum_id.karma_comment_unlink_all"/>
                     <t t-call="website_forum.link_button">
                         <t t-set="url" t-value="'/forum/' + slug(forum) + '/post/' + slug(object) + '/comment/' + slug(message) + '/delete'"/>
-                        <t t-set="label" t-value="' '"/>
+                        <t t-set="label"> </t>
                         <t t-set="karma" t-value="user.karma&lt;required_karma and required_karma or 0"/>
                         <t t-set="classes" t-value="'close comment_delete fa-times'"/>
                     </t>
@@ -1070,7 +1076,7 @@
                     <t t-if="allow_post_comment">
                         <t t-call="website_forum.link_button" >
                             <t t-set="url" t-value="'/forum/' + slug(forum) + '/post/' + slug(object) + '/comment/' + slug(message) + '/convert_to_answer'"/>
-                            <t t-set="label" t-value="'Convert as an answer'"/>
+                            <t t-set="label">Convert as an answer</t>
                             <t t-set="karma" t-value="user.karma&lt;required_karma and required_karma or 0"/>
                             <t t-set="classes" t-value="'fa-magic pull-right'"/>
                         </t>

From c4c9347b9986f60f1b8a534b805e248b25e3eef8 Mon Sep 17 00:00:00 2001
From: Jairo Llopis <Yajo@users.noreply.github.com>
Date: Thu, 8 Jun 2017 13:53:49 +0200
Subject: [PATCH 27/40] [IMP] web: Expose char_domain dialog widget

This simple return allows submodules to be able to know when a dialog is shown and modify something in it.

Note from GED: I am aware that this is a IMP in a stable version, and I really don't like that... But it looks like it really helps many people, as shown by the PR, and the risk induced by this commit is definitely extremely low, so I will make an exception.
(PR: #15579)
---
 addons/web/static/src/js/views/form_widgets.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/web/static/src/js/views/form_widgets.js b/addons/web/static/src/js/views/form_widgets.js
index 450025ee06b..70a11214901 100644
--- a/addons/web/static/src/js/views/form_widgets.js
+++ b/addons/web/static/src/js/views/form_widgets.js
@@ -501,6 +501,8 @@ var FieldCharDomain = common.AbstractField.extend(common.ReinitializeFieldMixin,
                 }
             }
         }).open();
+        this.trigger("dialog_opened", dialog);
+        return dialog;
     },
 });
 

From 77be3d8b396f31adfa11d2cd10a22ee3a7f27883 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Wed, 7 Jun 2017 15:49:32 +0200
Subject: [PATCH 28/40] [FIX] account: avoid duplicated move name

Commits 9365482df05 and 8fc81b871debc2 attempted to prevent the creation
of two moves with the same name during reconciliation. It works in most
cases, but it is still possible to reconcile the same statement line
with more than one line.

We add an extra check to make sure duplicate never happen.

opw-742018
---
 addons/account/models/account_bank_statement.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/account/models/account_bank_statement.py b/addons/account/models/account_bank_statement.py
index c9634d5f270..e49546e31e7 100644
--- a/addons/account/models/account_bank_statement.py
+++ b/addons/account/models/account_bank_statement.py
@@ -891,6 +891,10 @@ class AccountBankStatementLine(models.Model):
             # Create the move
             self.sequence = self.statement_id.line_ids.ids.index(self.id) + 1
             move_name = (self.statement_id.name or self.name) + "/" + str(self.sequence)
+            # Ensure no duplicate is created
+            if self.env['account.move'].search([('name', '=', move_name)]):
+                count = self.env['account.move'].search_count([('name', '=like', move_name + '/%')])
+                move_name = u'{}/{}'.format(move_name, count + 1)
             move_vals = self._prepare_reconciliation_move(move_name)
             move = self.env['account.move'].create(move_vals)
             counterpart_moves = (counterpart_moves | move)

From 45e94ec756e0da4766110bd3ce94ede4203e4486 Mon Sep 17 00:00:00 2001
From: xmo-odoo <xmo@odoo.com>
Date: Thu, 8 Jun 2017 14:16:43 +0200
Subject: [PATCH 29/40] [FIX] web: CrashManager can crash if trying to show an
 empty message
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If `d.message` is an empty string, `!!d.message` is false and the
crashmanager will try to display `d.error.data.message`… which does
not exist as it's a warning with an empty message not an upstream error.

That causes the crashmanager itself to crash, and even the warning
name/title to be lost.
---
 addons/web/static/src/xml/base.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index c846e969827..161509b364f 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -22,7 +22,7 @@
 <t t-name="CrashManager.warning">
     <div class="o_dialog_warning">
         <t t-js="d">
-            var message = d.message ? d.message : d.error.data.message;
+            var message = (d.message !== undefined) ? d.message : d.error.data.message;
             d.html_error = context.engine.tools.html_escape(message).replace(/\n/g, '<br/>');
         </t>
         <t t-raw="html_error"/>

From 78fee1c6342ec137521cebedc7309dff432ff512 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Thu, 8 Jun 2017 13:42:49 +0200
Subject: [PATCH 30/40] [FIX] website: restore some website rpc since new views

The website is not ready. It is still too young to understand what the
beautiful `_rpc` function can bring to its life. Someday it will, but
for now, it can at least rely on the `rpc.query` function or to the
'Ace' menu which now understands the beauty of `_rpc`.

---

-> Replace website `_rpc` calls with deprecated `rpc.query` as the
   website is not structured enough yet to handle 'trigger_up' events.

-> As the `_rpc` calls cannot be replaced for the ace editor because it
   is also used and tested in the backend, promote the 'Ace' menu (which
   instantiate the ace editor) to be a `ServiceProvider` so that the
   `_rpc` method works in this particular case.
---
 addons/website/static/src/js/website.ace.js |  7 +++-
 addons/website/static/src/js/website.seo.js | 42 ++++++++++-----------
 2 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/addons/website/static/src/js/website.ace.js b/addons/website/static/src/js/website.ace.js
index 6e0e4437487..2ce486fc1c8 100644
--- a/addons/website/static/src/js/website.ace.js
+++ b/addons/website/static/src/js/website.ace.js
@@ -3,18 +3,23 @@ odoo.define('website.ace', function (require) {
 
 var Widget = require('web.Widget');
 var website = require('website.website');
+var mixins = require('web.mixins');
 
 var ViewEditor = require('web_editor.ace');
 
 var hash = "#advanced-view-editor";
 
-var Ace = Widget.extend({
+var Ace = Widget.extend(mixins.ServiceProvider, {
     events: {
         "click a[data-action=ace]": function (e) {
             e.preventDefault();
             this.launchAce();
         },
     },
+    init: function () {
+        mixins.ServiceProvider.init.apply(this, arguments);
+        this._super.apply(this, arguments);
+    },
     start: function () {
         if (window.location.hash.substr(0, hash.length) === hash) {
             this.launchAce();
diff --git a/addons/website/static/src/js/website.seo.js b/addons/website/static/src/js/website.seo.js
index 219728aa552..a05fc4a5883 100644
--- a/addons/website/static/src/js/website.seo.js
+++ b/addons/website/static/src/js/website.seo.js
@@ -6,6 +6,7 @@ var ajax = require('web.ajax');
 var Class = require('web.Class');
 var Dialog = require('web.Dialog');
 var mixins = require('web.mixins');
+var rpc = require("web.rpc");
 var Widget = require('web.Widget');
 var base = require('web_editor.base');
 var website = require('website.website');
@@ -490,22 +491,21 @@ var Configurator = Dialog.extend({
             def.resolve(null);
         } else {
             var fields = ['website_meta_title', 'website_meta_description', 'website_meta_keywords'];
-            this._rpc({
-                    model: obj.model,
-                    method: 'read',
-                    args: [[obj.id], fields, base.get_context()],
-                })
-                .then(function (data) {
-                    if (data.length) {
-                        var meta = data[0];
-                        meta.model = obj.model;
-                        def.resolve(meta);
-                    } else {
-                        def.resolve(null);
-                    }
-                }).fail(function () {
-                    def.reject();
-                });
+            rpc.query({
+                model: obj.model,
+                method: 'read',
+                args: [[obj.id], fields, base.get_context()],
+            }).then(function (data) {
+                if (data.length) {
+                    var meta = data[0];
+                    meta.model = obj.model;
+                    def.resolve(meta);
+                } else {
+                    def.resolve(null);
+                }
+            }).fail(function () {
+                def.reject();
+            });
         }
         return def;
     },
@@ -514,11 +514,11 @@ var Configurator = Dialog.extend({
         if (!obj) {
             return $.Deferred().reject();
         } else {
-            return this._rpc({
-                    model: obj.model,
-                    method: 'write',
-                    args: [[obj.id], data, base.get_context()],
-                });
+            return rpc.query({
+                model: obj.model,
+                method: 'write',
+                args: [[obj.id], data, base.get_context()],
+            });
         }
     },
     titleChanged: function () {

From fdc87498880b19754faf7fc57f456d6383bfbbf7 Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Thu, 8 Jun 2017 15:41:07 +0200
Subject: [PATCH 31/40] [FIX] crm, website_crm_partner_assign: recompute
 saleteam automatically

Add a constrains on user_id field to avoid to recompute manually the team_id.

Eg: action_foward didn't call the onchange manually, so the saleteam not updated.
---
 addons/crm/models/crm_lead.py                        | 1 +
 addons/website_crm_partner_assign/models/crm_lead.py | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/crm/models/crm_lead.py b/addons/crm/models/crm_lead.py
index a7f4ff77290..e9cf8f9d372 100644
--- a/addons/crm/models/crm_lead.py
+++ b/addons/crm/models/crm_lead.py
@@ -249,6 +249,7 @@ class Lead(models.Model):
         team_id = self.env['crm.team']._get_default_team_id(user_id=user_id)
         return {'team_id': team_id}
 
+    @api.constrains('user_id')
     @api.onchange('user_id')
     def _onchange_user_id(self):
         """ When changing the user, also set a team_id or restrict team id to the ones user_id is member of. """
diff --git a/addons/website_crm_partner_assign/models/crm_lead.py b/addons/website_crm_partner_assign/models/crm_lead.py
index 6556deeec70..f5d59edbd8c 100644
--- a/addons/website_crm_partner_assign/models/crm_lead.py
+++ b/addons/website_crm_partner_assign/models/crm_lead.py
@@ -47,8 +47,6 @@ class CrmLead(models.Model):
         for salesman_id, leads_ids in salesmans_leads.items():
             leads = self.browse(leads_ids)
             leads.write({'user_id': salesman_id})
-            for lead in leads:
-                lead._onchange_user_id()
 
     @api.multi
     def action_assign_partner(self):

From e79eaecc46d72187c8a7ad39c0f2b17b61dff267 Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Thu, 8 Jun 2017 15:37:55 +0200
Subject: [PATCH 32/40] [FIX] stock:Creating new lots when option "use only
 existing lots" is activated

When the field use_create_lots is set to False in a picking type, it is not possible
to create lot for a pack operation linked to this picking type.

opw:744862
---
 addons/stock/i18n/stock.pot                       |  6 ++++++
 addons/stock/models/stock_production_lot.py       | 10 ++++++++++
 addons/stock/views/stock_pack_operation_views.xml |  2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/addons/stock/i18n/stock.pot b/addons/stock/i18n/stock.pot
index e01b6291165..c257035f4a9 100644
--- a/addons/stock/i18n/stock.pot
+++ b/addons/stock/i18n/stock.pot
@@ -6596,6 +6596,12 @@ msgid "You cannot set a negative product quantity in an inventory line:\n"
 "	%s - qty: %s"
 msgstr ""
 
+#. module: stock
+#: code:addons/stock/models/stock_production_lot.py:37
+#, python-format
+msgid "You are not allowed to create a lot for this picking type"
+msgstr ""
+
 #. module: stock
 #: code:addons/stock/models/stock_move.py:919
 #, python-format
diff --git a/addons/stock/models/stock_production_lot.py b/addons/stock/models/stock_production_lot.py
index 60f370fff51..a568cd80fe3 100644
--- a/addons/stock/models/stock_production_lot.py
+++ b/addons/stock/models/stock_production_lot.py
@@ -2,6 +2,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from odoo import api, fields, models, _
+from odoo.exceptions import UserError
 
 
 class ProductionLot(models.Model):
@@ -27,6 +28,15 @@ class ProductionLot(models.Model):
         ('name_ref_uniq', 'unique (name, product_id)', 'The combination of serial number and product must be unique !'),
     ]
 
+    @api.model
+    def create(self, vals):
+        pack_id = self.env.context.get('active_pack_operation', False)
+        if pack_id:
+            pack = self.env['stock.pack.operation'].browse(pack_id)
+            if pack.picking_id and not pack.picking_id.picking_type_id.use_create_lots:
+                raise UserError(_("You are not allowed to create a lot for this picking type"))
+        return super(ProductionLot, self).create(vals)
+
     @api.one
     @api.depends('quant_ids.qty')
     def _product_qty(self):
diff --git a/addons/stock/views/stock_pack_operation_views.xml b/addons/stock/views/stock_pack_operation_views.xml
index 5b6919dab83..cd8469d4672 100644
--- a/addons/stock/views/stock_pack_operation_views.xml
+++ b/addons/stock/views/stock_pack_operation_views.xml
@@ -85,7 +85,7 @@
                             <field name="lot_name" invisible="not context.get('only_create', False)"/>
                             <field name="lot_id" invisible="context.get('only_create', False)"
                                    domain="[('product_id','=', parent.product_id)]"
-                                   context="{'default_product_id': parent.product_id}"/>
+                                   context="{'default_product_id': parent.product_id, 'active_pack_operation': parent.id}"/>
                             <field name="qty_todo" invisible="not context.get('show_reserved') or context.get('serial') or context.get('state_done')" readonly="1"/>
                             <field name="qty" invisible="context.get('serial')"/>
                             <button name="do_minus" type="object" icon="fa-minus-square" attrs="{'invisible': [('qty', '&lt;=', 0.99)]}" invisible="not context.get('show_reserved') or context.get('state_done')"/>

From f66fb9061dc751f7b5b8934780fc9e8bc0419722 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Thu, 8 Jun 2017 14:55:11 +0200
Subject: [PATCH 33/40] [FIX] website_forum: karma link

The karma link is an hardcoded page from odoo.com. The information might
therefore not be correct depending on the configuration of the user.

We change to redirect to the FAQ, which also contains Karma information.

opw-746383
---
 .../static/src/xml/website_forum_share_templates.xml            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_forum/static/src/xml/website_forum_share_templates.xml b/addons/website_forum/static/src/xml/website_forum_share_templates.xml
index ab44aa48fcb..670e143ced8 100644
--- a/addons/website_forum/static/src/xml/website_forum_share_templates.xml
+++ b/addons/website_forum/static/src/xml/website_forum_share_templates.xml
@@ -33,7 +33,7 @@
     <t t-name="website_forum.social_message_answer">
         <p>By sharing you answer, you will get additional <b>karma points</b> if your
         answer is selected as the right one. See what you can do with karma
-        <a href="https://www.odoo.com/forum/how-to/miscellaneous-14/how-does-karma-work-odoo-v8-forum-software-57845" target="_blank">here</a>.</p>
+        <a href="/forum/help-1/faq" target="_blank">here</a>.</p>
     </t>
     <t t-name="website_forum.social_message_default">
         <p>Share this content to increase your chances to be featured on the front page and attract more visitors.</p>

From bd4da1b7499a27f1460bd67bf83e697a18753b5b Mon Sep 17 00:00:00 2001
From: qdp-odoo <qdp@odoo.com>
Date: Thu, 8 Jun 2017 17:40:21 +0200
Subject: [PATCH 34/40] [FIX] sale, sale_expense, stock_landed_costs: fix
 nightly build.

 stock_landed_costs: on nightly, the localization installed may not have stock properties accounts defined. If it's not, we create them on the fly with a random account

 sale, sale_expense: fix broken tests due to mismatch currency:
    On 10.0-nightly, the currency of the company is not the same that the product.list0
    that leads to assertion errors.
---
 addons/account/tests/account_test_classes.py  | 27 +++++++++++++++++++
 addons/sale/tests/test_sale_order.py          |  3 +++
 .../sale_expense/tests/test_sale_expense.py   |  3 +++
 addons/stock_landed_costs/tests/common.py     |  3 +++
 4 files changed, 36 insertions(+)

diff --git a/addons/account/tests/account_test_classes.py b/addons/account/tests/account_test_classes.py
index cf37e2493ef..8477f4109d9 100644
--- a/addons/account/tests/account_test_classes.py
+++ b/addons/account/tests/account_test_classes.py
@@ -28,3 +28,30 @@ class AccountingTestCase(HttpCase):
         if theorical_lines:
             raise ValidationError('Remaining theorical line (not found). %s)' % ([(aml[0], aml[1], aml[2]) for aml in theorical_lines]))
         return True
+
+    def ensure_account_property(self, property_name):
+        '''Ensure the ir.property targetting an account.account passed as parameter exists.
+        In case it's not: create it with a random account. This is useful when testing with
+        partially defined localization (missing stock properties for example)
+
+        :param property_name: The name of the property.
+        '''
+        company_id = self.env.user.company_id
+        field_id = self.env['ir.model.fields'].search(
+            [('model', '=', 'product.template'), ('name', '=', property_name)], limit=1)
+        property_id = self.env['ir.property'].search([
+            ('company_id', '=', company_id.id),
+            ('name', '=', property_name),
+            ('res_id', '=', None),
+            ('fields_id', '=', field_id.id)], limit=1)
+        account_id = self.env['account.account'].search([('company_id', '=', company_id.id)], limit=1)
+        value_reference = 'account.account,%d' % account_id.id
+        if property_id and not property_id.value_reference:
+            property_id.value_reference = value_reference
+        else:
+            self.env['ir.property'].create({
+                'name': property_name,
+                'company_id': company_id.id,
+                'fields_id': field_id.id,
+                'value_reference': value_reference,
+            })
diff --git a/addons/sale/tests/test_sale_order.py b/addons/sale/tests/test_sale_order.py
index c7e40df04db..2e97137277d 100644
--- a/addons/sale/tests/test_sale_order.py
+++ b/addons/sale/tests/test_sale_order.py
@@ -104,6 +104,9 @@ class TestSaleOrder(TestSale):
 
     def test_cost_invoicing(self):
         """ Test confirming a vendor invoice to reinvoice cost on the so """
+        # force the pricelist to have the same currency as the company
+        self.env.ref('product.list0').currency_id = self.env.ref('base.main_company').currency_id
+
         serv_cost = self.env.ref('product.service_cost_01')
         prod_gap = self.env.ref('product.product_product_1')
         so = self.env['sale.order'].create({
diff --git a/addons/sale_expense/tests/test_sale_expense.py b/addons/sale_expense/tests/test_sale_expense.py
index fdc1317cf57..e2893a2e2de 100644
--- a/addons/sale_expense/tests/test_sale_expense.py
+++ b/addons/sale_expense/tests/test_sale_expense.py
@@ -7,6 +7,9 @@ from odoo.addons.sale.tests.test_sale_common import TestSale
 class TestSaleExpense(TestSale):
     def test_sale_expense(self):
         """ Test the behaviour of sales orders when managing expenses """
+        # force the pricelist to have the same currency as the company
+        self.env.ref('product.list0').currency_id = self.env.ref('base.main_company').currency_id
+
         # create a so with a product invoiced on delivery
         prod = self.env.ref('product.product_product_1')
         so = self.env['sale.order'].create({
diff --git a/addons/stock_landed_costs/tests/common.py b/addons/stock_landed_costs/tests/common.py
index cdd99228dab..205d2171853 100644
--- a/addons/stock_landed_costs/tests/common.py
+++ b/addons/stock_landed_costs/tests/common.py
@@ -59,6 +59,9 @@ class TestStockLandedCostsCommon(AccountingTestCase):
         self.brokerage_quantity = self._create_services('Brokerage Cost')
         self.transportation_weight = self._create_services('Transportation Cost')
         self.packaging_volume = self._create_services('Packaging Cost')
+        # Ensure the account properties exists.
+        self.ensure_account_property('property_stock_account_input')
+        self.ensure_account_property('property_stock_account_output')
 
     def _create_services(self, name):
         return self.Product.create({

From 6edc0f7e6b4a9f506eceff4c2cda73efdd469ef9 Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Fri, 9 Jun 2017 01:04:21 +0200
Subject: [PATCH 35/40] [FIX] calendar: _get_recurrent_date_by_event Let's
 create in google calendar a reccurent event with all day set and a end date.

When synchronising google calendar with Odoo(by clicking on button
"Sync with Google"). It raised on error because the start date had
a time zone but not the end date(the UNTIL in the rrule).

Fine tuning of 20ed57f

opw:746549
---
 addons/calendar/models/calendar.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/calendar/models/calendar.py b/addons/calendar/models/calendar.py
index de53a4fd7d9..74f01285343 100644
--- a/addons/calendar/models/calendar.py
+++ b/addons/calendar/models/calendar.py
@@ -557,7 +557,7 @@ class Meeting(models.Model):
         if not event_date:
             event_date = datetime.now()
 
-        if self.allday and self.rrule and 'Z' not in self.rrule:
+        if self.allday and self.rrule and 'UNTIL' in self.rrule and 'Z' not in self.rrule:
             rset1 = rrule.rrulestr(str(self.rrule), dtstart=event_date.replace(tzinfo=None), forceset=True, ignoretz=True)
         else:
             # Convert the event date to saved timezone (or context tz) as it'll

From 74a89bcf5c656a0a64f2a699444d39739ff7f1d2 Mon Sep 17 00:00:00 2001
From: xmo-odoo <xmo@odoo.com>
Date: Fri, 9 Jun 2017 12:26:38 +0200
Subject: [PATCH 36/40] [FIX] base_geolocalize: geocode errors out on empty
 address

It's unclear whether that's a recent change or a long-standing issue,
however currently if geocode is called with an empty address string it
will reply with a 400 Bad Request, which gets raised as an exception and
forwarded to the user. That is not a great experience.

Shortcut the entire thing and just return None (= geolocation failed /
no geolocation) on trying to geolocate an empty address.

OPW-746686
---
 addons/base_geolocalize/models/res_partner.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/base_geolocalize/models/res_partner.py b/addons/base_geolocalize/models/res_partner.py
index 778a844ad83..44fa8d9692f 100644
--- a/addons/base_geolocalize/models/res_partner.py
+++ b/addons/base_geolocalize/models/res_partner.py
@@ -8,6 +8,8 @@ from odoo.exceptions import UserError
 
 
 def geo_find(addr):
+    if not addr:
+        return None
     url = 'https://maps.googleapis.com/maps/api/geocode/json?sensor=false&address='
     url += urllib2.quote(addr.encode('utf8'))
 

From 56948bb245b89fb6d4b6e6800a75f92c129aa1bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Maes?= <jem@openerp.com>
Date: Wed, 7 Jun 2017 13:00:58 +0200
Subject: [PATCH 37/40] [FIX] hr_timesheet: set correct default value for
 timesheet

When logging timesheet, no employee is set by
default on the UI. The employee is deduced
from the user_id in the create, but we want to
see it on the list view even if it is not saved
yet.
---
 addons/hr_timesheet/hr_timesheet.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index 74704a459f2..d8d07c42fd8 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -7,6 +7,13 @@ from odoo import api, fields, models
 class AccountAnalyticLine(models.Model):
     _inherit = 'account.analytic.line'
 
+    @api.model
+    def default_get(self, field_list):
+        result = super(AccountAnalyticLine, self).default_get(field_list)
+        if 'employee_id' in field_list and result.get('user_id') and result.get('project_id'):
+            result['employee_id'] = self.env['hr.employee'].search([('user_id', '=', result['user_id'])], limit=1).id
+        return result
+
     task_id = fields.Many2one('project.task', 'Task')
     project_id = fields.Many2one('project.project', 'Project', domain=[('allow_timesheets', '=', True)])
 

From 287958b57d53fdc0774383ef3ad1da94221e5f57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Maes?= <jem@openerp.com>
Date: Wed, 7 Jun 2017 16:39:39 +0200
Subject: [PATCH 38/40] [FIX] hr_timesheet,project_issue_sheet: can see
 timesheet tab

Only timesheet user can see the timesheet tab
on tasks and issues. This will avoid them logging
timesheets and getting access errors.
---
 addons/hr_timesheet/project_timesheet_view.xml          | 2 +-
 addons/project_issue_sheet/views/project_issue_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_timesheet/project_timesheet_view.xml b/addons/hr_timesheet/project_timesheet_view.xml
index f799cc5b76e..f14efa5d7ab 100644
--- a/addons/hr_timesheet/project_timesheet_view.xml
+++ b/addons/hr_timesheet/project_timesheet_view.xml
@@ -98,7 +98,7 @@
                     <field name="subtask_project_id" invisible="1" />
                 </field>
                 <xpath expr="//notebook/page[@name='description_page']" position="after">
-                    <page string="Timesheets" attrs="{'invisible': [('project_id', '=', False)]}">
+                    <page string="Timesheets" attrs="{'invisible': [('project_id', '=', False)]}"  groups="hr_timesheet.group_hr_timesheet_user">
                     <field name="timesheet_ids" context="{'default_project_id': project_id}">
                         <tree editable="bottom" string="Timesheet Activities" default_order="date">
                             <field name="date"/>
diff --git a/addons/project_issue_sheet/views/project_issue_view.xml b/addons/project_issue_sheet/views/project_issue_view.xml
index 7bd27cf2c7f..99928d28bdb 100644
--- a/addons/project_issue_sheet/views/project_issue_view.xml
+++ b/addons/project_issue_sheet/views/project_issue_view.xml
@@ -10,7 +10,7 @@
                     <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}" class="oe_inline"/>
                 </field>
                 <xpath expr="//notebook/page[@name='extra_info']" position="before">
-                    <page string="Timesheets" attrs="{'invisible': [('project_id', '=', False)]}">
+                    <page string="Timesheets" attrs="{'invisible': [('project_id', '=', False)]}" groups="hr_timesheet.group_hr_timesheet_user">
                         <field name="timesheet_ids" colspan="4" nolabel="1" context="{'default_user_id' : uid, 'default_project_id': project_id}"
                                 groups="base.group_user">
                             <tree editable="top" string="Timesheet Activities">

From c5df9b572c27b9b60449c07ab6b4ad9bd927d27e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Maes?= <jem@openerp.com>
Date: Thu, 8 Jun 2017 14:49:23 +0200
Subject: [PATCH 39/40] [FIX] sale_timesheet: use same method for delivered and
 ordered

Respect the same computation about rounding for
delivered and ordered services when computing
timesheet revenue.
---
 addons/sale_timesheet/models/account_invoice.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/sale_timesheet/models/account_invoice.py b/addons/sale_timesheet/models/account_invoice.py
index 64ac5d7a8aa..9f05b02454c 100644
--- a/addons/sale_timesheet/models/account_invoice.py
+++ b/addons/sale_timesheet/models/account_invoice.py
@@ -63,10 +63,9 @@ class AccountInvoice(models.Model):
 
                 # NOTE JEM : changing quantity (or unit price) of invoice line does not impact the revenue calculation. (FP specs)
                 if uninvoiced_timesheet_lines:
-                    precision = invoice_line.currency_id.decimal_places
                     # delivered : update revenue with the prorata of number of hours on the timesheet line
                     if invoice_line.product_id.invoice_policy == 'delivery':
-                        invoiced_price_per_hour = float_round(invoice_line.price_subtotal / float(sum(uninvoiced_timesheet_lines.mapped('unit_amount'))), precision)
+                        invoiced_price_per_hour = invoice_line.currency_id.round(invoice_line.price_subtotal / float(sum(uninvoiced_timesheet_lines.mapped('unit_amount'))))
                         # invoicing analytic lines of different currency
                         total_revenue_per_currency = dict.fromkeys(uninvoiced_timesheet_lines.mapped('company_currency_id').ids, 0.0)
                         for index, timesheet_line in enumerate(uninvoiced_timesheet_lines):

From fb504f3cbd41dc52a81d76aa54d83117730671d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Maes?= <jem@openerp.com>
Date: Fri, 9 Jun 2017 11:02:39 +0200
Subject: [PATCH 40/40] [FIX] sale_timesheet: compute revenue in a determinist
 order

Since we handle rouding error with the last line as
the difference of total and the other (already computed),
the order of lines to process is important.
Calling 'sorted()' on the lines to process allow
to always have the same last one.

Hope this will fix the random rounding bug, and make
the multi currency test always green !
---
 addons/sale_timesheet/models/account_invoice.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/sale_timesheet/models/account_invoice.py b/addons/sale_timesheet/models/account_invoice.py
index 9f05b02454c..17ba8ad96e2 100644
--- a/addons/sale_timesheet/models/account_invoice.py
+++ b/addons/sale_timesheet/models/account_invoice.py
@@ -53,7 +53,7 @@ class AccountInvoice(models.Model):
 
     def _compute_timesheet_revenue(self):
         for invoice in self:
-            for invoice_line in invoice.invoice_line_ids.filtered(lambda line: line.product_id.type == 'service'):
+            for invoice_line in invoice.invoice_line_ids.filtered(lambda line: line.product_id.type == 'service').sorted(key=lambda inv_line: (inv_line.invoice_id, inv_line.id)):
                 uninvoiced_timesheet_lines = self.env['account.analytic.line'].sudo().search([
                     ('so_line', 'in', invoice_line.sale_line_ids.ids),
                     ('project_id', '!=', False),
@@ -68,7 +68,7 @@ class AccountInvoice(models.Model):
                         invoiced_price_per_hour = invoice_line.currency_id.round(invoice_line.price_subtotal / float(sum(uninvoiced_timesheet_lines.mapped('unit_amount'))))
                         # invoicing analytic lines of different currency
                         total_revenue_per_currency = dict.fromkeys(uninvoiced_timesheet_lines.mapped('company_currency_id').ids, 0.0)
-                        for index, timesheet_line in enumerate(uninvoiced_timesheet_lines):
+                        for index, timesheet_line in enumerate(uninvoiced_timesheet_lines.sorted(key=lambda ts: ts.date)):
                             if index+1 != len(uninvoiced_timesheet_lines):
                                 line_revenue = invoice_line.currency_id.compute(invoiced_price_per_hour, timesheet_line.company_currency_id) * timesheet_line.unit_amount
                                 total_revenue_per_currency[timesheet_line.company_currency_id.id] += line_revenue
@@ -91,7 +91,7 @@ class AccountInvoice(models.Model):
                         # invoicing analytic lines of different currency
                         total_revenue_per_currency = dict.fromkeys(no_zero_timesheet_revenue.mapped('company_currency_id').ids, 0.0)
 
-                        for index, timesheet_line in enumerate(no_zero_timesheet_revenue):
+                        for index, timesheet_line in enumerate(no_zero_timesheet_revenue.sorted(key=lambda ts: ts.date)):
                             if index+1 != len(no_zero_timesheet_revenue):
                                 price_subtotal_inv = invoice_line.currency_id.compute(invoice_line.price_subtotal, timesheet_line.company_currency_id)
                                 price_subtotal_sol = timesheet_line.so_line.currency_id.compute(timesheet_line.so_line.price_subtotal, timesheet_line.company_currency_id)