From 4fb30a969d0fada26e0cc01618d9a570519dbd71 Mon Sep 17 00:00:00 2001
From: benjamin <benjamin@le-filament.com>
Date: Thu, 25 Jan 2024 18:03:37 +0100
Subject: [PATCH] [UPD] update contribution Industrie
---
models/scop_bordereau_cg.py | 18 ++++++++++--------
models/scop_cotisation_cg.py | 17 +++++++++--------
2 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/models/scop_bordereau_cg.py b/models/scop_bordereau_cg.py
index a6a91e2..b482bb1 100644
--- a/models/scop_bordereau_cg.py
+++ b/models/scop_bordereau_cg.py
@@ -835,15 +835,17 @@ class Bordereau(models.Model):
"cgscop_partner.cotiz_fede_indus"
).id
# Calcul de la cotisation de la fédé de l'industrie
- if liasse:
- amount_fede_indus = base_cotiz.round_to_closest_multiple(
- liasse.contribution_indus, 4
- )
- else:
- amount_fede_indus = 120
- # Ajout d'un forfait de 4 € si pas de salariés
if partner.staff_last == 0:
- amount_fede_indus += 4
+ # Forfait de 4 € si pas de salariés
+ amount_fede_indus = 4
+ else:
+ if liasse:
+ amount_fede_indus = base_cotiz.round_to_closest_multiple(
+ liasse.contribution_indus, 4
+ )
+ else:
+ amount_fede_indus = 120
+
# Création des factures associées
self.create_contribution(
product=product_fede_indus_id,
diff --git a/models/scop_cotisation_cg.py b/models/scop_cotisation_cg.py
index 8aea550..87e5a2f 100644
--- a/models/scop_cotisation_cg.py
+++ b/models/scop_cotisation_cg.py
@@ -767,15 +767,16 @@ class ScopCotisation(models.Model):
if m.is_federation_indus:
datas_contrib_indus = datas_contrib.copy()
- if liasse:
- contrib_fede_indus = self.round_to_closest_multiple(
- liasse.contribution_indus, 4
- )
- else:
- contrib_fede_indus = 120
- # Ajout d'un forfait de 4 € si pas de salariés
if m.staff_last == 0:
- contrib_fede_indus += 4
+ # Forfait de 4 € si pas de salariés
+ contrib_fede_indus = 4
+ else:
+ if liasse:
+ contrib_fede_indus = self.round_to_closest_multiple(
+ liasse.contribution_indus, 4
+ )
+ else:
+ contrib_fede_indus = 120
# Calcul cotisation N-1
contribution_last_year = sum(
--
GitLab