diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index c649b12cf99..736f13b3507 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -1142,6 +1142,12 @@
                     <field name="model_id" select="1"/>
                     <field name="sequence" select="2"/>
                     <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"/>
diff --git a/bin/addons/base/ir/ir_actions.py b/bin/addons/base/ir/ir_actions.py
index c270557f6c5..3aa83ffbe26 100644
--- a/bin/addons/base/ir/ir_actions.py
+++ b/bin/addons/base/ir/ir_actions.py
@@ -390,6 +390,7 @@ class actions_server(osv.osv):
         'state': fields.selection([
             ('client_action','Client Action'),
             ('dummy','Dummy'),
+            ('code','Python Code'),
             ('trigger','Trigger'),
             ('email','Email'),
             ('sms','SMS'),
@@ -397,6 +398,7 @@ class actions_server(osv.osv):
             ('object_write','Write Object'),
             ('other','Multi Actions'),
         ], 'Action State', required=True, size=32),
+        'code':fields.text('Python Code'),
         'sequence': fields.integer('Sequence'),
         'model_id': fields.many2one('ir.model', 'Object', required=True),
         'action_id': fields.many2one('ir.actions.actions', 'Client Action'),
@@ -418,6 +420,15 @@ class actions_server(osv.osv):
         'state': lambda *a: 'dummy',
         'type': lambda *a: 'ir.actions.server',
         'sequence': lambda *a: 5,
+        'code': lambda *a: """# You can use the following variables
+#    - object
+#    - object2
+#    - time
+#    - cr
+#    - uid
+#    - ids
+# If you plan to return an action, assign: action = {...}
+""",
     }