diff --git a/report_py3o/demo/report_py3o.xml b/report_py3o/demo/report_py3o.xml index 240960ea..bc3d06ec 100644 --- a/report_py3o/demo/report_py3o.xml +++ b/report_py3o/demo/report_py3o.xml @@ -1,20 +1,17 @@ - + - - - Py3o Demo Report - ir.actions.report - res.users - py3o_user_info - py3o - odt - report_py3o - demo/res_user.odt - - report + Py3o Demo Report + ir.actions.report + res.users + py3o_user_info + py3o + odt + report_py3o + demo/res_user.odt + + report - - + diff --git a/report_py3o/static/src/js/py3oactionmanager.js b/report_py3o/static/src/js/py3oactionmanager.js index 70ff2108..5c92fb26 100644 --- a/report_py3o/static/src/js/py3oactionmanager.js +++ b/report_py3o/static/src/js/py3oactionmanager.js @@ -1,39 +1,42 @@ /* Copyright 2017-2018 ACSONE SA/NV * License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). */ -odoo.define('report_py3o.report', function (require) { +odoo.define("report_py3o.report", function (require) { "use strict"; - var ActionManager = require('web.ActionManager'); + var ActionManager = require("web.ActionManager"); ActionManager.include({ _executeReportAction: function (action, options) { - // Py3o reports - if ('report_type' in action && action.report_type === 'py3o' ) { - return this._triggerDownload(action, options, 'py3o'); + // Py3o reports + if ("report_type" in action && action.report_type === "py3o") { + return this._triggerDownload(action, options, "py3o"); } return this._super.apply(this, arguments); - }, _makeReportUrls: function (action) { var reportUrls = this._super.apply(this, arguments); - reportUrls.py3o = '/report/py3o/' + action.report_name; + reportUrls.py3o = "/report/py3o/" + action.report_name; // We may have to build a query string with `action.data`. It's the place // were report's using a wizard to customize the output traditionally put // their options. - if (_.isUndefined(action.data) || _.isNull(action.data) || - _.isObject(action.data) && _.isEmpty(action.data)) { + if ( + _.isUndefined(action.data) || + _.isNull(action.data) || + _.isObject(action.data) && _.isEmpty(action.data) + ) { if (action.context.active_ids) { - var activeIDsPath = '/' + action.context.active_ids.join(','); + var activeIDsPath = "/" + action.context.active_ids.join(","); reportUrls.py3o += activeIDsPath; } } else { - var serializedOptionsPath = '?options=' + encodeURIComponent(JSON.stringify(action.data)); - serializedOptionsPath += '&context=' + encodeURIComponent(JSON.stringify(action.context)); + var serializedOptionsPath = + "?options=" + encodeURIComponent(JSON.stringify(action.data)); + serializedOptionsPath += + "&context=" + encodeURIComponent(JSON.stringify(action.context)); reportUrls.py3o += serializedOptionsPath; } return reportUrls; }, }); - }); diff --git a/report_py3o/views/ir_actions_report.xml b/report_py3o/views/ir_actions_report.xml index eae06332..d7dd54be 100644 --- a/report_py3o/views/ir_actions_report.xml +++ b/report_py3o/views/ir_actions_report.xml @@ -1,51 +1,52 @@ - + - - py3o_report_view ir.actions.report - - + + - - + - + - + - - - py3o_report_search_view ir.actions.report - + - + - diff --git a/report_py3o/views/menu.xml b/report_py3o/views/menu.xml index 4ee9c005..87385eca 100644 --- a/report_py3o/views/menu.xml +++ b/report_py3o/views/menu.xml @@ -1,8 +1,4 @@ - + - - - + diff --git a/report_py3o/views/py3o_template.xml b/report_py3o/views/py3o_template.xml index 95f752d8..f6f7be80 100644 --- a/report_py3o/views/py3o_template.xml +++ b/report_py3o/views/py3o_template.xml @@ -1,6 +1,5 @@ - + - py3o.template.configuration.search.view py3o.template @@ -9,13 +8,15 @@ - + - py3o.template.configuration.form.view py3o.template @@ -29,7 +30,6 @@ - py3o.template.configuration.tree.view py3o.template @@ -40,15 +40,14 @@ - Py3o Templates py3o.template tree,form - - - + action="py3o_template_configuration_action" + /> diff --git a/report_py3o/views/report_py3o.xml b/report_py3o/views/report_py3o.xml index d2702a30..41d28d45 100644 --- a/report_py3o/views/report_py3o.xml +++ b/report_py3o/views/report_py3o.xml @@ -1,8 +1,11 @@ - + - +