From: Denis Ledoux <dle@odoo.com>
Date: Wed, 17 Sep 2014 11:39:13 +0000 (+0200)
Subject: [MERGE] forward port of branch 7.0 up to f5f7609
X-Git-Tag: 8.0.0~25^2~1^2~1
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=60a82133cc0e0d7c4879b6c518054cbd44e20c0c;p=odoo%2Fodoo.git

[MERGE] forward port of branch 7.0 up to f5f7609
---

60a82133cc0e0d7c4879b6c518054cbd44e20c0c
diff --cc openerp/osv/orm.py
index 8e2cd69,f934235..520b2b0
--- a/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
  
      #