[MERGE] forward port branch saas-14 up to 5009752dcf1

8 files changed, 18 insertions, 10 deletions

diff --git a/addons/google_drive/models/google_drive.py b/addons/google_drive/models/google_drive.py
index b1eda64b842..f0e494c8405 100644
--- a/addons/google_drive/models/google_drive.py
+++ b/addons/google_drive/models/google_drive.py
@@ -160,7 +160,7 @@ class GoogleDrive(models.Model):
         # check if a model is configured with a template
         configs = self.search([('model_id', '=', res_model)])
         config_values = []
-        for config in configs:
+        for config in configs.sudo():
             if config.filter_id:
                 if config.filter_id.user_id and config.filter_id.user_id.id != self.env.user.id:
                     #Private
diff --git a/addons/mrp/wizard/change_production_qty.py b/addons/mrp/wizard/change_production_qty.py
index eebf8d29962..463c30c0a7c 100644
--- a/addons/mrp/wizard/change_production_qty.py
+++ b/addons/mrp/wizard/change_production_qty.py
@@ -22,7 +22,7 @@ class ChangeProductionQty(models.TransientModel):
         if 'mo_id' in fields and not res.get('mo_id') and self._context.get('active_model') == 'mrp.production' and self._context.get('active_id'):
             res['mo_id'] = self._context['active_id']
         if 'product_qty' in fields and not res.get('product_qty') and res.get('mo_id'):
-            res['product_qty'] = self.env['mrp.production'].browse(res.get['mo_id']).product_qty
+            res['product_qty'] = self.env['mrp.production'].browse(res['mo_id']).product_qty
         return res
 
     @api.model
diff --git a/addons/mrp/wizard/change_production_qty_views.xml b/addons/mrp/wizard/change_production_qty_views.xml
index 0ba2fc8488e..f731d2cecc1 100644
--- a/addons/mrp/wizard/change_production_qty_views.xml
+++ b/addons/mrp/wizard/change_production_qty_views.xml
@@ -10,6 +10,7 @@
                 <form string="Change Product Qty">
                     <group>
                         <field name="product_qty"/>
+                        <field name="mo_id" invisible="1"/>
                     </group>
                     <footer>
                         <button name="change_prod_qty" string="Approve"
diff --git a/addons/payment_authorize/views/payment_views.xml b/addons/payment_authorize/views/payment_views.xml
index 7c464bc24f4..7a957e41442 100644
--- a/addons/payment_authorize/views/payment_views.xml
+++ b/addons/payment_authorize/views/payment_views.xml
@@ -9,7 +9,7 @@
                     <group attrs="{'invisible': [('provider', '!=', 'authorize')]}">
                         <field name="authorize_login"/>
                         <field name="authorize_transaction_key" password="True"/>
-                        <a colspan="2" href="http://welcome.authorize.net/about_authorizenet/" target="_blank">How to configure your Authorize.Net account (look for Getting Started Guide) ?</a>
+                        <a colspan="2" href="https://www.odoo.com/documentation/user/online/ecommerce/shopper_experience/authorize.html" target="_blank">How to get paid with Authorize.Net</a>
                     </group>
                 </xpath>
             </field>
diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index 72a5934fcd6..5ab4aca782c 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -7,6 +7,7 @@ odoo.define('website.website', function (require) {
     var Widget = require('web.Widget');
     var session = require('web.session');
     var base = require('web_editor.base');
+    var utils = require('web.utils');
 
     var qweb = core.qweb;
     var _t = core._t;
@@ -238,6 +239,10 @@ odoo.define('website.website', function (require) {
         }
     });
 
+    /* Load localizations */
+    var lang = utils.get_cookie('website_lang') || $('html').attr('lang') || 'en_US';
+    ajax.loadJS('/web/webclient/locale/' + lang.replace('-', '_'));
+
     /**
      * Object who contains all method and bind for the top bar, the template is create server side.
      */
diff --git a/doc/cla/corporate/merchise.md b/doc/cla/corporate/merchise.md
index 829864e2b50..6cc3e022152 100644
--- a/doc/cla/corporate/merchise.md
+++ b/doc/cla/corporate/merchise.md
@@ -1,8 +1,7 @@
-Havana, 2017-05-05
+Cuba, 2017-07-03
 
-Merchise Autrement (https://github.com/merchise/ and
-https://github.com/merchise-autrement/) agrees to the terms of the Odoo
-Corporate Contributor License Agreement v1.0.
+Merchise Autrement [~º/~] 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.
@@ -11,7 +10,7 @@ Signed,
 
 Manuel Vázquez Acosta manuel@merchise.org https://github.com/mvaled
 
-List of contributors (some members don't have a github account yet):
+List of contributors:
 
 Manuel Vázquez Acosta manuel@merchise.org https://github.com/mvaled
 Johanny Rivera johanny@merchise.org
diff --git a/doc/cla/corporate/therp.md b/doc/cla/corporate/therp.md
index e9f7dfae3ba..cf1a8f99fda 100644
--- a/doc/cla/corporate/therp.md
+++ b/doc/cla/corporate/therp.md
@@ -1,6 +1,8 @@
 Netherlands, 2015-03-09
 
-Updated 2016-05-27
+Updated:
+    2016-05-27
+    2017-06-27
 
 Therp BV agrees to the terms of the Odoo Corporate 
 Contributor License Agreement v1.0.
@@ -18,4 +20,5 @@ List of contributors:
 *  Holger Brunn hbrunn@therp.nl https://github.com/hbrunn
 *  Lara Freeke lfreeke@therp.nl https://github.com/lfreeke
 *  Ronald Portier ronald@therp.nl https://github.com/nl66278
+*  George Daramouskas gdaramouskas@therp.nl https://github.com/daramousk
 
diff --git a/odoo/service/server.py b/odoo/service/server.py
index e0d8d08e352..5831bcef309 100644
--- a/odoo/service/server.py
+++ b/odoo/service/server.py
@@ -749,7 +749,7 @@ class WorkerHTTP(Worker):
     """ HTTP Request workers """
     def process_request(self, client, addr):
         client.setblocking(1)
-        client.settimeout(0.5)
+        client.settimeout(2)
         client.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
         # Prevent fd inherientence close_on_exec
         flags = fcntl.fcntl(client, fcntl.F_GETFD) | fcntl.FD_CLOEXEC