From ea64fc2558693cd790404d903153800336f6ac67 Mon Sep 17 00:00:00 2001 From: kongrattapong Date: Fri, 21 Feb 2020 17:19:02 +0700 Subject: [PATCH] [MIG] report_csv: Migration to 13.0 --- report_csv/README.rst | 11 +++-- report_csv/__manifest__.py | 4 +- report_csv/readme/CONTRIBUTORS.rst | 1 + report_csv/report/report_partner_csv.py | 1 + report_csv/static/description/index.html | 7 +-- .../static/src/js/report/qwebactionmanager.js | 46 +++++++++---------- report_csv/tests/test_report.py | 2 + 7 files changed, 39 insertions(+), 33 deletions(-) diff --git a/report_csv/README.rst b/report_csv/README.rst index fc2942fce..3bafebf45 100644 --- a/report_csv/README.rst +++ b/report_csv/README.rst @@ -14,13 +14,13 @@ Base report csv :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Freporting--engine-lightgray.png?logo=github - :target: https://github.com/OCA/reporting-engine/tree/12.0/report_csv + :target: https://github.com/OCA/reporting-engine/tree/13.0-mig-report_csv/report_csv :alt: OCA/reporting-engine .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/reporting-engine-12-0/reporting-engine-12-0-report_csv + :target: https://translation.odoo-community.org/projects/reporting-engine-13-0-mig-report_csv/reporting-engine-13-0-mig-report_csv-report_csv :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/143/12.0 + :target: https://runbot.odoo-community.org/runbot/143/13.0-mig-report_csv :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -80,7 +80,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 `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -97,6 +97,7 @@ Contributors * Enric Tobella * Jaime Arroyo +* Rattapong Chokmasermkul Maintainers ~~~~~~~~~~~ @@ -111,6 +112,6 @@ 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. -This module is part of the `OCA/reporting-engine `_ project on GitHub. +This module is part of the `OCA/reporting-engine `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/report_csv/__manifest__.py b/report_csv/__manifest__.py index d4d909afa..291be37f1 100644 --- a/report_csv/__manifest__.py +++ b/report_csv/__manifest__.py @@ -3,10 +3,10 @@ { "name": "Base report csv", "summary": "Base module to create csv report", - "author": "Creu Blanca," "Odoo Community Association (OCA)", + "author": "Creu Blanca, Odoo Community Association (OCA)", "website": "https://github.com/oca/reporting-engine", "category": "Reporting", - "version": "12.0.1.0.0", + "version": "13.0.1.0.0", "license": "AGPL-3", "external_dependencies": {"python": ["csv"]}, "depends": ["base", "web"], diff --git a/report_csv/readme/CONTRIBUTORS.rst b/report_csv/readme/CONTRIBUTORS.rst index 94e7b0a40..1ee404f73 100644 --- a/report_csv/readme/CONTRIBUTORS.rst +++ b/report_csv/readme/CONTRIBUTORS.rst @@ -1,2 +1,3 @@ * Enric Tobella * Jaime Arroyo +* Rattapong Chokmasermkul diff --git a/report_csv/report/report_partner_csv.py b/report_csv/report/report_partner_csv.py index 904a2e2b5..247c906e1 100644 --- a/report_csv/report/report_partner_csv.py +++ b/report_csv/report/report_partner_csv.py @@ -8,6 +8,7 @@ from odoo import models class PartnerCSV(models.AbstractModel): _name = "report.report_csv.partner_csv" _inherit = "report.report_csv.abstract" + _description = "Report Partner to CSV" def generate_csv_report(self, writer, data, partners): writer.writeheader() diff --git a/report_csv/static/description/index.html b/report_csv/static/description/index.html index 5e2997e20..acc9617f5 100644 --- a/report_csv/static/description/index.html +++ b/report_csv/static/description/index.html @@ -367,7 +367,7 @@ ul.auto-toc { !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: AGPL-3 OCA/reporting-engine Translate me on Weblate Try me on Runbot

+

Beta License: AGPL-3 OCA/reporting-engine Translate me on Weblate Try me on Runbot

This module provides a basic report class to generate csv report.

Table of contents

@@ -427,7 +427,7 @@ class PartnerCSV(models.AbstractModel):

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.

+feedback.

Do not contact contributors directly about support or help with technical issues.

@@ -443,6 +443,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
@@ -452,7 +453,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome

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.

-

This module is part of the OCA/reporting-engine project on GitHub.

+

This module is part of the OCA/reporting-engine project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

diff --git a/report_csv/static/src/js/report/qwebactionmanager.js b/report_csv/static/src/js/report/qwebactionmanager.js index 796f188cb..86db5139e 100644 --- a/report_csv/static/src/js/report/qwebactionmanager.js +++ b/report_csv/static/src/js/report/qwebactionmanager.js @@ -5,7 +5,6 @@ odoo.define("report_csv.report", function (require) { var core = require("web.core"); var ActionManager = require("web.ActionManager"); - var crash_manager = require("web.crash_manager"); var framework = require("web.framework"); var session = require("web.session"); var _t = core._t; @@ -13,8 +12,8 @@ odoo.define("report_csv.report", function (require) { ActionManager.include({ _downloadReportCSV: function (url, actions) { + var self = this; framework.blockUI(); - var def = $.Deferred(); var type = "csv"; var cloned_action = _.clone(actions); @@ -30,28 +29,29 @@ odoo.define("report_csv.report", function (require) { url += "&context=" + encodeURIComponent(JSON.stringify(cloned_action.context)); } - var blocked = !session.get_file({ - url: url, - data: { - data: JSON.stringify([url, type]), - }, - success: def.resolve.bind(def), - error: function () { - crash_manager.rpc_error.apply(crash_manager, arguments); - def.reject(); - }, - complete: framework.unblockUI, + return new Promise(function (resolve, reject) { + var blocked = !session.get_file({ + url: url, + data: { + data: JSON.stringify([url, type]), + }, + success: resolve, + error: (error) => { + self.call('crash_manager', 'rpc_error', error); + reject(); + }, + complete: framework.unblockUI, + }); + if (blocked) { + // AAB: this check should be done in get_file service directly, + // should not be the concern of the caller (and that way, get_file + // could return a deferred) + var message = _t('A popup window with your report was blocked. You ' + + 'may need to change your browser settings to allow ' + + 'popup windows for this page.'); + this.do_warn(_t('Warning'), message, true); + } }); - if (blocked) { - // AAB: this check should be done in get_file service directly, - // should not be the concern of the caller (and that way, get_file - // could return a deferred) - var message = _t('A popup window with your report was blocked. You ' + - 'may need to change your browser settings to allow ' + - 'popup windows for this page.'); - this.do_warn(_t('Warning'), message, true); - } - return def; }, _triggerDownload: function (action, options, type) { diff --git a/report_csv/tests/test_report.py b/report_csv/tests/test_report.py index 84c9a112d..32239262f 100644 --- a/report_csv/tests/test_report.py +++ b/report_csv/tests/test_report.py @@ -24,6 +24,8 @@ class TestReport(common.TransactionCase): self.docs = self.env["res.company"].search([], limit=1).partner_id def test_report(self): + # Test if not res: + self.env["ir.actions.report"]._get_report_from_name("TEST") report = self.report self.assertEqual(report.report_type, "csv") rep = report.render(self.docs.ids, {})