Browse Source

fix booking parameter sudo

master
root 2 years ago
parent
commit
c886585222
2 changed files with 15 additions and 4 deletions
  1. +1
    -1
      controllers/booking.py
  2. +14
    -3
      wizard/accounting_file_wizard.py

+ 1
- 1
controllers/booking.py View File

@ -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


+ 14
- 3
wizard/accounting_file_wizard.py View File

@ -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


Loading…
Cancel
Save