From f0e27a00638bda99a15cc3870206ae0d3a2cde8d Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Thu, 18 Dec 2008 12:01:14 +0530
Subject: [PATCH] remove comments and improve the server action code

bzr revid: mga@tinyerp.com-20081218063114-skhq72lf12uhra9s
---
 bin/addons/base/ir/ir.xml        | 1 +
 bin/addons/base/ir/ir_actions.py | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 09baa10c880..b757dd163a5 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -1235,6 +1235,7 @@
                 <tree string="Server Actions">
                     <field name="name"/>
                     <field name="state"/>
+                    <field name="sequence"/>
                 </tree>
             </field>
         </record>
diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index 584a1c37623..d8b24c86787 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -380,6 +380,7 @@ class actions_server(osv.osv):
     _name = 'ir.actions.server'
     _table = 'ir_act_server'
     _sequence = 'ir_actions_id_seq'
+    _order = 'sequence'
     _columns = {
         'name': fields.char('Action Name', required=True, size=64),
         'condition' : fields.char('Condition', size=256),
@@ -586,6 +587,7 @@ class actions_server(osv.osv):
                     result = self.run(cr, uid, [act.id], context)
                     if result:
                         res.append(result)
+                    
                 return res
             
             if action.state == 'loop':
@@ -631,6 +633,11 @@ class actions_server(osv.osv):
                     obj_pool = self.pool.get(action.srcmodel_id.model)
                     rec = self.pool.get(action.model_id.model).browse(cr, uid, context.get('active_id'))
                     id = eval(action.write_id, {'object': rec})
+                    try:
+                        id = int(id)
+                    except:
+                        raise osv.except_osv(_('Error'), _("Problem in configuration `Record Id` in Server Action!"))
+                    
                     if type(id) != type(1):
                         raise osv.except_osv(_('Error'), _("Problem in configuration `Record Id` in Server Action!"))
                     write_id = id