[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 5098 rev-id: odo@openerp...

bzr revid: dle@openerp.com-20131009131902-a93nsbou4w8y0vlx
bzr revid: chs@openerp.com-20131009175454-j06y1ngylfbqyrpj
bzr revid: dle@openerp.com-20130918160049-fo88fl7uyhfoofkv
bzr revid: dle@openerp.com-20130924130544-kmkyr0d73cusvdav
bzr revid: odo@openerp.com-20131011134433-nyfjipvlql4xu127

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

diff --cc addons/mail/mail_thread.py
Simple merge

diff --cc addons/mail/update.py
index 94416ae,97a1474..bcf9bb8
--- 1/addons/mail/update.py
--- 2/addons/mail/update.py
+++ b/addons/mail/update.py
@@@ -5,9 -5,9 +5,9 @@@ import sy
  import urllib
  import urllib2
  
 -from openerp import pooler, SUPERUSER_ID
 -from openerp import release
 +import openerp
- from openerp import release
- from openerp.osv import fields, osv
++from openerp import release, SUPERUSER_ID
+ from openerp.osv import osv
  from openerp.tools.translate import _
  from openerp.tools.safe_eval import safe_eval
  from openerp.tools.config import config

diff --cc addons/procurement/procurement.py
index 93b9417,2bc095a..f3c49c0
--- 1/addons/procurement/procurement.py
--- 2/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@@ -371,12 -372,12 +371,11 @@@ class procurement_order(osv.osv)
                      ctx_wkf = dict(context or {})
                      ctx_wkf['workflow.trg_write.%s' % self._name] = False
                      self.write(cr, uid, [procurement.id], {'message': message},context=ctx_wkf)
-                     self.message_post(cr, uid, [procurement.id], body=message, context=context)
          return ok
  
 -    def _workflow_trigger(self, cr, uid, ids, trigger, context=None):
 -        """ Don't trigger workflow for the element specified in trigger
 -        """
 -        wkf_op_key = 'workflow.%s.%s' % (trigger, self._name)
 +    def step_workflow(self, cr, uid, ids, context=None):
 +        """ Don't trigger workflow for the element specified in trigger """
 +        wkf_op_key = 'workflow.trg_write.%s' % self._name
          if context and not context.get(wkf_op_key, True):
              # make sure we don't have a trigger loop while processing triggers
              return 

diff --cc addons/product/product_view.xml
Simple merge

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

diff --cc addons/stock/product_view.xml
Simple merge

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

diff --cc openerp/addons/base/ir/ir_mail_server.py
Simple merge

diff --cc openerp/addons/base/ir/ir_model.py
index 437095e,14061e4..2d7bec3
--- 1/openerp/addons/base/ir/ir_model.py
--- 2/openerp/addons/base/ir/ir_model.py
+++ b/openerp/addons/base/ir/ir_model.py
@@@ -197,7 -197,8 +197,8 @@@ class ir_model(osv.osv)
                  field_state='manual',
                  select=vals.get('select_level', '0'),
                  update_custom_fields=True)
 -            self.pool.get(vals['model'])._auto_init(cr, ctx)
 -            self.pool.get(vals['model'])._auto_end(cr, ctx) # actually create FKs!
 +            self.pool[vals['model']]._auto_init(cr, ctx)
++            self.pool[vals['model']]._auto_end(cr, ctx) # actually create FKs!
              openerp.modules.registry.RegistryManager.signal_registry_change(cr.dbname)
          return res
  
@@@ -355,7 -356,8 +356,8 @@@ class ir_model_fields(osv.osv)
                      field_state='manual',
                      select=vals.get('select_level', '0'),
                      update_custom_fields=True)
 -                self.pool.get(vals['model'])._auto_init(cr, ctx)
 -                self.pool.get(vals['model'])._auto_end(cr, ctx) # actually create FKs!
 +                self.pool[vals['model']]._auto_init(cr, ctx)
++                self.pool[vals['model']]._auto_end(cr, ctx) # actually create FKs!
                  openerp.modules.registry.RegistryManager.signal_registry_change(cr.dbname)
  
          return res

diff --cc openerp/addons/base/ir/ir_translation.py
Simple merge

diff --cc openerp/modules/registry.py
index 2569bf4,8c68663..98a4260
--- 1/openerp/modules/registry.py
--- 2/openerp/modules/registry.py
+++ b/openerp/modules/registry.py
@@@ -303,10 -290,8 +303,8 @@@ class RegistryManager(object)
                  # Check if the model caches must be invalidated (e.g. after a write
                  # occured on another process). Don't clear right after a registry
                  # has been reload.
-                 elif registry.base_cache_signaling_sequence != c:
 -                if registry.base_cache_signaling_sequence > 1 and registry.base_cache_signaling_sequence != c:
++                elif registry.base_cache_signaling_sequence > 1 and registry.base_cache_signaling_sequence != c:
                      _logger.info("Invalidating all model caches after database signaling.")
-                     registry.base_cache_signaling_sequence = c
                      registry.clear_caches()
                      registry.reset_any_cache_cleared()
                      # One possible reason caches have been invalidated is the

diff --cc openerp/osv/fields.py
Simple merge

diff --cc openerp/osv/orm.py
Simple merge

diff --cc openerp/tools/translate.py
Simple merge