Merge branch 'main' of git.ebene.ovh:ebene/radiantrh

Modele/College_temp.php

@@ -80,7 +80,9 @@ class College_temp extends Modele {
 
     public function getPrestation($idCollegeTemp)
 	{
-		$sql = 'select A.*, B.libelle as reseausoin from prestation_temp A
+		//
+		$sql = 'select A.*, B.libelle as reseausoin, 
+		B.libelleEng as reseausoinEng  from prestation_temp A
 		join reseausoins B on (B.codeReseau=A.codeReseau)
 		where (A.idCollegeTemp=?) order by A.tmBase, A.tm';
 		

Vue/Ajaxconsultertableauprestation/index.php

@@ -15,9 +15,13 @@
       <tbody>
         <?php foreach ($tableau_prestations as $prestation):
           $idPrestation = $this->nettoyer($prestation['id']);
+          $reseausoin = est_anglophone() 
+          ? $this->nettoyer($prestation['reseausoinEng']) 
+          : $this->nettoyer($prestation['reseausoin']);
+
         ?>
         <tr class="align-middle">
-          <td><?= $this->nettoyer($prestation['reseausoin']) ?></td>
+          <td><?= $reseausoin ?></td>
           <td><?= $this->nettoyer($prestation['tmBase']) ?></td>
           <td><?= $this->nettoyer($prestation['tauxRachatTm']) ?></td>
           <td><?= $this->nettoyer($prestation['tm']) ?></td>

Vue/gabarit.php

@@ -291,9 +291,11 @@ $photoAssureCrypte = $_SESSION['photoAssureCrypte'];
                         <a class="dropdown-item" href="javascript:change_password()">
                             <i class="fas fa-user-circle me-2"></i> <?= _('Mon compte') ?>
                         </a>
+                        <!--
                         <a class="dropdown-item" href="javascript:appNotifications.showMessagesModal()">
                             <i class="fas fa-envelope me-2"></i> <?= _('Messagerie') ?>
                         </a>
+                        -->
                         <div class="dropdown-divider"></div>
                         <a class="dropdown-item text-danger" href="Connexion/deconnecter">
                             <i class="fas fa-sign-out-alt me-2"></i> <?= _('Déconnexion') ?>