diff --git a/models/scop_cotisation_cg.py b/models/scop_cotisation_cg.py index ee6a7901af45e2d806b7f34380006c0b35826f6c..64b10fb9d4313188c11c0e9dd2946568013ff8c8 100644 --- a/models/scop_cotisation_cg.py +++ b/models/scop_cotisation_cg.py @@ -496,6 +496,7 @@ class ScopCotisation(models.Model): # Ajout ligne UR HDF ur_hdf = self.env.ref('cgscop_partner.riga_14232') if m.ur_id == ur_hdf: + datas_contrib_hdf = datas_contrib.copy() # Calcul cotisation contrib_hdf = self.round_to_closest_multiple( liasse.contribution_hdf, 4) if liasse else 40 @@ -503,15 +504,16 @@ class ScopCotisation(models.Model): contribution_last_year = sum(line_ids.filtered( lambda l: l.product_id == product_hdf_id).mapped( 'price_subtotal_signed')) - datas_contrib[4] = 'Cotisation UR HDF' - datas_contrib[5] = contrib_hdf - datas_contrib[6] = contribution_last_year - datas.append(datas_contrib) + datas_contrib_hdf[4] = 'Cotisation UR HDF' + datas_contrib_hdf[5] = contrib_hdf + datas_contrib_hdf[6] = contribution_last_year + datas.append(datas_contrib_hdf) total_hdf += contrib_hdf # Ajout ligne UR Med ur_med = self.env.ref('cgscop_partner.riga_14243') if m.ur_id == ur_med: + datas_contrib_med = datas_contrib.copy() # Calcul cotisation contrib_med = self.round_to_closest_multiple( liasse.contribution_med, 4) if liasse else 0 @@ -519,14 +521,15 @@ class ScopCotisation(models.Model): contribution_last_year = sum(line_ids.filtered( lambda l: l.product_id == product_med_id).mapped( 'price_subtotal_signed')) - datas_contrib[4] = 'Cotisation UR Méditerranée' - datas_contrib[5] = contrib_med - datas_contrib[6] = contribution_last_year - datas.append(datas_contrib) + datas_contrib_med[4] = 'Cotisation UR Méditerranée' + datas_contrib_med[5] = contrib_med + datas_contrib_med[6] = contribution_last_year + datas.append(datas_contrib_med) total_med += contrib_med # Ajout ligne Fédération Com if m.is_federation_com: + datas_contrib_com = datas_contrib.copy() # Calcul cotisation if liasse: contrib_fede_com = self.round_to_closest_multiple( @@ -543,23 +546,24 @@ class ScopCotisation(models.Model): contribution_last_year = sum(line_ids.filtered( lambda l: l.product_id == product_com_id).mapped( 'price_subtotal_signed')) - datas_contrib[4] = 'Cotisation Fédération de la Com' - datas_contrib[5] = contrib_fede_com - datas_contrib[6] = contribution_last_year - datas.append(datas_contrib) + datas_contrib_com[4] = 'Cotisation Fédération de la Com' + datas_contrib_com[5] = contrib_fede_com + datas_contrib_com[6] = contribution_last_year + datas.append(datas_contrib_com) total_com += contrib_fede_com # Ajout ligne Fédération CAE if m.is_federation_cae: + datas_contrib_cae = datas_contrib.copy() contrib_fede_cae = 100 # Calcul cotisation N-1 contribution_last_year = sum(line_ids.filtered( lambda l: l.product_id == product_cae_id).mapped( 'price_subtotal_signed')) - datas_contrib[4] = 'Cotisation Fédération des CAE' - datas_contrib[5] = contrib_fede_cae - datas_contrib[6] = contribution_last_year - datas.append(datas_contrib) + datas_contrib_cae[4] = 'Cotisation Fédération des CAE' + datas_contrib_cae[5] = contrib_fede_cae + datas_contrib_cae[6] = contribution_last_year + datas.append(datas_contrib_cae) total_cae += contrib_fede_cae count_member += 1 @@ -582,6 +586,7 @@ class ScopCotisation(models.Model): # Intégration datas format_monetary = workbook.add_format( {'num_format': '#,##0 [$€-407]'}) + for row, contrib in enumerate(datas): for col, value in enumerate(contrib): worksheet1.write(row + 1, col, value)