From 00fbd093389e0e9b29bf99be8151e45db23a630f Mon Sep 17 00:00:00 2001 From: Guewen Baconnier Date: Mon, 17 Nov 2014 14:38:34 +0100 Subject: [PATCH] We need the report in print_document and print options (needed in printer_tray) --- base_report_to_printer/printing.py | 6 +++--- base_report_to_printer/report.py | 2 +- base_report_to_printer/report_service.py | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/base_report_to_printer/printing.py b/base_report_to_printer/printing.py index a863926..179ea57 100644 --- a/base_report_to_printer/printing.py +++ b/base_report_to_printer/printing.py @@ -224,7 +224,7 @@ class PrintingPrinter(models.Model): uri = fields.Char(string='URI', readonly=True) @api.multi - def print_options(self, format): + def print_options(self, report, format): """ Hook to set print options """ options = {} if format == 'raw': @@ -232,7 +232,7 @@ class PrintingPrinter(models.Model): return options @api.multi - def print_document(self, content, format): + def print_document(self, report, content, format): """ Print a file Format could be pdf, qweb-pdf, raw, ... @@ -246,7 +246,7 @@ class PrintingPrinter(models.Model): os.close(fd) connection = cups.Connection() - options = self.print_options(format) + options = self.print_options(report, format) connection.printFile(self.system_name, file_name, diff --git a/base_report_to_printer/report.py b/base_report_to_printer/report.py index 493ae08..5749e58 100644 --- a/base_report_to_printer/report.py +++ b/base_report_to_printer/report.py @@ -35,5 +35,5 @@ class Report(models.Model): action = data['action'] printer = data['printer'] if action != 'client' and result: - printer.print_document(result, report.report_type) + printer.print_document(report, result, report.report_type) return result diff --git a/base_report_to_printer/report_service.py b/base_report_to_printer/report_service.py index 12f20d2..2469f57 100644 --- a/base_report_to_printer/report_service.py +++ b/base_report_to_printer/report_service.py @@ -62,7 +62,8 @@ def exp_report_get(db, uid, report_id): if (self_reports and self_reports.get(report_id) and self_reports[report_id].get('result') and self_reports[report_id].get('format')): - printer.print_document(self_reports[report_id]['result'], + printer.print_document(report, + self_reports[report_id]['result'], self_reports[report_id]['format']) # FIXME "Warning" removed as it breaks the workflow # it would be interesting to have a dialog box to