From c8865852224ac79b0ba548d955eee7b05d5fbb9e Mon Sep 17 00:00:00 2001 From: root Date: Sun, 16 Jul 2023 10:51:33 +0200 Subject: [PATCH] fix booking parameter sudo --- controllers/booking.py | 2 +- wizard/accounting_file_wizard.py | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/controllers/booking.py b/controllers/booking.py index 6f1309e..19f2ee9 100755 --- a/controllers/booking.py +++ b/controllers/booking.py @@ -40,7 +40,7 @@ class booking(WebsiteEventController,AuthSignupHome): request.session['event_id']=int(event_id) event=request.env['event.event'].sudo().search([('id','=',int(event_id))]) data['event']=event - data['bottom_text']=request.env['booking.parameter'].search([('name','=','bottom_text')]).value + data['bottom_text']=request.env['booking.parameter'].sudo().search([('name','=','bottom_text')]).value request.session['individual_booking_event']=event.individual_booking_event data['individual_booking_event']=event.individual_booking_event diff --git a/wizard/accounting_file_wizard.py b/wizard/accounting_file_wizard.py index 8953d7b..038ed7e 100644 --- a/wizard/accounting_file_wizard.py +++ b/wizard/accounting_file_wizard.py @@ -284,12 +284,15 @@ class AccountingFileWizard(models.TransientModel): global total_debit global total_credit global no_mvt + #écritures pour les inscriptions évts hors RETRAITES avec facture payée non déjà exportés registration=self.env['event.registration'].search([('date_compta','=',False),('payment_status','=','paid'),('event_id.booking_event','=',False),('event_id.individual_booking_event','=',False)]) if registration: for reg in registration: + membership_credit_line=False + membership_amount=0 reg.date_compta=date_compta #if not reg.invoice_id.payment_mode_id.fixed_journal_id: raise UserError(_("no account found for payment mode %r",reg.invoice_id.payment_mode_id)) account_debit_number=self._file_format(str(reg.invoice_id.payment_mode_id.fixed_journal_id.default_account_id.code),6) @@ -321,6 +324,13 @@ class AccountingFileWizard(models.TransientModel): account_credit_number=self._file_format('754700',6) affectation=reg.event_id.participation_product_id.name + #recherche d'une l'adhésion + membership_credit_line=False + membership=self.env['kalachakra.membership'].search([('invoice_id','=',int(reg.invoice_id))]) + if membership: + membership_credit_line=True + membership_amount=membership.amount + #si facture liée à une transaction: trans=self.env['payment.transaction'].search([('invoice_ids','in',reg.invoice_id.id),('state','=','done')],limit=1) if trans: @@ -331,14 +341,14 @@ class AccountingFileWizard(models.TransientModel): lib2=self._file_format(affectation,13) lib=lib1+' '+lib2 debit='' - credit=str(amount) + credit=str(amount-membership_amount) fic_line=str(no_mvt)+';'+'IN'+';'+date_line+';'+account_credit_number+';'+lib+';'+debit+';'+credit+';'+lib_piece+'\n' f.write(fic_line) no_mvt+=1 total_credit+=amount #debit line - debit=str(amount) + debit=str(amount-membership_amount) credit='' fic_line=str(no_mvt)+';'+'IN'+';'+date_line+';'+account_debit_number+';'+lib+';'+debit+';'+credit+';'+lib_piece+'\n' f.write(fic_line) @@ -573,7 +583,8 @@ class AccountingFileWizard(models.TransientModel): if membership_credit_line: debit='' credit=str(membership_amount) - fic_line=str(no_mvt)+';'+'IN'+';'+date_line+';'+account_credit_number+';'+lib+';'+debit+';'+credit+';'+lib_piece+'\n' + + fic_line=str(no_mvt)+';'+'IN'+';'+date_line+';'+self._file_format('756100',6)+';'+lib+';'+debit+';'+credit+';'+lib_piece+'\n' f.write(fic_line) no_mvt=no_mvt+1 total_credit+=membership_amount