From 58bbd4dee7fba38a5971cf7fb21bc4a2c0ca6eeb Mon Sep 17 00:00:00 2001
From: benjamin <benjamin@le-filament.com>
Date: Wed, 9 Feb 2022 14:45:09 +0100
Subject: [PATCH] [add] is_python on export.journal.field
---
controllers/main.py | 5 +++++
models/export_journal_field.py | 1 +
views/export_journal_type.xml | 1 +
3 files changed, 7 insertions(+)
diff --git a/controllers/main.py b/controllers/main.py
index f467863..a97ec69 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 5109c53..8800236 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 ef79b8a..e4ccfae 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>
--
GitLab