Merge lp:~openerp-dev/openobject-server/stable-bug-818189-6.0 into lp:openobject-server/6.0

[gpa(OpenERP)]

Fixed problem of unlink tuple (5) in many2many

=== modified file 'bin/osv/fields.py'
--- bin/osv/fields.py	2011-05-25 14:59:09 +0000
+++ bin/osv/fields.py	2011-08-17 09:53:29 +0000
@@ -630,7 +630,7 @@
                 if not cr.fetchone():
                     cr.execute('insert into '+self._rel+' ('+self._id1+','+self._id2+') values (%s,%s)', (id, act[1]))
             elif act[0] == 5:
-                cr.execute('update '+self._rel+' set '+self._id2+'=null where '+self._id2+'=%s', (id,))
+                cr.execute('delete from '+self._rel+' where ' + self._id1 + ' = %s', (id,))
             elif act[0] == 6:
 
                 d1, d2,tables = obj.pool.get('ir.rule').domain_get(cr, user, obj._name, context=context)