Merge tag 'V8-3046' into develop

src/Service/Organization/Utils.php

@@ -76,11 +76,12 @@ class Utils
      * @see UtilsTest::testGetOrganizationCurrentActivityYear()
      */
     public static function getOrganizationCurrentActivityYear(Organization $organization): int{
-        $musicalDate = $organization->getParameters()->getMusicalDate();
-        if(empty($musicalDate)) $musicalDate = new \DateTime('now');
-
         $today = new \DateTime();
         $year = intval($today->format('Y'));
+
+        $musicalDate = $organization->getParameters()->getMusicalDate();
+        if(empty($musicalDate)) $musicalDate = new \DateTime($year.'-08-31');
+
         $base_date = new \DateTime($musicalDate->format($year.'-m-d'));
         $dateStart = new \DateTime($year . '-01-01');