diff --git a/wizard/datas_export.py b/wizard/datas_export.py index ba09a114ffe4ffdc0f289aacf7dae7e746239a47..710f7908f46423f748e2ad64ab5caeb0bfb4ce55 100644 --- a/wizard/datas_export.py +++ b/wizard/datas_export.py @@ -4,29 +4,9 @@ from odoo import models, fields, http from odoo.addons.web.controllers.main import serialize_exception from odoo.http import request - -HEADER_DEFAULT = [ - 'date', - 'journal', - 'compte', - 'debit', - 'credit', - 'libelle', - 'piece', - 'echeance', - 'ref_piece' - ] - -HEADER_DEFAULT_CEGID = [ - 'journal', - 'date', - 'compte', - 'auxiliaire', - 'ref_piece', - 'libelle', - 'debit', - 'credit', - ] +from odoo.addons.lefilament_export_journal.wizard.datas_export import AccountDatasExport +from odoo.addons.lefilament_export_journal.wizard.datas_export import HEADER_DEFAULT +from odoo.addons.lefilament_export_journal.wizard.datas_export import HEADER_DEFAULT_CEGID class POSDatasExportWizard(models.TransientModel): @@ -35,10 +15,16 @@ class POSDatasExportWizard(models.TransientModel): journal = fields.Selection(selection_add=[('caisses', 'Caisses')]) -class POSDatasExport(http.Controller): +class POSDatasExport(AccountDatasExport): def datas_export_caisses(self, format, date_start, date_end, nom_outil_compta): + if nom_outil_compta == 'ibiza': + header = HEADER_DEFAULT + elif nom_outil_compta == 'cegid': + header = HEADER_DEFAULT_CEGID + else: + header = HEADER_DEFAULT request.cr.execute(""" SELECT l.date, 'PDV' AS journal, @@ -60,14 +46,6 @@ class POSDatasExport(http.Controller): ORDER BY l.date, l.move_id, a.code DESC; """, (date_start, date_end)) lignes_export = request.cr.dictfetchall() - - if nom_outil_compta == 'ibiza': - header = HEADER_DEFAULT - elif nom_outil_compta == 'cegid': - header = HEADER_DEFAULT_CEGID - else: - header = HEADER_DEFAULT - company_name = request.env['res.company'].search([('id', '=', 1)]).name filename_ = (company_name.title().replace(' ', '') + 'Caisses_' + date_start.replace('-', '')