pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port branch saas-11 up to 5f7f3209e0

Browse Source
This commit is contained in:
Christophe Simonis
2017-07-06 12:30:51 +02:00
parent 52f268d042 5f7f3209e0
commit 1206cc3f7d
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/google_drive/models/google_drive.py
+1 -1
View File
@@ -160,7 +160,7 @@ class GoogleDrive(models.Model):
# check if a model is configured with a template # check if a model is configured with a template
configs = self.search([('model_id', '=', res_model)]) configs = self.search([('model_id', '=', res_model)])
config_values = [] config_values = []
for config in configs: for config in configs.sudo():
if config.filter_id: if config.filter_id:
if config.filter_id.user_id and config.filter_id.user_id.id != self.env.user.id: if config.filter_id.user_id and config.filter_id.user_id.id != self.env.user.id:
#Private #Private
doc/cla/corporate/merchise.md
+4 -5
View File
@@ -1,8 +1,7 @@
Havana, 2017-05-05 Cuba, 2017-07-03
Merchise Autrement (https://github.com/merchise/ and Merchise Autrement [~º/~] agrees to the terms of the Odoo Corporate
https://github.com/merchise-autrement/) agrees to the terms of the Odoo Contributor License Agreement v1.0.
Corporate Contributor License Agreement v1.0.
I declare that I am authorized and able to make this agreement and sign this I declare that I am authorized and able to make this agreement and sign this
declaration. declaration.
@@ -11,7 +10,7 @@ Signed,
Manuel Vázquez Acosta manuel@merchise.org https://github.com/mvaled 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 Manuel Vázquez Acosta manuel@merchise.org https://github.com/mvaled
Johanny Rivera johanny@merchise.org Johanny Rivera johanny@merchise.org
doc/cla/corporate/therp.md
+4 -1
View File
@@ -1,6 +1,8 @@
Netherlands, 2015-03-09 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 Therp BV agrees to the terms of the Odoo Corporate
Contributor License Agreement v1.0. Contributor License Agreement v1.0.
@@ -18,4 +20,5 @@ List of contributors:
* Holger Brunn hbrunn@therp.nl https://github.com/hbrunn * Holger Brunn hbrunn@therp.nl https://github.com/hbrunn
* Lara Freeke lfreeke@therp.nl https://github.com/lfreeke * Lara Freeke lfreeke@therp.nl https://github.com/lfreeke
* Ronald Portier ronald@therp.nl https://github.com/nl66278 * Ronald Portier ronald@therp.nl https://github.com/nl66278
* George Daramouskas gdaramouskas@therp.nl https://github.com/daramousk
odoo/service/server.py
+1 -1
View File
@@ -748,7 +748,7 @@ class WorkerHTTP(Worker):
""" HTTP Request workers """ """ HTTP Request workers """
def process_request(self, client, addr): def process_request(self, client, addr):
client.setblocking(1) client.setblocking(1)
client.settimeout(0.5) client.settimeout(2)
client.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1) client.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
# Prevent fd inherientence close_on_exec # Prevent fd inherientence close_on_exec
flags = fcntl.fcntl(client, fcntl.F_GETFD) | fcntl.FD_CLOEXEC flags = fcntl.fcntl(client, fcntl.F_GETFD) | fcntl.FD_CLOEXEC