diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-03-21 18:20:22 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-03-21 18:20:22 +0100 |
| commit | e8f630e44df6460a9027cc07fd79d2a4e11ce17c (patch) | |
| tree | 5462ac8d67c48fa524f7d4093371bcc565f538e5 /addons/web | |
| parent | 3c468b0185077626ef2d2f220294f24923dd504f (diff) | |
| parent | 7a45296cf1a1643de6b2a114e535bc167364498e (diff) | |
[MERGE] forward port branch saas-15 up to 7a45296cf1a
Diffstat (limited to 'addons/web')
| -rw-r--r-- | addons/web/controllers/main.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 913edc89932..578bc3420b8 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -993,7 +993,7 @@ class Binary(http.Controller): '/web/content/<string:model>/<int:id>/<string:field>/<string:filename>'], type='http', auth="public") def content_common(self, xmlid=None, model='ir.attachment', id=None, field='datas', filename=None, filename_field='datas_fname', unique=None, mimetype=None, - download=None, data=None, token=None, access_token=None): + download=None, data=None, token=None, access_token=None, **kw): status, headers, content = binary_content( xmlid=xmlid, model=model, id=id, field=field, unique=unique, filename=filename, filename_field=filename_field, download=download, mimetype=mimetype, |