Skip to content

Commit

Permalink
temp rebasing PR 77 (2978d7b)
Browse files Browse the repository at this point in the history
  • Loading branch information
roboadhoc authored Feb 6, 2025
2 parents a5ff36a + 2978d7b commit 94fbb96
Show file tree
Hide file tree
Showing 25 changed files with 924 additions and 947 deletions.
32 changes: 16 additions & 16 deletions base_report_to_printer_aeroo/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,23 @@
#
##############################################################################
{
'name': 'Report to print Aeroo',
'version': "16.0.1.0.0",
'category': 'Reporting Subsystem',
'sequence': 14,
'author': 'ADHOC SA',
'website': 'www.adhoc.com.ar',
'license': 'AGPL-3',
'depends': [
'report_aeroo',
'base_report_to_printer',
"name": "Report to print Aeroo",
"version": "16.0.1.0.0",
"category": "Reporting Subsystem",
"sequence": 14,
"author": "ADHOC SA",
"website": "www.adhoc.com.ar",
"license": "AGPL-3",
"depends": [
"report_aeroo",
"base_report_to_printer",
],
'data': [],
'assets': {
'web.assets_backend': [
'base_report_to_printer_aeroo/static/src/js/qweb_action_manager.js',
"data": [],
"assets": {
"web.assets_backend": [
"base_report_to_printer_aeroo/static/src/js/qweb_action_manager.js",
],
},
'installable': False,
'auto_install': True,
"installable": False,
"auto_install": True,
}
33 changes: 15 additions & 18 deletions base_report_to_printer_aeroo/models/ir_actions_report.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,41 +2,38 @@
# For copyright and license notices, see __manifest__.py file in module root
# directory
##############################################################################
from odoo import api, exceptions, models, _
from odoo import _, exceptions, models


class IrActionsReport(models.Model):

_inherit = 'ir.actions.report'
_inherit = "ir.actions.report"

def print_document(self, record_ids, data=None):
""" This method is called from the print actions (controller).
"""This method is called from the print actions (controller).
Every time ir.action.print is called.
ir.actions.report, everytime someone click Print button
This overwrite let us to proper render aeroo report's when printing
from server
"""
if self.report_type == 'aeroo':
document, doc_format = self.with_context(must_skip_send_to_printer=True)._render_aeroo(self.report_name, record_ids, data=data)
if self.report_type == "aeroo":
document, doc_format = self.with_context(must_skip_send_to_printer=True)._render_aeroo(
self.report_name, record_ids, data=data
)
behaviour = self.behaviour()
printer = behaviour.pop('printer', None)
printer = behaviour.pop("printer", None)
if not printer:
raise exceptions.Warning(
_('No printer configured to print this report.')
)
raise exceptions.Warning(_("No printer configured to print this report."))
# TODO chequear que nosotros estamos haciendo igual que en
# https://github.com/OCA/report-print-send/blob/13.0/base_report_to_printer/models/ir_actions_report.py#L111
# pero en realidad luego pareciera que doc_format no es interpretado en
# https://github.com/OCA/report-print-send/blob/14.0/base_report_to_printer/models/printing_printer.py#L134
return printer.print_document(
self, document, doc_format=doc_format, **behaviour)
return printer.print_document(self, document, doc_format=doc_format, **behaviour)

return super(IrActionsReport, self).print_document(
record_ids, data=data)
return super(IrActionsReport, self).print_document(record_ids, data=data)

def _render_qweb_pdf(self, report_ref, res_ids=None, data=None):
""" This method is called directly from another places in odoo like
"""This method is called directly from another places in odoo like
portal, website, pos, email template attachments, etc.
In this case we do not want to print using the printer. With this
Expand All @@ -47,6 +44,6 @@ def _render_qweb_pdf(self, report_ref, res_ids=None, data=None):
# desde los lugares donde se llama directamente a "render_qweb_pdf" se
# mande a impresora (portal, plantilla de email, etc), tal vez sea
# interesante hacerlo para pos."
return super(IrActionsReport, self.with_context(
must_skip_send_to_printer=True))._render_qweb_pdf(
report_ref=report_ref, res_ids=res_ids, data=data)
return super(IrActionsReport, self.with_context(must_skip_send_to_printer=True))._render_qweb_pdf(
report_ref=report_ref, res_ids=res_ids, data=data
)
2 changes: 1 addition & 1 deletion report_aeroo/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Report templates in the following formats
Output formats:
--------------------------------------------------------------------------------
* Open Document Format (ODF) - .odt, .ods;
* Other ASCII based formats, like HTML, CSV, etc.
* Other ASCII based formats, like HTML, CSV, etc.
* using Aeroo DOCS - PDF, DOC, XLS, CSV.

Reporting engine features
Expand Down
16 changes: 8 additions & 8 deletions report_aeroo/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
################################################################################
#
# This file is part of Aeroo Reports software - for license refer LICENSE file
# This file is part of Aeroo Reports software - for license refer LICENSE file
#
################################################################################
from . import controllers
Expand All @@ -13,12 +13,12 @@
from . import wizard

check_list = [
'import aeroolib',
'import genshi',
'from genshi.template import NewTextTemplate',
'from xml.dom import minidom',
'from pyPdf import PdfFileWriter, PdfFileReader',
"import aeroolib",
"import genshi",
"from genshi.template import NewTextTemplate",
"from xml.dom import minidom",
"from pyPdf import PdfFileWriter, PdfFileReader",
]

#from . import check_deps
#check_deps(check_list)
# from . import check_deps
# check_deps(check_list)
36 changes: 18 additions & 18 deletions report_aeroo/__manifest__.py
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
################################################################################
#
# This file is part of Aeroo Reports software - for license refer LICENSE file
# This file is part of Aeroo Reports software - for license refer LICENSE file
#
################################################################################

{
'name': 'Aeroo Reports',
'version': "18.0.1.0.0",
'category': 'Generic Modules/Aeroo Reports',
'summary': 'Enterprise grade reporting solution',
'author': 'Alistek', # pylint: disable=manifest-required-author
'website': 'http://www.alistek.com',
'complexity': "easy",
'depends': ['base', 'web', 'mail'],
'demo': [
"name": "Aeroo Reports",
"version": "18.0.1.0.0",
"category": "Generic Modules/Aeroo Reports",
"summary": "Enterprise grade reporting solution",
"author": "Alistek", # pylint: disable=manifest-required-author
"website": "http://www.alistek.com",
"complexity": "easy",
"depends": ["base", "web", "mail"],
"demo": [
"demo/report_sample.xml",
],
'data': [
"data": [
"views/report_view.xml",
"data/report_aeroo_data.xml",
"wizard/installer.xml",
"security/ir.model.access.csv",
],
'assets': {
'web.assets_backend': [
'report_aeroo/static/src/js/report/reportactionmanager.js',
],
"assets": {
"web.assets_backend": [
"report_aeroo/static/src/js/report/reportactionmanager.js",
],
},
"license": "GPL-3 or any later version",
'installable': True,
'application': True,
'auto_install': False,
"installable": True,
"application": True,
"auto_install": False,
}
Loading

0 comments on commit 94fbb96

Please sign in to comment.