From 5cf7ea187205102fcfec8e97235a1e6379316593 Mon Sep 17 00:00:00 2001 From: "Adrien Peiffer (ACSONE)" Date: Thu, 24 Dec 2015 15:11:52 +0100 Subject: [PATCH 01/12] [ADD] Add base_report_xlsx module --- base_report_xlsx/README.rst | 49 +++++++++++++++++++ base_report_xlsx/__init__.py | 5 ++ base_report_xlsx/__openerp__.py | 19 +++++++ base_report_xlsx/models/__init__.py | 5 ++ base_report_xlsx/models/ir_report.py | 16 ++++++ base_report_xlsx/report/__init__.py | 4 ++ base_report_xlsx/report/report_xlsx.py | 33 +++++++++++++ base_report_xlsx/static/description/icon.png | Bin 0 -> 9455 bytes 8 files changed, 131 insertions(+) create mode 100644 base_report_xlsx/README.rst create mode 100644 base_report_xlsx/__init__.py create mode 100644 base_report_xlsx/__openerp__.py create mode 100644 base_report_xlsx/models/__init__.py create mode 100644 base_report_xlsx/models/ir_report.py create mode 100644 base_report_xlsx/report/__init__.py create mode 100644 base_report_xlsx/report/report_xlsx.py create mode 100644 base_report_xlsx/static/description/icon.png diff --git a/base_report_xlsx/README.rst b/base_report_xlsx/README.rst new file mode 100644 index 00000000..cf6d51a6 --- /dev/null +++ b/base_report_xlsx/README.rst @@ -0,0 +1,49 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 + +================ +Base report xlsx +================ + +This module was written to provide a basic report class to generate xlsx report. + +Usage +===== + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/143/9.0 + +For further information, please visit: + + * https://www.odoo.com/forum/help-1 + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed feedback +`here `_. + +Credits +======= + +Contributors +------------ + +* Adrien Peiffer + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +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 http://odoo-community.org. \ No newline at end of file diff --git a/base_report_xlsx/__init__.py b/base_report_xlsx/__init__.py new file mode 100644 index 00000000..9a384baf --- /dev/null +++ b/base_report_xlsx/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# Copyright 2015 ACSONE SA/NV () +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from . import models +from . import report diff --git a/base_report_xlsx/__openerp__.py b/base_report_xlsx/__openerp__.py new file mode 100644 index 00000000..f6576b3a --- /dev/null +++ b/base_report_xlsx/__openerp__.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# Copyright 2015 ACSONE SA/NV () +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +{ + 'name': "Base report xlsx", + + 'summary': """ + Base module to create xlsx report""", + 'author': 'ACSONE SA/NV,' + 'Odoo Community Association (OCA)', + 'website': "http://acsone.eu", + 'category': 'Reporting', + 'version': '8.0.1.0.0', + 'license': 'AGPL-3', + 'external_dependencies': {'python': ['xlsxwriter']}, + 'depends': [ + 'base', + ], +} diff --git a/base_report_xlsx/models/__init__.py b/base_report_xlsx/models/__init__.py new file mode 100644 index 00000000..521aa82b --- /dev/null +++ b/base_report_xlsx/models/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# Copyright 2015 ACSONE SA/NV () +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).+ + +from . import ir_report diff --git a/base_report_xlsx/models/ir_report.py b/base_report_xlsx/models/ir_report.py new file mode 100644 index 00000000..fad54f5a --- /dev/null +++ b/base_report_xlsx/models/ir_report.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Copyright 2015 ACSONE SA/NV () +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from openerp import models, api + + +class IrActionsReportXml(models.Model): + _inherit = 'ir.actions.report.xml' + + @api.model + def _check_selection_field_value(self, field, value): + if field == 'report_type' and value == 'xlsx': + return + return super(IrActionsReportXml, self).\ + _check_selection_field_value(field, value) diff --git a/base_report_xlsx/report/__init__.py b/base_report_xlsx/report/__init__.py new file mode 100644 index 00000000..37c50512 --- /dev/null +++ b/base_report_xlsx/report/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# Copyright 2015 ACSONE SA/NV () +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from . import report_xlsx diff --git a/base_report_xlsx/report/report_xlsx.py b/base_report_xlsx/report/report_xlsx.py new file mode 100644 index 00000000..da5e9ffd --- /dev/null +++ b/base_report_xlsx/report/report_xlsx.py @@ -0,0 +1,33 @@ +# -*- coding: utf-8 -*- +# Copyright 2015 ACSONE SA/NV () +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +import xlsxwriter +from openerp.report.report_sxw import report_sxw +from openerp.api import Environment +from cStringIO import StringIO + + +class ReportXlsx(report_sxw): + + def create(self, cr, uid, ids, data, context=None): + self.env = Environment(cr, uid, context) + report_obj = self.env['ir.actions.report.xml'] + report = report_obj.search([('report_name', '=', self.name[7:])]) + 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 super(ReportXlsx, self).create(cr, uid, ids, data, context) + + def create_xlsx_report(self, data, objs): + file_data = StringIO() + workbook = xlsxwriter.Workbook(file_data) + self.generate_xlsx_report(workbook, data, objs) + workbook.close() + file_data.seek(0) + return (file_data.read(), 'xlsx') + + def generate_xlsx_report(self, workbook, data, objs): + raise NotImplementedError() diff --git a/base_report_xlsx/static/description/icon.png b/base_report_xlsx/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 From efdd19ffdc9ee51f7ba2cbaaf6e743a2693bc289 Mon Sep 17 00:00:00 2001 From: "Adrien Peiffer (ACSONE)" Date: Mon, 4 Jan 2016 20:13:42 +0100 Subject: [PATCH 02/12] [IMP][base_report_xlsx] Readme file --- base_report_xlsx/README.rst | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/base_report_xlsx/README.rst b/base_report_xlsx/README.rst index cf6d51a6..0763ceb4 100644 --- a/base_report_xlsx/README.rst +++ b/base_report_xlsx/README.rst @@ -6,7 +6,7 @@ Base report xlsx ================ -This module was written to provide a basic report class to generate xlsx report. +This module provides a basic report class to generate xlsx report. Usage ===== @@ -15,10 +15,6 @@ Usage :alt: Try me on Runbot :target: https://runbot.odoo-community.org/runbot/143/9.0 -For further information, please visit: - - * https://www.odoo.com/forum/help-1 - Bug Tracker =========== @@ -46,4 +42,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 http://odoo-community.org. \ No newline at end of file +To contribute to this module, please visit https://odoo-community.org. \ No newline at end of file From 5596dc46c5454805de51332fe7bc13c136b6f996 Mon Sep 17 00:00:00 2001 From: "Adrien Peiffer (ACSONE)" Date: Mon, 4 Jan 2016 20:13:59 +0100 Subject: [PATCH 03/12] [IMP][base_report_xlsx] Protect import --- base_report_xlsx/report/report_xlsx.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/base_report_xlsx/report/report_xlsx.py b/base_report_xlsx/report/report_xlsx.py index da5e9ffd..9b96fa7d 100644 --- a/base_report_xlsx/report/report_xlsx.py +++ b/base_report_xlsx/report/report_xlsx.py @@ -2,11 +2,18 @@ # Copyright 2015 ACSONE SA/NV () # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -import xlsxwriter from openerp.report.report_sxw import report_sxw from openerp.api import Environment from cStringIO import StringIO +import logging +_logger = logging.getLogger(__name__) + +try: + import xlsxwriter +except ImportError: + _logger.debug('Can not import xlsxwriter`.') + class ReportXlsx(report_sxw): From e96135b145cfd5985274253edf380b6993a70fbe Mon Sep 17 00:00:00 2001 From: "Adrien Peiffer (ACSONE)" Date: Mon, 4 Jan 2016 21:34:04 +0100 Subject: [PATCH 04/12] [IMP][base_report_xlsx] Add exemple with partner xlsx report --- base_report_xlsx/README.rst | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/base_report_xlsx/README.rst b/base_report_xlsx/README.rst index 0763ceb4..657f38ee 100644 --- a/base_report_xlsx/README.rst +++ b/base_report_xlsx/README.rst @@ -11,6 +11,38 @@ This module provides a basic report class to generate xlsx report. Usage ===== +An example of XLSX report for partners: + +A python class :: + + from openerp.addons.base_report_xlsx.report.report_xlsx import ReportXlsx + + class partner_xlsx(ReportXlsx): + + def generate_xlsx_report(self, workbook, data, partners): + for obj in partners: + report_name = obj.name + # One sheet by partner + sheet = workbook.add_worksheet(report_name[:31]) + bold = workbook.add_format({'bold': True}) + sheet.write(0, 0, obj.name, bold) + + + partner_xlsx('report.res.partner.xlsx', + 'res.partner') + +A report XML record :: + + + .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot :target: https://runbot.odoo-community.org/runbot/143/9.0 @@ -21,7 +53,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed feedback -`here `_. +`here `_. Credits ======= From ebba6c6816f66b5760f3dbd4b5c0259e675cb703 Mon Sep 17 00:00:00 2001 From: "Adrien Peiffer (ACSONE)" Date: Fri, 5 Feb 2016 20:49:23 +0100 Subject: [PATCH 05/12] [ADD] Add xlsxwriter in travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index ab42259e..96e5adf1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,7 @@ virtualenv: 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} From b2a9f7d431008943f46acc3fdd1b141f62530b5d Mon Sep 17 00:00:00 2001 From: "Adrien Peiffer (ACSONE)" Date: Mon, 4 Apr 2016 20:28:23 +0200 Subject: [PATCH 06/12] [CHG] Rename base_report_xlsx to report_xlsx and add xlsx report type in selection --- base_report_xlsx/models/ir_report.py | 16 ---------------- {base_report_xlsx => report_xlsx}/README.rst | 4 ++-- {base_report_xlsx => report_xlsx}/__init__.py | 0 .../__openerp__.py | 0 .../models/__init__.py | 0 report_xlsx/models/ir_report.py | 11 +++++++++++ .../report/__init__.py | 0 .../report/report_xlsx.py | 0 .../static/description/icon.png | Bin 9 files changed, 13 insertions(+), 18 deletions(-) delete mode 100644 base_report_xlsx/models/ir_report.py rename {base_report_xlsx => report_xlsx}/README.rst (90%) rename {base_report_xlsx => report_xlsx}/__init__.py (100%) rename {base_report_xlsx => report_xlsx}/__openerp__.py (100%) rename {base_report_xlsx => report_xlsx}/models/__init__.py (100%) create mode 100644 report_xlsx/models/ir_report.py rename {base_report_xlsx => report_xlsx}/report/__init__.py (100%) rename {base_report_xlsx => report_xlsx}/report/report_xlsx.py (100%) rename {base_report_xlsx => report_xlsx}/static/description/icon.png (100%) diff --git a/base_report_xlsx/models/ir_report.py b/base_report_xlsx/models/ir_report.py deleted file mode 100644 index fad54f5a..00000000 --- a/base_report_xlsx/models/ir_report.py +++ /dev/null @@ -1,16 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright 2015 ACSONE SA/NV () -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - -from openerp import models, api - - -class IrActionsReportXml(models.Model): - _inherit = 'ir.actions.report.xml' - - @api.model - def _check_selection_field_value(self, field, value): - if field == 'report_type' and value == 'xlsx': - return - return super(IrActionsReportXml, self).\ - _check_selection_field_value(field, value) diff --git a/base_report_xlsx/README.rst b/report_xlsx/README.rst similarity index 90% rename from base_report_xlsx/README.rst rename to report_xlsx/README.rst index 657f38ee..eb3cdb24 100644 --- a/base_report_xlsx/README.rst +++ b/report_xlsx/README.rst @@ -15,7 +15,7 @@ An example of XLSX report for partners: A python class :: - from openerp.addons.base_report_xlsx.report.report_xlsx import ReportXlsx + from openerp.addons.report_xlsx.report.report_xlsx import ReportXlsx class partner_xlsx(ReportXlsx): @@ -53,7 +53,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed feedback -`here `_. +`here `_. Credits ======= diff --git a/base_report_xlsx/__init__.py b/report_xlsx/__init__.py similarity index 100% rename from base_report_xlsx/__init__.py rename to report_xlsx/__init__.py diff --git a/base_report_xlsx/__openerp__.py b/report_xlsx/__openerp__.py similarity index 100% rename from base_report_xlsx/__openerp__.py rename to report_xlsx/__openerp__.py diff --git a/base_report_xlsx/models/__init__.py b/report_xlsx/models/__init__.py similarity index 100% rename from base_report_xlsx/models/__init__.py rename to report_xlsx/models/__init__.py diff --git a/report_xlsx/models/ir_report.py b/report_xlsx/models/ir_report.py new file mode 100644 index 00000000..37928be7 --- /dev/null +++ b/report_xlsx/models/ir_report.py @@ -0,0 +1,11 @@ +# -*- coding: utf-8 -*- +# Copyright 2015 ACSONE SA/NV () +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from openerp import api, fields, models + + +class IrActionsReportXml(models.Model): + _inherit = 'ir.actions.report.xml' + + report_type = fields.Selection(selection_add=[("xlsx", "xlsx")]) diff --git a/base_report_xlsx/report/__init__.py b/report_xlsx/report/__init__.py similarity index 100% rename from base_report_xlsx/report/__init__.py rename to report_xlsx/report/__init__.py diff --git a/base_report_xlsx/report/report_xlsx.py b/report_xlsx/report/report_xlsx.py similarity index 100% rename from base_report_xlsx/report/report_xlsx.py rename to report_xlsx/report/report_xlsx.py diff --git a/base_report_xlsx/static/description/icon.png b/report_xlsx/static/description/icon.png similarity index 100% rename from base_report_xlsx/static/description/icon.png rename to report_xlsx/static/description/icon.png From a132e61d51996ed02ac65df3313405a69cd73814 Mon Sep 17 00:00:00 2001 From: sebalix Date: Tue, 12 Apr 2016 15:28:46 +0200 Subject: [PATCH 07/12] [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 08/12] [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 09/12] [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 10/12] [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 From 36ff29ac3e6910f5d36410bd3c08dd1cc1880313 Mon Sep 17 00:00:00 2001 From: "Adrien Peiffer (ACSONE)" Date: Wed, 13 Apr 2016 12:56:09 +0200 Subject: [PATCH 11/12] [CHG][report_xlsx] Bump version --- report_xlsx/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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': [ From 8be07e8d302dce174d5d9012e502249643637964 Mon Sep 17 00:00:00 2001 From: sebalix Date: Wed, 13 Apr 2016 16:05:14 +0200 Subject: [PATCH 12/12] [FIX] report_xlsx - Minor fix --- report_xlsx/report/report_xlsx.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/report_xlsx/report/report_xlsx.py b/report_xlsx/report/report_xlsx.py index aab372b4..285c97b5 100644 --- a/report_xlsx/report/report_xlsx.py +++ b/report_xlsx/report/report_xlsx.py @@ -33,7 +33,7 @@ class ReportXlsx(report_sxw): 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') + self.parser_instance.set_context(objs, data, ids, 'xlsx') file_data = StringIO() workbook = xlsxwriter.Workbook(file_data) self.generate_xlsx_report(workbook, data, objs)