diff --git a/report_xlsx/README.rst b/report_xlsx/README.rst
index eb3cdb24..215ef82f 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
=====
@@ -18,7 +25,7 @@ A python class ::
from openerp.addons.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
@@ -31,9 +38,12 @@ 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 ::
- `_.
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
=======
+* Icon taken from http://www.icons101.com/icon/id_67712/setid_2096/Boxed_Metal_by_Martin/xlsx.
+
Contributors
------------
@@ -74,4 +86,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/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)
diff --git a/report_xlsx/static/description/icon.png b/report_xlsx/static/description/icon.png
index 3a0328b5..baab9a4c 100644
Binary files a/report_xlsx/static/description/icon.png and b/report_xlsx/static/description/icon.png differ
diff --git a/requirements.txt b/requirements.txt
index d074946c..a2a85aad 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1 @@
-xlwt
\ No newline at end of file
+xlwt
xlsxwriter
\ No newline at end of file