Skip to content
Extraits de code Groupes Projets
Valider 58bbd4de rédigé par Benjamin - Le Filament's avatar Benjamin - Le Filament
Parcourir les fichiers

[add] is_python on export.journal.field

parent 01eb02c8
Branches
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -48,8 +48,13 @@ class JournalDatasExport(http.Controller): ...@@ -48,8 +48,13 @@ class JournalDatasExport(http.Controller):
for line in export_line_ids: for line in export_line_ids:
row = [] row = []
for field in export_id.fields_ids: for field in export_id.fields_ids:
<<<<<<< HEAD
if field["field_name"].startswith("line."): if field["field_name"].startswith("line."):
value = safe_eval(field["field_name"], {"line": line}, mode="eval") value = safe_eval(field["field_name"], {"line": line}, mode="eval")
=======
if field.is_python:
value = safe_eval(field["field_name"], {'line': line}, mode="eval")
>>>>>>> ebb23a7 ([add] is_python on export.journal.field)
else: else:
value = safe_eval(field["field_name"]) value = safe_eval(field["field_name"])
row.append(value) row.append(value)
......
...@@ -13,3 +13,4 @@ class ExportJournalField(models.Model): ...@@ -13,3 +13,4 @@ class ExportJournalField(models.Model):
sequence = fields.Integer("Sequence", default=10) sequence = fields.Integer("Sequence", default=10)
export_id = fields.Many2one(comodel_name="export.journal.type", name="Parent") export_id = fields.Many2one(comodel_name="export.journal.type", name="Parent")
field_name = fields.Char("Champ") field_name = fields.Char("Champ")
is_python = fields.Boolean("Expression python", default=True)
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
<field name="sequence" widget="handle" /> <field name="sequence" widget="handle" />
<field name="name" required="1" /> <field name="name" required="1" />
<field name="field_name" required="1" /> <field name="field_name" required="1" />
<field name="is_python" widget="boolean_toggle"/>
</tree> </tree>
</field> </field>
</sheet> </sheet>
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter