Techsystech
/
account-financial-reporting
mirror of https://github.com/OCA/account-financial-reporting.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[FIX][mis_builder] Fix the creation of a new mis.report.instance.

pull/189/head
Adrien Peiffer (ACSONE) 2016-03-16 10:16:01 +01:00 committed by Stéphane Bidoul
parent f6fd1c88f4
commit cafbdda1c0
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mis_builder/models/mis_builder.py
View File

@ -629,12 +629,12 @@ class MisReportInstance(models.Model):
@api.multi @api.multi
def display_settings(self): def display_settings(self):
self.ensure_one() assert len(self.ids) <= 1
view_id = self.env.ref('mis_builder.mis_report_instance_view_form') view_id = self.env.ref('mis_builder.mis_report_instance_view_form')
return { return {
'type': 'ir.actions.act_window', 'type': 'ir.actions.act_window',
'res_model': 'mis.report.instance', 'res_model': 'mis.report.instance',
'res_id': self.id, 'res_id': self.id if self.id else False,
'view_mode': 'form', 'view_mode': 'form',
'view_type': 'form', 'view_type': 'form',
'views': [(view_id.id, 'form')], 'views': [(view_id.id, 'form')],

11
mis_builder/static/src/js/mis_builder.js
View File

@ -24,14 +24,23 @@ var MisReport = form_common.FormWidget.extend({
reload_widget: function() { reload_widget: function() {
var self = this var self = this
self.mis_report_instance_id = self.getParent().datarecord.id self.mis_report_instance_id = self.getParent().datarecord.id
if (self.mis_report_instance_id) {
self.generate_content(); self.generate_content();
} else {
self.display_settings();
}
}, },
start: function() { start: function() {
this._super.apply(this, arguments); this._super.apply(this, arguments);
var self = this; var self = this;
self.mis_report_instance_id = self.getParent().datarecord.id self.mis_report_instance_id = self.getParent().datarecord.id
if (self.mis_report_instance_id) {
self.getParent().dataset.context['no_destroy'] = true;
self.generate_content(); self.generate_content();
} else {
self.display_settings();
}
}, },
get_context: function() { get_context: function() {
@ -94,7 +103,7 @@ var MisReport = form_common.FormWidget.extend({
self.$(".oe_mis_builder_print").click(_.bind(this.print, this)); self.$(".oe_mis_builder_print").click(_.bind(this.print, this));
self.$(".oe_mis_builder_export").click(_.bind(this.export_pdf, this)); self.$(".oe_mis_builder_export").click(_.bind(this.export_pdf, this));
self.$(".oe_mis_builder_settings").click(_.bind(this.display_settings, this)); self.$(".oe_mis_builder_settings").click(_.bind(this.display_settings, this));
var Users = new instance.web.Model('res.users'); var Users = new Model('res.users');
Users.call('has_group', ['account.group_account_user']).done(function (res) { Users.call('has_group', ['account.group_account_user']).done(function (res) {
if (res) { if (res) {
self.$(".oe_mis_builder_settings").show(); self.$(".oe_mis_builder_settings").show();