From 24069b2fa667a08b5496fd82397dfda07ddaeb73 Mon Sep 17 00:00:00 2001
From: "Anup (OpenERP)" <ach@tinyerp.com>
Date: Tue, 11 May 2010 13:00:51 +0530
Subject: [PATCH] [FIX] Server Actions: Cleaner legend help and error message

bzr revid: ach@tinyerp.com-20100511073051-ewoak4j5lhsyvfg1
---
 bin/addons/base/ir/ir.xml        | 4 ++--
 bin/addons/base/ir/ir_actions.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index f28a26103d2..2644ebd3706 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -1251,14 +1251,14 @@
                             <field name="subject" colspan="4" attrs="{'required':[('state','=','email')]}"/>
                             <field name="message" select="2" colspan="4" attrs="{'required':[('state','=','email')]}"/>
                             <newline/>
-                            <label colspan="4" string="Access all the fields related to the current object using expression in double brackets, i.e.[[ object.partner_id.name ]]" align="0.0"/>
+                            <label colspan="4" string="Access all the fields related to the current object using expressions, i.e. object.partner_id.name " align="0.0"/>
                         </page>
                         <page string="SMS Configuration" attrs="{'invisible':[('state','!=','sms')]}">
                             <separator colspan="4" string="SMS Configuration"/>
                             <field name="mobile" domain="[('model_id','=',model_id)]" attrs="{'required':[('state','=','sms')]}"/>
                             <field name="sms" colspan="4" attrs="{'required':[('state','=','sms')]}"/>
                             <newline/>
-                            <label colspan="4" string="Access all the fields related to the current object using expression in double brackets, i.e. [[ object.partner_id.name ]]" align="0.0"/>
+                            <label colspan="4" string="Access all the fields related to the current object using expressions, i.e. object.partner_id.name " align="0.0"/>
                         </page>
                         <page string="Create / Write / Copy" attrs="{'invisible':[('state','!=','object_create'), ('state','!=','object_write'), ('state','!=','object_copy')]}">
                             <separator colspan="4" string="Fields Mapping"/>
diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index 7f4e2339c52..81ba8eccf5d 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -532,7 +532,7 @@ class actions_server(osv.osv):
 
     def run(self, cr, uid, ids, context={}):
         logger = netsvc.Logger()
-
+        print "::ODS",ids
         for action in self.browse(cr, uid, ids, context):
             obj_pool = self.pool.get(action.model_id.model)
             obj = obj_pool.browse(cr, uid, context['active_id'], context=context)
@@ -580,7 +580,7 @@ class actions_server(osv.osv):
                     logger.notifyChannel('email', netsvc.LOG_INFO, 'Partner Email address not Specified!')
                     continue
                 if not user:
-                    raise osv.except_osv(_('Error'), _("Please specify server option --smtp-from !"))
+                    raise osv.except_osv(_('Error'), _("Please specify server option --email-from !"))
 
                 subject = self.merge_message(cr, uid, action.subject, action, context)
                 body = self.merge_message(cr, uid, action.message, action, context)