diff --git a/models/scop_cotisation_cg.py b/models/scop_cotisation_cg.py index 754fb861c5671903283bdd4a6870be8bbdae7647..ed013588694405578ced1ea02e382a0e2961e401 100644 --- a/models/scop_cotisation_cg.py +++ b/models/scop_cotisation_cg.py @@ -761,6 +761,7 @@ class ScopCotisation(models.Model): [ ("partner_id", "=", member.id), ("is_qualified", "=", True), + ("year", ">", 0), "|", "|", ("L2052_FL", ">", 0), @@ -769,6 +770,21 @@ class ScopCotisation(models.Model): ], order="year desc", ) + + if not liasse_ids: + liasse_ids = Liasse.search( + [ + ("partner_id", "=", member.id), + ("is_qualified", "=", True), + "|", + "|", + ("L2052_FL", ">", 0), + ("av_lf", ">", 0), + ("av_cg", ">", 0), + ], + order="id desc", + ) + if liasse_ids: last_liasse = liasse_ids[0] if last_liasse.year > 0: