[MERGE] latest trunk

bzr revid: odo@openerp.com-20110913144600-ve4vb5po9vi3edw4

diff --cc openerp/addons/base/ir/ir_actions.py
index 93cefe8,3ce3d9c..3442ecd
--- 1/openerp/addons/base/ir/ir_actions.py
--- 2/openerp/addons/base/ir/ir_actions.py
+++ b/openerp/addons/base/ir/ir_actions.py
@@@ -622,16 -601,16 +622,18 @@@ class actions_server(osv.osv)
              context = {}
          user = self.pool.get('res.users').browse(cr, uid, uid)
          for action in self.browse(cr, uid, ids, context):
+             obj = None
 +            obj_pool = self.pool.get(action.model_id.model)
-             obj = obj_pool.browse(cr, uid, context['active_id'], context=context)
+             if context.get('active_model') == action.model_id.model and context.get('active_id'):
 -                obj_pool = self.pool.get(action.model_id.model)
+                 obj = obj_pool.browse(cr, uid, context['active_id'], context=context)
              cxt = {
 -                'context': dict(context), # copy context to prevent side-effects of eval
 +                'self': obj_pool,
                  'object': obj,
 +                'obj': obj,
 +                'pool': self.pool,
                  'time': time,
                  'cr': cr,
 -                'pool': self.pool,
 +                'context': dict(context), # copy context to prevent side-effects of eval
                  'uid': uid,
                  'user': user
              }

diff --cc openerp/addons/base/res/res_lang.py
index f6743a5,f6743a5..5084124
--- 1/openerp/addons/base/res/res_lang.py
--- 2/openerp/addons/base/res/res_lang.py
+++ b/openerp/addons/base/res/res_lang.py
@@@ -194,7 -194,7 +194,7 @@@ class lang(osv.osv)
              trans_obj.unlink(cr, uid, trans_ids, context=context)
          return super(lang, self).unlink(cr, uid, ids, context=context)
  
--    def format(self, cr, uid, ids, percent, value, grouping=False, monetary=False):
++    def format(self, cr, uid, ids, percent, value, grouping=False, monetary=False, context=None):
          """ Format() will return the language-specific output for float values"""
  
          if percent[0] != '%':

diff --cc openerp/addons/base/rng/view.rng
Simple merge