Merge branch 'fix_typo_printer_tray_id' of https://github.com/vrenaville/report-print-send into 8.0

This commit is contained in:
Yannick Vaucher
2015-11-24 13:42:06 +01:00
2 changed files with 3 additions and 3 deletions

View File

@@ -19,7 +19,7 @@
# #
############################################################################## ##############################################################################
{'name': 'Report to printer - Paper tray selection', {'name': 'Report to printer - Paper tray selection',
'version': '8.0.1.0.0', 'version': '8.0.1.0.1',
'category': 'Printer', 'category': 'Printer',
'author': "Camptocamp,Odoo Community Association (OCA)", 'author': "Camptocamp,Odoo Community Association (OCA)",
'maintainer': 'Camptocamp', 'maintainer': 'Camptocamp',

View File

@@ -92,8 +92,8 @@ class Printer(models.Model):
('user_id', '=', self.env.uid), ('user_id', '=', self.env.uid),
('action', '!=', 'user_default')], ('action', '!=', 'user_default')],
limit=1) limit=1)
if action and action.printer_tray_id: if printer_tray_id:
tray = action.tray_id tray = action.printer_tray_id
if tray: if tray:
options['InputSlot'] = str(tray.system_name) options['InputSlot'] = str(tray.system_name)