From fef7f5ab11192eb7dc894ef09cc1bf42cbbadd96 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Fri, 30 Dec 2016 21:11:02 +0100 Subject: [PATCH] =?UTF-8?q?Tests=20non=20r=C3=A9gression=20de=20nouveau=20?= =?UTF-8?q?OK?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- facture.py | 3 +-- sqlobjects.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/facture.py b/facture.py index 927b39d7..09962d6e 100644 --- a/facture.py +++ b/facture.py @@ -288,7 +288,7 @@ def __init__(self, inscrit, annee, mois, options=0): elif state == VACANCES: if heures_reference > 0: self.jours_vacances.append(date) - if not inscription.IsNombreSemainesCongesAtteint(date): + if creche.repartition == REPARTITION_SANS_MENSUALISATION and not inscription.IsNombreSemainesCongesAtteint(date): self.jours_conges_non_factures.append(date) self.heures_facturees_par_mode[cotisation.mode_garde] -= heures_reference self.CalculeDeduction(cotisation, heures_reference) @@ -309,7 +309,6 @@ def __init__(self, inscrit, annee, mois, options=0): affectation_jours_supplementaires = True self.CalculeSupplement(cotisation, 10) elif cotisation.inscription.mode not in (MODE_FORFAIT_MENSUEL, MODE_FORFAIT_HEBDOMADAIRE): - print "ICI1", heures_supplementaires_facturees cotisation.heures_supplementaires += heures_supplementaires_facturees self.heures_supplementaires += heures_supplementaires_facturees self.heures_facture_par_mode[cotisation.mode_garde] += heures_supplementaires_facturees diff --git a/sqlobjects.py b/sqlobjects.py index 7e869dec..642f2bcb 100644 --- a/sqlobjects.py +++ b/sqlobjects.py @@ -1871,7 +1871,7 @@ def GetNombreJoursCongesPoses(self): return 0 def IsNombreSemainesCongesAtteint(self, jalon): - if creche.repartition != REPARTITION_SANS_MENSUALISATION or creche.facturation_jours_feries == ABSENCES_DEDUITES_SANS_LIMITE: + if creche.facturation_jours_feries == ABSENCES_DEDUITES_SANS_LIMITE: return False if self.debut: if not self.semaines_conges: