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

[FIX] base_report_to_printer - restore error message as osv + propagate options

Browse Source
This commit is contained in:
Yannick Vaucher
2013-10-01 16:21:37 +02:00
parent f1173ee774
commit e99e95d14d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
base_report_to_printer/printing.py
View File

@@ -33,7 +33,7 @@ from threading import Thread
from threading import Lock from threading import Lock
from openerp import pooler from openerp import pooler
from openerp.osv import orm, fields from openerp.osv import osv, orm, fields
from openerp.tools.translate import _ from openerp.tools.translate import _
from openerp.addons.base_calendar import base_calendar from openerp.addons.base_calendar import base_calendar
@@ -250,7 +250,7 @@ class report_xml(orm.Model):
options = self.set_print_options(cr, uid, report_id, format, context=context) options = self.set_print_options(cr, uid, report_id, format, context=context)
connection.printFile(printer_system_name, file_name, file_name, options={}) connection.printFile(printer_system_name, file_name, file_name, options=options)
logger = logging.getLogger('base_report_to_printer') logger = logging.getLogger('base_report_to_printer')
logger.info("Printing job : '%s'" % file_name) logger.info("Printing job : '%s'" % file_name)
return True return True
@@ -364,7 +364,7 @@ class virtual_report_spool(base_calendar.virtual_report_spool):
and self._reports[report_id].get('format', False)): and self._reports[report_id].get('format', False)):
report_obj.print_direct(cr, uid, report.id, base64.encodestring(self._reports[report_id]['result']), report_obj.print_direct(cr, uid, report.id, base64.encodestring(self._reports[report_id]['result']),
self._reports[report_id]['format'], printer) self._reports[report_id]['format'], printer)
raise orm.except_orm(_('Printing...'), _('Document sent to printer %s') % (printer,)) raise osv.except_osv(_('Printing...'), _('Document sent to printer %s') % (printer,))
except: except:
cr.rollback() cr.rollback()