diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 54575088482..75dd05c3c87 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -1058,8 +1058,9 @@
                 <form string="Fields">
                     <group colspan="4" col="4">
                         <field name="name" select="1"/>
-                        <field name="model_id" readonly="1"/>
-                        <field colspan="4" name="field_description"/>
+                        <field name="model_id" attrs="{'readonly': [('state','!=', 'manual')]}"/>
+                        <field name="field_description"/>
+                        <field name="state"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Properties">
@@ -1070,7 +1071,6 @@
                                 <field name="relation_field" attrs="{'required': [('ttype','=','one2many')], 'readonly': [('ttype','!=','one2many')]}"/>
                                 <field name="selection" attrs="{'required': [('ttype','in',['selection','reference'])], 'readonly': [('ttype','not in',['selection','reference'])]}"/>
                                 <field name="size" attrs="{'required': [('ttype','in',['char','reference'])], 'readonly': [('ttype','not in',['char','reference'])]}"/>
-                                <field name="state"/>
                                 <field name="domain" attrs="{'readonly': [('relation','=','')]}"/>
                             </group>
 
@@ -1100,7 +1100,7 @@
                     <field name="field_description"/>
                     <field name="model_id"/>
                     <field name="ttype"/>
-                    <field name="required"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
diff --git a/bin/addons/base/ir/ir_model.py b/bin/addons/base/ir/ir_model.py
index bfce915894e..39e5f7567c0 100644
--- a/bin/addons/base/ir/ir_model.py
+++ b/bin/addons/base/ir/ir_model.py
@@ -232,7 +232,24 @@ class ir_model_grid(osv.osv):
     <field name="group_0"/>
     ''' % (view_type,)
         for group in groups_br:
-            xml += '''<field name="group_%d"/>''' % (group.id, )
+            xml += '''<field name="grouDHCPDISCOVER on eth0 to 255.255.255.255 port 67 interval 3
+DHCPDISCOVER on eth0 to 255.255.255.255 port 67 interval 6
+DHCPDISCOVER on eth0 to 255.255.255.255 port 67 interval 9
+DHCPDISCOVER on eth0 to 255.255.255.255 port 67 interval 4
+No DHCPOFFERS received.
+No working leases in persistent database - sleeping.
+ * Stopping the Firestarter firewall...
+   ...done.
+ * Starting the Firestarter firewall...
+   ...done.
+                                                                                                                      [ OK ]
+rpa@rpa:~$  * Stopping NTP server ntpd
+   ...done.
+ * Starting NTP server ntpd
+   ...done.
+
+
+p_%d"/>''' % (group.id, )
         xml += '''</%s>''' % (view_type,)
         result['arch'] = xml
         result['fields'] = self.fields_get(cr, uid, cols, context)
@@ -256,7 +273,7 @@ class ir_model_fields(osv.osv):
         'select_level': fields.selection([('0','Not Searchable'),('1','Always Searchable'),('2','Advanced Search')],'Searchable', required=True),
         'translate': fields.boolean('Translate'),
         'size': fields.integer('Size'),
-        'state': fields.selection([('manual','Custom Field'),('base','Base Field')],'Manually Created', required=True, readonly=True, select=1),
+        'state': fields.selection([('manual','Custom Field'),('base','Base Field')],'Type', required=True, readonly=True, select=1),
         'on_delete': fields.selection([('cascade','Cascade'),('set null','Set NULL')], 'On delete', help='On delete property for many2one fields'),
         'domain': fields.char('Domain', size=256),
         'groups': fields.many2many('res.groups', 'ir_model_fields_group_rel', 'field_id', 'group_id', 'Groups'),