[MERGE]

bzr revid: ovnicraft@gmail.com-20101227052633-hi3op794dkd3pn5m

1 files changed, 18 insertions, 18 deletions

diff --git a/addons/process/process.py b/addons/process/process.py
index 544ff73e761..72c8bce10b4 100644
--- a/addons/process/process.py
+++ b/addons/process/process.py
@@ -43,7 +43,7 @@ class process_process(osv.osv):
     _description = "Process"
     _columns = {
         'name': fields.char('Name', size=30,required=True, translate=True),
-        'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the process without removing it."),
+        'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the process without removing it."),
         'model_id': fields.many2one('ir.model', 'Object', ondelete='set null'),
         'note': fields.text('Notes', translate=True),
         'node_ids': fields.one2many('process.node', 'process_id', 'Nodes')
@@ -52,7 +52,7 @@ class process_process(osv.osv):
         'active' : lambda *a: True,
     }
 
-    def search_by_model(self, cr, uid, res_model, context):
+    def search_by_model(self, cr, uid, res_model, context=None):
         pool = pooler.get_pool(cr.dbname)
         model_ids = (res_model or None) and pool.get('ir.model').search(cr, uid, [('model', '=', res_model)])
 
@@ -62,7 +62,7 @@ class process_process(osv.osv):
         # search all processes
         res = pool.get('process.process').search(cr, uid, domain)
         if res:
-            res = pool.get('process.process').browse(cr, uid, res, context)
+            res = pool.get('process.process').browse(cr, uid, res, context=context)
             for process in res:
                 result.append((process.id, process.name))
             return result
@@ -70,18 +70,18 @@ class process_process(osv.osv):
         # else search process nodes
         res = pool.get('process.node').search(cr, uid, domain)
         if res:
-            res = pool.get('process.node').browse(cr, uid, res, context)
+            res = pool.get('process.node').browse(cr, uid, res, context=context)
             for node in res:
                 if (node.process_id.id, node.process_id.name) not in result:
                     result.append((node.process_id.id, node.process_id.name))
 
         return result
 
-    def graph_get(self, cr, uid, id, res_model, res_id, scale, context):
+    def graph_get(self, cr, uid, id, res_model, res_id, scale, context=None):
 
         pool = pooler.get_pool(cr.dbname)
 
-        process = pool.get('process.process').browse(cr, uid, [id], context)[0]
+        process = pool.get('process.process').browse(cr, uid, id, context=context)
 
         name = process.name
         resource = None
@@ -95,13 +95,13 @@ class process_process(osv.osv):
             states = dict(pool.get(res_model).fields_get(cr, uid, context=context).get('state', {}).get('selection', {}))
 
         if res_id:
-            current_object = pool.get(res_model).browse(cr, uid, [res_id], context)[0]
-            current_user = pool.get('res.users').browse(cr, uid, [uid], context)[0]
+            current_object = pool.get(res_model).browse(cr, uid, res_id, context=context)
+            current_user = pool.get('res.users').browse(cr, uid, uid, context=context)
             expr_context = Env(current_object, current_user)
             resource = current_object.name
             if 'state' in current_object:
                 state = states.get(current_object.state, 'N/A')
-            perm = pool.get(res_model).perm_read(cr, uid, [res_id], context)[0]
+            perm = pool.get(res_model).perm_read(cr, uid, [res_id], context=context)[0]
 
         notes = process.note or "N/A"
         nodes = {}
@@ -188,7 +188,7 @@ class process_process(osv.osv):
 
             nodes[nid]['res'] = resource = {'id': ref_id, 'model': ref_model}
 
-            refobj = pool.get(ref_model).browse(cr, uid, [ref_id], context)[0]
+            refobj = pool.get(ref_model).browse(cr, uid, ref_id, context=context)
             fields = pool.get(ref_model).fields_get(cr, uid, context=context)
 
             # check for directory_id from inherited from document module
@@ -245,15 +245,15 @@ class process_process(osv.osv):
 
         return dict(name=name, resource=resource, state=state, perm=perm, notes=notes, nodes=nodes, transitions=transitions)
 
-    def copy(self, cr, uid, id, default=None, context={}):
+    def copy(self, cr, uid, id, default=None, context=None):
         """ Deep copy the entire process.
         """
 
         if not default:
             default = {}
-
+        
         pool = pooler.get_pool(cr.dbname)
-        process = pool.get('process.process').browse(cr, uid, [id], context)[0]
+        process = pool.get('process.process').browse(cr, uid, id, context=context)
 
         nodes = {}
         transitions = {}
@@ -309,14 +309,14 @@ class process_node(osv.osv):
         'flow_start': lambda *args: False,
     }
 
-    def copy_data(self, cr, uid, id, default=None, context={}):
+    def copy_data(self, cr, uid, id, default=None, context=None):
         if not default:
             default = {}
         default.update({
             'transition_in': [],
             'transition_out': []
         })
-        return super(process_node, self).copy_data(cr, uid, id, default, context)
+        return super(process_node, self).copy_data(cr, uid, id, default, context=context)
 
 process_node()
 
@@ -366,11 +366,11 @@ class process_transition_action(osv.osv):
         'state': lambda *args: 'dummy',
     }
 
-    def copy_data(self, cr, uid, id, default=None, context={}):
+    def copy_data(self, cr, uid, id, default=None, context=None):
         if not default:
             default = {}
-
-        state = self.pool.get('process.transition.action').browse(cr, uid, [id], context)[0].state
+            
+        state = self.pool.get('process.transition.action').browse(cr, uid, id, context=context).state
         if state:
             default['state'] = state