From 81e6b063fd540119cc0029285147e853d942bc02 Mon Sep 17 00:00:00 2001 From: sebalix Date: Tue, 12 Apr 2016 15:28:46 +0200 Subject: [PATCH] [IMP] report_xlsx - Pass the report instance as well as ids of records to print to the 'create_xlsx_report' method + Instanciate the parser and make it available for the 'generate_xlsx_report' method --- report_xlsx/README.rst | 18 ++++++++++++++---- report_xlsx/__openerp__.py | 2 +- report_xlsx/models/ir_report.py | 2 +- report_xlsx/report/report_xlsx.py | 13 +++++++++---- 4 files changed, 25 insertions(+), 10 deletions(-) diff --git a/report_xlsx/README.rst b/report_xlsx/README.rst index eb3cdb24..2ce2e112 100644 --- a/report_xlsx/README.rst +++ b/report_xlsx/README.rst @@ -8,6 +8,13 @@ Base report xlsx This module provides a basic report class to generate xlsx report. +Installation +============ + +Make sure you have ``xlsxwriter`` Python module installed:: + +$ pip install xlsxwriter + Usage ===== @@ -17,7 +24,7 @@ A python class :: from openerp.addons.report_xlsx.report.report_xlsx import ReportXlsx - class partner_xlsx(ReportXlsx): + class PartnerXlsx(ReportXlsx): def generate_xlsx_report(self, workbook, data, partners): for obj in partners: @@ -28,8 +35,11 @@ A python class :: sheet.write(0, 0, obj.name, bold) - partner_xlsx('report.res.partner.xlsx', - 'res.partner') + PartnerXlsx('report.res.partner.xlsx', + 'res.partner') + +To manipulate the ``workbook`` and ``sheet`` objects, refer to the +`documentation `_ of ``xlsxwriter``. A report XML record :: @@ -74,4 +84,4 @@ This module is maintained by the OCA. OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -To contribute to this module, please visit https://odoo-community.org. \ No newline at end of file +To contribute to this module, please visit https://odoo-community.org. diff --git a/report_xlsx/__openerp__.py b/report_xlsx/__openerp__.py index f6576b3a..07985d16 100644 --- a/report_xlsx/__openerp__.py +++ b/report_xlsx/__openerp__.py @@ -10,7 +10,7 @@ 'Odoo Community Association (OCA)', 'website': "http://acsone.eu", 'category': 'Reporting', - 'version': '8.0.1.0.0', + 'version': '9.0.1.0.0', 'license': 'AGPL-3', 'external_dependencies': {'python': ['xlsxwriter']}, 'depends': [ diff --git a/report_xlsx/models/ir_report.py b/report_xlsx/models/ir_report.py index 37928be7..e3793ae6 100644 --- a/report_xlsx/models/ir_report.py +++ b/report_xlsx/models/ir_report.py @@ -2,7 +2,7 @@ # Copyright 2015 ACSONE SA/NV () # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from openerp import api, fields, models +from openerp import fields, models class IrActionsReportXml(models.Model): diff --git a/report_xlsx/report/report_xlsx.py b/report_xlsx/report/report_xlsx.py index 9b96fa7d..285c97b5 100644 --- a/report_xlsx/report/report_xlsx.py +++ b/report_xlsx/report/report_xlsx.py @@ -2,9 +2,10 @@ # Copyright 2015 ACSONE SA/NV () # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from cStringIO import StringIO + from openerp.report.report_sxw import report_sxw from openerp.api import Environment -from cStringIO import StringIO import logging _logger = logging.getLogger(__name__) @@ -24,11 +25,15 @@ class ReportXlsx(report_sxw): if report.ids: self.title = report.name if report.report_type == 'xlsx': - objs = self.env[self.table].browse(ids) - return self.create_xlsx_report(data, objs) + return self.create_xlsx_report(ids, data, report) return super(ReportXlsx, self).create(cr, uid, ids, data, context) - def create_xlsx_report(self, data, objs): + def create_xlsx_report(self, ids, data, report): + self.parser_instance = self.parser( + self.env.cr, self.env.uid, self.name2, self.env.context) + objs = self.getObjects( + self.env.cr, self.env.uid, ids, self.env.context) + self.parser_instance.set_context(objs, data, ids, 'xlsx') file_data = StringIO() workbook = xlsxwriter.Workbook(file_data) self.generate_xlsx_report(workbook, data, objs)