diff --git a/controllers/main.py b/controllers/main.py index 6b85533c031717f603e781bb8684b8fe7673609e..4165650cd0cff0006249e387db402e099ded0f20 100644 --- a/controllers/main.py +++ b/controllers/main.py @@ -22,13 +22,19 @@ class ExportJournalCg(http.Controller): self, company_id, date_start=False, date_end=False, date_creation_start=False, date_creation_end=False, - partner_ids=False, **kwargs): + partner_ids=False, export_type='empty', **kwargs): """ Sélectionne les account.move.line correspondants aux journaux et à la plage de date définis Crée le lignes de valeurs + :param company_id: int :param date_start: date :param date_end: date + :param date_end: date + :param date_creation_start: date + :param date_creation_end: date + :param partner_ids: list + :param export_type: string :return: file """ # Get accounts variables @@ -55,7 +61,7 @@ class ExportJournalCg(http.Controller): ('create_date', '>=', date_creation_start), ('create_date', '<=', date_creation_end), ] - if type == 'empty': + if export_type == 'empty': domain += [('date_export', '=', False)] # adds partner in domain @@ -139,8 +145,7 @@ class ExportJournalCg(http.Controller): }) filename_ = ('Export CG Scop - ' - + date_start - + '_' + date_end) + + datetime.strftime(datetime.now(), "%Y-%m-%d_%Hh%S")) return self.export_cg_csv(lines_to_export, filename_) diff --git a/wizard/export_journal_wizard.py b/wizard/export_journal_wizard.py index 4b421dd80e424d7de3f9bfee1072c143d8ffd997..6cb84ae5931fafdba649ead3a6c54e3b21878501 100755 --- a/wizard/export_journal_wizard.py +++ b/wizard/export_journal_wizard.py @@ -57,8 +57,8 @@ class ExportJournalWizard(models.TransientModel): }) if self.date_creation_start and self.date_creation_end: datas.update({ - 'date_creation_start': self.date_start, - 'date_creation_end': self.date_end, + 'date_creation_start': self.date_creation_start, + 'date_creation_end': self.date_creation_end, }) if self.partner_ids: datas['partner_ids'] = ','.join(str(x) for x in self.partner_ids.ids)