[Nos ptits loups] Version 1.06d - Corrections

studio1247 · May 25, 2016 · 6e93b96 · 6e93b96
1 parent 3bdf2d2
commit 6e93b96
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/doc_facture_mensuelle.py b/doc_facture_mensuelle.py
@@ -130,10 +130,10 @@ def FillRecapSection(self, section, facture):
                             details = " (%s)" % GetHeureString(facture.jours_absence_non_prevenue[date])                                    
                         elif date in facture.jours_presence_selon_contrat:
                             state = PRESENT
-                            details = " (%s)" % GetHeureString(facture.jours_presence_selon_contrat[date][1])
+                            details = " (%s)" % GetHeureString(facture.jours_presence_selon_contrat[date])
                         elif date in facture.jours_supplementaires:
                             state = SUPPLEMENT
-                            details = " (%s)" % GetHeureString(facture.jours_supplementaires[date][1])
+                            details = " (%s)" % GetHeureString(facture.jours_supplementaires[date])
                         elif date in facture.jours_maladie:
                             state = MALADE
                         elif facture.inscrit.IsDateConge(date):

diff --git a/facture.py b/facture.py
@@ -312,9 +312,9 @@ def __init__(self, inscrit, annee, mois, options=0):
                                         self.CalculeSupplement(cotisation, heures_supplementaires_facturees)
 
                             if affectation_jours_supplementaires:
-                                self.jours_supplementaires[date] = heures_realisees, heures_facturees
+                                self.jours_supplementaires[date] = heures_realisees
                             else:
-                                self.jours_presence_selon_contrat[date] = heures_realisees, heures_facturees
+                                self.jours_presence_selon_contrat[date] = heures_realisees
 
                             if cotisation.majoration_journaliere:
                                 self.supplement += cotisation.majoration_journaliere

diff --git a/panel_planning.py b/panel_planning.py
@@ -111,7 +111,7 @@ def GetHeuresEnfant(line):
                     date = GetMonthStart(self.date)
                 else:
                     date = GetNextMonthStart(self.date)
-                if date in inscrit.factures_cloturees:
+                if creche.cloture_factures and date in inscrit.factures_cloturees:
                     line.readonly = True
                 line.day = self.date.weekday()
                 self.lignes_enfants.append(line)

diff --git a/version.py b/version.py
@@ -15,4 +15,4 @@
 #    You should have received a copy of the GNU General Public License
 #    along with Gertrude; if not, see <http://www.gnu.org/licenses/>.
 
-VERSION = '1.06c'
+VERSION = '1.06d'