diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-07-06 12:30:51 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-07-06 12:30:51 +0200 |
| commit | 1206cc3f7da476f67ee27b6c3bc2bf579c1c011e (patch) | |
| tree | 7ec4cb9a61b5ec369ae2b75af81b4c8fca8799a7 | |
| parent | 52f268d0426bf3533df4fd82aa99600187afb4b0 (diff) | |
| parent | 5f7f3209e08abe71f8e824e4293ab7899492e508 (diff) | |
[MERGE] forward port branch saas-11 up to 5f7f3209e08
| -rw-r--r-- | addons/google_drive/models/google_drive.py | 2 | ||||
| -rw-r--r-- | doc/cla/corporate/merchise.md | 9 | ||||
| -rw-r--r-- | doc/cla/corporate/therp.md | 5 | ||||
| -rw-r--r-- | odoo/service/server.py | 2 |
4 files changed, 10 insertions, 8 deletions
diff --git a/addons/google_drive/models/google_drive.py b/addons/google_drive/models/google_drive.py index 0a65ffb175e..ea4c23b4200 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/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 1a9ec1599cd..3c6a16370c2 100644 --- a/odoo/service/server.py +++ b/odoo/service/server.py @@ -748,7 +748,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 |