From e49da34abe3d2a15615094cd0b9a0173caffbc25 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 29 Jul 2023 22:36:32 +0200 Subject: [PATCH] accounting file --- wizard/accounting_file_wizard.py | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/wizard/accounting_file_wizard.py b/wizard/accounting_file_wizard.py index 6fd7206..a423dc4 100644 --- a/wizard/accounting_file_wizard.py +++ b/wizard/accounting_file_wizard.py @@ -84,7 +84,7 @@ class AccountingFileWizard(models.TransientModel): tmstp=secrets.token_hex(16) filename='/tmp/accounting_file_'+tmstp+'.csv' - f = open(filename, "a") + f = open(filename, "ab") #N° mouvement 1-5 @@ -98,6 +98,7 @@ class AccountingFileWizard(models.TransientModel): fic_line='"N° mouvement;Code du journal;Date;N° de compte;Libellé;Débit;Crédit;N° de pièce'+'"'+"\n" + fic_line=fic_line.encode(encoding="utf-8",errors='ignore') f.write(fic_line) @@ -108,6 +109,7 @@ class AccountingFileWizard(models.TransientModel): if self.export_out_refund_lines:self.out_refund_lines(f) if self.export_end_of_stay_lines:self.end_of_stay_lines(f) fic_line="TOTAL_DEBIT="+str(total_debit)+ " TOTAL CREDIT="+str(total_credit) + fic_line=fic_line.encode(encoding="utf-8",errors='ignore') f.write(fic_line) f.close @@ -137,7 +139,9 @@ class AccountingFileWizard(models.TransientModel): def _accounting_line(self,no_mvt,date_line,account_number,lib,debit,credit,lib_piece): - return '"'+str(no_mvt)+';'+'IN'+';'+date_line+';'+account_number+';'+lib+';'+debit+';'+credit+';'+lib_piece+'"'+'\n' + + str_line='"'+str(no_mvt)+';'+'IN'+';'+date_line+';'+account_number+';'+lib+';'+debit+';'+credit+';'+lib_piece+'"'+'\n' + return str_line.encode(encoding="utf-8",errors='ignore') def donation_lines(self,f): global total_debit @@ -789,7 +793,8 @@ class AccountingFileWizard(models.TransientModel): #écriture de crédit debit='' credit=str(amount) - account_credit_number='411000' + account_credit_number='170000' + account_number=account_credit_number fic_line=self._accounting_line(no_mvt,date_line,account_number,lib,debit,credit,lib_piece) f.write(fic_line) @@ -814,6 +819,7 @@ class AccountingFileWizard(models.TransientModel): lib2='' reg=self.env['event.registration'].search(['|',('invoice_id','=',int(invoice.out_invoice_id)),('balance_invoice_id','=',int(invoice.out_invoice_id))]) + if reg: lib2=self._file_format(reg.event_id.name,13) else: @@ -828,9 +834,9 @@ class AccountingFileWizard(models.TransientModel): #écriture de débit - amount=invoice.amount_total - account_debit_number='411000' - + amount=invoice.amount_total + account_debit_number='170000' + #date du paiement #_logger.error(self._payment_date_ok(invoice.out_invoice_id)) if not self._payment_date_ok(invoice):continue @@ -848,11 +854,10 @@ class AccountingFileWizard(models.TransientModel): #écriture de crédit debit='' credit=str(amount) - if reg: + if invoice.out_invoice_id: account_credit_number='170000' else: - - account_credit_number=self._payment_account_number(invoice) + account_credit_number='411000' account_number=account_credit_number fic_line=self._accounting_line(no_mvt,date_line,account_number,lib,debit,credit,lib_piece) f.write(fic_line)