diff options
| author | Martin Trigaux <mat@odoo.com> | 2018-08-31 14:42:03 +0000 |
|---|---|---|
| committer | Martin Trigaux <mat@odoo.com> | 2019-08-02 08:53:24 +0000 |
| commit | 66dea8bb7bd6db2557515dc21b8f3e96b072aca0 (patch) | |
| tree | 0201ecd7c448551c2a75168801712759ab6c2dfd /addons | |
| parent | 987951a8d44276d768566752fdf4be2a55dd25f2 (diff) | |
[REF] web: remove raw_mode flag on export
The export is now always in raw_mode
Adapt the tests
Fixes odoo/odoo#18798
closes odoo/odoo#26724
Signed-off-by: Martin Trigaux (mat) <mat@odoo.com>
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/calendar/models/calendar.py | 4 | ||||
| -rw-r--r-- | addons/web/controllers/main.py | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/addons/calendar/models/calendar.py b/addons/calendar/models/calendar.py index 5498759f550..3870e028d7e 100644 --- a/addons/calendar/models/calendar.py +++ b/addons/calendar/models/calendar.py @@ -1604,10 +1604,10 @@ class Meeting(models.Model): self.env['calendar.alarm_manager']._notify_next_alarm(meeting.partner_ids.ids) return meeting - def export_data(self, fields_to_export, raw_data=False): + def export_data(self, fields_to_export): """ Override to convert virtual ids to ids """ records = self.browse(set(get_real_ids(self.ids))) - return super(Meeting, records).export_data(fields_to_export, raw_data) + return super(Meeting, records).export_data(fields_to_export) @api.model def read_group(self, domain, fields, groupby, offset=0, limit=None, orderby=False, lazy=True): diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index befdc0a2c8b..85f01e3c83d 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -1576,7 +1576,6 @@ class Export(http.Controller): for k, v in self.fields_info(model, export_fields).items()) class ExportFormat(object): - raw_data = False @property def content_type(self): @@ -1612,7 +1611,7 @@ class ExportFormat(object): fields = [field for field in fields if field['name'] != 'id'] field_names = [f['name'] for f in fields] - import_data = records.export_data(field_names, self.raw_data).get('datas',[]) + import_data = records.export_data(field_names).get('datas',[]) if import_compat: columns_headers = field_names @@ -1658,8 +1657,6 @@ class CSVExport(ExportFormat, http.Controller): return fp.getvalue() class ExcelExport(ExportFormat, http.Controller): - # Excel needs raw data to correctly handle numbers and date values - raw_data = True @http.route('/web/export/xls', type='http', auth="user") @serialize_exception |