From 00e39fd15d9c093d6ccc8d498e61b54231c8e875 Mon Sep 17 00:00:00 2001
From: benjamin <benjamin@le-filament.com>
Date: Mon, 6 Feb 2023 11:43:26 +0100
Subject: [PATCH] [update] contribution CG : authorize negative VA in
calculation
---
models/scop_cotisation_cg.py | 2 +-
models/scop_liasse_fiscale.py | 25 ++++++++-----------------
2 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/models/scop_cotisation_cg.py b/models/scop_cotisation_cg.py
index 27632d9..b0681c4 100644
--- a/models/scop_cotisation_cg.py
+++ b/models/scop_cotisation_cg.py
@@ -823,7 +823,7 @@ class ScopCotisation(models.Model):
:return:
"""
liasse.read(["av_lf", "av_cg"])
- if liasse.av_lf > 0:
+ if liasse.av_lf != 0:
if liasse.av_lf > liasse.av_cg:
va = liasse.av_cg
else:
diff --git a/models/scop_liasse_fiscale.py b/models/scop_liasse_fiscale.py
index 80eed44..7fb1bdc 100644
--- a/models/scop_liasse_fiscale.py
+++ b/models/scop_liasse_fiscale.py
@@ -63,10 +63,9 @@ class ScopLiasseFiscale(models.Model):
@return float : cotisation
"""
for liasse in self:
- # Calcul VA
+ # Calcul VA la plus avantageuse
liasse.read(["av_lf", "av_cg", "L2052_FL"])
- # Calcul de la VA la plus avantageuse
- if liasse.av_lf > 0:
+ if liasse.av_lf != 0:
if liasse.av_lf > liasse.av_cg:
va = liasse.av_cg
else:
@@ -80,20 +79,12 @@ class ScopLiasseFiscale(models.Model):
ca = ca * (12 / liasse.dureeExercice)
# Calcul Type Assiette
- if ca > 0 and va > 0:
- if ca <= va * 7 / 3:
- contribution_base_type = "ca"
- contribution_base_amount = ca
- else:
- contribution_base_type = "va"
- contribution_base_amount = va
+ if ca <= va * 7 / 3:
+ contribution_base_type = "ca"
+ contribution_base_amount = ca
else:
- if va > 0:
- contribution_base_type = "va"
- contribution_base_amount = va
- else:
- contribution_base_type = "ca"
- contribution_base_amount = ca
+ contribution_base_type = "va"
+ contribution_base_amount = va
liasse.contribution_base_type = contribution_base_type
liasse.contribution_base_amount = contribution_base_amount
@@ -241,7 +232,7 @@ class ScopLiasseFiscale(models.Model):
liasse.read(["av_lf", "av_cg"])
if liasse.partner_id.is_federation_com:
# Calcul VA
- if liasse.av_lf > 0:
+ if liasse.av_lf != 0:
if liasse.av_lf > liasse.av_cg:
va = liasse.av_cg
else:
--
GitLab