From a132e61d51996ed02ac65df3313405a69cd73814 Mon Sep 17 00:00:00 2001 From: sebalix Date: Tue, 12 Apr 2016 15:28:46 +0200 Subject: [PATCH 1/4] [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 | 2 +- report_xlsx/report/report_xlsx.py | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/report_xlsx/README.rst b/report_xlsx/README.rst index eb3cdb24..149e117a 100644 --- a/report_xlsx/README.rst +++ b/report_xlsx/README.rst @@ -74,4 +74,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/report/report_xlsx.py b/report_xlsx/report/report_xlsx.py index 9b96fa7d..601a7c7e 100644 --- a/report_xlsx/report/report_xlsx.py +++ b/report_xlsx/report/report_xlsx.py @@ -24,11 +24,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, objs.ids, 'xlsx') file_data = StringIO() workbook = xlsxwriter.Workbook(file_data) self.generate_xlsx_report(workbook, data, objs) From fb606e1c66197e759ab57df4c1f3f75a992d2155 Mon Sep 17 00:00:00 2001 From: sebalix Date: Tue, 12 Apr 2016 15:48:25 +0200 Subject: [PATCH 2/4] [IMP] report_xlsx - README updated --- report_xlsx/README.rst | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/report_xlsx/README.rst b/report_xlsx/README.rst index 149e117a..03821ebd 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 ===== @@ -31,6 +38,9 @@ A python class :: partner_xlsx('report.res.partner.xlsx', 'res.partner') +To manipulate the ``workbook`` and ``sheet`` objects, refer to the +`documentation `_ of ``xlsxwriter``. + A report XML record :: Date: Tue, 12 Apr 2016 17:18:24 +0200 Subject: [PATCH 3/4] [FIX] report_xlsx - Fix lint --- report_xlsx/models/ir_report.py | 2 +- report_xlsx/report/report_xlsx.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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 601a7c7e..aab372b4 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__) From fba586d55902f0eea54c30c38ca8a28e7e610052 Mon Sep 17 00:00:00 2001 From: sebalix Date: Wed, 13 Apr 2016 12:33:16 +0200 Subject: [PATCH 4/4] [ADD] requirements.txt added --- .travis.yml | 2 -- requirements.txt | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 requirements.txt diff --git a/.travis.yml b/.travis.yml index 96e5adf1..2520fc1a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,8 +21,6 @@ virtualenv: system_site_packages: true install: - - pip install xlwt - - pip install xlsxwriter - git clone https://github.com/OCA/maintainer-quality-tools.git ${HOME}/maintainer-quality-tools - export PATH=${HOME}/maintainer-quality-tools/travis:${PATH} - travis_install_nightly ${VERSION} diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 00000000..3ccfc8e7 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,2 @@ +xlwt +xlsxwriter