diff --git a/controllers/main.py b/controllers/main.py index fca15b096e788354626e5dd7b56984e21fdb380e..40a7b0f9c18363739b196d0dc0e1d99dd53602cc 100755 --- a/controllers/main.py +++ b/controllers/main.py @@ -58,7 +58,10 @@ class JournalDatasExport(http.Controller): # ------------------------------------------------------ def export_csv(self, export_id, lines_to_export, filename_): fp = StringIO() - export_file = csv.writer(fp, delimiter=';', quoting=csv.QUOTE_ALL) + export_file = csv.writer( + fp, + delimiter=export_id.delimiter, + quoting=csv.QUOTE_ALL) # Add header line if export_id.is_header: row = [] diff --git a/models/export_journal_type.py b/models/export_journal_type.py index 754f8fa5896f27a0fcb9a5aea7db4771102ccdd3..3ef2badda1fd67d5376061c03690cf66e8b9642c 100755 --- a/models/export_journal_type.py +++ b/models/export_journal_type.py @@ -28,5 +28,6 @@ class ExportJournalType(models.Model): string='Journaux', copy=True ) + delimiter = fields.Char('Séparateur', default=';') csv_datestyle = fields.Char('Format Date CSV', default='%Y-%m-%d') xls_datestyle = fields.Char('Format Date XLS', default='YYYY-MM-DD') diff --git a/views/export_journal_type.xml b/views/export_journal_type.xml index 5b2e3bab0e299c41020f162aa5ec9e6dd4be0c00..4dd816db1a1f2fc2cacd8b45a231061d3f3e39f8 100755 --- a/views/export_journal_type.xml +++ b/views/export_journal_type.xml @@ -19,6 +19,7 @@ <group> <field name="journal_ids" widget="many2many_tags" options="{'no_create': 1}" required="1"/> <field name="is_header"/> + <field name="delimiter" required="1"/> <field name="csv_datestyle" required="1"/> <field name="xls_datestyle" required="1"/> </group>