From 98292c4dcc5f4b46ba0bb771a1b9ba8454993d56 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Sat, 13 Dec 2008 12:00:50 +0530
Subject: [PATCH] small change in the server action Other Action => Multi
 Action

bzr revid: mga@tinyerp.com-20081213063050-5z4r2h0i3ko2i6fw
---
 bin/addons/base/ir/ir.xml        | 3 ++-
 bin/addons/base/ir/ir_actions.py | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 6cd10d7cc3a..fd3b7345d5a 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -1194,9 +1194,10 @@
                             <label colspan="4" string="If you use a formula type, use a python expression using the variable 'object'." align="0.0"/>
                         </page>
                         
-                        <page string="Other Actions" attrs="{'invisible':[('state','!=','other')]}">
+                        <page string="Milti Actions" attrs="{'invisible':[('state','!=','other')]}">
                             <separator colspan="4" string="Other Actions Configuration"/>
                             <field name="child_ids" nolabel="1" colspan="4" />
+                            <label string="Only one client action will be execute, last clinent action will be consider in case of multipls clinets actions"/>
                         </page>
                         
                     </notebook>
diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index 5ac38dd55b9..fea7c49f6e1 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -394,7 +394,7 @@ class actions_server(osv.osv):
             ('sms','SMS'),
             ('object_create','Create Object'),
             ('object_write','Write Object'),
-            ('other','Others Actions'),
+            ('other','Multi Actions'),
         ], 'Action State', required=True, size=32),
         'code': fields.text('Python Code'),
         'sequence': fields.integer('Sequence'),
@@ -409,7 +409,7 @@ class actions_server(osv.osv):
         'sms': fields.char('SMS', size=160, translate=True),
         'child_ids': fields.many2many('ir.actions.server', 'rel_server_actions', 'server_id', 'action_id', 'Others Actions'),
         'usage': fields.char('Action Usage', size=32),
-        'type': fields.char('Report Type', size=32, required=True),
+        'type': fields.char('Action Type', size=32, required=True),
         'srcmodel_id': fields.many2one('ir.model', 'Model', help="In which object you want to create / write the object if its empty refer to the Object field"),
         'fields_lines': fields.one2many('ir.server.object.lines', 'server_id', 'Fields Mapping'),
         'record_id':fields.many2one('ir.model.fields', 'Record Id', help="privide the field name from where the record id refers, if its empty it will refer to the active id of the object")