diff --git a/bin/addons/base/base_data.xml b/bin/addons/base/base_data.xml
index 4777b7ea4f0..442147434bd 100644
--- a/bin/addons/base/base_data.xml
+++ b/bin/addons/base/base_data.xml
@@ -2877,5 +2877,6 @@
             <test expr="currency_id.code == 'eur'.upper()"/>
             <test expr="name">Tiny sprl</test>
         </assert>
+
     </data>
 </openerp>
diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index c3987d05fa7..f935a4801b8 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -1153,40 +1153,35 @@
                     <field name="sequence" select="2"/>
                     <field name="condition" colspan="4"/>
                     <notebook colspan="4">
-                    
                         <page string="Python Code" attrs="{'invisible':[('state','!=','code')]}">
                             <separator colspan="4" string="Python Code"/>
                             <field name="code" colspan="4" nolabel="1"/>
                         </page>
-                        
                         <page string="Trigger" attrs="{'invisible':[('state','!=','trigger')]}">
                             <separator colspan="4" string="Trigger Configuration"/>
-                            <field name="wkf_model_id"/>
-                            <field name="trigger_obj_id" select="2" domain="[('model_id','=',model_id)]" on_change="on_trigger_obj_id(trigger_obj_id)"/>
-                            <field name="trigger_name" select="2"/>
+                            <field name="wkf_model_id" attrs="{'required':[('state','=','trigger')]}"/>
+                            <field name="trigger_obj_id" select="2" context="{'key':''}" domain="[('model_id','=',model_id)]" attrs="{'required':[('state','=','trigger')]}"/>
+                            <field name="trigger_name" select="2" attrs="{'required':[('state','=','trigger')]}"/>
                         </page>
-                        
-                         <page string="Action to Launch" attrs="{'invisible':[('state','!=','client_action')]}">
-                            <field name="action_id" select="2" colspan="4"/>
+                        <page string="Action to Launch" attrs="{'invisible':[('state','!=','client_action')]}">
+                        	<separator colspan="4" string="Client Action Configuration"/>
+                            <field name="action_id" select="2" attrs="{'required':[('state','=','client_action')]}"/>
                         </page>
-                        
                         <page string="Email Configuration" attrs="{'invisible':[('state','!=','email')]}">
                             <separator colspan="4" string="Email Configuration"/>
-                            <field name="email" domain="[('model_id','=',model_id)]"/>
-                            <field name="subject" colspan="4"/>
-                            <field name="message" select="2" colspan="4"/>
+                            <field name="email" domain="[('model_id','=',model_id)]" attrs="{'required':[('state','=','email')]}"/>
+                            <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 expression in double brackets, 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)]"/>
-                            <field name="sms" colspan="4"/>
+                            <field name="mobile" domain="[('model_id','=',model_id)]" attrs="{'required':[('state','=','email')]}"/>
+                            <field name="sms" 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"/>
                         </page>
-                        
                         <page string="Create / Write" attrs="{'invisible':[('state','!=','object_create'),('state','!=','object_write')]}">
                             <separator colspan="4" string="Fields Mapping"/>
                            	<field name="srcmodel_id" select="2" attrs="{'required':[('state','!=','dummy'), ('state','!=','sms'), ('state','!=','code'), ('state','!=','loop'),('state','!=','trigger'), ('state','!=','client_action'), ('state','!=','email'), ('state','!=','sms'), ('state','!=','other')]}"/>
@@ -1206,21 +1201,17 @@
                              <field name="write_id" attrs="{'readonly':[('state','!=','object_write')]}"/>
                             <label colspan="4" string="If you use a formula type, use a python expression using the variable 'object'." align="0.0"/>
                         </page>
-                        
                         <page string="Iteration Actions" attrs="{'invisible':[('state','!=','loop')]}">
                             <separator colspan="4" string="Iteration Action Configuration"/>
-                            <field name="loop_action" domain="[('state','!=','loop')]"/>
                             <field name="expression" attrs="{'required':[('state','=','loop')]}"/>
-                            <label colspan="4" string="Define the expression that generate a list" align="0.0"/>
+                            <field name="loop_action" domain="[('state','!=','loop')]" attrs="{'required':[('state','=','loop')]}"/>
                         </page>
-                        
                         <page string="Multi Actions" attrs="{'invisible':[('state','!=','other')]}">
                             <separator colspan="4" string="Other Actions Configuration"/>
                             <field name="child_ids" nolabel="1" colspan="4"/>
                             <label colspan="4" string="Only one client action will be execute, last
                                 clinent action will be consider in case of multiples clients actions" align="0.0"/>
                         </page>
-                        
                     </notebook>
                     <field name="type" readonly="1"/>
                 </form>
diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index d8b24c86787..24c99e18d69 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -364,7 +364,7 @@ server_object_lines()
 # Actions that are run on the server side
 #
 class actions_server(osv.osv):
-            
+
     def _select_signals(self, cr, uid, context={}):
         cr.execute("select distinct t.signal as key, t.signal || ' - [ ' || w.osv || ' ] ' as val from wkf w, wkf_activity a, wkf_transition t "\
                         " where w.id = a.wkf_id " \
@@ -376,14 +376,14 @@ class actions_server(osv.osv):
             if not rs[0] == None and not rs[1] == None:
                 res.append(rs)
         return res
-    
+
     _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),
+        'condition' : fields.char('Condition', size=256, required=True),
         'sub_condition' : fields.char('Condition', size=256),
         'state': fields.selection([
             ('client_action','Client Action'),