odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

merginf from the trunk 

bzr revid: mga@tinyerp.com-20081215123034-1gnqhxeteza8e183
This commit is contained in:
Mantavya Gajjar 2008-12-15 18:00:34 +05:30
parent 08b662555d
commit c0e1fc3452
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bin/addons/base/ir/ir_actions.py
View File

@ -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

1
bin/netsvc.py
View File

@ -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]

2
bin/sql_db.py
View File

@ -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: