diff --git a/odoo/addons/base/models/ir_model.py b/odoo/addons/base/models/ir_model.py index 256b5df21ba..b0222dadf38 100644 --- a/odoo/addons/base/models/ir_model.py +++ b/odoo/addons/base/models/ir_model.py @@ -446,9 +446,9 @@ class IrModelFields(models.Model): name = fields.Char(string='Field Name', default='x_', required=True, index=True) complete_name = fields.Char(index=True) - model = fields.Char(string='Object Name', required=True, index=True, + model = fields.Char(string='Model Name', required=True, index=True, help="The technical name of the model this field belongs to") - relation = fields.Char(string='Object Relation', + relation = fields.Char(string='Related Model', help="For relationship fields, the technical name of the target model") relation_field = fields.Char(help="For one2many fields, the field on the target model that implement the opposite many2one relationship") relation_field_id = fields.Many2one('ir.model.fields', compute='_compute_relation_field_id', @@ -1589,7 +1589,7 @@ class IrModelAccess(models.Model): name = fields.Char(required=True, index=True) active = fields.Boolean(default=True, help='If you uncheck the active field, it will disable the ACL without deleting it (if you delete a native ACL, it will be re-created when you reload the module).') - model_id = fields.Many2one('ir.model', string='Object', required=True, index=True, ondelete='cascade') + model_id = fields.Many2one('ir.model', string='Model', required=True, index=True, ondelete='cascade') group_id = fields.Many2one('res.groups', string='Group', ondelete='cascade', index=True) perm_read = fields.Boolean(string='Read Access') perm_write = fields.Boolean(string='Write Access') diff --git a/odoo/addons/base/models/ir_rule.py b/odoo/addons/base/models/ir_rule.py index e2703b36bd9..96d6f73c077 100644 --- a/odoo/addons/base/models/ir_rule.py +++ b/odoo/addons/base/models/ir_rule.py @@ -18,7 +18,7 @@ class IrRule(models.Model): name = fields.Char(index=True) active = fields.Boolean(default=True, help="If you uncheck the active field, it will disable the record rule without deleting it (if you delete a native record rule, it may be re-created when you reload the module).") - model_id = fields.Many2one('ir.model', string='Object', index=True, required=True, ondelete="cascade") + model_id = fields.Many2one('ir.model', string='Model', index=True, required=True, ondelete="cascade") groups = fields.Many2many('res.groups', 'rule_group_rel', 'rule_group_id', 'group_id') domain_force = fields.Text(string='Domain') perm_read = fields.Boolean(string='Apply for Read', default=True) diff --git a/odoo/addons/base/views/ir_model_views.xml b/odoo/addons/base/views/ir_model_views.xml index fef210e961a..0db2766a456 100644 --- a/odoo/addons/base/views/ir_model_views.xml +++ b/odoo/addons/base/views/ir_model_views.xml @@ -388,8 +388,9 @@ + - + @@ -503,7 +504,7 @@ - + @@ -683,7 +684,7 @@ - + diff --git a/odoo/addons/base/views/ir_rule_views.xml b/odoo/addons/base/views/ir_rule_views.xml index 68a8d6d459a..782a6461d89 100644 --- a/odoo/addons/base/views/ir_rule_views.xml +++ b/odoo/addons/base/views/ir_rule_views.xml @@ -81,7 +81,7 @@ - + diff --git a/odoo/addons/base/views/ir_ui_view_views.xml b/odoo/addons/base/views/ir_ui_view_views.xml index 352c58be17b..d100abf3584 100644 --- a/odoo/addons/base/views/ir_ui_view_views.xml +++ b/odoo/addons/base/views/ir_ui_view_views.xml @@ -84,7 +84,7 @@ - +