From eca8a08710ef16b17780e917740c268b61bf11e6 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Thu, 22 Dec 2016 08:54:55 +0100 Subject: [PATCH] [FIX] point_of_sale: generates sale details using dates The dates were lost when in render_html as replaced by the one in the context (None so fallback on today). Avoid calling twice get_sale_details Fixes #14789 Replaces and closes #14790 --- addons/point_of_sale/models/pos_order.py | 8 +++----- addons/point_of_sale/wizard/pos_details.py | 4 +--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/addons/point_of_sale/models/pos_order.py b/addons/point_of_sale/models/pos_order.py index 9a10c8a9812..f06b7d5b8df 100644 --- a/addons/point_of_sale/models/pos_order.py +++ b/addons/point_of_sale/models/pos_order.py @@ -906,9 +906,7 @@ class ReportSaleDetails(models.AbstractModel): @api.multi def render_html(self, docids, data=None): - company = request.env.user.company_id - date_start = self.env.context.get('date_start', False) - date_stop = self.env.context.get('date_stop', False) - data = dict(data or {}, date_start=date_start, date_stop=date_stop) - data.update(self.get_sale_details(date_start, date_stop, company)) + data = dict(data or {}) + configs = self.env['pos.config'].browse(data['config_ids']) + data.update(self.get_sale_details(data['date_start'], data['date_stop'], configs)) return self.env['report'].render('point_of_sale.report_saledetails', data) diff --git a/addons/point_of_sale/wizard/pos_details.py b/addons/point_of_sale/wizard/pos_details.py index d261fe1e4e4..3b8c236fccc 100644 --- a/addons/point_of_sale/wizard/pos_details.py +++ b/addons/point_of_sale/wizard/pos_details.py @@ -26,8 +26,6 @@ class PosDetails(models.TransientModel): @api.multi def generate_report(self): - data = {'date_start': self.start_date, 'date_stop': self.end_date} - data.update(self.env['report.point_of_sale.report_saledetails'].get_sale_details( - self.start_date, self.end_date, self.pos_config_ids)) + data = {'date_start': self.start_date, 'date_stop': self.end_date, 'config_ids': self.pos_config_ids.ids} return self.env['report'].get_action( [], 'point_of_sale.report_saledetails', data=data)