Skip to content
Extraits de code Groupes Projets
Valider dc49a4a6 rédigé par Benjamin - Le Filament's avatar Benjamin - Le Filament
Parcourir les fichiers

[fix] wrong base replace wage_cg by L2052_FY

parent 843a4d72
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -45,18 +45,18 @@ class ScopAuraAccountInvoice(models.Model): ...@@ -45,18 +45,18 @@ class ScopAuraAccountInvoice(models.Model):
# ------------------------------------------------------ # ------------------------------------------------------
# Compute fields # Compute fields
# ------------------------------------------------------ # ------------------------------------------------------
@api.depends("liasse_fiscale_id.wage_cg") @api.depends("liasse_fiscale_id.L2052_FY")
def _compute_wage_cg_connu(self): def _compute_wage_cg_connu(self):
for i in self: for i in self:
if i.cotisation_aura_id: if i.cotisation_aura_id:
i.wage_cg_connu = i.liasse_fiscale_id.wage_cg i.wage_cg_connu = i.liasse_fiscale_id.L2052_FY
@api.depends("wage_cg_retenu") @api.depends("wage_cg_retenu")
def _compute_amount_aura_calculated(self): def _compute_amount_aura_calculated(self):
for i in self: for i in self:
if i.cotisation_aura_id: if i.cotisation_aura_id:
i.amount_aura_calculated = i.env["scop.cotisation.aura"].get_cotiz_aura( i.amount_aura_calculated = i.env["scop.cotisation.aura"].get_cotiz_aura(
partner_id=i.partner_id, wage_cg=i.wage_cg_retenu partner_id=i.partner_id, wage=i.wage_cg_retenu
) )
@api.depends("amount_aura_calculated", "nb_quarter_aura") @api.depends("amount_aura_calculated", "nb_quarter_aura")
......
...@@ -399,8 +399,8 @@ class ScopCotisationAura(models.Model): ...@@ -399,8 +399,8 @@ class ScopCotisationAura(models.Model):
"payment_mode_id": partner.customer_payment_mode_id.id, "payment_mode_id": partner.customer_payment_mode_id.id,
"invoice_date": date_invoice, "invoice_date": date_invoice,
"cotisation_aura_id": self.id, "cotisation_aura_id": self.id,
"wage_cg_connu": liasse.wage_cg, "wage_cg_connu": liasse.L2052_FY,
"wage_cg_retenu": liasse.wage_cg, "wage_cg_retenu": liasse.L2052_FY,
"nb_quarter_aura": nb_quarter_aura, "nb_quarter_aura": nb_quarter_aura,
"invoice_line_ids": [ "invoice_line_ids": [
( (
...@@ -463,7 +463,7 @@ class ScopCotisationAura(models.Model): ...@@ -463,7 +463,7 @@ class ScopCotisationAura(models.Model):
# ------------------------------------------------------ # ------------------------------------------------------
# Calcul des cotisations # Calcul des cotisations
# ------------------------------------------------------ # ------------------------------------------------------
def get_cotiz_aura(self, partner_id, liasse=None, wage_cg=0): def get_cotiz_aura(self, partner_id, liasse=None, wage=0):
""" """
Calcule la cotisation Aura : Calcule la cotisation Aura :
Assiette : Salaires au sens CGSCOP Assiette : Salaires au sens CGSCOP
...@@ -476,13 +476,13 @@ class ScopCotisationAura(models.Model): ...@@ -476,13 +476,13 @@ class ScopCotisationAura(models.Model):
rate = 0.005 rate = 0.005
plancher = 300 plancher = 300
date_debut_plancher = date(2016, 1, 1) date_debut_plancher = date(2016, 1, 1)
if wage_cg == 0: if wage == 0:
if liasse: if liasse:
cotiz = liasse.wage_cg * rate cotiz = liasse.L2052_FY * rate
else: else:
cotiz = 0 cotiz = 0
else: else:
cotiz = wage_cg * rate cotiz = wage * rate
if cotiz < plancher: if cotiz < plancher:
# Last start date of membership period (current membership) # Last start date of membership period (current membership)
# to compare with date plancher # to compare with date plancher
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter