From 936e321ae032ef071d099fb8bf91c780b306f245 Mon Sep 17 00:00:00 2001 From: Simon Lejeune Date: Tue, 14 Jul 2015 18:05:01 +0200 Subject: [PATCH 01/12] [FIX] packaging: remove policy-rc configuration It was preventing postgresql to generate a working cluster. --- setup/package.dfdebian | 3 --- setup/package.dfsrc | 3 --- 2 files changed, 6 deletions(-) diff --git a/setup/package.dfdebian b/setup/package.dfdebian index 7a96a560792..af5c49956c5 100644 --- a/setup/package.dfdebian +++ b/setup/package.dfdebian @@ -3,9 +3,6 @@ FROM debian:stable MAINTAINER Odoo S.A. -# Change policy-rc.d so that services start automatically once installed -RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d - RUN apt-get update && \ apt-get install -y locales && \ rm -rf /var/lib/apt/lists/* diff --git a/setup/package.dfsrc b/setup/package.dfsrc index 3b1f4cdfd09..743efcc8f08 100644 --- a/setup/package.dfsrc +++ b/setup/package.dfsrc @@ -3,9 +3,6 @@ FROM debian:stable MAINTAINER Odoo S.A. -# Change policy-rc.d so that services start automatically once installed -RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d - RUN apt-get update && \ apt-get install -y locales && \ rm -rf /var/lib/apt/lists/* From 94e2d9928397bb5d8cfd4d31a21903a15bf9cf27 Mon Sep 17 00:00:00 2001 From: Simon Lejeune Date: Tue, 14 Jul 2015 18:05:01 +0200 Subject: [PATCH 02/12] [FIX] packaging: remove policy-rc configuration It was preventing postgresql to generate a working cluster. --- setup/package.dfdebian | 3 --- 1 file changed, 3 deletions(-) diff --git a/setup/package.dfdebian b/setup/package.dfdebian index bf9489a88c0..fefaa0123d5 100644 --- a/setup/package.dfdebian +++ b/setup/package.dfdebian @@ -3,9 +3,6 @@ FROM debian:stable MAINTAINER Odoo S.A. -# Change policy-rc.d so that services start automatically once installed -RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d - RUN apt-get update && \ apt-get install -y locales && \ rm -rf /var/lib/apt/lists/* From ee690395e0dfa492e3b0b20081db482688d28fec Mon Sep 17 00:00:00 2001 From: Simon Lejeune Date: Wed, 15 Jul 2015 09:08:38 +0200 Subject: [PATCH 03/12] [FIX] package.py: tarball test: don't hardcode pip path --- setup/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/package.py b/setup/package.py index 12d75d3086b..1f7df51c7fa 100755 --- a/setup/package.py +++ b/setup/package.py @@ -319,7 +319,7 @@ def test_tgz(o): with docker('odoo-%s-src-nightly-tests' % version, o.build_dir, o.pub) as wheezy: wheezy.release = '*.tar.gz' wheezy.system("service postgresql start") - wheezy.system('/usr/local/bin/pip install /opt/release/%s' % wheezy.release) + wheezy.system('pip install /opt/release/%s' % wheezy.release) wheezy.system("useradd --system --no-create-home odoo") wheezy.system('su postgres -s /bin/bash -c "createuser -s odoo"') wheezy.system('su postgres -s /bin/bash -c "createdb mycompany"') From 36e9726c67cde7d4327469679fb8f36995728c73 Mon Sep 17 00:00:00 2001 From: Aaron Bohy Date: Wed, 15 Jul 2015 11:25:36 +0200 Subject: [PATCH 04/12] [FIX] packaging: tarball nightly test Workarounded https://launchpad.net/debian/+source/openssl/1.0.1j-1 by updating requests in requirements.txt and pip in our tests environment. --- requirements.txt | 2 +- setup/package.dfsrc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 53682ca9993..d29b32934ba 100644 --- a/requirements.txt +++ b/requirements.txt @@ -31,7 +31,7 @@ pytz==2014.4 pyusb==1.0.0b1 qrcode==5.0.1 reportlab==3.1.8 -requests==2.3.0 +requests==2.6.0 simplejson==3.5.3 six==1.7.3 unittest2==0.5.1 diff --git a/setup/package.dfsrc b/setup/package.dfsrc index 743efcc8f08..282a4a5846b 100644 --- a/setup/package.dfsrc +++ b/setup/package.dfsrc @@ -30,6 +30,7 @@ RUN apt-get update -qq && \ python-pip \ build-essential \ python -y && \ + easy_install --upgrade pip && \ rm -rf /var/lib/apt/lists/* COPY requirements.txt /opt/release/requirements.txt From 5bbcc14d2f39a593a2b42719bbda82a2750208dc Mon Sep 17 00:00:00 2001 From: Simon Lejeune Date: Wed, 15 Jul 2015 12:03:23 +0200 Subject: [PATCH 05/12] [FIX] packaging: tarball nightly test PIL is no more en pypi. Use the external provider. --- setup/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/package.py b/setup/package.py index 685e987f7cb..dfea3979be7 100755 --- a/setup/package.py +++ b/setup/package.py @@ -318,7 +318,7 @@ def test_tgz(o): with docker('openerp-%s-debian-nightly-tests' % version, o.build_dir, o.pub) as wheezy: wheezy.release = 'openerp.tar.gz' wheezy.system("service postgresql start") - wheezy.system('pip install /opt/release/%s' % wheezy.release) + wheezy.system('pip install --allow-external PIL --allow-unverified PIL /opt/release/%s' % wheezy.release) wheezy.system("useradd --system --no-create-home openerp") wheezy.system('su postgres -s /bin/bash -c "createuser -s openerp"') wheezy.system('su postgres -s /bin/bash -c "createdb mycompany"') From 8ea4bf81f7c7e74cbe6c654051ae021e683417e5 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Wed, 15 Jul 2015 14:18:08 +0200 Subject: [PATCH 06/12] [FIX] fetchmail: workaround poplib line length bug In order to fix Python bug https://bugs.python.org/issue16041 a maximum line length was introduced in poplib when reading email contents from the POP3 server. That limit is set to prevent DoS attacks via malicious POP3 servers. The default limit (2048) seems to be too low for emails commonly found on the internet, retrieved via POP3 from popular mail services such as GMail, Hotmail, etc. (The POP3 servers might send back the lines verbatim without splitting them up) This is discussed in follow-up Python bug https://bugs.python.org/issue23906. Workaround implemented by forcing a higher default limit to accomodate POP3 responses with lines up to 64KB. --- addons/fetchmail/fetchmail.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py index 0a27a05b275..84e48c794fd 100644 --- a/addons/fetchmail/fetchmail.py +++ b/addons/fetchmail/fetchmail.py @@ -20,6 +20,7 @@ ############################################################################## import logging +import poplib import time from imaplib import IMAP4 from imaplib import IMAP4_SSL @@ -42,6 +43,9 @@ from openerp.tools.translate import _ _logger = logging.getLogger(__name__) MAX_POP_MESSAGES = 50 +# Workaround for Python 2.7.8 bug https://bugs.python.org/issue23906 +poplib._MAXLINE = 65536 + class fetchmail_server(osv.osv): """Incoming POP/IMAP mail server account""" _name = 'fetchmail.server' From e9403a7ab72e245ca9877a5babc2cd70beee2b12 Mon Sep 17 00:00:00 2001 From: Simon Lejeune Date: Wed, 15 Jul 2015 15:34:14 +0200 Subject: [PATCH 07/12] [FIX] packaging: tarball nightly test This reverts commit 5bbcc14d2f39a593a2b42719bbda82a2750208dc and allow to use the pil from debian's "python-pil" by telling pip to not install the dependencies --- setup/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/package.py b/setup/package.py index dfea3979be7..7bdb21f9d5d 100755 --- a/setup/package.py +++ b/setup/package.py @@ -318,7 +318,7 @@ def test_tgz(o): with docker('openerp-%s-debian-nightly-tests' % version, o.build_dir, o.pub) as wheezy: wheezy.release = 'openerp.tar.gz' wheezy.system("service postgresql start") - wheezy.system('pip install --allow-external PIL --allow-unverified PIL /opt/release/%s' % wheezy.release) + wheezy.system('pip install --no-deps /opt/release/%s' % wheezy.release) wheezy.system("useradd --system --no-create-home openerp") wheezy.system('su postgres -s /bin/bash -c "createuser -s openerp"') wheezy.system('su postgres -s /bin/bash -c "createdb mycompany"') From fc2d7f7945bdf3d667e16b55ed96852ce6a56074 Mon Sep 17 00:00:00 2001 From: Alessio Gerace Date: Tue, 14 Jul 2015 12:19:17 +0200 Subject: [PATCH 08/12] [ADD] archetipo CLA --- doc/cla/individual/archetipo.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 doc/cla/individual/archetipo.md diff --git a/doc/cla/individual/archetipo.md b/doc/cla/individual/archetipo.md new file mode 100644 index 00000000000..a6efcff31c0 --- /dev/null +++ b/doc/cla/individual/archetipo.md @@ -0,0 +1,11 @@ +Italy, 2015-07-14 + +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, + +Alessio Gerace alessio.gerace@gmail.com https://github.com/archetipo \ No newline at end of file From 56143f05a0064a0df3673d6e4d4f2f4996179c47 Mon Sep 17 00:00:00 2001 From: Irenie White Date: Wed, 15 Jul 2015 16:49:09 +0200 Subject: [PATCH 09/12] [CLA] Credativ Ltd. --- doc/cla/corporate/credativ.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 doc/cla/corporate/credativ.md diff --git a/doc/cla/corporate/credativ.md b/doc/cla/corporate/credativ.md new file mode 100644 index 00000000000..3af8d9fdbcc --- /dev/null +++ b/doc/cla/corporate/credativ.md @@ -0,0 +1,20 @@ +United Kingdom, 2015-06-12 + +Credativ Limited 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, + +Irenie White irenie.white@credativ.co.uk + +List of contributors: + +Craig Gowing craig.gowing@credativ.co.uk +David Spautz david.spautz@credativ.co.uk +Jacob Hicks jacob.hicks@credativ.co.uk +Ondrej Kuznik ondrej.kuznik@credativ.co.uk +Kinner Vachhani kinner.vachhani@credativ.co.uk +Tom Pickering tom.pickering@credativ.co.uk From 4cd8b15fd554177f4e02f17682ec9b2f2508adc9 Mon Sep 17 00:00:00 2001 From: Irenie White Date: Wed, 15 Jul 2015 17:04:57 +0200 Subject: [PATCH 10/12] [CLA] Credativ Ltd. github usernames --- doc/cla/corporate/credativ.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/cla/corporate/credativ.md b/doc/cla/corporate/credativ.md index 3af8d9fdbcc..6758b5b548f 100644 --- a/doc/cla/corporate/credativ.md +++ b/doc/cla/corporate/credativ.md @@ -12,9 +12,9 @@ Irenie White irenie.white@credativ.co.uk List of contributors: -Craig Gowing craig.gowing@credativ.co.uk -David Spautz david.spautz@credativ.co.uk -Jacob Hicks jacob.hicks@credativ.co.uk -Ondrej Kuznik ondrej.kuznik@credativ.co.uk -Kinner Vachhani kinner.vachhani@credativ.co.uk -Tom Pickering tom.pickering@credativ.co.uk +Craig Gowing craig.gowing@credativ.co.uk https://github.com/craiggowing +David Spautz david.spautz@credativ.co.uk https://github.com/dspautz +Jacob Hicks jacob.hicks@credativ.co.uk https://github.com/JaHicks +Ondřej Kuzník ondrej.kuznik@credativ.co.uk https://github.com/mistotebe +Kinner Vachhani kinner.vachhani@credativ.co.uk https://github.com/kenvac +Tom Pickering tom.pickering@credativ.co.uk https://github.com/tompickering From e0c1f54fd78117e1a72bf3550f175cf848544515 Mon Sep 17 00:00:00 2001 From: Nicolas Lempereur Date: Thu, 16 Jul 2015 08:12:09 +0200 Subject: [PATCH 11/12] [FIX] mail: reload only in log after composer The commit 312b85e added a reloading of the chatter messages after closing the mail composer. But e.g in Messaging > Inbox a simple reload isn't enough. For now this commit restrict the reload to chatter logs (e.g the chatter of a quotation). related to PR #7596 --- addons/mail/static/src/js/mail.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index 1920d95c986..7b9f1467cd5 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -583,7 +583,7 @@ openerp.mail = function (session) { }; self.do_action(action, { - 'on_close': function(){ self.parent_thread.message_fetch() } + 'on_close': function(){ self.is_log && self.parent_thread.message_fetch() } }); self.on_cancel(); }); From e7085a8bd794446dfda3c8b422601495dc6a8210 Mon Sep 17 00:00:00 2001 From: Damien Bouvy Date: Thu, 16 Jul 2015 09:20:07 +0200 Subject: [PATCH 12/12] [FIX] payment_ogone: ogone error responses is now handled correctly There was a mixup in the ogone response parameters that prevented error message to be stored successfully; this commit fixes that. --- addons/payment_ogone/models/ogone.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/payment_ogone/models/ogone.py b/addons/payment_ogone/models/ogone.py index 60864ac4422..557ebee75c9 100644 --- a/addons/payment_ogone/models/ogone.py +++ b/addons/payment_ogone/models/ogone.py @@ -260,9 +260,9 @@ class PaymentTxOgone(osv.Model): }) else: error = 'Ogone: feedback error: %(error_str)s\n\n%(error_code)s: %(error_msg)s' % { - 'error_str': data.get('NCERROR'), - 'error_code': data.get('NCERRORPLUS'), - 'error_msg': ogone.OGONE_ERROR_MAP.get(data.get('NCERRORPLUS')), + 'error_str': data.get('NCERRORPLUS'), + 'error_code': data.get('NCERROR'), + 'error_msg': ogone.OGONE_ERROR_MAP.get(data.get('NCERROR')), } _logger.info(error) tx.write({