Rename model_id and group_id into model and group

trytond/ir/fr_FR.csv

@@ -65,8 +65,8 @@ field,"ir.lang,code",0,Code,Code,0
 field,"ir.lang,direction",0,Direction,Direction,0
 field,"ir.lang,name",0,Name,Nom,0
 field,"ir.lang,translatable",0,Translatable,Traduisible,0
-field,"ir.model.access,group_id",0,Group,Groupe,0
-field,"ir.model.access,model_id",0,Model,Modèle,0
+field,"ir.model.access,group",0,Group,Groupe,0
+field,"ir.model.access,model",0,Model,Modèle,0
 field,"ir.model.access,name",0,Name,Nom,0
 field,"ir.model.access,perm_create",0,Create Access,Accès à la creation,0
 field,"ir.model.access,perm_read",0,Read Access,Accès à la lecture,0
@@ -84,8 +84,7 @@ field,"ir.model.field,field_description",0,Field Description,Champ de descriptio
 field,"ir.model.field,group_name",0,Group Name,Nom du groupe,0
 field,"ir.model.field,groups",0,Groups,Groupes,0
 field,"ir.model.field,help",0,Help,Aide,0
-field,"ir.model.field,model",0,Model Name,Nom du modèle,0
-field,"ir.model.field,model_id",0,Model id,Id de modèle,0
+field,"ir.model.field,model",0,Model,Modèle,0
 field,"ir.model.field,name",0,Name,Nom,0
 field,"ir.model.field,relate",0,Click and Relate,Clicker et relier,0
 field,"ir.model.field,relation",0,Model Relation,Relation du modèle,0

trytond/ir/model.py

@@ -40,7 +40,7 @@ class ModelField(OSV):
     _columns = {
         'name': fields.Char('Name', size=64),
         'relation': fields.Char('Model Relation', size=64),
-        'model': fields.Many2One('ir.model', 'Model id', required=True,
+        'model': fields.Many2One('ir.model', 'Model', required=True,
             select=True, ondelete='cascade'),
         'field_description': fields.Char('Field Description', size=256,
             translate=True),
@@ -69,13 +69,13 @@ class ModelAccess(OSV):
     _name = 'ir.model.access'
     _description = __doc__
     _columns = {
-        'name': fields.char('Name', size=64, required=True),
-        'model_id': fields.many2one('ir.model', 'Model', required=True),
-        'group_id': fields.many2one('res.group', 'Group'),
-        'perm_read': fields.boolean('Read Access'),
-        'perm_write': fields.boolean('Write Access'),
-        'perm_create': fields.boolean('Create Access'),
-        'perm_unlink': fields.boolean('Delete Permission'),
+        'name': fields.Char('Name', size=64, required=True),
+        'model': fields.Many2One('ir.model', 'Model', required=True),
+        'group': fields.Many2One('res.group', 'Group'),
+        'perm_read': fields.Boolean('Read Access'),
+        'perm_write': fields.Boolean('Write Access'),
+        'perm_create': fields.Boolean('Create Access'),
+        'perm_unlink': fields.Boolean('Delete Permission'),
     }
 
     def check(self, cursor, user, model_name, mode='read',
@@ -87,9 +87,9 @@ class ModelAccess(OSV):
         cursor.execute('SELECT MAX(CASE WHEN perm_'+mode+' THEN 1 else 0 END) '
             'FROM ir_model_access a '
                 'JOIN ir_model m '
-                    'ON (a.model_id=m.id) '
+                    'ON (a.model = m.id) '
                 'JOIN res_group_user_rel gu '
-                    'ON (gu.gid = a.group_id) '
+                    'ON (gu.gid = a.group) '
             'WHERE m.model = %s AND gu.uid = %s', (model_name, user,))
         row = cursor.fetchall()
         if row[0][0] == None:
@@ -97,8 +97,8 @@ class ModelAccess(OSV):
                         'MAX(CASE WHEN perm_' + mode + ' THEN 1 else 0 END) ' \
                     'FROM ir_model_access a ' \
                     'JOIN ir_model m ' \
-                        'ON (a.model_id = m.id) ' \
-                    'WHERE a.group_id IS NULL AND m.model = %s', (model_name,))
+                        'ON (a.model = m.id) ' \
+                    'WHERE a.group IS NULL AND m.model = %s', (model_name,))
             row = cursor.fetchall()
             if row[0][0] == None:
                 return True

trytond/ir/model.xml

@@ -72,8 +72,8 @@
                 <form string="Fields">
                     <label name="name"/>
                     <field name="name"/>
-                    <label name="model_id"/>
-                    <field name="model_id" readonly="1"/>
+                    <label name="model"/>
+                    <field name="model" readonly="1"/>
                     <label name="ttype"/>
                     <field name="ttype"/>
                     <label name="relation"/>
@@ -126,8 +126,8 @@
               <![CDATA[
                 <tree string="Access controls">
                     <field name="name" select="1"/>
-                    <field name="model_id" select="1"/>
-                    <field name="group_id" select="1"/>
+                    <field name="model" select="1"/>
+                    <field name="group" select="1"/>
                 </tree>
                 ]]>
             </field>
@@ -140,10 +140,10 @@
                 <form string="Access controls">
                     <label name="name"/>
                     <field name="name" colspan="3"/>
-                    <label name="model_id"/>
-                    <field name="model_id"/>
-                    <label name="group_id"/>
-                    <field name="group_id"/>
+                    <label name="model"/>
+                    <field name="model"/>
+                    <label name="group"/>
+                    <field name="group"/>
                     <newline/>
                     <label name="perm_read"/>
                     <field name="perm_read"/>