From a47b0aa239704a14c9f4bb8189787e552f312e04 Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Fri, 19 Dec 2008 16:17:12 +0530
Subject: [PATCH] merging from the trunk, and small change in the view

bzr revid: mga@tinyerp.com-20081219104712-yiovfbb2jddnhu62
---
 bin/addons/base/ir/ir.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 1b7028e50aa..1490c7a1f2c 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -1152,7 +1152,7 @@
 	                    <field name="model_id" select="1"/>
 	                    <field name="state" select="1"/>
 	                    <field name="sequence" select="2"/>
-	                    <field name="condition" colspan="3"/>
+	                    <field name="condition"/>
 	                </group>
                     <notebook colspan="4">
                         <page string="Python Code" attrs="{'invisible':[('state','!=','code')]}">
@@ -1228,6 +1228,7 @@
                 <tree string="Server Actions">
                     <field name="name"/>
                     <field name="state"/>
+                    <field name="model_id"/>
                     <field name="sequence"/>
                 </tree>
             </field>