diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-03-21 19:36:58 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-03-21 19:36:58 +0100 |
| commit | 6773bdbe327ec6dbc9d6120de63258770efddadb (patch) | |
| tree | 72787d4e15fc9032e532d8fcbb0847bd9ac9494a /addons/web/controllers/main.py | |
| parent | 9239ec7de85e928bce86303d30fdab00ae90aa41 (diff) | |
| parent | e8f630e44df6460a9027cc07fd79d2a4e11ce17c (diff) | |
[MERGE] forward port branch 11.0 up to e8f630e44df
Diffstat (limited to 'addons/web/controllers/main.py')
| -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 6af25b7eaa0..8a307e893be 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, |