diff --git a/.travis.yml b/.travis.yml index ba62955..4d1cbdd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,7 +45,7 @@ install: - git clone --depth=1 https://github.com/OCA/maintainer-quality-tools.git ${HOME}/maintainer-quality-tools - export PATH=${HOME}/maintainer-quality-tools/travis:${PATH} - travis_install_nightly - - pip install pycups==1.9.66 + - pip install pycups==1.9.73 - pip install PyPDF2==1.18 - pip install requests - git clone https://github.com/OCA/reporting-engine -b ${VERSION} $HOME/reporting-engine diff --git a/base_report_to_printer/__init__.py b/base_report_to_printer/__init__.py index 754152d..5c28b44 100644 --- a/base_report_to_printer/__init__.py +++ b/base_report_to_printer/__init__.py @@ -7,5 +7,4 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from . import models -from . import report_service from . import wizards diff --git a/base_report_to_printer/__manifest__.py b/base_report_to_printer/__manifest__.py index a917731..f43141f 100644 --- a/base_report_to_printer/__manifest__.py +++ b/base_report_to_printer/__manifest__.py @@ -8,7 +8,7 @@ { 'name': "Report to printer", - 'version': '10.0.1.0.0', + 'version': '10.0.1.0.1', 'category': 'Generic Modules/Base', 'author': "Agile Business Group & Domsense, Pegueroles SCP, NaN," " LasLabs, Odoo Community Association (OCA)", diff --git a/base_report_to_printer/report_service.py b/base_report_to_printer/report_service.py deleted file mode 100644 index 4237870..0000000 --- a/base_report_to_printer/report_service.py +++ /dev/null @@ -1,75 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (c) 2007 Ferran Pegueroles -# Copyright (c) 2009 Albert Cervera i Areny -# Copyright (C) 2011 Agile Business Group sagl () -# Copyright (C) 2011 Domsense srl () -# Copyright (C) 2013-2014 Camptocamp () -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - -import odoo - -from odoo.service.report import self_reports - -original_exp_report = odoo.service.report.exp_report - - -def exp_report(db, uid, object, ids, datas=None, context=None): - """ Export Report """ - # We can't use the named args because a monkey patch in 'calendar' - # doesn't use them and use a different name for 'datas' - res = original_exp_report(db, uid, object, ids, datas, context) - self_reports[res]['report_name'] = object - return res - - -odoo.service.report.exp_report = exp_report - - -original_exp_report_get = odoo.service.report.exp_report_get - - -def exp_report_get(db, uid, report_id): - # First we need to know if the module is installed - registry = odoo.registry(db) - if registry.get('printing.printer'): - cr = registry.cursor() - try: - # First of all load report defaults: name, action and printer - report_obj = registry['ir.actions.report.xml'] - report_name = self_reports[report_id]['report_name'] - report = report_obj.search(cr, uid, - [('report_name', '=', report_name)]) - if report: - report = report_obj.browse(cr, uid, report[0]) - data = report.behaviour()[report.id] - action = data['action'] - printer = data['printer'] - if action != 'client': - if all(self_reports, - self_reports.get(report_id), - self_reports[report_id].get('result'), - self_reports[report_id].get('format') - ): - 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 - # confirm if we really want to print in this case it - # must be with a by pass parameter to allow massive - # prints - # raise osv.except_osv( - # _('Printing...'), - # _('Document sent to printer %s') % (printer,)) - - except: - cr.rollback() - raise - finally: - cr.close() - return original_exp_report_get(db, uid, report_id) - - -odoo.service.report.exp_report_get = exp_report_get