diff --git a/trytond/ir/fr_FR.csv b/trytond/ir/fr_FR.csv index cfff7de561..c361ae8dc9 100644 --- a/trytond/ir/fr_FR.csv +++ b/trytond/ir/fr_FR.csv @@ -121,7 +121,7 @@ field,"ir.property,field",0,Field,Champ,0 field,"ir.property,name",0,Name,Nom,0 field,"ir.property,res",0,Resource,Ressource,0 field,"ir.property,value",0,Value,Valeur,0 -field,"ir.rule,field_id",0,Field,Champ,0 +field,"ir.rule,field",0,Field,Champ,0 field,"ir.rule.group,global",0,Global,Global,0 field,"ir.rule.group,groups",0,Groups,Groupes,0 field,"ir.rule.group,model",0,Model,Modèle,0 diff --git a/trytond/ir/rule.py b/trytond/ir/rule.py index 3912e87a64..d7afbd88cf 100644 --- a/trytond/ir/rule.py +++ b/trytond/ir/rule.py @@ -54,13 +54,13 @@ RuleGroup() class Rule(OSV): "Rule" _name = 'ir.rule' - _rec_name = 'field_id' + _rec_name = 'field' _description = __doc__ _columns = { - 'field_id': fields.many2one('ir.model.field', 'Field', + 'field': fields.Many2One('ir.model.field', 'Field', domain="[('model', '=', parent.model)]", select=1, required=True), - 'operator':fields.selection([ + 'operator':fields.Selection([ ('=', '='), ('<>', '<>'), ('<=', '<='), @@ -68,8 +68,8 @@ class Rule(OSV): ('in', 'in'), ('child_of', 'child_of'), ], 'Operator', required=True), - 'operand':fields.selection('operand','Operand', size=64, required=True), - 'rule_group': fields.many2one('ir.rule.group', 'Group', select=2, + 'operand':fields.Selection('operand','Operand', size=64, required=True), + 'rule_group': fields.Many2One('ir.rule.group', 'Group', select=2, required=True, ondelete="cascade") } @@ -145,12 +145,12 @@ class Rule(OSV): for rule in self.browse(cursor, 1, ids): if rule.operator in ('in', 'child_of'): dom = eval("[('%s', '%s', [%s])]" % \ - (rule.field_id.name, rule.operator, rule.operand), + (rule.field.name, rule.operator, rule.operand), {'user': self.pool.get('res.user').browse(cursor, 1, user), 'time': time}) else: dom = eval("[('%s', '%s', %s)]" % \ - (rule.field_id.name, rule.operator, rule.operand), + (rule.field.name, rule.operator, rule.operand), {'user': self.pool.get('res.user').browse(cursor, 1, user), 'time': time}) diff --git a/trytond/ir/rule.xml b/trytond/ir/rule.xml index e7bd1270d0..6c1a3978fe 100644 --- a/trytond/ir/rule.xml +++ b/trytond/ir/rule.xml @@ -60,8 +60,8 @@ -