From a0ea75e5f1dea41452e394996b60821139e29daf Mon Sep 17 00:00:00 2001 From: Arthur Maniet Date: Thu, 1 Oct 2015 10:36:19 +0200 Subject: [PATCH] [REVERT] shema changes introduced in 9927f960f1c7f5c49416ae8fa0cf385f30349335 --- .../static/src/js/account_reconciliation_widgets.js | 8 +++++--- addons/base_iban/base_iban.py | 4 ++-- openerp/addons/base/res/res_bank.py | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/addons/account/static/src/js/account_reconciliation_widgets.js b/addons/account/static/src/js/account_reconciliation_widgets.js index b705b3ddb00..313512d482e 100644 --- a/addons/account/static/src/js/account_reconciliation_widgets.js +++ b/addons/account/static/src/js/account_reconciliation_widgets.js @@ -1081,12 +1081,13 @@ var abstractReconciliationLine = Widget.extend({ self.$el.wrap(container); return $.when(self.$el.parent().animate({height: 0, marginBottom: 0}, speed*height/150)).then(function() { $.each(self.$(".bootstrap_popover"), function(){ $(this).popover('destroy') }); - _.each(self.getChildren(), function(o){ o.destroy() }); - self.$el.parent().remove(); return $.when(self.destroy()).then(function(){ if (doPostMortemProcess) postMortemProcess.call(self); }); + self.$el.parent().hide(); + if (doPostMortemProcess) + postMortemProcess.call(self); }); }, @@ -1754,7 +1755,8 @@ var bankStatementReconciliationLine = abstractReconciliationLine.extend({ } }; self.field_manager.fields_view.fields["change_partner"] = change_partner_field; - self.change_partner_field = new FieldMany2One(self.field_manager, change_partner_node); + var field_object = new FieldMany2One(self.field_manager, change_partner_node); + self.change_partner_field = field_object; self.change_partner_field.appendTo(self.$(".change_partner_container")); self.change_partner_field.on("change:value", self.change_partner_field, function() { self.changePartner(this.get_value()); diff --git a/addons/base_iban/base_iban.py b/addons/base_iban/base_iban.py index 14507379439..c7d80f32705 100644 --- a/addons/base_iban/base_iban.py +++ b/addons/base_iban/base_iban.py @@ -70,13 +70,13 @@ class ResPartnerBank(models.Model): return super(ResPartnerBank, self).write(vals) @api.one - @api.constrains('acc_type', 'acc_number') + @api.constrains('acc_number') def _check_iban(self): if self.acc_type == 'iban': validate_iban(self.acc_number) @api.one - @api.constrains('acc_type', 'bank_bic') + @api.constrains('acc_number', 'bank_bic') def _check_bank_bic(self): if self.acc_type == 'iban' and not self.bank_bic: raise ValidationError(_("Please define BIC/Swift code on bank for bank type IBAN Account to make valid payments.")) diff --git a/openerp/addons/base/res/res_bank.py b/openerp/addons/base/res/res_bank.py index fdc1800fb82..31af80d893c 100644 --- a/openerp/addons/base/res/res_bank.py +++ b/openerp/addons/base/res/res_bank.py @@ -55,7 +55,7 @@ class ResPartnerBank(models.Model): _description = 'Bank Accounts' _order = 'sequence' - acc_type = fields.Char(compute='_compute_acc_type', store=True, help='Bank account type, inferred from account number') + acc_type = fields.Char(compute='_compute_acc_type', help='Bank account type, inferred from account number') acc_number = fields.Char('Account Number', required=True) sanitized_acc_number = fields.Char(compute='_compute_sanitized_acc_number', string='Sanitized Account Number', readonly=True, store=True) partner_id = fields.Many2one('res.partner', 'Account Holder', ondelete='cascade', select=True, domain=['|', ('is_company', '=', True), ('parent_id', '=', False)])