Skip to content
Extraits de code Groupes Projets
Valider 698b1907 rédigé par Hervé Silvant - CGScop's avatar Hervé Silvant - CGScop
Parcourir les fichiers

Correction calcul coti A-1

parent 677e62bf
Branches 14-RV-20250417
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -71,9 +71,6 @@ class ScopCotisationPaca(models.Model): ...@@ -71,9 +71,6 @@ class ScopCotisationPaca(models.Model):
# ------------------------------------------------------ # ------------------------------------------------------
@api.constrains("year") @api.constrains("year")
def _check_year(self): def _check_year(self):
"""
date_dossier <= decision_qualif_date_decision
"""
for rec in self: for rec in self:
if rec.year and (rec.year < 2024 or rec.year > 2050): if rec.year and (rec.year < 2024 or rec.year > 2050):
raise exceptions.ValidationError(_("Année de cotisation invalide")) raise exceptions.ValidationError(_("Année de cotisation invalide"))
...@@ -93,12 +90,12 @@ class ScopCotisationPaca(models.Model): ...@@ -93,12 +90,12 @@ class ScopCotisationPaca(models.Model):
contribution_last_year = self.search( contribution_last_year = self.search(
[ [
("partner_id", "=", contribution.partner_id.id), ("partner_id", "=", contribution.partner_id.id),
("annee", "<", contribution.year - 1), ("year", "=", contribution.year - 1),
] ]
) )
if contribution_last_year: if contribution_last_year:
contribution.amount_contribution_last_year = ( contribution.amount_contribution_last_year = (
contribution_last_year.amount_contribution contribution_last_year[0].amount_contribution
) )
else: else:
contribution.amount_contribution_last_year = 0 contribution.amount_contribution_last_year = 0
...@@ -40,7 +40,6 @@ ...@@ -40,7 +40,6 @@
<field <field
name="amount_paid" name="amount_paid"
widget="monetary" widget="monetary"
attrs="{'readonly': [('invoice_number', '=', False)], 'required': [('invoice_number', '!=', False)]}"
/> />
<field name="notes" /> <field name="notes" />
</tree> </tree>
......
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