Correction export Filoue

studio1247 · Feb 22, 2021 · c51580d · c51580d
1 parent d49258d
commit c51580d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/generation/export_filoue.py b/generation/export_filoue.py
@@ -57,27 +57,22 @@ def execute(self, text):
             total_facture = 0
             date = self.start
             error = False
-            facture_heures = None
+            facture = None
             while date < self.end:
                 try:
-                    facture_montants = Facture(inscrit, self.annee, date.month, NO_NUMERO)
-                    if database.creche.temps_facturation == FACTURATION_FIN_MOIS:
-                        facture_heures = facture_montants
-                    else:
-                        date_heures = GetNextMonthStart(date)
-                        facture_heures = Facture(inscrit, date_heures.year, date_heures.month, NO_NUMERO)
+                    facture = Facture(inscrit, self.annee, date.month, NO_NUMERO)
                     regime_caf = self.get_regime_caf(inscrit, date)
-                    heures_realisees += facture_heures.heures_realisees
-                    heures_facturees += facture_heures.heures_facturees
-                    total_facture += facture_montants.total
+                    heures_realisees += facture.heures_realisees
+                    heures_facturees += facture.heures_facturees
+                    total_facture += facture.total
                 except CotisationException as e:
                     errors[GetPrenomNom(inscrit)] = e.errors
                     error = True
                 if error:
                     break
                 date = GetNextMonthStart(date)
             line = template
-            if facture_heures:
+            if facture:
                 fields = {
                     "top-allocataire": 1,
                     "prenom": inscrit.prenom,

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.22.34'
+VERSION = '1.22.35'