diff --git a/controllers/main.py b/controllers/main.py index f467863fc737c00c96a3db9257c7e817fe4183cb..a97ec69bee23dee3fb7f285fda5e3599233a8061 100644 --- a/controllers/main.py +++ b/controllers/main.py @@ -48,8 +48,13 @@ class JournalDatasExport(http.Controller): for line in export_line_ids: row = [] for field in export_id.fields_ids: +<<<<<<< HEAD if field["field_name"].startswith("line."): 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: value = safe_eval(field["field_name"]) row.append(value) diff --git a/models/export_journal_field.py b/models/export_journal_field.py index 5109c5367313b104f59357cf4be603f1b0443627..8800236eb3813a76337c1213e73a3c26db972218 100644 --- a/models/export_journal_field.py +++ b/models/export_journal_field.py @@ -13,3 +13,4 @@ class ExportJournalField(models.Model): sequence = fields.Integer("Sequence", default=10) export_id = fields.Many2one(comodel_name="export.journal.type", name="Parent") field_name = fields.Char("Champ") + is_python = fields.Boolean("Expression python", default=True) diff --git a/views/export_journal_type.xml b/views/export_journal_type.xml index ef79b8a88532a619b8325a211cac2cd3d53541e6..e4ccfae87f6c43941e6e856b6ac4b632e11651fe 100644 --- a/views/export_journal_type.xml +++ b/views/export_journal_type.xml @@ -51,6 +51,7 @@ <field name="sequence" widget="handle" /> <field name="name" required="1" /> <field name="field_name" required="1" /> + <field name="is_python" widget="boolean_toggle"/> </tree> </field> </sheet>