merging from the trunk, and small change in the view

bzr revid: mga@tinyerp.com-20081219104712-yiovfbb2jddnhu62
2008-12-19 16:17:12 +05:30
parent 5b3507c947
commit a47b0aa239
1 changed files with 2 additions and 1 deletions
@@ -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>