[MERGE] OPW 574806: process: process node active state should be evaluated on related...

bzr revid: xal@openerp.com-20120716095822-wwi39412fflq9ugb

diff --combined addons/process/process.py
index 3d82751,1578672..cc7c19f
--- 1/addons/process/process.py
--- 2/addons/process/process.py
+++ b/addons/process/process.py
@@@ -118,6 -118,7 +118,7 @@@ class process_process(osv.osv)
              data['active'] = False
              data['gray'] = False
              data['url'] = node.help_url
+             data['model_states'] = node.model_states
  
              # get assosiated workflow
              if data['model']:
@@@ -131,21 -132,21 +132,21 @@@
              if node.menu_id:
                  data['menu'] = {'name': node.menu_id.complete_name, 'id': node.menu_id.id}
  
 -            if node.model_id and node.model_id.model == res_model:
 -                try:
 -                    data['active'] = eval(node.model_states, expr_context)
 -                except Exception:
 -                    pass
 -
 -            if not data['active']:
 -                try:
 -                    gray = True
 -                    for cond in node.condition_ids:
 -                        if cond.model_id and cond.model_id.model == res_model:
 -                            gray = gray and eval(cond.model_states, expr_context)
 -                    data['gray'] = not gray
 -                except:
 -                    pass
 +            try:
 +                gray = True
 +                for cond in node.condition_ids:
 +                    if cond.model_id and cond.model_id.model == res_model:
 +                        gray = gray and eval(cond.model_states, expr_context)
 +                data['gray'] = not gray
 +            except:
 +                pass
 +
 +            if not data['gray']:
 +                if node.model_id and node.model_id.model == res_model:
 +                    try:
 +                        data['active'] = eval(node.model_states, expr_context)
 +                    except Exception:
 +                        pass
  
              nodes[node.id] = data
              if node.flow_start:
@@@ -198,6 -199,12 +199,12 @@@
              resource['name'] = refobj.name_get(context)[0][1]
              resource['perm'] = pool.get(ref_model).perm_read(cr, uid, [ref_id], context)[0]
  
+             ref_expr_context = Env(refobj, current_user)
+             try:
+                 if not nodes[nid]['gray']:
+                     nodes[nid]['active'] = eval(nodes[nid]['model_states'], ref_expr_context)
+             except:
+                 pass
              for r in relatives:
                  node = nodes[r]
                  if 'res' not in node: