Merge PR #259 into 11.0

Signed-off-by sbidoul
OCA · Oct 21, 2019 · d969b21 · d969b21
2 parents 42bb138 + 4a1398c
commit d969b21
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/report_xlsx/models/ir_report.py b/report_xlsx/models/ir_report.py
@@ -16,9 +16,9 @@ def render_xlsx(self, docids, data):
         report_model = self.env.get(report_model_name)
         if report_model is None:
             raise UserError(_('%s model was not found' % report_model_name))
-        return report_model.with_context({
-            'active_model': self.model
-        }).create_xlsx_report(docids, data)
+        return report_model.with_context(
+            active_model=self.model,
+        ).create_xlsx_report(docids, data)
 
     @api.model
     def _get_report_from_name(self, report_name):

diff --git a/report_xlsx/report/report_xlsx.py b/report_xlsx/report/report_xlsx.py
@@ -37,7 +37,9 @@ def _get_objs_for_report(self, docids, data):
             ids = data["context"].get('active_ids', [])
         else:
             ids = self.env.context.get('active_ids', [])
-        return self.env[self.env.context.get('active_model')].browse(ids)
+        # propagate context anyway
+        # let it fail explicitely if `active_model` is not there
+        return self.env[self.env.context['active_model']].browse(ids)
 
     def create_xlsx_report(self, docids, data):
         objs = self._get_objs_for_report(docids, data)