From cec45e79fe270c41410d05a5a29487fccf3d3305 Mon Sep 17 00:00:00 2001 From: "Adrien Peiffer (ACSONE)" Date: Mon, 4 Apr 2016 20:28:23 +0200 Subject: [PATCH 01/12] [CHG] Rename base_report_xlsx to report_xlsx and add xlsx report type in selection --- report_xlsx/README.rst | 77 ++++++++++++++++++++++++ report_xlsx/__init__.py | 5 ++ report_xlsx/__openerp__.py | 19 ++++++ report_xlsx/models/__init__.py | 5 ++ report_xlsx/models/ir_report.py | 11 ++++ report_xlsx/report/__init__.py | 4 ++ report_xlsx/report/report_xlsx.py | 40 ++++++++++++ report_xlsx/static/description/icon.png | Bin 0 -> 9455 bytes 8 files changed, 161 insertions(+) create mode 100644 report_xlsx/README.rst create mode 100644 report_xlsx/__init__.py create mode 100644 report_xlsx/__openerp__.py create mode 100644 report_xlsx/models/__init__.py create mode 100644 report_xlsx/models/ir_report.py create mode 100644 report_xlsx/report/__init__.py create mode 100644 report_xlsx/report/report_xlsx.py create mode 100644 report_xlsx/static/description/icon.png diff --git a/report_xlsx/README.rst b/report_xlsx/README.rst new file mode 100644 index 00000000..eb3cdb24 --- /dev/null +++ b/report_xlsx/README.rst @@ -0,0 +1,77 @@ +.. 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 provides a basic report class to generate xlsx report. + +Usage +===== + +An example of XLSX report for partners: + +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 + # 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 + +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 https://odoo-community.org. \ No newline at end of file diff --git a/report_xlsx/__init__.py b/report_xlsx/__init__.py new file mode 100644 index 00000000..9a384baf --- /dev/null +++ b/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/report_xlsx/__openerp__.py b/report_xlsx/__openerp__.py new file mode 100644 index 00000000..f6576b3a --- /dev/null +++ b/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/report_xlsx/models/__init__.py b/report_xlsx/models/__init__.py new file mode 100644 index 00000000..521aa82b --- /dev/null +++ b/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/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/report_xlsx/report/__init__.py b/report_xlsx/report/__init__.py new file mode 100644 index 00000000..37c50512 --- /dev/null +++ b/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/report_xlsx/report/report_xlsx.py b/report_xlsx/report/report_xlsx.py new file mode 100644 index 00000000..9b96fa7d --- /dev/null +++ b/report_xlsx/report/report_xlsx.py @@ -0,0 +1,40 @@ +# -*- coding: utf-8 -*- +# Copyright 2015 ACSONE SA/NV () +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +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): + + 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/report_xlsx/static/description/icon.png b/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 81e6b063fd540119cc0029285147e853d942bc02 Mon Sep 17 00:00:00 2001 From: sebalix Date: Tue, 12 Apr 2016 15:28:46 +0200 Subject: [PATCH 02/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 | 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) From 19d928b5a850caba7d01200496d4b3b14bdbd4f1 Mon Sep 17 00:00:00 2001 From: "Adrien Peiffer (ACSONE)" Date: Thu, 13 Oct 2016 08:24:08 +0200 Subject: [PATCH 03/12] [MIG] Migration of report_xlsx to 10.0 (#76) --- report_xlsx/README.rst | 12 ++++++------ report_xlsx/{__openerp__.py => __manifest__.py} | 3 ++- report_xlsx/models/ir_report.py | 2 +- report_xlsx/report/report_xlsx.py | 4 ++-- 4 files changed, 11 insertions(+), 10 deletions(-) rename report_xlsx/{__openerp__.py => __manifest__.py} (90%) diff --git a/report_xlsx/README.rst b/report_xlsx/README.rst index 2ce2e112..bd2a96e5 100644 --- a/report_xlsx/README.rst +++ b/report_xlsx/README.rst @@ -22,7 +22,7 @@ An example of XLSX report for partners: A python class :: - from openerp.addons.report_xlsx.report.report_xlsx import ReportXlsx + from odoo.addons.report_xlsx.report.report_xlsx import ReportXlsx class PartnerXlsx(ReportXlsx): @@ -55,15 +55,15 @@ 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 + :target: https://runbot.odoo-community.org/runbot/143/10.0 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 `_. +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. Credits ======= diff --git a/report_xlsx/__openerp__.py b/report_xlsx/__manifest__.py similarity index 90% rename from report_xlsx/__openerp__.py rename to report_xlsx/__manifest__.py index 07985d16..a5ba63a5 100644 --- a/report_xlsx/__openerp__.py +++ b/report_xlsx/__manifest__.py @@ -10,10 +10,11 @@ 'Odoo Community Association (OCA)', 'website': "http://acsone.eu", 'category': 'Reporting', - 'version': '9.0.1.0.0', + 'version': '10.0.1.0.0', 'license': 'AGPL-3', 'external_dependencies': {'python': ['xlsxwriter']}, 'depends': [ 'base', ], + 'installable': True, } diff --git a/report_xlsx/models/ir_report.py b/report_xlsx/models/ir_report.py index e3793ae6..7bf10a9a 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 fields, models +from odoo import fields, models class IrActionsReportXml(models.Model): diff --git a/report_xlsx/report/report_xlsx.py b/report_xlsx/report/report_xlsx.py index 285c97b5..a9891205 100644 --- a/report_xlsx/report/report_xlsx.py +++ b/report_xlsx/report/report_xlsx.py @@ -4,8 +4,8 @@ from cStringIO import StringIO -from openerp.report.report_sxw import report_sxw -from openerp.api import Environment +from odoo.report.report_sxw import report_sxw +from odoo.api import Environment import logging _logger = logging.getLogger(__name__) From f275af485da29d369e2292e8d046b0e356890e06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul=20=28ACSONE=29?= Date: Wed, 22 Feb 2017 13:58:38 +0100 Subject: [PATCH 04/12] [10.0] report_xlsx: Allow to define options for workbook creation (#98) * Allow to define options for workbook creation --- report_xlsx/__manifest__.py | 2 +- report_xlsx/report/report_xlsx.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/report_xlsx/__manifest__.py b/report_xlsx/__manifest__.py index a5ba63a5..2d8368b3 100644 --- a/report_xlsx/__manifest__.py +++ b/report_xlsx/__manifest__.py @@ -10,7 +10,7 @@ 'Odoo Community Association (OCA)', 'website': "http://acsone.eu", 'category': 'Reporting', - 'version': '10.0.1.0.0', + 'version': '10.0.1.0.1', 'license': 'AGPL-3', 'external_dependencies': {'python': ['xlsxwriter']}, 'depends': [ diff --git a/report_xlsx/report/report_xlsx.py b/report_xlsx/report/report_xlsx.py index a9891205..a199beb5 100644 --- a/report_xlsx/report/report_xlsx.py +++ b/report_xlsx/report/report_xlsx.py @@ -35,11 +35,14 @@ class ReportXlsx(report_sxw): 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) + workbook = xlsxwriter.Workbook(file_data, self.get_workbook_options()) self.generate_xlsx_report(workbook, data, objs) workbook.close() file_data.seek(0) return (file_data.read(), 'xlsx') + def get_workbook_options(self): + return {} + def generate_xlsx_report(self, workbook, data, objs): raise NotImplementedError() From b042daca55c59bb1c189d1a42a2aeb5efe827773 Mon Sep 17 00:00:00 2001 From: OCA Transbot Date: Tue, 29 Nov 2016 10:29:37 -0500 Subject: [PATCH 05/12] OCA Transbot updated translations from Transifex --- report_xlsx/i18n/de.po | 24 ++++++++++++++++++++++++ report_xlsx/i18n/es.po | 24 ++++++++++++++++++++++++ report_xlsx/i18n/fr.po | 24 ++++++++++++++++++++++++ report_xlsx/i18n/hr.po | 24 ++++++++++++++++++++++++ report_xlsx/i18n/hr_HR.po | 24 ++++++++++++++++++++++++ report_xlsx/i18n/it.po | 24 ++++++++++++++++++++++++ report_xlsx/i18n/nl_NL.po | 24 ++++++++++++++++++++++++ report_xlsx/i18n/pt_PT.po | 24 ++++++++++++++++++++++++ report_xlsx/i18n/tr.po | 24 ++++++++++++++++++++++++ 9 files changed, 216 insertions(+) create mode 100644 report_xlsx/i18n/de.po create mode 100644 report_xlsx/i18n/es.po create mode 100644 report_xlsx/i18n/fr.po create mode 100644 report_xlsx/i18n/hr.po create mode 100644 report_xlsx/i18n/hr_HR.po create mode 100644 report_xlsx/i18n/it.po create mode 100644 report_xlsx/i18n/nl_NL.po create mode 100644 report_xlsx/i18n/pt_PT.po create mode 100644 report_xlsx/i18n/tr.po diff --git a/report_xlsx/i18n/de.po b/report_xlsx/i18n/de.po new file mode 100644 index 00000000..ccf2c942 --- /dev/null +++ b/report_xlsx/i18n/de.po @@ -0,0 +1,24 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * report_xlsx +# +# Translators: +# Niki Waibel , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-11-01 20:11+0000\n" +"PO-Revision-Date: 2016-11-01 20:11+0000\n" +"Last-Translator: Niki Waibel , 2016\n" +"Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: de\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: report_xlsx +#: model:ir.model,name:report_xlsx.model_ir_actions_report_xml +msgid "ir.actions.report.xml" +msgstr "ir.actions.report.xml" diff --git a/report_xlsx/i18n/es.po b/report_xlsx/i18n/es.po new file mode 100644 index 00000000..58e885df --- /dev/null +++ b/report_xlsx/i18n/es.po @@ -0,0 +1,24 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * report_xlsx +# +# Translators: +# Pedro M. Baeza , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-11-01 20:11+0000\n" +"PO-Revision-Date: 2016-11-01 20:11+0000\n" +"Last-Translator: Pedro M. Baeza , 2016\n" +"Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: es\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: report_xlsx +#: model:ir.model,name:report_xlsx.model_ir_actions_report_xml +msgid "ir.actions.report.xml" +msgstr "ir.actions.report.xml" diff --git a/report_xlsx/i18n/fr.po b/report_xlsx/i18n/fr.po new file mode 100644 index 00000000..2a1c473c --- /dev/null +++ b/report_xlsx/i18n/fr.po @@ -0,0 +1,24 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * report_xlsx +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-05-31 03:52+0000\n" +"PO-Revision-Date: 2017-05-31 03:52+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: fr\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#. module: report_xlsx +#: model:ir.model,name:report_xlsx.model_ir_actions_report_xml +msgid "ir.actions.report.xml" +msgstr "ir.actions.report.xml" diff --git a/report_xlsx/i18n/hr.po b/report_xlsx/i18n/hr.po new file mode 100644 index 00000000..5c908d30 --- /dev/null +++ b/report_xlsx/i18n/hr.po @@ -0,0 +1,24 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * report_xlsx +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-05-31 03:52+0000\n" +"PO-Revision-Date: 2017-05-31 03:52+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: report_xlsx +#: model:ir.model,name:report_xlsx.model_ir_actions_report_xml +msgid "ir.actions.report.xml" +msgstr "ir.actions.report.xml" diff --git a/report_xlsx/i18n/hr_HR.po b/report_xlsx/i18n/hr_HR.po new file mode 100644 index 00000000..0abdc61c --- /dev/null +++ b/report_xlsx/i18n/hr_HR.po @@ -0,0 +1,24 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * report_xlsx +# +# Translators: +# Bole , 2016 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-11-01 20:11+0000\n" +"PO-Revision-Date: 2016-11-01 20:11+0000\n" +"Last-Translator: Bole , 2016\n" +"Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/hr_HR/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: hr_HR\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#. module: report_xlsx +#: model:ir.model,name:report_xlsx.model_ir_actions_report_xml +msgid "ir.actions.report.xml" +msgstr "ir.actions.report.xml" diff --git a/report_xlsx/i18n/it.po b/report_xlsx/i18n/it.po new file mode 100644 index 00000000..9a2b4260 --- /dev/null +++ b/report_xlsx/i18n/it.po @@ -0,0 +1,24 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * report_xlsx +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-05-31 03:52+0000\n" +"PO-Revision-Date: 2017-05-31 03:52+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: it\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: report_xlsx +#: model:ir.model,name:report_xlsx.model_ir_actions_report_xml +msgid "ir.actions.report.xml" +msgstr "ir.actions.report.xml" diff --git a/report_xlsx/i18n/nl_NL.po b/report_xlsx/i18n/nl_NL.po new file mode 100644 index 00000000..33bccedc --- /dev/null +++ b/report_xlsx/i18n/nl_NL.po @@ -0,0 +1,24 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * report_xlsx +# +# Translators: +# Peter Hageman , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-06-23 00:28+0000\n" +"PO-Revision-Date: 2017-06-23 00:28+0000\n" +"Last-Translator: Peter Hageman , 2017\n" +"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/teams/23907/nl_NL/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: nl_NL\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: report_xlsx +#: model:ir.model,name:report_xlsx.model_ir_actions_report_xml +msgid "ir.actions.report.xml" +msgstr "ir.actions.report.xml" diff --git a/report_xlsx/i18n/pt_PT.po b/report_xlsx/i18n/pt_PT.po new file mode 100644 index 00000000..42b119fe --- /dev/null +++ b/report_xlsx/i18n/pt_PT.po @@ -0,0 +1,24 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * report_xlsx +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-05-31 03:52+0000\n" +"PO-Revision-Date: 2017-05-31 03:52+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Portuguese (Portugal) (https://www.transifex.com/oca/teams/23907/pt_PT/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: pt_PT\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. module: report_xlsx +#: model:ir.model,name:report_xlsx.model_ir_actions_report_xml +msgid "ir.actions.report.xml" +msgstr "ir.actions.report.xml" diff --git a/report_xlsx/i18n/tr.po b/report_xlsx/i18n/tr.po new file mode 100644 index 00000000..4464c184 --- /dev/null +++ b/report_xlsx/i18n/tr.po @@ -0,0 +1,24 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * report_xlsx +# +# Translators: +# OCA Transbot , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-05-31 03:52+0000\n" +"PO-Revision-Date: 2017-05-31 03:52+0000\n" +"Last-Translator: OCA Transbot , 2017\n" +"Language-Team: Turkish (https://www.transifex.com/oca/teams/23907/tr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Language: tr\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#. module: report_xlsx +#: model:ir.model,name:report_xlsx.model_ir_actions_report_xml +msgid "ir.actions.report.xml" +msgstr "ir.actions.report.xml" From 360614df553d0abfc4b0d22f69b1d466f0d2591e Mon Sep 17 00:00:00 2001 From: Enric Tobella Date: Wed, 25 Oct 2017 18:00:03 +0200 Subject: [PATCH 06/12] [MIG] report_xlsx: Migration to 11.0 --- report_xlsx/README.rst | 25 ++++++----- report_xlsx/__init__.py | 6 +-- report_xlsx/__manifest__.py | 26 +++++++---- report_xlsx/controllers/__init__.py | 1 + report_xlsx/controllers/main.py | 44 +++++++++++++++++++ report_xlsx/demo/report.xml | 16 +++++++ report_xlsx/models/__init__.py | 4 -- report_xlsx/models/ir_report.py | 32 +++++++++++--- report_xlsx/report/__init__.py | 4 +- report_xlsx/report/report_partner_xlsx.py | 15 +++++++ report_xlsx/report/report_xlsx.py | 35 +++++---------- .../static/src/js/report/qwebactionmanager.js | 42 ++++++++++++++++++ report_xlsx/tests/__init__.py | 1 + report_xlsx/tests/test_report.py | 24 ++++++++++ report_xlsx/views/webclient_templates.xml | 13 ++++++ 15 files changed, 229 insertions(+), 59 deletions(-) create mode 100644 report_xlsx/controllers/__init__.py create mode 100644 report_xlsx/controllers/main.py create mode 100644 report_xlsx/demo/report.xml create mode 100644 report_xlsx/report/report_partner_xlsx.py create mode 100644 report_xlsx/static/src/js/report/qwebactionmanager.js create mode 100644 report_xlsx/tests/__init__.py create mode 100644 report_xlsx/tests/test_report.py create mode 100644 report_xlsx/views/webclient_templates.xml diff --git a/report_xlsx/README.rst b/report_xlsx/README.rst index bd2a96e5..a0548a83 100644 --- a/report_xlsx/README.rst +++ b/report_xlsx/README.rst @@ -1,5 +1,5 @@ .. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg - :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :target: https://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 ================ @@ -15,16 +15,22 @@ Make sure you have ``xlsxwriter`` Python module installed:: $ pip install xlsxwriter +For testing it is also necessary ``xlrd`` Python module installed:: + +$ pip install xlrd + Usage ===== -An example of XLSX report for partners: +An example of XLSX report for partners on a module called `module_name`: A python class :: - from odoo.addons.report_xlsx.report.report_xlsx import ReportXlsx + from odoo import models - class PartnerXlsx(ReportXlsx): + class PartnerXlsx(models.AbstractModel): + _name = 'report.module_name.report_name' + _inherit = 'report.report_xlsx.abstract' def generate_xlsx_report(self, workbook, data, partners): for obj in partners: @@ -34,10 +40,6 @@ A python class :: bold = workbook.add_format({'bold': True}) sheet.write(0, 0, obj.name, bold) - - PartnerXlsx('report.res.partner.xlsx', - 'res.partner') - To manipulate the ``workbook`` and ``sheet`` objects, refer to the `documentation `_ of ``xlsxwriter``. @@ -48,14 +50,14 @@ A report XML record :: model="res.partner" string="Print to XLSX" report_type="xlsx" - name="res.partner.xlsx" - file="res.partner.xlsx" + name="module_name.report_name" + file="res_partner" attachment_use="False" /> .. 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/10.0 + :target: https://runbot.odoo-community.org/runbot/143/11.0 Bug Tracker =========== @@ -72,6 +74,7 @@ Contributors ------------ * Adrien Peiffer +* Enric Tobella Maintainer ---------- diff --git a/report_xlsx/__init__.py b/report_xlsx/__init__.py index 9a384baf..2a4823f8 100644 --- a/report_xlsx/__init__.py +++ b/report_xlsx/__init__.py @@ -1,5 +1,5 @@ -# -*- coding: utf-8 -*- -# Copyright 2015 ACSONE SA/NV () -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +from . import controllers from . import models from . import report diff --git a/report_xlsx/__manifest__.py b/report_xlsx/__manifest__.py index 2d8368b3..8283dda4 100644 --- a/report_xlsx/__manifest__.py +++ b/report_xlsx/__manifest__.py @@ -1,20 +1,30 @@ -# -*- coding: utf-8 -*- # Copyright 2015 ACSONE SA/NV () -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). { 'name': "Base report xlsx", - 'summary': """ - Base module to create xlsx report""", + 'summary': "Base module to create xlsx report", 'author': 'ACSONE SA/NV,' + 'Creu Blanca,' 'Odoo Community Association (OCA)', - 'website': "http://acsone.eu", + 'website': "http://github.com/oca/reporting-engine", 'category': 'Reporting', - 'version': '10.0.1.0.1', + 'version': '11.0.1.0.0', 'license': 'AGPL-3', - 'external_dependencies': {'python': ['xlsxwriter']}, + 'external_dependencies': { + 'python': [ + 'xlsxwriter', + 'xlrd', + ], + }, 'depends': [ - 'base', + 'base', 'web', + ], + 'data': [ + 'views/webclient_templates.xml', + ], + 'demo': [ + 'demo/report.xml', ], 'installable': True, } diff --git a/report_xlsx/controllers/__init__.py b/report_xlsx/controllers/__init__.py new file mode 100644 index 00000000..12a7e529 --- /dev/null +++ b/report_xlsx/controllers/__init__.py @@ -0,0 +1 @@ +from . import main diff --git a/report_xlsx/controllers/main.py b/report_xlsx/controllers/main.py new file mode 100644 index 00000000..3c8c6a4c --- /dev/null +++ b/report_xlsx/controllers/main.py @@ -0,0 +1,44 @@ +# Copyright (C) 2017 Creu Blanca +# License AGPL-3.0 or later (https://www.gnuorg/licenses/agpl.html). + +from odoo.addons.web.controllers import main as report +from odoo.http import route, request + +import json + + +class ReportController(report.ReportController): + @route() + def report_routes(self, reportname, docids=None, converter=None, **data): + if converter == 'xlsx': + report = request.env['ir.actions.report']._get_report_from_name( + reportname) + context = dict(request.env.context) + if docids: + docids = [int(i) for i in docids.split(',')] + if data.get('options'): + data.update(json.loads(data.pop('options'))) + if data.get('context'): + # Ignore 'lang' here, because the context in data is the one + # from the webclient *but* if the user explicitely wants to + # change the lang, this mechanism overwrites it. + data['context'] = json.loads(data['context']) + if data['context'].get('lang'): + del data['context']['lang'] + context.update(data['context']) + xlsx = report.with_context(context).render_xlsx( + docids, data=data + )[0] + xlsxhttpheaders = [ + ('Content-Type', 'application/vnd.openxmlformats-' + 'officedocument.spreadsheetml.sheet'), + ('Content-Length', len(xlsx)), + ( + 'Content-Disposition', + 'attachment; filename=' + report.report_file + '.xlsx' + ) + ] + return request.make_response(xlsx, headers=xlsxhttpheaders) + return super(ReportController, self).report_routes( + reportname, docids, converter, **data + ) diff --git a/report_xlsx/demo/report.xml b/report_xlsx/demo/report.xml new file mode 100644 index 00000000..9f82fbf8 --- /dev/null +++ b/report_xlsx/demo/report.xml @@ -0,0 +1,16 @@ + + + + + diff --git a/report_xlsx/models/__init__.py b/report_xlsx/models/__init__.py index 521aa82b..54dbf3df 100644 --- a/report_xlsx/models/__init__.py +++ b/report_xlsx/models/__init__.py @@ -1,5 +1 @@ -# -*- 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/report_xlsx/models/ir_report.py b/report_xlsx/models/ir_report.py index 7bf10a9a..e295d1e7 100644 --- a/report_xlsx/models/ir_report.py +++ b/report_xlsx/models/ir_report.py @@ -1,11 +1,33 @@ -# -*- coding: utf-8 -*- # Copyright 2015 ACSONE SA/NV () -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). -from odoo import fields, models +from odoo import api, fields, models, _ +from odoo.exceptions import UserError -class IrActionsReportXml(models.Model): - _inherit = 'ir.actions.report.xml' +class ReportAction(models.Model): + _inherit = 'ir.actions.report' report_type = fields.Selection(selection_add=[("xlsx", "xlsx")]) + + @api.model + def render_xlsx(self, docids, data): + report_model_name = 'report.%s' % self.report_name + report_model = self.env.get(report_model_name) + if report_model is None: + raise UserError(_('%s model was not found' % report_model_name)) + return report_model.with_context({ + 'active_model': self.model + }).create_xlsx_report(docids, data) + + @api.model + def _get_report_from_name(self, report_name): + res = super(ReportAction, self)._get_report_from_name(report_name) + if res: + return res + report_obj = self.env['ir.actions.report'] + qwebtypes = ['xlsx'] + conditions = [('report_type', 'in', qwebtypes), + ('report_name', '=', report_name)] + context = self.env['res.users'].context_get() + return report_obj.with_context(context).search(conditions, limit=1) diff --git a/report_xlsx/report/__init__.py b/report_xlsx/report/__init__.py index 37c50512..0d77311a 100644 --- a/report_xlsx/report/__init__.py +++ b/report_xlsx/report/__init__.py @@ -1,4 +1,2 @@ -# -*- 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 +from . import report_partner_xlsx diff --git a/report_xlsx/report/report_partner_xlsx.py b/report_xlsx/report/report_partner_xlsx.py new file mode 100644 index 00000000..e4fe715a --- /dev/null +++ b/report_xlsx/report/report_partner_xlsx.py @@ -0,0 +1,15 @@ +# Copyright 2017 Creu Blanca +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +from odoo import models + + +class PartnerXlsx(models.AbstractModel): + _name = 'report.report_xlsx.partner_xlsx' + _inherit = 'report.report_xlsx.abstract' + + def generate_xlsx_report(self, workbook, data, partners): + for obj in partners: + sheet = workbook.add_worksheet('Report') + bold = workbook.add_format({'bold': True}) + sheet.write(0, 0, obj.name, bold) diff --git a/report_xlsx/report/report_xlsx.py b/report_xlsx/report/report_xlsx.py index a199beb5..45bf9cee 100644 --- a/report_xlsx/report/report_xlsx.py +++ b/report_xlsx/report/report_xlsx.py @@ -1,11 +1,9 @@ -# -*- coding: utf-8 -*- # Copyright 2015 ACSONE SA/NV () -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). -from cStringIO import StringIO +from io import BytesIO -from odoo.report.report_sxw import report_sxw -from odoo.api import Environment +from odoo import models import logging _logger = logging.getLogger(__name__) @@ -16,30 +14,17 @@ except ImportError: _logger.debug('Can not import xlsxwriter`.') -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': - return self.create_xlsx_report(ids, data, report) - return super(ReportXlsx, self).create(cr, uid, ids, data, context) - - 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() +class ReportXlsxAbstract(models.AbstractModel): + _name = 'report.report_xlsx.abstract' + + def create_xlsx_report(self, docids, data): + objs = self.env[self.env.context.get('active_model')].browse(docids) + file_data = BytesIO() workbook = xlsxwriter.Workbook(file_data, self.get_workbook_options()) self.generate_xlsx_report(workbook, data, objs) workbook.close() file_data.seek(0) - return (file_data.read(), 'xlsx') + return file_data.read(), 'xlsx' def get_workbook_options(self): return {} diff --git a/report_xlsx/static/src/js/report/qwebactionmanager.js b/report_xlsx/static/src/js/report/qwebactionmanager.js new file mode 100644 index 00000000..3d560d86 --- /dev/null +++ b/report_xlsx/static/src/js/report/qwebactionmanager.js @@ -0,0 +1,42 @@ +// © 2017 Creu Blanca +// License AGPL-3.0 or later (https://www.gnuorg/licenses/agpl.html). +odoo.define('report_xlsx.report', function(require){ +'use strict'; + +var ActionManager= require('web.ActionManager'); +var crash_manager = require('web.crash_manager'); +var framework = require('web.framework'); + +ActionManager.include({ + ir_actions_report: function (action, options){ + var self = this; + var cloned_action = _.clone(action); + if (cloned_action.report_type === 'xlsx') { + framework.blockUI(); + var report_xlsx_url = 'report/xlsx/' + cloned_action.report_name; + if(cloned_action.context.active_ids){ + report_xlsx_url += '/' + cloned_action.context.active_ids.join(','); + }else{ + report_xlsx_url += '?options=' + encodeURIComponent(JSON.stringify(cloned_action.data)); + report_xlsx_url += '&context=' + encodeURIComponent(JSON.stringify(cloned_action.context)); + } + self.getSession().get_file({ + url: report_xlsx_url, + data: {data: JSON.stringify([ + report_xlsx_url, + cloned_action.report_type + ])}, + error: crash_manager.rpc_error.bind(crash_manager), + success: function (){ + if(cloned_action && options && !cloned_action.dialog){ + options.on_close(); + } + } + }); + framework.unblockUI(); + return; + } + return self._super(action, options); + } +}); +}); diff --git a/report_xlsx/tests/__init__.py b/report_xlsx/tests/__init__.py new file mode 100644 index 00000000..32ae3c2c --- /dev/null +++ b/report_xlsx/tests/__init__.py @@ -0,0 +1 @@ +from . import test_report diff --git a/report_xlsx/tests/test_report.py b/report_xlsx/tests/test_report.py new file mode 100644 index 00000000..1222f3ad --- /dev/null +++ b/report_xlsx/tests/test_report.py @@ -0,0 +1,24 @@ +# Copyright 2017 Creu Blanca +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +from odoo.tests import common +import logging +_logger = logging.getLogger(__name__) + +try: + from xlrd import open_workbook +except ImportError: + _logger.debug('Can not import xlsxwriter`.') + + +class TestReport(common.TransactionCase): + def test_report(self): + report_object = self.env['ir.actions.report'] + report_name = 'report_xlsx.partner_xlsx' + report = report_object._get_report_from_name(report_name) + docs = self.env['res.company'].search([], limit=1).partner_id + self.assertEqual(report.report_type, 'xlsx') + rep = report.render(docs.ids, {}) + wb = open_workbook(file_contents=rep[0]) + sheet = wb.sheet_by_index(0) + self.assertEqual(sheet.cell(0, 0).value, docs.name) diff --git a/report_xlsx/views/webclient_templates.xml b/report_xlsx/views/webclient_templates.xml new file mode 100644 index 00000000..31529e56 --- /dev/null +++ b/report_xlsx/views/webclient_templates.xml @@ -0,0 +1,13 @@ + + + +