[MERGE] forward port of branch 7.0 up to f5f7609

diff --cc addons/auth_ldap/users_ldap.py
Simple merge

diff --cc addons/point_of_sale/point_of_sale.py
Simple merge

diff --cc openerp/osv/orm.py
index 8e2cd69,f934235..520b2b0
--- 1/openerp/osv/orm.py
--- 2/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@@ -53,9 -55,8 +53,10 @@@ import simplejso
  import time
  import traceback
  import types
+ from collections import defaultdict
  
 +import babel.dates
 +import dateutil.parser
  import psycopg2
  from lxml import etree
  
@@@ -4026,10 -4386,11 +4035,11 @@@ class BaseModel(object)
              for id in ids_to_update:
                  if id not in done[key]:
                      done[key][id] = True
-                     todo.append(id)
+                     if id not in deleted_related[object]:
+                         todo.append(id)
 -            self.pool.get(object)._store_set_values(cr, user, todo, fields_to_recompute, context)
 +            self.pool[model_name]._store_set_values(cr, user, todo, fields_to_recompute, context)
  
 -        self._workflow_trigger(cr, user, ids, 'trg_write', context=context)
 +        self.step_workflow(cr, user, ids, context=context)
          return True
  
      #