Browse Source
Merge pull request #214 from SimoRubi/10.0-fix-report_py3o-blockingUI
[FIX] If this is not a py3o report, do nothing at all
pull/218/head
Pedro M. Baeza
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
4 additions and
4 deletions
-
report_py3o/__manifest__.py
-
report_py3o/static/src/js/py3oactionmanager.js
|
|
@ -5,7 +5,7 @@ |
|
|
|
'name': 'Py3o Report Engine', |
|
|
|
'summary': 'Reporting engine based on Libreoffice (ODT -> ODT, ' |
|
|
|
'ODT -> PDF, ODT -> DOC, ODT -> DOCX, ODS -> ODS, etc.)', |
|
|
|
'version': '10.0.2.0.1', |
|
|
|
'version': '10.0.2.0.2', |
|
|
|
'category': 'Reporting', |
|
|
|
'license': 'AGPL-3', |
|
|
|
'author': 'XCG Consulting,' |
|
|
|
|
|
@ -27,12 +27,12 @@ var trigger_download = function(session, response, c, action, options) { |
|
|
|
ActionManager.include({ |
|
|
|
ir_actions_report_xml: function(action, options) { |
|
|
|
var self = this; |
|
|
|
framework.blockUI(); |
|
|
|
action = _.clone(action); |
|
|
|
_t = core._t; |
|
|
|
|
|
|
|
// Py3o reports
|
|
|
|
if ('report_type' in action && action.report_type == 'py3o' ) { |
|
|
|
framework.blockUI(); |
|
|
|
action = _.clone(action); |
|
|
|
_t = core._t; |
|
|
|
var report_url = '/report/py3o/' + action.report_name;; |
|
|
|
// generic report: no query string
|
|
|
|
// particular: query string of action.data.form and context
|
|
|
|