[REF]: use openerp.workflow instead of LocalService("workflow").

bzr revid: vmt@openerp.com-20130326162040-kkq46wrur3pgn6eh

7 files changed, 15 insertions, 23 deletions

diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py
index 3e29a0a9b97..29cebd81823 100644
--- a/openerp/addons/base/ir/ir_actions.py
+++ b/openerp/addons/base/ir/ir_actions.py
@@ -26,13 +26,14 @@ from socket import gethostname
 import time
 
 from openerp import SUPERUSER_ID
-from openerp import netsvc, tools
+from openerp import tools
 from openerp.osv import fields, osv
 import openerp.report.interface
 from openerp.report.report_sxw import report_sxw, report_rml
 from openerp.tools.config import config
 from openerp.tools.safe_eval import safe_eval as eval
 from openerp.tools.translate import _
+import openerp.workflow
 
 _logger = logging.getLogger(__name__)
 
@@ -645,12 +646,11 @@ class actions_server(osv.osv):
                     _logger.warning('Failed to send email to: %s', addresses)
 
             if action.state == 'trigger':
-                wf_service = netsvc.LocalService("workflow")
                 model = action.wkf_model_id.model
                 m2o_field_name = action.trigger_obj_id.name
                 target_id = obj_pool.read(cr, uid, context.get('active_id'), [m2o_field_name])[m2o_field_name]
                 target_id = target_id[0] if isinstance(target_id,tuple) else target_id
-                wf_service.trg_validate(uid, model, int(target_id), action.trigger_name, cr)
+                openerp.workflow.trg_validate(uid, model, int(target_id), action.trigger_name, cr)
 
             if action.state == 'sms':
                 #TODO: set the user and password from the system
diff --git a/openerp/addons/base/ir/ir_model.py b/openerp/addons/base/ir/ir_model.py
index b6bb0c5e227..088dfdd8a3a 100644
--- a/openerp/addons/base/ir/ir_model.py
+++ b/openerp/addons/base/ir/ir_model.py
@@ -26,7 +26,7 @@ import types
 
 import openerp
 from openerp import SUPERUSER_ID
-from openerp import netsvc, pooler, tools
+from openerp import pooler, tools
 from openerp.osv import fields,osv
 from openerp.osv.orm import Model
 from openerp.tools.safe_eval import safe_eval as eval
@@ -1047,10 +1047,9 @@ class ir_model_data(osv.osv):
                 wkf_todo.extend(cr.fetchall())
                 cr.execute("update wkf_transition set condition='True', group_id=NULL, signal=NULL,act_to=act_from,act_from=%s where act_to=%s", (res_id,res_id))
 
-        wf_service = netsvc.LocalService("workflow")
         for model,res_id in wkf_todo:
             try:
-                wf_service.trg_write(uid, model, res_id, cr)
+                openerp.workflow.trg_write(uid, model, res_id, cr)
             except Exception:
                 _logger.info('Unable to force processing of workflow for item %s@%s in order to leave activity to be deleted', res_id, model, exc_info=True)
 
diff --git a/openerp/addons/base/ir/workflow/workflow.py b/openerp/addons/base/ir/workflow/workflow.py
index 46884c5035b..0ce951940a9 100644
--- a/openerp/addons/base/ir/workflow/workflow.py
+++ b/openerp/addons/base/ir/workflow/workflow.py
@@ -21,7 +21,7 @@
 
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
-from openerp import netsvc
+import openerp.workflow
 
 class workflow(osv.osv):
     _name = "workflow"
@@ -40,8 +40,7 @@ class workflow(osv.osv):
     def write(self, cr, user, ids, vals, context=None):
         if not context:
             context={}
-        wf_service = netsvc.LocalService("workflow")
-        wf_service.clear_cache(cr, user)
+        openerp.workflow.clear_cache(cr, user)
         return super(workflow, self).write(cr, user, ids, vals, context=context)
 
     def get_active_workitems(self, cr, uid, res, res_id, context=None):
@@ -62,8 +61,7 @@ class workflow(osv.osv):
     def create(self, cr, user, vals, context=None):
         if not context:
             context={}
-        wf_service = netsvc.LocalService("workflow")
-        wf_service.clear_cache(cr, user)
+        openerp.workflow.clear_cache(cr, user)
         return super(workflow, self).create(cr, user, vals, context=context)
 
 workflow()
diff --git a/openerp/modules/graph.py b/openerp/modules/graph.py
index 56b17e3239a..0e14480d8ac 100644
--- a/openerp/modules/graph.py
+++ b/openerp/modules/graph.py
@@ -36,8 +36,6 @@ from openerp.tools.safe_eval import safe_eval as eval
 import openerp.pooler as pooler
 from openerp.tools.translate import _
 
-import openerp.netsvc as netsvc
-
 import zipfile
 import openerp.release as release
 
diff --git a/openerp/modules/migration.py b/openerp/modules/migration.py
index e0faa77c3a4..16de56879b9 100644
--- a/openerp/modules/migration.py
+++ b/openerp/modules/migration.py
@@ -36,8 +36,6 @@ from openerp.tools.safe_eval import safe_eval as eval
 import openerp.pooler as pooler
 from openerp.tools.translate import _
 
-import openerp.netsvc as netsvc
-
 import zipfile
 import openerp.release as release
 
diff --git a/openerp/tools/convert.py b/openerp/tools/convert.py
index 59e66512da4..b462b6d6aef 100644
--- a/openerp/tools/convert.py
+++ b/openerp/tools/convert.py
@@ -29,7 +29,9 @@ import sys
 
 # for eval context:
 import time
-import openerp.release as release
+
+import openerp.release
+import openerp.workflow
 
 import assertion_report
 
@@ -85,7 +87,7 @@ def _get_idref(self, cr, uid, model_str, context, idref):
                   time=time,
                   DateTime=datetime,
                   timedelta=timedelta,
-                  version=release.major_version,
+                  version=openerp.release.major_version,
                   ref=_ref(self, cr),
                   pytz=pytz)
     if len(model_str):
@@ -526,9 +528,7 @@ form: module.record_id""" % (xml_id,)
             id = _eval_xml(self, rec[0], self.pool, cr, self.uid, self.idref)
 
         uid = self.get_uid(cr, self.uid, data_node, rec)
-        import openerp.netsvc as netsvc
-        wf_service = netsvc.LocalService("workflow")
-        wf_service.trg_validate(uid, model,
+        openerp.workflow.trg_validate(uid, model,
             id,
             str(rec.get('action','')), cr)
 
diff --git a/openerp/tools/yaml_import.py b/openerp/tools/yaml_import.py
index 2fffb07daaf..5cad12d76c1 100644
--- a/openerp/tools/yaml_import.py
+++ b/openerp/tools/yaml_import.py
@@ -7,6 +7,7 @@ import logging
 
 import openerp.pooler as pooler
 import openerp.sql_db as sql_db
+import openerp.workflow
 import misc
 from config import config
 import yaml_tag
@@ -584,9 +585,7 @@ class YamlInterpreter(object):
         signals=[x['signal'] for x in self.cr.dictfetchall()]
         if workflow.action not in signals:
             raise YamlImportException('Incorrect action %s. No such action defined' % workflow.action)
-        import openerp.netsvc as netsvc
-        wf_service = netsvc.LocalService("workflow")
-        wf_service.trg_validate(uid, workflow.model, id, workflow.action, self.cr)
+        openerp.workflow.trg_validate(uid, workflow.model, id, workflow.action, self.cr)
 
     def _eval_params(self, model, params):
         args = []