From c0e35f84e23ebda8ea6033711ded5638ef309da2 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Sun, 21 Oct 2018 00:04:37 +0200 Subject: [PATCH 01/13] [FIX] migration: use correct migration prefix in docstring Migration files must contain `-` in its name for being executed --- odoo/modules/migration.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/odoo/modules/migration.py b/odoo/modules/migration.py index 7f86b73a0da..78025cbfa11 100644 --- a/odoo/modules/migration.py +++ b/odoo/modules/migration.py @@ -25,8 +25,8 @@ class MigrationManager(object): function. Theses files must respect a directory tree structure: A 'migrations' folder which containt a folder by version. Version can be 'module' version or 'server.module' version (in this case, the files will only be processed by this version of the server). - Python file names must start by `pre` or `post` and will be executed, respectively, - before and after the module initialisation. `end` scripts are run after all modules have + Python file names must start by `pre-` or `post-` and will be executed, respectively, + before and after the module initialisation. `end-` scripts are run after all modules have been updated. Example: From 5d932e5db164fe80fd7c011ddd53f3494ef89ef5 Mon Sep 17 00:00:00 2001 From: "Julien (juc) Castiaux" Date: Tue, 23 Oct 2018 14:31:31 +0200 Subject: [PATCH 02/13] [FIX] delivery: wrong currency conversion In a multi-currency company, the delivery price of a quotation was wrongly converted when the currency used by the pricelist was not the same as the currency used by the company. This PR correct that behavior by correcly compute the delivery price according to the pricelist currency. To reproduce: 1) Install the accounting, sales and delivery modules 2) Set the company as a multi-currency company in the accounting settings 3) Change the currency rate so the one used by the company is 1 and the other one (the one that will be used on the pricelist) is anything else than 1 4) Create a pricelist with that other currency 5) Create a quotation using the new pricelist, select a deliver 6) Click "Set Price", the delivery price shown on the form isn't the same as the price on the quotation. opw-1894422 --- addons/delivery/models/sale_order.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/delivery/models/sale_order.py b/addons/delivery/models/sale_order.py index 4ee66daee85..601f104ff3c 100644 --- a/addons/delivery/models/sale_order.py +++ b/addons/delivery/models/sale_order.py @@ -23,7 +23,8 @@ class SaleOrder(models.Model): # Prevent SOAP call to external shipping provider when SO has no lines yet continue else: - order.delivery_price = order.carrier_id.with_context(order_id=order.id).price + order.delivery_price = order.company_id.currency_id.with_context(date=order.date_order).compute( + order.carrier_id.with_context(order_id=order.id).price, order.pricelist_id.currency_id) @api.onchange('partner_id') def onchange_partner_id_dtype(self): From da08a9e98671ca8f2f0c963ad6793c58f1fa73be Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Wed, 24 Oct 2018 15:36:55 +0200 Subject: [PATCH 03/13] [FIX] base: don't ignore new uninstallable modules When updating the module list (`ir.module.module.update_list()`), new modules that are not installable were ignored. This behavior was not consistent with the database initialization [1] which creates all modules. [1] https://github.com/odoo/odoo/blob/5d932e5db164fe80fd7c011ddd53f3494ef89ef5/odoo/modules/db.py#L51-L54 --- odoo/addons/base/module/module.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/odoo/addons/base/module/module.py b/odoo/addons/base/module/module.py index 55cbb2d4be0..4145389ff7f 100644 --- a/odoo/addons/base/module/module.py +++ b/odoo/addons/base/module/module.py @@ -624,11 +624,10 @@ class Module(models.Model): mod.write(updated_values) else: mod_path = modules.get_module_path(mod_name) - if not mod_path: + if not mod_path or not terp: continue - if not terp or not terp.get('installable', True): - continue - mod = self.create(dict(name=mod_name, state='uninstalled', **values)) + state = "uninstalled" if terp.get('installable', True) else "uninstallable" + mod = self.create(dict(name=mod_name, state=state, **values)) res[1] += 1 mod._update_dependencies(terp.get('depends', [])) From 3f89774ed08d435a6374ec281b02d6135c706207 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marius=20=C5=BDil=C4=97nas?= Date: Wed, 24 Oct 2018 17:15:02 +0300 Subject: [PATCH 04/13] [FIX] cli: fix broken link The master file no longer exists Closes odoo/odoo#26623 --- odoo/cli/templates/default/__manifest__.py.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/odoo/cli/templates/default/__manifest__.py.template b/odoo/cli/templates/default/__manifest__.py.template index 024d23c74d5..75fcd0aa3ac 100644 --- a/odoo/cli/templates/default/__manifest__.py.template +++ b/odoo/cli/templates/default/__manifest__.py.template @@ -14,7 +14,7 @@ 'website': "http://www.yourcompany.com", # Categories can be used to filter modules in modules listing - # Check https://github.com/odoo/odoo/blob/master/odoo/addons/base/module/module_data.xml + # Check https://github.com/odoo/odoo/blob/10.0/odoo/addons/base/module/module_data.xml # for the full list 'category': 'Uncategorized', 'version': '0.1', From 5f44f9a8431c05df9c6ebe807c0166742cf878d1 Mon Sep 17 00:00:00 2001 From: Anil Kesariya Date: Mon, 17 Sep 2018 14:50:54 +0530 Subject: [PATCH 05/13] [CLA] signature for AnilKesariya Closes odoo/odoo#27024 --- doc/cla/individual/anilkesariya.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 doc/cla/individual/anilkesariya.md diff --git a/doc/cla/individual/anilkesariya.md b/doc/cla/individual/anilkesariya.md new file mode 100644 index 00000000000..2b4158360eb --- /dev/null +++ b/doc/cla/individual/anilkesariya.md @@ -0,0 +1,12 @@ +India, 17, Sept - 2018 + +I hereby agree to the terms of the Odoo Individual Contributor License +Agreement v1.0. + +I declare that I am authorized and able to make this agreement and sign this +declaration. + +Signed, + +Anil Kesariya anil.r.kesariya@gmail.com https://github.com/AnilKesariya + From d6a074b832e02649503b1151fd6f9096aaa4087d Mon Sep 17 00:00:00 2001 From: Luis Guzman Date: Wed, 24 Oct 2018 16:56:14 -0500 Subject: [PATCH 06/13] [CLA] signature for Ark74 Closes #28126 --- doc/cla/individual/ark74.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 doc/cla/individual/ark74.md diff --git a/doc/cla/individual/ark74.md b/doc/cla/individual/ark74.md new file mode 100644 index 00000000000..e729859d95f --- /dev/null +++ b/doc/cla/individual/ark74.md @@ -0,0 +1,11 @@ +Mexico, 2018-10-24 + +I hereby agree to the terms of the Odoo Individual Contributor License +Agreement v1.0. + +I declare that I am authorized and able to make this agreement and sign this +declaration. + +Signed, + +Luis Guzman ark@switnet.org https://github.com/ark74 From 71cb425d0004fe6aff283b5ddfef704f167f88db Mon Sep 17 00:00:00 2001 From: xmo-odoo Date: Thu, 25 Oct 2018 11:08:35 +0200 Subject: [PATCH 07/13] [FIX] doc: translator under Sphinx 1.5 In Sphinx 1.5 (fairly specifically), the warner thing takes a `type` kw, and building the doc blows up if that parameter is not provided. --- doc/_extensions/odoo_ext/translator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/_extensions/odoo_ext/translator.py b/doc/_extensions/odoo_ext/translator.py index 48c5e901f28..f466b9ad6d0 100644 --- a/doc/_extensions/odoo_ext/translator.py +++ b/doc/_extensions/odoo_ext/translator.py @@ -196,7 +196,7 @@ class BootstrapTranslator(nodes.NodeVisitor, object): else: opts = {} - def warner(msg): + def warner(msg, **kw): self.builder.warn(msg, (self.builder.current_docname, node.line)) highlighted = self.builder.highlighter.highlight_block( node.rawsource, lang, opts=opts, warn=warner, linenos=linenos, From 8e63bcb47c72240f5d520f157b0ae5ffa291a714 Mon Sep 17 00:00:00 2001 From: Gert Pellin Date: Thu, 11 Oct 2018 13:44:55 +0200 Subject: [PATCH 08/13] [FIX] point_of_sale: IoT https in pos before this fix it was not possible to connect to the pos/iot-box using https on the pos. By checking if the pos is http or https this is now possible after accepting the certificate. if https scanning for proxy is disabled, the user should always give a ip in the configuration --- addons/point_of_sale/static/src/js/chrome.js | 3 +++ addons/point_of_sale/static/src/js/devices.js | 19 ++++++++++------ addons/point_of_sale/static/src/js/models.js | 22 +++++++++++++------ 3 files changed, 30 insertions(+), 14 deletions(-) diff --git a/addons/point_of_sale/static/src/js/chrome.js b/addons/point_of_sale/static/src/js/chrome.js index 3c2bf4519a1..ee7e4d9d9de 100644 --- a/addons/point_of_sale/static/src/js/chrome.js +++ b/addons/point_of_sale/static/src/js/chrome.js @@ -630,6 +630,9 @@ var Chrome = PosBaseWidget.extend({ if(err.message === 'XmlHttpRequestError '){ title = 'Network Failure (XmlHttpRequestError)'; body = 'The Point of Sale could not be loaded due to a network problem.\n Please check your internet connection.'; + }else if(err.message === 'TLSError'){ + title = 'Https connection to IoT Box failed'; + body = 'Make sure you are using IoT Box v18.10 or higher.\n\n Navigate to ' + err.url + ' to accept the certificate of your IoT Box.'; }else if(err.code === 200){ title = err.data.message; body = err.data.debug; diff --git a/addons/point_of_sale/static/src/js/devices.js b/addons/point_of_sale/static/src/js/devices.js index e8bd95bc117..26371ff01f4 100644 --- a/addons/point_of_sale/static/src/js/devices.js +++ b/addons/point_of_sale/static/src/js/devices.js @@ -188,11 +188,15 @@ var ProxyDevice = core.Class.extend(core.mixins.PropertiesMixin,{ // try harder when we remember a good proxy url found_url = this.try_hard_to_connect(localStorage.hw_proxy_url, options) .then(null,function(){ - return self.find_proxy(options); + if (window.location.protocol != 'https:'){ + return self.find_proxy(options); + } }); }else{ // just find something quick - found_url = this.find_proxy(options); + if (window.location.protocol != 'https:'){ + found_url = this.find_proxy(options); + } } success = found_url.then(function(url){ @@ -244,16 +248,17 @@ var ProxyDevice = core.Class.extend(core.mixins.PropertiesMixin,{ // try several time to connect to a known proxy url try_hard_to_connect: function(url,options){ options = options || {}; - var port = ':' + (options.port || '8069'); + var protocol = window.location.protocol; + var port = ( !options.port && protocol == "https:") ? ':443' : ':' + (options.port || '8069'); this.set_connection_status('connecting'); if(url.indexOf('//') < 0){ - url = 'http://'+url; + url = protocol + '//' + url; } if(url.indexOf(':',5) < 0){ - url = url+port; + url = url + port; } // try real hard to connect to url, with a 1sec timeout and up to 'retries' retries @@ -269,11 +274,11 @@ var ProxyDevice = core.Class.extend(core.mixins.PropertiesMixin,{ .done(function(){ done.resolve(url); }) - .fail(function(){ + .fail(function(resp){ if(retries > 0){ try_real_hard_to_connect(url,retries-1,done); }else{ - done.reject(); + done.reject(resp.statusText, url); } }); return done; diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js index 8b938738e85..dd2eb8d9596 100644 --- a/addons/point_of_sale/static/src/js/models.js +++ b/addons/point_of_sale/static/src/js/models.js @@ -121,13 +121,21 @@ exports.PosModel = Backbone.Model.extend({ progress: function(prog){ self.chrome.loading_progress(prog); }, - }).then(function(){ - if(self.config.iface_scan_via_proxy){ - self.barcode_reader.connect_to_proxy(); - } - }).always(function(){ - done.resolve(); - }); + }).then( + function(){ + if(self.config.iface_scan_via_proxy){ + self.barcode_reader.connect_to_proxy(); + } + done.resolve(); + }, + function(statusText, url){ + if (statusText == 'error' && window.location.protocol == 'https:') { + var error = {message: 'TLSError', url: url}; + self.chrome.loading_error(error); + } else { + done.resolve(); + } + }); return done; }, From bfbaa092688c6282ae8468ab0cb6bfc2fcdfc552 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Thu, 25 Oct 2018 11:46:21 +0200 Subject: [PATCH 09/13] [FIX] hr_attendance: allow multiple attendances If the search returns more than one result, the rendering of the message would crash (SingletonError when accessing check_in field value). Use the same order and limit as both search before and after Courtesy of David Tran Closes odoo/odoo#28055 --- addons/hr_attendance/models/hr_attendance.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr_attendance/models/hr_attendance.py b/addons/hr_attendance/models/hr_attendance.py index e8772aeba10..55fbcf9102e 100644 --- a/addons/hr_attendance/models/hr_attendance.py +++ b/addons/hr_attendance/models/hr_attendance.py @@ -81,7 +81,7 @@ class HrAttendance(models.Model): ('employee_id', '=', attendance.employee_id.id), ('check_out', '=', False), ('id', '!=', attendance.id), - ]) + ], order='check_in desc', limit=1) if no_check_out_attendances: raise exceptions.ValidationError(_("Cannot create new attendance record for %(empl_name)s, the employee hasn't checked out since %(datetime)s") % { 'empl_name': attendance.employee_id.name_related, From 299c6dd3b474272940904ddc7b8917475574e160 Mon Sep 17 00:00:00 2001 From: Gert Pellin Date: Wed, 17 Oct 2018 14:30:52 +0200 Subject: [PATCH 10/13] [FIX] point_of_sale: alignment note textarea before fix: in firefox the textarea of note modal has a overflow textarea can be expanded outside borders modal in all browsers closes #25199 closes #25215 issue 1895298 --- addons/point_of_sale/static/src/css/pos.css | 13 +++++++++++++ addons/point_of_sale/static/src/xml/pos.xml | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css index e76f3854340..0673494853c 100644 --- a/addons/point_of_sale/static/src/css/pos.css +++ b/addons/point_of_sale/static/src/css/pos.css @@ -2140,6 +2140,19 @@ td { font-family: 'Lato'; font-family: Lato; } +.pos .modal-dialog .popup-textinput{ + display: flex; + flex-direction: column; +} +.pos .modal-dialog .popup-textinput .title, +.pos .modal-dialog .popup-textinput .footer{ + flex: none; +} +.pos .modal-dialog .popup-textinput textarea{ + resize: none; + flex: auto; + margin: 0 20px 80px; +} .pos .popup .title { background: rgba(255,255,255,0.5); margin: 0; diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml index c6627159262..b3122705a2c 100644 --- a/addons/point_of_sale/static/src/xml/pos.xml +++ b/addons/point_of_sale/static/src/xml/pos.xml @@ -1076,7 +1076,7 @@

- +
Ok From 9647620a91a0c8597eff0dd4361f8a2b8e0997ed Mon Sep 17 00:00:00 2001 From: Josse Colpaert Date: Wed, 14 Mar 2018 14:11:25 +0100 Subject: [PATCH 11/13] [FIX] mrp: workorders of sub-BOMs - Create the following BOM structure: ``` Prod 1 (Manufacture) | --- Prod 2 Prod 3 (Kit) | --- Prod 4 Prod 5 ``` - The BOMs for Prod 1 & 3 must have a routing set, to generate workorders - Create a MO for 1 unit of Prod 1, process to the end 2 units of Prod 1 are created instead of 1. This is due to the WO for Prod 3 not having a `next_work_order_id`. Therefore, `record_production` adds an extra quantity at: ``` production_move.quantity_done += self.qty_producing ``` To prevent this, we set as `next_work_order_id` of the BOM of Prod 3 the WO of Prod 1. Closes #19527 opw-1817398 opw-1883693 --- addons/mrp/models/mrp_production.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/addons/mrp/models/mrp_production.py b/addons/mrp/models/mrp_production.py index 5e3bb3a91bf..cfc80e4415d 100644 --- a/addons/mrp/models/mrp_production.py +++ b/addons/mrp/models/mrp_production.py @@ -435,10 +435,16 @@ class MrpProduction(models.Model): @api.multi def _generate_workorders(self, exploded_boms): workorders = self.env['mrp.workorder'] + original_one = False for bom, bom_data in exploded_boms: # If the routing of the parent BoM and phantom BoM are the same, don't recreate work orders, but use one master routing if bom.routing_id.id and (not bom_data['parent_line'] or bom_data['parent_line'].bom_id.routing_id.id != bom.routing_id.id): - workorders += self._workorders_create(bom, bom_data) + temp_workorders = self._workorders_create(bom, bom_data) + workorders += temp_workorders + if temp_workorders: # In order to avoid two "ending work orders" + if original_one: + temp_workorders[-1].next_work_order_id = original_one + original_one = temp_workorders[0] return workorders def _workorders_create(self, bom, bom_data): From ac08e2ba53297b303c00be25ba46af3e727db625 Mon Sep 17 00:00:00 2001 From: Olivier Colson Date: Fri, 26 Oct 2018 11:31:58 +0200 Subject: [PATCH 12/13] [FIX] mail: display both tracking values and body of the messages in mail thread Before that, the body of the message was never displayed if the message had tracking values. This was annoying for account_asset module, were we prompt the user for some justification when she modifies the depreciation data of an asset, and then call message_post with this text as body, and tracking values reflecting the change that was made. --- addons/mail/static/src/xml/thread.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/addons/mail/static/src/xml/thread.xml b/addons/mail/static/src/xml/thread.xml index b9579be0790..5ec1d754100 100644 --- a/addons/mail/static/src/xml/thread.xml +++ b/addons/mail/static/src/xml/thread.xml @@ -121,6 +121,7 @@ t-att-data-message-id="message.id" title="Mark as Read"/>

+

@@ -128,9 +129,6 @@

Subject:

- - - From b4e310e7f621e067a406030a14257f32f4c5499e Mon Sep 17 00:00:00 2001 From: len-odoo Date: Fri, 26 Oct 2018 14:52:32 +0200 Subject: [PATCH 13/13] [FIX] website_links: do not require flash to copy text to clipboard The "copy link" to clipboard button ancestrally used a flash (.swf) dependency (ZeroClipboard) to work. Since Odoo honours its history, it was still there. However on Firefox you are asked to activate flash to make it work, and on Chrome nothing happens. We get rid of this shibboleth, using instead clipboard.js that is already used elswhere for the same purpose. closes #27958 opw 1896509 --- addons/website_links/static/src/js/website_links.js | 8 +++----- addons/website_links/views/website_links_template.xml | 1 - 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/addons/website_links/static/src/js/website_links.js b/addons/website_links/static/src/js/website_links.js index 95580483a9e..f9390db632e 100644 --- a/addons/website_links/static/src/js/website_links.js +++ b/addons/website_links/static/src/js/website_links.js @@ -10,7 +10,6 @@ var Model = require('web.Model'); var qweb = core.qweb; var _t = core._t; -var ZeroClipboard = window.ZeroClipboard; var exports = {}; @@ -99,7 +98,8 @@ if(!$('.o_website_links_create_tracked_url').length) { this.animating_copy = false; }, start: function() { - new ZeroClipboard(this.$('.btn_shorten_url_clipboard')); + // DO NOT FORWARD PORT ABOVE V11 + new Clipboard(this.$('.btn_shorten_url_clipboard')[0]); }, toggle_copy_button: function() { var self = this; @@ -249,8 +249,6 @@ if(!$('.o_website_links_create_tracked_url').length) { base.ready().done(function() { - ZeroClipboard.config({swfPath: location.origin + "/website_links/static/lib/zeroclipboard/ZeroClipboard.swf" }); - // UTMS selects widgets var campaign_select = new SelectBox('utm.campaign'); campaign_select.start($("#campaign-select"), _t('e.g. Promotion of June, Winter Newsletter, ..')); @@ -282,7 +280,7 @@ if(!$('.o_website_links_create_tracked_url').length) { }); // Clipboard Library - var client = new ZeroClipboard($("#btn_shorten_url")); + new Clipboard($("#btn_shorten_url")[0]); $("#generated_tracked_link a").click(function() { $("#generated_tracked_link a").text("Copied").removeClass("btn-primary").addClass("btn-success"); diff --git a/addons/website_links/views/website_links_template.xml b/addons/website_links/views/website_links_template.xml index 0bebe2efc7f..8d65bdc011c 100644 --- a/addons/website_links/views/website_links_template.xml +++ b/addons/website_links/views/website_links_template.xml @@ -3,7 +3,6 @@