From 7718811809f1ccdcab93415c1351144061d0c9b6 Mon Sep 17 00:00:00 2001 From: Nicolas Martinelli Date: Thu, 25 Oct 2018 12:18:34 +0000 Subject: [PATCH 1/5] [FIX] mrp: unbuild of tracked products - Create 2 Products A and B, tracked by serial number - Create a BOM for A: 1 Unit of B - Create a MO for 2 Units of A - Validate: Product with S/N A1 consumes B1 Product with S/N A2 consumes B2 - Unbuild A2 If A1 was created before A2, B1 will used as a component of A2 at unbuild. When going through the stock move lines, we don't verify that the lot produced matches the lot we unbuild. opw-1889002 closes odoo/odoo#28154 --- addons/mrp/models/mrp_unbuild.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/mrp/models/mrp_unbuild.py b/addons/mrp/models/mrp_unbuild.py index 0ff3db0a337..9f5fb78b9e8 100644 --- a/addons/mrp/models/mrp_unbuild.py +++ b/addons/mrp/models/mrp_unbuild.py @@ -117,7 +117,7 @@ class MrpUnbuild(models.Model): if produce_move.has_tracking != 'none': original_move = self.mo_id.move_raw_ids.filtered(lambda move: move.product_id == produce_move.product_id) needed_quantity = produce_move.product_qty - for move_lines in original_move.mapped('move_line_ids'): + for move_lines in original_move.mapped('move_line_ids').filtered(lambda ml: ml.lot_produced_id == self.lot_id): # Iterate over all move_lines until we unbuilded the correct quantity. taken_quantity = min(needed_quantity, move_lines.qty_done) if taken_quantity: From e968d1de7e65428e06704c52757678f069da7fcc Mon Sep 17 00:00:00 2001 From: Yannick Vaucher Date: Thu, 25 Oct 2018 16:51:36 +0000 Subject: [PATCH 2/5] [FIX] web: typo in docstring The parameter would not be correctly detected by doc extractors closes odoo/odoo#28169 --- addons/web/static/src/js/views/basic/basic_model.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 116bd73fbdb..5ad8e92c907 100644 --- a/addons/web/static/src/js/views/basic/basic_model.js +++ b/addons/web/static/src/js/views/basic/basic_model.js @@ -2007,7 +2007,7 @@ var BasicModel = AbstractModel.extend({ * @param {Object} [options] * @param {string[]} [options.fieldNames] the list of fields to fetch. If * not given, fetch all the fields in record.fieldNames (+ display_name) - * @param {string} [optinos.viewType] the type of view for which the record + * @param {string} [options.viewType] the type of view for which the record * is fetched (usefull to load the adequate fields), by defaults, uses * record.viewType * @returns {Deferred} resolves to the record or is rejected in From cd580dd60545766acd0a02ea9dc89e2c9c5de743 Mon Sep 17 00:00:00 2001 From: qsm-odoo Date: Fri, 26 Oct 2018 09:44:13 +0000 Subject: [PATCH 3/5] [FIX] web_editor: fix forward-port Forward-port of https://github.com/odoo/odoo/commit/227fc6408ddc998529bb1c38222ddba50f40868b made with https://github.com/odoo/odoo/commit/717f4583949219c346c87c390fbc336b4f31571c introduced a JS error. closes odoo/odoo#28187 --- addons/web_editor/static/src/js/editor/snippets.options.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web_editor/static/src/js/editor/snippets.options.js b/addons/web_editor/static/src/js/editor/snippets.options.js index 3f0212c201b..b9aeafd7ccd 100644 --- a/addons/web_editor/static/src/js/editor/snippets.options.js +++ b/addons/web_editor/static/src/js/editor/snippets.options.js @@ -834,7 +834,7 @@ registry.colorpicker = SnippetOption.extend({ */ _onColorResetButtonClick: function () { this.$target.removeClass(this.classes); - self.$target.trigger('content_changed'); + this.$target.trigger('content_changed'); this.$el.find('.colorpicker button.selected').removeClass('selected'); }, }); From cff3ed4ae33a1d724b3af041575ccc886cbc2a9d Mon Sep 17 00:00:00 2001 From: Cas Vissers Date: Fri, 26 Oct 2018 10:42:33 +0000 Subject: [PATCH 4/5] [CLA] signature for Brahoo Backport to 11.0 of #28161 --- doc/cla/corporate/brahoo.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 doc/cla/corporate/brahoo.md diff --git a/doc/cla/corporate/brahoo.md b/doc/cla/corporate/brahoo.md new file mode 100644 index 00000000000..04e4d39cb31 --- /dev/null +++ b/doc/cla/corporate/brahoo.md @@ -0,0 +1,15 @@ +The Netherlands, 2018-10-24 + +Brahoo B.V. agrees to the terms of the Odoo Corporate Contributor License +Agreement v1.0. + +I declare that I am authorized and able to make this agreement and sign this +declaration. + +Signed, + +Cas Vissers c.vissers@brahoo.nl https://github.com/CasVissers + +List of contributors: + +Cas Vissers c.vissers@brahoo.nl https://github.com/CasVissers \ No newline at end of file From ca52c6c3a0ab3cbc041a832207888b06a596041d Mon Sep 17 00:00:00 2001 From: Cas Vissers Date: Fri, 26 Oct 2018 10:11:11 +0000 Subject: [PATCH 5/5] [FIX] base_vat_autocomplete: add missing attrs VAT number should be readonly when parent_id is set This is already what is done in base.view_partner_form and base.view_partner_short_form --- addons/base_vat_autocomplete/views/res_partner_views.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/base_vat_autocomplete/views/res_partner_views.xml b/addons/base_vat_autocomplete/views/res_partner_views.xml index 1c56b7f93a9..8dc861c87b7 100644 --- a/addons/base_vat_autocomplete/views/res_partner_views.xml +++ b/addons/base_vat_autocomplete/views/res_partner_views.xml @@ -8,7 +8,7 @@ - + @@ -21,7 +21,7 @@ - +