audrius/report-print-send
1
0
Fork 0
mirror of https://github.com/OCA/report-print-send.git synced 2025-02-16 07:11:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #160 from CompassionCH/10.0

Browse Source 
[FIX] printer_tray: print_options expecting the full report instead of a string
This commit is contained in:
Pedro M. Baeza
2018-09-04 13:11:57 +02:00
committed by GitHub
parent 587e331b7e 88501d3581
commit 762a616a8d
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
printer_tray/models/printing_printer.py
View File

@@ -76,16 +76,18 @@ class PrintingPrinter(models.Model):
options = super(PrintingPrinter, self).print_options(report, format)
if report is not None:
full_report = self.env['report']._get_report_from_name(report) \
if isinstance(report, basestring) else report
# Retrieve report default values
if report.printer_tray_id:
tray = report.printer_tray_id
if full_report.printer_tray_id:
tray = full_report.printer_tray_id
else:
# Retrieve user default values
tray = self.env.user.printer_tray_id
# Retrieve report-user specific values
action = printing_act_obj.search([
('report_id', '=', report.id),
('report_id', '=', full_report.id),
('user_id', '=', self.env.uid),
('action', '!=', 'user_default'),
], limit=1)