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/report_xlsx/README.rst b/report_xlsx/README.rst index eb3cdb24..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 :: ) # 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..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__) @@ -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, objs.ids, 'xlsx') file_data = StringIO() workbook = xlsxwriter.Workbook(file_data) self.generate_xlsx_report(workbook, data, objs) 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