From fee8b2b2d36704887a3d2c57dccb3cb81fc3eb6f Mon Sep 17 00:00:00 2001 From: "Lucas Perais (lpe)" Date: Wed, 15 Nov 2017 14:38:08 +0100 Subject: [PATCH 1/8] [FIX] point_of_sale: hardcode jessie in posbox scripts Before this commit, the latest version of Raspbian was chosen. It is not very helpful though as if something goes wrong, we don't on which part it is. Also, fix python dependencies for the image --- .../posbox/overwrite_before_init/etc/init_posbox_image.sh | 5 +++-- addons/point_of_sale/tools/posbox/posbox_download_images.sh | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/point_of_sale/tools/posbox/overwrite_before_init/etc/init_posbox_image.sh b/addons/point_of_sale/tools/posbox/overwrite_before_init/etc/init_posbox_image.sh index 00058bef68c..d24963a31a6 100755 --- a/addons/point_of_sale/tools/posbox/overwrite_before_init/etc/init_posbox_image.sh +++ b/addons/point_of_sale/tools/posbox/overwrite_before_init/etc/init_posbox_image.sh @@ -17,8 +17,7 @@ export DEBIAN_FRONTEND=noninteractive echo "nameserver 8.8.8.8" >> /etc/resolv.conf -apt-get update -apt-get -y dist-upgrade +apt-get update && apt-get -y upgrade # Do not be too fast to upgrade to more recent firmware and kernel than 4.38 # Firmware 4.44 seems to prevent the LED mechanism from working @@ -39,6 +38,8 @@ rm -rf /usr/share/doc pip install pyusb==1.0.0b1 pip install qrcode pip install evdev +pip install simplejson +pip install unittest2 # --upgrade because websocket_client in wheezy is bad: # https://github.com/docker/compose/issues/1288 diff --git a/addons/point_of_sale/tools/posbox/posbox_download_images.sh b/addons/point_of_sale/tools/posbox/posbox_download_images.sh index 09bd79b2103..33beddac041 100755 --- a/addons/point_of_sale/tools/posbox/posbox_download_images.sh +++ b/addons/point_of_sale/tools/posbox/posbox_download_images.sh @@ -1,5 +1,5 @@ #!/bin/sh -wget 'https://downloads.raspberrypi.org/raspbian_lite_latest' -O raspbian.img.zip +wget 'http://downloads.raspberrypi.org/raspbian_lite/images/raspbian_lite-2017-07-05/2017-07-05-raspbian-jessie-lite.zip' -O raspbian.img.zip unzip raspbian.img.zip wget 'https://github.com/dhruvvyas90/qemu-rpi-kernel/raw/master/kernel-qemu-4.4.13-jessie' -O kernel-qemu From 586d3d44600a896fa1cb20cd37f1b5c4903ad238 Mon Sep 17 00:00:00 2001 From: "Lucas Perais (lpe)" Date: Thu, 16 Nov 2017 13:14:00 +0100 Subject: [PATCH 2/8] [FIX] point_of_sale: fix perms in posbox script Before this commit, the posbox was built and in the process the permissions of the repo were whanged As a result, there was a diff in the repo, making it un-upgradable After this commit, the permissions on the posbox' Odoo repository are unchanged, and no diff is to be seen --- .../tools/posbox/overwrite_before_init/etc/init_posbox_image.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/point_of_sale/tools/posbox/overwrite_before_init/etc/init_posbox_image.sh b/addons/point_of_sale/tools/posbox/overwrite_before_init/etc/init_posbox_image.sh index d24963a31a6..6856f9b4d06 100755 --- a/addons/point_of_sale/tools/posbox/overwrite_before_init/etc/init_posbox_image.sh +++ b/addons/point_of_sale/tools/posbox/overwrite_before_init/etc/init_posbox_image.sh @@ -54,7 +54,6 @@ sudo -u postgres createuser -s pi mkdir /var/log/odoo chown pi:pi /var/log/odoo chown pi:pi -R /home/pi/odoo/ -chmod 770 -R /home/pi/odoo/ # logrotate is very picky when it comes to file permissions chown -R root:root /etc/logrotate.d/ From 8be77ca382ca660572181ce31c0fecfc39527dc4 Mon Sep 17 00:00:00 2001 From: Jeremy Kersten Date: Tue, 21 Nov 2017 11:31:00 +0100 Subject: [PATCH 3/8] [FIX] website_event: add old class removed in previous commit That could break xpath for others modules and that have no real impact to keep it since it is removed in JS via: .find('.modal-body > div').removeClass('container'); // retrocompatibility Related to https://github.com/odoo/odoo/commit/809aaf9e7b9de28383444d5059b19a67bb513f51#commitcomment-25751949 --- addons/website_event/views/website_event.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml index b90747a56ae..7ebcb5900df 100644 --- a/addons/website_event/views/website_event.xml +++ b/addons/website_event/views/website_event.xml @@ -449,7 +449,7 @@
-
+
From 8214395a495da91840b3155bed8d658e1d16d37f Mon Sep 17 00:00:00 2001 From: Laurent Smet Date: Wed, 22 Nov 2017 11:55:28 +0100 Subject: [PATCH 4/8] [FIX] account: fix account.tax order Suppose some taxes with the same sequence: The tax are not computed in the same order in POS and SO/INV. This is wrong in case of multiple taxes affecting the base. -opw: 779498 --- addons/account/models/account.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/models/account.py b/addons/account/models/account.py index c64473778ec..d8932b5175a 100644 --- a/addons/account/models/account.py +++ b/addons/account/models/account.py @@ -506,7 +506,7 @@ class AccountTaxGroup(models.Model): class AccountTax(models.Model): _name = 'account.tax' _description = 'Tax' - _order = 'sequence' + _order = 'sequence,id' @api.model def _default_tax_group(self): From 10de33a57e14d8e767411f474afe3b549cb8244b Mon Sep 17 00:00:00 2001 From: Stefan Rijnhart Date: Mon, 27 Nov 2017 10:57:59 +0100 Subject: [PATCH 5/8] [FIX] mail: handle emails with a single non-text part SAP sends out emails that only contain a PDF part, without a text or html body, e.g.: X-Mailer: SAP NetWeaver 751 Content-Type: application/pdf; name="Afleveringsbewijs.pdf" Content-Transfer-Encoding: base64 Content-Description: Afleveringsbewijs Before this patch, this single non-text part was parsed into the body of the final message, as if it was a text part. Making the check for the main part more restrictive solves the issue, as there is no reason to assume that a non-multipart content is necessarily of text/* type. This PR also includes a regression test. Closes #21102 --- addons/mail/models/mail_thread.py | 4 +++- addons/mail/tests/test_mail_gateway.py | 17 +++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/addons/mail/models/mail_thread.py b/addons/mail/models/mail_thread.py index 63cf9641597..3daf8b0bf89 100644 --- a/addons/mail/models/mail_thread.py +++ b/addons/mail/models/mail_thread.py @@ -1277,6 +1277,8 @@ class MailThread(models.AbstractModel): mail module, and should not contain security or generic html cleaning. Indeed those aspects should be covered by html_email_clean and html_sanitize methods located in tools. """ + if not body: + return body, attachments root = lxml.html.fromstring(body) postprocessed = False to_remove = [] @@ -1304,7 +1306,7 @@ class MailThread(models.AbstractModel): # Content-Type: multipart/related; # boundary="_004_3f1e4da175f349248b8d43cdeb9866f1AMSPR06MB343eurprd06pro_"; # type="text/html" - if not message.is_multipart() or message.get('content-type', '').startswith("text/"): + if message.get_content_maintype() == 'text': encoding = message.get_content_charset() body = message.get_payload(decode=True) body = tools.ustr(body, encoding, errors='replace') diff --git a/addons/mail/tests/test_mail_gateway.py b/addons/mail/tests/test_mail_gateway.py index 9c1bc2216da..ab4f0ea853e 100644 --- a/addons/mail/tests/test_mail_gateway.py +++ b/addons/mail/tests/test_mail_gateway.py @@ -175,6 +175,19 @@ Content-Type: text/html; --Apple-Mail=_9331E12B-8BD2-4EC7-B53E-01F3FBEC9227-- """ +MAIL_SINGLE_BINARY = """X-Original-To: raoul@grosbedon.fr +Delivered-To: raoul@grosbedon.fr +Received: by mail1.grosbedon.com (Postfix, from userid 10002) + id E8166BFACA; Fri, 23 Aug 2013 13:18:01 +0200 (CEST) +From: "Bruce Wayne" +Content-Type: application/pdf; +Content-Disposition: filename=thetruth.pdf +Content-Transfer-Encoding: base64 +Message-Id: <6BB1FAB2-2104-438E-9447-07AE2C8C4A92@sexample.com> +Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) + +SSBhbSB0aGUgQmF0TWFuCg==""" + class TestMailgateway(TestMail): @@ -230,6 +243,10 @@ class TestMailgateway(TestMail): res.get('body', ''), 'message_parse: second part of the html version should be in body after parsing multipart/mixed') + res = self.env['mail.thread'].message_parse(MAIL_SINGLE_BINARY) + self.assertEqual(res['body'], '') + self.assertEqual(res['attachments'][0][0], 'thetruth.pdf') + @mute_logger('openerp.addons.mail.models.mail_thread', 'openerp.models') def test_message_process_alias_basic(self): """ Incoming email on an alias creating a new record + message_new + message details """ From ccaced9292174e468e4fa88d1bbb704002d07eb1 Mon Sep 17 00:00:00 2001 From: Martin Geubelle Date: Mon, 27 Nov 2017 15:02:40 +0100 Subject: [PATCH 6/8] [FIX] web: display selection label in graph When grouping a graph view by a selection field, the labels on x axis were the selection values themselves (not their corresponding label). This issue was only present if there was only one group by field. In this case, the attribute `grouped_on` is not an array but a string containing the field name. This case wasn't correctly handled. Note that this issue is not present in the new views (from saas-16). Closes #19790 --- addons/web/static/src/js/views/graph_widget.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/js/views/graph_widget.js b/addons/web/static/src/js/views/graph_widget.js index 8e6a574a35d..d1452fed2b1 100644 --- a/addons/web/static/src/js/views/graph_widget.js +++ b/addons/web/static/src/js/views/graph_widget.js @@ -66,7 +66,8 @@ return Widget.extend({ values = []; if (this.groupbys.length === 1) data_pt.value = [data_pt.value]; for (j = 0; j < data_pt.value.length; j++) { - values[j] = this.sanitize_value(data_pt.value[j], data_pt.grouped_on[j]); + var field = _.isArray(data_pt.grouped_on) ? data_pt.grouped_on[j] : data_pt.grouped_on; + values[j] = this.sanitize_value(data_pt.value[j], field); } value = is_count ? data_pt.length : data_pt.aggregates[this.measure]; this.data.push({ From 11ae103e122a2ed4f31be5e18154d4692e4be177 Mon Sep 17 00:00:00 2001 From: Joren Van Onder Date: Mon, 27 Nov 2017 14:02:21 -0800 Subject: [PATCH 7/8] [FIX] point_of_sale: search customers with full search query When the keypress handler is called the pressed key has not yet been added to this.value. This leads to the search being performed with e.g. 'Agr' when the user has typed 'Agro'. Fix this by getting this value when the timeout expires. At this point the value will be updated. Fixes #21129 --- addons/point_of_sale/static/src/js/screens.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js index 013973cbbfc..788276ea957 100644 --- a/addons/point_of_sale/static/src/js/screens.js +++ b/addons/point_of_sale/static/src/js/screens.js @@ -1018,10 +1018,10 @@ var ClientListScreenWidget = ScreenWidget.extend({ this.$('.searchbox input').on('keypress',function(event){ clearTimeout(search_timeout); - var query = this.value; + var searchbox = this; search_timeout = setTimeout(function(){ - self.perform_search(query,event.which === 13); + self.perform_search(searchbox.value, event.which === 13); },70); }); From 6d2bf44fee76a8b73ebad206cd7a283c88b6c4ef Mon Sep 17 00:00:00 2001 From: qsm-odoo Date: Mon, 27 Nov 2017 15:34:24 +0100 Subject: [PATCH 8/8] [FIX] website: do not duplicate iframes at each edition Before this commit, when an user added a video in his page (an