[MERGE] forward port of branch 8.0 up to 9ac62d7

8 files changed, 41 insertions, 11 deletions

diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index eb7e0b2e24e..87bf4ec1e68 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.exceptions import UserError
 _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'
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 2bfcb13fa59..a3a1d08306c 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -542,7 +542,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();
             });
diff --git a/addons/payment_ogone/models/ogone.py b/addons/payment_ogone/models/ogone.py
index 47bb235a490..aafe2e1f438 100644
--- a/addons/payment_ogone/models/ogone.py
+++ b/addons/payment_ogone/models/ogone.py
@@ -306,9 +306,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({
diff --git a/doc/cla/corporate/credativ.md b/doc/cla/corporate/credativ.md
new file mode 100644
index 00000000000..6758b5b548f
--- /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     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
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
diff --git a/requirements.txt b/requirements.txt
index 75b835f5647..ab1c1f3a185 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -31,7 +31,7 @@ pytz==2014.10
 pyusb==1.0.0b2
 qrcode==5.1
 reportlab==3.1.44
-requests==2.5.1
+requests==2.6.0
 simplejson==3.6.5
 six==1.9.0
 suds-jurko==0.6
diff --git a/setup/package.dfdebian b/setup/package.dfdebian
index ef1232ac51c..85a019d64cd 100644
--- a/setup/package.dfdebian
+++ b/setup/package.dfdebian
@@ -3,9 +3,6 @@
 FROM debian:jessie
 MAINTAINER Odoo S.A. <info@odoo.com>
 
-# 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 20408633ad8..6b6c06efbf9 100644
--- a/setup/package.dfsrc
+++ b/setup/package.dfsrc
@@ -3,9 +3,6 @@
 FROM debian:jessie
 MAINTAINER Odoo S.A. <info@odoo.com>
 
-# 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/*
@@ -33,6 +30,7 @@ RUN apt-get update -qq &&  \
 		python-pip \
 		build-essential \
 		python -y && \
+	easy_install --upgrade pip && \
 	rm -rf /var/lib/apt/lists/*
 
 RUN pip install --upgrade pip