Automated merge with ssh://tycho.b2ck.org///home/hg/modules/partner

category.xml

@@ -26,7 +26,7 @@
                 <![CDATA[
                 <tree string="Categories">
                     <field name="name" select="1"/>
-                    <field name="active" select="2"/>
+                    <field name="active" select="2" tree_invisible="1"/>
                 </tree>
                 ]]>
             </field>

partner.py

@@ -21,7 +21,7 @@ class Partner(OSV):
     _name = "partner.partner"
     _order = "name"
 
-    name = fields.Char('Name', size=128, required=True, select=True,
+    name = fields.Char('Name', size=128, required=True, select=1,
            states=STATES)
     type = fields.Many2One("partner.partner.type", "Type",
            states=STATES)
@@ -37,7 +37,7 @@ class Partner(OSV):
             'partner.category', 'partner_category_rel',
             'partner', 'category', 'Categories',
             states=STATES)
-    active = fields.Boolean('Active')
+    active = fields.Boolean('Active', select=1)
 
     def __init__(self):
         super(Partner, self).__init__()

partner.xml

@@ -31,7 +31,7 @@
                         <page string="General">
                             <field name="addresses" mode="form,tree" colspan="4">
                                 <tree string="Addresses" sequence="sequence">
-                                    <field name="sequence" invisible="1"/>
+                                    <field name="sequence" tree_invisible="1"/>
                                     <field name="name"/>
                                     <field name="phone"/>
                                     <field name="email"/>