Merge lp:~openerp-dev/openobject-server/6.0-opw-586600-rgo into lp:openobject-server/6.0

[Ravi Gohil (OpenERP)]

Steps to reproduce issue:
1) Create 2 new accounts, one of type=receivable and one of type=payable,
2) Create a new partner and set these accounts in the field account receivable, account payable,
3) Select the one of the account you've created and click on delete,
You will have the warning message: You cannot remove/deactivate an account which is set as a property to any Partner.

4) Delete the partner you've created an retry to delete the account.
You will still have the same error message.

The reason for this is that the constraint wont allow to delete the account if it is referring to properties, but the properties are no longer needed as the resource itself was deleted.

This fix will remove the properties at the time of deletion of resource record.

Kindly review the fix.

Thanks.

=== modified file 'bin/osv/orm.py'
--- bin/osv/orm.py	2012-10-03 13:00:55 +0000
+++ bin/osv/orm.py	2013-02-21 07:31:20 +0000
@@ -3256,13 +3256,19 @@
 
         self.pool.get('ir.model.access').check(cr, uid, self._name, 'unlink', context=context)
 
-        properties = self.pool.get('ir.property')
+        ir_property = self.pool.get('ir.property')
+
+        # Check if the records are used as default properties.
         domain = [('res_id', '=', False),
                   ('value_reference', 'in', ['%s,%s' % (self._name, i) for i in ids]),
                  ]
-        if properties.search(cr, uid, domain, context=context):
+        if ir_property.search(cr, uid, domain, context=context):
             raise except_orm(_('Error'), _('Unable to delete this document because it is used as a default property'))
 
+        # Delete the records' properties.
+        property_ids = ir_property.search(cr, uid, [('res_id', 'in', ['%s,%s' % (self._name, i) for i in ids])], context=context)
+        ir_property.unlink(cr, uid, property_ids, context=context)
+
         wf_service = netsvc.LocalService("workflow")
         for oid in ids:
             wf_service.trg_delete(uid, self._name, oid, cr)