Rename field_parent into field_childs

trytond/init.sql

@@ -45,7 +45,7 @@ CREATE TABLE ir_ui_view (
 	model varchar(64) DEFAULT ''::varchar NOT NULL,
 	"type" varchar(64) DEFAULT 'form'::varchar NOT NULL,
 	arch text NOT NULL,
-	field_parent varchar(64),
+	field_childs varchar(64),
 	priority integer DEFAULT 5 NOT NULL,
 	primary key(id)
 );

trytond/ir/fr_FR.csv

@@ -158,8 +158,8 @@ field,"ir.ui.menu,name",0,Menu,Menu,0
 field,"ir.ui.menu,parent",0,Parent Menu,Menu parent,0
 field,"ir.ui.menu,sequence",0,Sequence,Séquence,0
 field,"ir.ui.view,arch",0,View Architecture,Architecture de la vue,0
-field,"ir.ui.view,field_parent",0,Childs Field,Champs enfants,0
-field,"ir.ui.view,inherit_id",0,Inherited View,Vue héritée,0
+field,"ir.ui.view,field_childs",0,Childs Field,Champs enfants,0
+field,"ir.ui.view,inherit",0,Inherited View,Vue héritée,0
 field,"ir.ui.view,model",0,Model,Modèle,0
 field,"ir.ui.view,module",0,Module,Module,0
 field,"ir.ui.view,priority",0,Priority,Priorité,0

trytond/ir/module/category.xml

@@ -18,7 +18,7 @@
         <record model="ir.ui.view" id="category_view_tree">
             <field name="model">ir.module.category</field>
             <field name="type">tree</field>
-            <field name="field_parent">childs</field>
+            <field name="field_childs">childs</field>
             <field name="arch" type="xml">
               <![CDATA[
                 <tree string="Module Categories">

trytond/ir/ui/menu.xml

@@ -4,7 +4,7 @@
         <record model="ir.ui.view" id="menu_view_tree_tree">
             <field name="model">ir.ui.menu</field>
             <field name="type">tree</field>
-            <field name="field_parent">childs</field>
+            <field name="field_childs">childs</field>
             <field name="arch" type="xml">
                 <![CDATA[
                 <tree string="Menu" toolbar="1">

trytond/ir/ui/view.py

@@ -18,8 +18,8 @@ class View(OSV):
             ('graph', 'Graph'),
             ('calendar', 'Calendar')), 'View Type', required=True),
         'arch': fields.Text('View Architecture', required=True),
-        'inherit_id': fields.Many2One('ir.ui.view', 'Inherited View'),
-        'field_parent': fields.Char('Childs Field',size=64),
+        'inherit': fields.Many2One('ir.ui.view', 'Inherited View'),
+        'field_childs': fields.Char('Childs Field',size=64),
         'module': fields.Char('Module', size=128, readonly=True),
     }
     _defaults = {

trytond/ir/ui/view.xml

@@ -11,10 +11,10 @@
                     <field name="model"/>
                     <label name="type"/>
                     <field name="type"/>
-                    <label name="inherit_id"/>
-                    <field name="inherit_id"/>
-                    <label name="field_parent"/>
-                    <field name="field_parent"/>
+                    <label name="inherit"/>
+                    <field name="inherit"/>
+                    <label name="field_childs"/>
+                    <field name="field_childs"/>
                     <label name="priority"/>
                     <field name="priority"/>
                     <separator name="arch" colspan="4"/>
@@ -32,8 +32,8 @@
                     <field name="priority" select="2"/>
                     <field name="model" select="1"/>
                     <field name="type" select="1"/>
-                    <field name="inherit_id" select="1"/>
-                    <field name="field_parent" select="2"/>
+                    <field name="inherit" select="1"/>
+                    <field name="field_childs" select="2"/>
                 </tree>
                 ]]>
             </field>

trytond/osv/orm.py

@@ -1819,12 +1819,12 @@ class ORM(object):
         while test:
             if view_id:
                 where = (model and (" and model='%s'" % (self._name,))) or ''
-                cursor.execute('SELECT arch, name, field_parent, id, type, ' \
-                            'inherit_id ' \
+                cursor.execute('SELECT arch, name, field_childs, id, type, ' \
+                            'inherit ' \
                         'FROM ir_ui_view WHERE id = %d ' + where, (view_id,))
             else:
-                cursor.execute('SELECT arch, name, field_parent, id, type, ' \
-                        'inherit_id ' \
+                cursor.execute('SELECT arch, name, field_childs, id, type, ' \
+                        'inherit ' \
                         'FROM ir_ui_view ' \
                         'WHERE model = %s AND type = %s ORDER BY priority',
                         (self._name,view_type))
@@ -1844,7 +1844,7 @@ class ORM(object):
             def _inherit_apply_rec(result, inherit_id):
                 # get all views which inherit from (ie modify) this view
                 cursor.execute('SELECT arch, id FROM ir_ui_view ' \
-                        'WHERE inherit_id = %d AND model = %s ' \
+                        'WHERE inherit = %d AND model = %s ' \
                         'ORDER BY priority', (inherit_id, self._name))
                 sql_inherit = cursor.fetchall()
                 for (inherit, view_id) in sql_inherit:
@@ -1855,7 +1855,7 @@ class ORM(object):
             result['arch'] = _inherit_apply_rec(result['arch'], sql_res[3])
 
             result['name'] = sql_res[1]
-            result['field_parent'] = sql_res[2] or False
+            result['field_childs'] = sql_res[2] or False
         # otherwise, build some kind of default view
         else:
             if view_type == 'form':
@@ -1882,7 +1882,7 @@ class ORM(object):
                 xml = ''
             result['arch'] = xml
             result['name'] = 'default'
-            result['field_parent'] = False
+            result['field_childs'] = False
             result['view_id'] = 0
 
         doc = dom.minidom.parseString(result['arch'])

trytond/webdav/webdav.xml

@@ -6,7 +6,7 @@
         <record model="ir.ui.view" id="directory_view_tree">
             <field name="model">webdav.directory</field>
             <field name="type">tree</field>
-            <field name="field_parent">childs</field>
+            <field name="field_childs">childs</field>
             <field name="arch" type="xml">
                 <![CDATA[
                     <tree string="Directories">