From b2a9f7d431008943f46acc3fdd1b141f62530b5d Mon Sep 17 00:00:00 2001 From: "Adrien Peiffer (ACSONE)" Date: Mon, 4 Apr 2016 20:28:23 +0200 Subject: [PATCH] [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