From c0e1fc3452362e4479351a8be040679c879ccc02 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Mon, 15 Dec 2008 18:00:34 +0530
Subject: [PATCH] merginf from the trunk

bzr revid: mga@tinyerp.com-20081215123034-1gnqhxeteza8e183
---
 bin/addons/base/ir/ir_actions.py | 13 ++-----------
 bin/netsvc.py                    |  1 +
 bin/sql_db.py                    |  2 +-
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index d31a13211a5..78ba0161999 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -372,15 +372,6 @@ class actions_server(osv.osv):
                         " or t.act_to = a.wkf_id ")
         return cr.fetchall()
     
-    def on_trigger_obj_id(self, cr, uid, ids, context={}):
-        cr.execute("select distinct t.signal as key, t.signal as val from wkf w, wkf_activity a, wkf_transition t "\
-                        " where w.id = a.wkf_id " \
-                        " and t.act_from = a.wkf_id " \
-                        " or t.act_to = a.wkf_id " \
-                        " and w.osv = %s ", ('account.invoice'))
-        data = cr.fetchall()
-        return {"values":{'trigger_name':data}}
-    
     _name = 'ir.actions.server'
     _table = 'ir_act_server'
     _sequence = 'ir_actions_id_seq'
@@ -568,7 +559,7 @@ class actions_server(osv.osv):
                     if exp.type == 'equation':
                         obj_pool = self.pool.get(action.model_id.model)
                         obj = obj_pool.browse(cr, uid, context['active_id'], context=context)
-                        expr = eval(euq, {'context':context, 'object': obj})
+                        expr = eval(euq, {'context':context, 'object': obj, 'time':time})
                     else:
                         expr = exp.value
                     res[exp.col1.name] = expr
@@ -592,7 +583,7 @@ class actions_server(osv.osv):
                     if exp.type == 'equation':
                         obj_pool = self.pool.get(action.model_id.model)
                         obj = obj_pool.browse(cr, uid, context['active_id'], context=context)
-                        expr = eval(euq, {'context':context, 'object': obj})
+                        expr = eval(euq, {'context':context, 'object': obj, 'time':time})
                     else:
                         expr = exp.value
                     res[exp.col1.name] = expr
diff --git a/bin/netsvc.py b/bin/netsvc.py
index b969ee2ff9f..3e73fc88785 100644
--- a/bin/netsvc.py
+++ b/bin/netsvc.py
@@ -263,6 +263,7 @@ class xmlrpc(object):
 
 class GenericXMLRPCRequestHandler:
     def _dispatch(self, method, params):
+        #print 'TERP-CALL : ',method, params
         import traceback
         try:
             n = self.path.split("/")[-1]
diff --git a/bin/sql_db.py b/bin/sql_db.py
index 08b6a25da79..335a0950c13 100644
--- a/bin/sql_db.py
+++ b/bin/sql_db.py
@@ -117,7 +117,7 @@ class Cursor(object):
 
         if self.sql_log:
             now = mdt.now()
-
+        
         res = self._obj.execute(query, p or None)
 
         if self.sql_log: