@ -139,7 +139,7 @@ class CdrAccountingFileWizard(models.TransientModel):
name = d . partner_id . name
name = d . partner_id . name
if not name : name = ' N/A '
if not name : name = ' N/A '
if not firstname : firstname = ' '
if not firstname : firstname = ' '
lib1 = first name[ 0 ] + ' ' + name
lib1 = name + ' ' + first name[ 0 ]
lib1 = self . _file_format ( lib1 , 12 )
lib1 = self . _file_format ( lib1 , 12 )
#lib1=lib1[11]
#lib1=lib1[11]
@ -207,7 +207,7 @@ class CdrAccountingFileWizard(models.TransientModel):
name = reg . partner_id . name
name = reg . partner_id . name
if not name : name = ' N/A '
if not name : name = ' N/A '
if not firstname : firstname = ' '
if not firstname : firstname = ' '
lib1 = first name[ 0 ] + ' ' + name
lib1 = name + ' ' + first name[ 0 ]
lib1 = self . _file_format ( lib1 , 12 )
lib1 = self . _file_format ( lib1 , 12 )
lib2 = self . _file_format ( reg . event_id . booking_product_id . name , 13 )
lib2 = self . _file_format ( reg . event_id . booking_product_id . name , 13 )
lib = lib1 + ' ' + lib2
lib = lib1 + ' ' + lib2
@ -271,6 +271,10 @@ class CdrAccountingFileWizard(models.TransientModel):
for reg in registration :
for reg in registration :
tag_ids = reg . event_id . tag_ids
for tag in tag_ids :
if tag . name == ' VOYAGES ' : continue
if reg . event_id . booking_event :
if reg . event_id . booking_event :
if reg . event_id . individual_booking_event :
if reg . event_id . individual_booking_event :
account_credit_number = self . _file_format ( ' 754799 ' , 6 )
account_credit_number = self . _file_format ( ' 754799 ' , 6 )
@ -324,7 +328,7 @@ class CdrAccountingFileWizard(models.TransientModel):
name = reg . partner_id . name
name = reg . partner_id . name
if not name : name = ' N/A '
if not name : name = ' N/A '
if not firstname : firstname = ' '
if not firstname : firstname = ' '
lib1 = first name[ 0 ] + ' ' + name
lib1 = name + ' ' + first name[ 0 ]
lib1 = self . _file_format ( lib1 , 12 )
lib1 = self . _file_format ( lib1 , 12 )
lib2 = self . _file_format ( reg . event_id . booking_product_id . name , 13 )
lib2 = self . _file_format ( reg . event_id . booking_product_id . name , 13 )
lib = lib1 + ' ' + lib2
lib = lib1 + ' ' + lib2
@ -429,7 +433,7 @@ class CdrAccountingFileWizard(models.TransientModel):
name = reg . partner_id . name
name = reg . partner_id . name
if not name : name = ' N/A '
if not name : name = ' N/A '
if not firstname : firstname = ' '
if not firstname : firstname = ' '
lib1 = first name[ 0 ] + ' ' + name
lib1 = name + ' ' + first name[ 0 ]
lib1 = self . _file_format ( lib1 , 12 )
lib1 = self . _file_format ( lib1 , 12 )
lib2 = self . _file_format ( reg . event_id . booking_product_id . name , 13 )
lib2 = self . _file_format ( reg . event_id . booking_product_id . name , 13 )
lib = lib1 + ' ' + lib2
lib = lib1 + ' ' + lib2
@ -445,8 +449,8 @@ class CdrAccountingFileWizard(models.TransientModel):
account_debit_number = self . _file_format ( ' 170000 ' , 6 )
account_debit_number = self . _file_format ( ' 170000 ' , 6 )
trans = self . env [ ' payment.transaction ' ] . search ( [ ( ' invoice_ids ' , ' in ' , reg . down_payment_invoice_id . id ) , ( ' state ' , ' = ' , ' done ' ) ] , limit = 1 )
trans = self . env [ ' payment.transaction ' ] . search ( [ ( ' invoice_ids ' , ' in ' , reg . down_payment_invoice_id . id ) , ( ' state ' , ' = ' , ' done ' ) ] , limit = 1 )
if trans and trans . acquirer_id . name == ' Paypal ' : account_debit_number = self . _file_format ( str ( self . env [ ' account.payment.mode ' ] . search ( [ ( ' name ' , ' = ' , ' Paypal ' ) ] ) . fixed_journal_id . default_account_id . code ) , 6 )
if trans and trans . acquirer_id . name == ' Paiement par carte bancaire ' : account_debit_number = self . _file_format ( str ( self . env [ ' account.payment.mode ' ] . search ( [ ( ' name ' , ' = ' , ' CB ' ) ] ) . fixed_journal_id . default_account_id . code ) , 6 )
#if trans and trans.acquirer_id.name=='Paypal': account_debit_number=self._file_format(str(self.env['account.payment.mode'].search([('name','=','Paypal')]).fixed_journal_id.default_account_id.code),6 )
#if trans and trans.acquirer_id.name=='Paiement par carte bancaire': account_debit_number=self._file_format(str(self.env['account.payment.mode'].search([('name','=','CB')]).fixed_journal_id.default_account_id.code),6 )
amount = reg . down_payment_invoice_id . amount_total
amount = reg . down_payment_invoice_id . amount_total
date_line = self . _date_format ( reg . date_payment_down_payment )
date_line = self . _date_format ( reg . date_payment_down_payment )
@ -510,7 +514,7 @@ class CdrAccountingFileWizard(models.TransientModel):
name = reg . partner_id . name
name = reg . partner_id . name
if not name : name = ' N/A '
if not name : name = ' N/A '
if not firstname : firstname = ' '
if not firstname : firstname = ' '
lib1 = first name[ 0 ] + ' ' + name
lib1 = name + ' ' + first name[ 0 ]
lib1 = self . _file_format ( lib1 , 12 )
lib1 = self . _file_format ( lib1 , 12 )
lib2 = self . _file_format ( reg . event_id . booking_product_id . name , 13 )
lib2 = self . _file_format ( reg . event_id . booking_product_id . name , 13 )
lib = lib1 + ' ' + lib2
lib = lib1 + ' ' + lib2
@ -619,7 +623,7 @@ class CdrAccountingFileWizard(models.TransientModel):
name = invoice . partner_id . name
name = invoice . partner_id . name
if not name : name = ' N/A '
if not name : name = ' N/A '
if not firstname : firstname = ' '
if not firstname : firstname = ' '
lib1 = first name[ 0 ] + ' ' + name
lib1 = name + ' ' + first name[ 0 ]
lib1 = self . _file_format ( lib1 , 12 )
lib1 = self . _file_format ( lib1 , 12 )
lines = self . env [ ' account.move.line ' ] . search ( [ ( ' move_id ' , ' = ' , int ( invoice . id ) ) ] , limit = 1 )
lines = self . env [ ' account.move.line ' ] . search ( [ ( ' move_id ' , ' = ' , int ( invoice . id ) ) ] , limit = 1 )
@ -667,7 +671,7 @@ class CdrAccountingFileWizard(models.TransientModel):
#_logger.error(name)
#_logger.error(name)
if not name : name = ' N/A '
if not name : name = ' N/A '
if not firstname : firstname = ' '
if not firstname : firstname = ' '
lib1 = first name[ 0 ] + ' ' + name
lib1 = name + ' ' + first name[ 0 ]
lib1 = self . _file_format ( lib1 , 12 )
lib1 = self . _file_format ( lib1 , 12 )
lib2 = ' '
lib2 = ' '