Ajout d'un mode de compatibilité (correction janvier 2018)

studio1247 · Feb 16, 2019 · ac09210 · ac09210
1 parent 4f53b18
commit ac09210
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/config.py b/config.py
@@ -194,6 +194,8 @@ def getOptionsParameter(self):
             options |= COMPATIBILITY_MODE_ADAPTATIONS_2016
         if "compatibility-decompte-semaines-2017" in value:
             options |= COMPATIBILITY_MODE_DECOMPTE_SEMAINES_2017
+        if "compatibility-adaptations-2018" in value:
+            options |= COMPATIBILITY_MODE_ADAPTATIONS_2018
         if "regularisation-uniquement-semaines-fermeture" in value:
             options |= REGULARISATION_UNIQUEMENT_SEMAINES_FERMETURE
         if "prelevements-automatiques" in value:

diff --git a/constants.py b/constants.py
@@ -445,6 +445,7 @@
 TARIFS_SPECIAUX_LABELS = 1 << 20
 PREINSCRIPTIONS_ONLY = 1 << 21
 REGULARISATION_UNIQUEMENT_SEMAINES_FERMETURE = 1 << 22
+COMPATIBILITY_MODE_ADAPTATIONS_2018 = 1 << 23
 
 # Atributs de plages horaires spéciales
 PLAGE_FERMETURE = 0

diff --git a/cotisation.py b/cotisation.py
@@ -158,7 +158,8 @@ def __init__(self, inscrit, date, options=0):
                 self.fin = self.inscription.fin_periode_adaptation
             else:
                 self.debut = self.inscription.fin_periode_adaptation + datetime.timedelta(1)
-                self.debut_inscription = self.debut
+                if not (config.options & COMPATIBILITY_MODE_ADAPTATIONS_2018):
+                    self.debut_inscription = self.debut
 
         if options & TRACES:
             print("\nCotisation de %s au %s ..." % (GetPrenomNom(inscrit), date))

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.17'
+VERSION = '1.22.18'