diff --git a/addons/account/account.py b/addons/account/account.py index 26bc467d644..d899d9284ba 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -321,8 +321,9 @@ class account_account(osv.osv): if 'active' in vals and not vals['active']: line_obj = self.pool.get('account.move.line') if line_obj.search(cr, uid, [('account_id', 'in', ids)]): - raise osv.except_osv('Error!', 'You can not deactivate a account with entry lines!') - super(account_account, self).write(cr, uid, ids, vals, context=context) + vals=vals.copy() + del vals['active'] + return super(account_account, self).write(cr, uid, ids, vals, context=context) account_account() class account_journal_view(osv.osv): diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 1aeb243dbdc..4a32562e33e 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -113,6 +113,7 @@ + @@ -129,7 +130,6 @@ -