Merge tag 'fix-7630' into develop

# Conflicts:
#	pages/parameters/attendances.vue

pages/parameters/attendances.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <LayoutCommonSection v-if="organizationProfile.isSchool">
+    <LayoutParametersSection>
       <h4>{{ $t('configuration') }}</h4>
       <UiFormEdition :model="Parameters" :id="organizationProfile.parametersId">
         <template #default="{ entity : parameters }">
@@ -14,33 +14,34 @@
                   field="handlePresence"
                   label="handlePresence"
                 />
+                <div v-if="organizationProfile.isSchool">
+                  <h5 class="pa-2">{{ $t('alert') }}</h5>
+                  <UiInputCheckbox
+                    v-model="parameters.sendAttendanceEmail"
+                    field="sendAttendanceEmail"
+                    label="sendAttendanceEmail"
+                  />
 
-                <h5 class="pa-2">{{ $t('alert') }}</h5>
-                <UiInputCheckbox
-                  v-model="parameters.sendAttendanceEmail"
-                  field="sendAttendanceEmail"
-                  label="sendAttendanceEmail"
-                />
-
-                <UiInputCheckbox
-                  v-model="parameters.sendAttendanceSms"
-                  field="sendAttendanceSms"
-                  label="sendAttendanceSms"
-                />
+                  <UiInputCheckbox
+                    v-model="parameters.sendAttendanceSms"
+                    field="sendAttendanceSms"
+                    label="sendAttendanceSms"
+                  />
 
-                <UiInputCheckbox
-                  v-model="parameters.notifyAdministrationAbsence"
-                  field="notifyAdministrationAbsence"
-                  label="notifyAdministrationAbsence"
-                />
+                  <UiInputCheckbox
+                    v-model="parameters.notifyAdministrationAbsence"
+                    field="notifyAdministrationAbsence"
+                    label="notifyAdministrationAbsence"
+                  />
 
-                <UiInputNumber
-                  v-if="parameters.notifyAdministrationAbsence"
-                  v-model="parameters.numberConsecutiveAbsences"
-                  field="numberConsecutiveAbsences"
-                  label="numberConsecutiveAbsences"
-                  :rules="getAsserts('numberConsecutiveAbsences')"
-                />
+                  <UiInputNumber
+                    v-if="parameters.notifyAdministrationAbsence"
+                    v-model="parameters.numberConsecutiveAbsences"
+                    field="numberConsecutiveAbsences"
+                    label="numberConsecutiveAbsences"
+                    :rules="getAsserts('numberConsecutiveAbsences')"
+                  />
+                </div>
               </v-col>
             </v-row>
           </div>