Merge lp:~openerp-dev/openobject-addons/trunk-bug-1096439-hip into lp:openobject-addons

[Hiral Patel (OpenERP)]

[Phil Frost (bitglue)]

This is an incomplete fix. Does a user know what "a property" is? Even if they do, how would they know which object's proprerty is referencing the account they are attempting to delete? This error isn't actionable or useful. It might as well be "you can't do that because there was a problem."

review: Disapprove

Unmerged revisions

8496. By Hiral Patel (OpenERP) on 2013-01-07

[IMP] Improve code

8495. By Hiral Patel (OpenERP) on 2013-01-07

[trunk][FIX] You cannot remove/deactivate an account which is set on a customer or supplier

=== modified file 'account/account.py'
--- account/account.py	2012-12-19 11:34:13 +0000
+++ account/account.py	2013-01-07 09:04:21 +0000
@@ -638,7 +638,7 @@
         value = 'account.account,' + str(ids[0])
         partner_prop_acc = self.pool.get('ir.property').search(cr, uid, [('value_reference','=',value)], context=context)
         if partner_prop_acc:
-            raise osv.except_osv(_('Warning!'), _('You cannot remove/deactivate an account which is set on a customer or supplier.'))
+            raise osv.except_osv(_('Warning!'), _('You cannot remove/deactivate an account which is set as a property.'))
         return True
 
     def _check_allow_type_change(self, cr, uid, ids, new_type, context=None):