From f0d12a44dcdc7265a4f75a4846c3e3661606682e Mon Sep 17 00:00:00 2001
From: KONE SOREL <skone@ebene.info>
Date: Mon, 30 Mar 2026 08:40:10 +0000
Subject: [PATCH 01/20] edr

---
 Vue/Fichebeneficiaire/index.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Vue/Fichebeneficiaire/index.php b/Vue/Fichebeneficiaire/index.php
index b44c01a..a45b0c0 100644
--- a/Vue/Fichebeneficiaire/index.php
+++ b/Vue/Fichebeneficiaire/index.php
@@ -10,6 +10,8 @@
 	$derogation_en_cours 		= $_SESSION['p_derogation_en_cours_C'];
 	$dateSortieBeneficiaire		= $this->nettoyer($beneficiaire['dateSortieBeneficiaire']);
 	
+	var_dump($dateSortieBeneficiaire);
+	
 	$estsorti 					= false;
 	// maj 15/10/2018 => si dateSortie < dateJour => on n'est pas couvert
 	if($dateSortieBeneficiaire>"2000-01-01")

From 75d3b043ad4eb77ed407612a90d4697319a522fc Mon Sep 17 00:00:00 2001
From: KONE SOREL <skone@ebene.info>
Date: Mon, 30 Mar 2026 08:55:17 +0000
Subject: [PATCH 02/20] df

---
 Vue/Fichebeneficiaire/index.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Vue/Fichebeneficiaire/index.php b/Vue/Fichebeneficiaire/index.php
index a45b0c0..46e7d6e 100644
--- a/Vue/Fichebeneficiaire/index.php
+++ b/Vue/Fichebeneficiaire/index.php
@@ -1,6 +1,9 @@
 <?php 
 	$this->titre				= "INTER-SANTE - Fiche Bénéficiaire"; 
 	$datejour					= $this->datejour;	
+
+	var_dump($datejour);
+
 	$estcouvert 				= ($_SESSION['p_dateEcheancePolice_C']>=$datejour);
 	$_SESSION['p_nbTentative'] 	= "0";
 	$age 						= $beneficiaire['ageBeneficiaire'];
@@ -8,8 +11,9 @@
 	$estsubstitue 				= ($_SESSION['p_idSubstitut_C']>0);
 	$college_couvert 			= $_SESSION['p_college_couvert_C'];
 	$derogation_en_cours 		= $_SESSION['p_derogation_en_cours_C'];
+
 	$dateSortieBeneficiaire		= $this->nettoyer($beneficiaire['dateSortieBeneficiaire']);
-	
+
 	var_dump($dateSortieBeneficiaire);
 	
 	$estsorti 					= false;

From 2ea1c4e744daa03581bda62d3fefcf2164fb9330 Mon Sep 17 00:00:00 2001
From: KONE SOREL <skone@ebene.info>
Date: Mon, 30 Mar 2026 08:57:54 +0000
Subject: [PATCH 03/20] drt

---
 Vue/Fichebeneficiaire/index.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Vue/Fichebeneficiaire/index.php b/Vue/Fichebeneficiaire/index.php
index 46e7d6e..c1e0555 100644
--- a/Vue/Fichebeneficiaire/index.php
+++ b/Vue/Fichebeneficiaire/index.php
@@ -2,7 +2,7 @@
 	$this->titre				= "INTER-SANTE - Fiche Bénéficiaire"; 
 	$datejour					= $this->datejour;	
 
-	var_dump($datejour);
+	//var_dump($datejour);
 
 	$estcouvert 				= ($_SESSION['p_dateEcheancePolice_C']>=$datejour);
 	$_SESSION['p_nbTentative'] 	= "0";
@@ -14,13 +14,16 @@
 
 	$dateSortieBeneficiaire		= $this->nettoyer($beneficiaire['dateSortieBeneficiaire']);
 
-	var_dump($dateSortieBeneficiaire);
+	//var_dump($dateSortieBeneficiaire);
 	
 	$estsorti 					= false;
 	// maj 15/10/2018 => si dateSortie < dateJour => on n'est pas couvert
 	if($dateSortieBeneficiaire>"2000-01-01")
 	{
 		$estsorti 				= ($dateSortieBeneficiaire<=$datejour);
+
+		var_dump($estsorti);
+
 		$estcouvert 			= ($estcouvert && ($dateSortieBeneficiaire>$datejour));
 	}
 

From cf44d2f56558fc929989c79dad3fd98c765cc668 Mon Sep 17 00:00:00 2001
From: KONE SOREL <skone@ebene.info>
Date: Mon, 30 Mar 2026 08:58:56 +0000
Subject: [PATCH 04/20] dert

---
 Vue/Fichebeneficiaire/index.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Vue/Fichebeneficiaire/index.php b/Vue/Fichebeneficiaire/index.php
index c1e0555..f06cfcc 100644
--- a/Vue/Fichebeneficiaire/index.php
+++ b/Vue/Fichebeneficiaire/index.php
@@ -21,10 +21,9 @@
 	if($dateSortieBeneficiaire>"2000-01-01")
 	{
 		$estsorti 				= ($dateSortieBeneficiaire<=$datejour);
-
-		var_dump($estsorti);
-
 		$estcouvert 			= ($estcouvert && ($dateSortieBeneficiaire>$datejour));
+
+		var_dump($estcouvert);
 	}
 
 	$dateEffetCouvert 			= $_SESSION['p_dateEffetCouvert'];

From 913112d886c3b85d15fc760318591cd1060d436a Mon Sep 17 00:00:00 2001
From: KONE SOREL <skone@ebene.info>
Date: Mon, 30 Mar 2026 09:01:19 +0000
Subject: [PATCH 05/20] dert

---
 Vue/Fichebeneficiaire/index.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Vue/Fichebeneficiaire/index.php b/Vue/Fichebeneficiaire/index.php
index f06cfcc..d34e81d 100644
--- a/Vue/Fichebeneficiaire/index.php
+++ b/Vue/Fichebeneficiaire/index.php
@@ -22,8 +22,6 @@
 	{
 		$estsorti 				= ($dateSortieBeneficiaire<=$datejour);
 		$estcouvert 			= ($estcouvert && ($dateSortieBeneficiaire>$datejour));
-
-		var_dump($estcouvert);
 	}
 
 	$dateEffetCouvert 			= $_SESSION['p_dateEffetCouvert'];
@@ -43,6 +41,8 @@
 	
 	$prestationPossible		= $this->nettoyer($beneficiaire['prestationPossible']);
 	$pointvente		= $this->nettoyer($beneficiaire['pointvente']);
+
+	var_dump($beneficiaire['codeEtatBeneficiaire']);
 ?>
 
 <script type="text/javascript">

From 210b3b93f7331585591e66c4d21e611beb462331 Mon Sep 17 00:00:00 2001
From: KONE SOREL <skone@ebene.info>
Date: Mon, 30 Mar 2026 09:28:33 +0000
Subject: [PATCH 06/20] df

---
 Js/fonctions.js                 |  1 +
 Vue/Fichebeneficiaire/index.php | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Js/fonctions.js b/Js/fonctions.js
index 9a5f759..71147d9 100644
--- a/Js/fonctions.js
+++ b/Js/fonctions.js
@@ -1060,6 +1060,7 @@ function prestation_possible()
 	{
 		v_msg="Attention! "+etatbeneficiaire;
 		v_msgEng="Warning! "+etatbeneficiaire;
+		
 		alert_ebene(v_msg, v_msgEng);
 		return false;
 	}
diff --git a/Vue/Fichebeneficiaire/index.php b/Vue/Fichebeneficiaire/index.php
index d34e81d..a842b46 100644
--- a/Vue/Fichebeneficiaire/index.php
+++ b/Vue/Fichebeneficiaire/index.php
@@ -40,9 +40,9 @@
 	$faceActif 		= $_SESSION['p_faceActif'];
 	
 	$prestationPossible		= $this->nettoyer($beneficiaire['prestationPossible']);
-	$pointvente		= $this->nettoyer($beneficiaire['pointvente']);
+	$pointvente				= $this->nettoyer($beneficiaire['pointvente']);
 
-	var_dump($beneficiaire['codeEtatBeneficiaire']);
+	
 ?>
 
 <script type="text/javascript">
@@ -60,6 +60,9 @@
 <INPUT 	class="sr-only" TYPE="text" id="faceRegistered" name="faceRegistered" value="<?= $faceRegistered ?>">		
 <INPUT 	class="sr-only" TYPE="text" id="prestationPossible" name="prestationPossible" value="<?= $prestationPossible ?>">
 
+<INPUT 	class="sr-only" TYPE="text" id="estsorti" name="estsorti" value="<?= $estsorti ?>">
+
+
 <legend><?= _("Bénéficiaire") . " : (" . $beneficiaire['numeroBeneficiaire'] . ") => " . _("Date Effet") . " : " . dateLang($this->nettoyer($beneficiaire['dateEffetBeneficiaire']), $_SESSION['p_lang']) ?></legend>
 <button class="sr-only" id="btn_pop_save_face" name="btn_pop_save_face" type="button" data-toggle="modal" data-target="#pop_rec_faciale"  >  </button>
 
@@ -152,6 +155,9 @@
 							<?php if ($beneficiaire['codeEtatBeneficiaire']=="V"): ?>
 								<td align="center" style='font-size:10pt; background-color:blue;color:white;'> <?= $beneficiaire['etatbeneficiaireEng'] ?> </td>
 							<?php else: ?>
+								<?php if(!($estsorti)): ?>
+									<td align="center" style='font-size:10pt; background-color:blue;color:white;'> <?= $beneficiaire['etatbeneficiaireEng'] ?> </td>
+								<?php endif; ?>
 								<td align="center" style='font-size:10pt; background-color:red;color:white;'> <?= $beneficiaire['etatbeneficiaireEng']  ?> </td>
 							<?php endif; ?>
 						<?php else: ?>

From b5a7f94eaf69aa0fd56d366502656825c2afb73e Mon Sep 17 00:00:00 2001
From: KONE SOREL <skone@ebene.info>
Date: Mon, 30 Mar 2026 09:32:21 +0000
Subject: [PATCH 07/20] df

---
 Vue/Fichebeneficiaire/index.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Vue/Fichebeneficiaire/index.php b/Vue/Fichebeneficiaire/index.php
index a842b46..a253989 100644
--- a/Vue/Fichebeneficiaire/index.php
+++ b/Vue/Fichebeneficiaire/index.php
@@ -155,10 +155,12 @@
 							<?php if ($beneficiaire['codeEtatBeneficiaire']=="V"): ?>
 								<td align="center" style='font-size:10pt; background-color:blue;color:white;'> <?= $beneficiaire['etatbeneficiaireEng'] ?> </td>
 							<?php else: ?>
-								<?php if(!($estsorti)): ?>
+								<td align="center" style='font-size:10pt; background-color:red;color:white;'> <?= $beneficiaire['etatbeneficiaireEng']  ?> </td>
+								
+								<?php if(!$estsorti): ?>
 									<td align="center" style='font-size:10pt; background-color:blue;color:white;'> <?= $beneficiaire['etatbeneficiaireEng'] ?> </td>
 								<?php endif; ?>
-								<td align="center" style='font-size:10pt; background-color:red;color:white;'> <?= $beneficiaire['etatbeneficiaireEng']  ?> </td>
+								
 							<?php endif; ?>
 						<?php else: ?>
 							<?php if ($beneficiaire['codeEtatBeneficiaire']=="V"): ?>

From 00ad83fa453221ca77dc902817cc9a90042f0df5 Mon Sep 17 00:00:00 2001
From: KONE SOREL <skone@ebene.info>
Date: Mon, 30 Mar 2026 09:43:45 +0000
Subject: [PATCH 08/20] sdr

---
 Vue/Fichebeneficiaire/index.php | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/Vue/Fichebeneficiaire/index.php b/Vue/Fichebeneficiaire/index.php
index a253989..4d3119f 100644
--- a/Vue/Fichebeneficiaire/index.php
+++ b/Vue/Fichebeneficiaire/index.php
@@ -152,15 +152,14 @@
 				<?php else: ?>
 					<?php if ($estcouvert) : ?>
 						<?php if (isset($_SESSION['p_lang']) && $_SESSION['p_lang']=="en_US"): ?>
-							<?php if ($beneficiaire['codeEtatBeneficiaire']=="V"): ?>
-								<td align="center" style='font-size:10pt; background-color:blue;color:white;'> <?= $beneficiaire['etatbeneficiaireEng'] ?> </td>
+							<?php if (!$estsorti && $beneficiaire['codeEtatBeneficiaire'] == "V"): ?>
+								<td align="center" style="font-size:10pt; background-color:blue; color:white;">
+									<?= $beneficiaire['etatbeneficiaireEng'] ?>
+								</td>
 							<?php else: ?>
-								<td align="center" style='font-size:10pt; background-color:red;color:white;'> <?= $beneficiaire['etatbeneficiaireEng']  ?> </td>
-								
-								<?php if(!$estsorti): ?>
-									<td align="center" style='font-size:10pt; background-color:blue;color:white;'> <?= $beneficiaire['etatbeneficiaireEng'] ?> </td>
-								<?php endif; ?>
-								
+								<td align="center" style="font-size:10pt; background-color:red; color:white;">
+									<?= $beneficiaire['etatbeneficiaireEng'] ?>
+								</td>
 							<?php endif; ?>
 						<?php else: ?>
 							<?php if ($beneficiaire['codeEtatBeneficiaire']=="V"): ?>

From 0c73634ac6ea0644a79946c57e413bf662044754 Mon Sep 17 00:00:00 2001
From: KONE SOREL <skone@ebene.info>
Date: Mon, 30 Mar 2026 09:46:29 +0000
Subject: [PATCH 09/20] df

---
 Vue/Fichebeneficiaire/index.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Vue/Fichebeneficiaire/index.php b/Vue/Fichebeneficiaire/index.php
index 4d3119f..50443de 100644
--- a/Vue/Fichebeneficiaire/index.php
+++ b/Vue/Fichebeneficiaire/index.php
@@ -162,13 +162,16 @@
 								</td>
 							<?php endif; ?>
 						<?php else: ?>
-							<?php if ($beneficiaire['codeEtatBeneficiaire']=="V"): ?>
-								<td align="center" style='font-size:10pt; background-color:blue;color:white;'> <?= $beneficiaire['etatbeneficiaire'] ?> </td>
+							<?php if (!$estsorti && $beneficiaire['codeEtatBeneficiaire'] == "V"): ?>
+								<td align="center" style="font-size:10pt; background-color:blue; color:white;">
+									<?= $beneficiaire['etatbeneficiaireEng'] ?>
+								</td>
 							<?php else: ?>
-								<td align="center" style='font-size:10pt; background-color:red;color:white;'> <?= $beneficiaire['etatbeneficiaire'] ?> </td>
+								<td align="center" style="font-size:10pt; background-color:red; color:white;">
+									<?= $beneficiaire['etatbeneficiaireEng'] ?>
+								</td>
 							<?php endif; ?>
 						<?php endif; ?>
-					
 					<?php else: ?>
 						<?php if ($estsorti): ?>
 							<td align="center" style='font-size:10pt; background-color:red;color:white;'> <?= _("Retiré") ?> </td>

From 273d4a5175b71045d310d0978fcc831218b97f06 Mon Sep 17 00:00:00 2001
From: KONE SOREL <skone@ebene.info>
Date: Mon, 30 Mar 2026 09:50:02 +0000
Subject: [PATCH 10/20] dr

---
 Vue/Fichebeneficiaire/index.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Vue/Fichebeneficiaire/index.php b/Vue/Fichebeneficiaire/index.php
index 50443de..f053ad4 100644
--- a/Vue/Fichebeneficiaire/index.php
+++ b/Vue/Fichebeneficiaire/index.php
@@ -152,7 +152,7 @@
 				<?php else: ?>
 					<?php if ($estcouvert) : ?>
 						<?php if (isset($_SESSION['p_lang']) && $_SESSION['p_lang']=="en_US"): ?>
-							<?php if (!$estsorti && $beneficiaire['codeEtatBeneficiaire'] == "V"): ?>
+							<?php if ($beneficiaire['codeEtatBeneficiaire'] == "V"): ?>
 								<td align="center" style="font-size:10pt; background-color:blue; color:white;">
 									<?= $beneficiaire['etatbeneficiaireEng'] ?>
 								</td>
@@ -162,13 +162,13 @@
 								</td>
 							<?php endif; ?>
 						<?php else: ?>
-							<?php if (!$estsorti && $beneficiaire['codeEtatBeneficiaire'] == "V"): ?>
+							<?php if ($beneficiaire['codeEtatBeneficiaire'] == "V"): ?>
 								<td align="center" style="font-size:10pt; background-color:blue; color:white;">
-									<?= $beneficiaire['etatbeneficiaireEng'] ?>
+									<?= $beneficiaire['etatbeneficiaire'] ?>
 								</td>
 							<?php else: ?>
 								<td align="center" style="font-size:10pt; background-color:red; color:white;">
-									<?= $beneficiaire['etatbeneficiaireEng'] ?>
+									<?= $beneficiaire['etatbeneficiaire'] ?>
 								</td>
 							<?php endif; ?>
 						<?php endif; ?>

From c5a213ad4944fd6743f34d0f3a434b5930ab1f33 Mon Sep 17 00:00:00 2001
From: KONE SOREL <skone@ebene.info>
Date: Mon, 30 Mar 2026 10:02:55 +0000
Subject: [PATCH 11/20] szaer

---
 Vue/Fichebeneficiaire/index.php | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/Vue/Fichebeneficiaire/index.php b/Vue/Fichebeneficiaire/index.php
index f053ad4..5db1cd7 100644
--- a/Vue/Fichebeneficiaire/index.php
+++ b/Vue/Fichebeneficiaire/index.php
@@ -151,15 +151,20 @@
 					<td align="center" style='font-size:10pt; background-color:red;color:white;'> <?= _("Non renouvelé") ?> </td>
 				<?php else: ?>
 					<?php if ($estcouvert) : ?>
+
 						<?php if (isset($_SESSION['p_lang']) && $_SESSION['p_lang']=="en_US"): ?>
 							<?php if ($beneficiaire['codeEtatBeneficiaire'] == "V"): ?>
 								<td align="center" style="font-size:10pt; background-color:blue; color:white;">
 									<?= $beneficiaire['etatbeneficiaireEng'] ?>
 								</td>
 							<?php else: ?>
-								<td align="center" style="font-size:10pt; background-color:red; color:white;">
-									<?= $beneficiaire['etatbeneficiaireEng'] ?>
-								</td>
+								<?php if (!$estsorti && $beneficiaire['codeEtatBeneficiaire'] == "R"): ?>
+									<td align="center" style="font-size:10pt; background-color:blue; color:white;"> Deferred withdrawal </td>
+								<?php else: ?>
+									<td align="center" style="font-size:10pt; background-color:red; color:white;">
+										<?= $beneficiaire['etatbeneficiaireEng'] ?>
+									</td>
+								<?php endif; ?>
 							<?php endif; ?>
 						<?php else: ?>
 							<?php if ($beneficiaire['codeEtatBeneficiaire'] == "V"): ?>
@@ -167,9 +172,13 @@
 									<?= $beneficiaire['etatbeneficiaire'] ?>
 								</td>
 							<?php else: ?>
-								<td align="center" style="font-size:10pt; background-color:red; color:white;">
-									<?= $beneficiaire['etatbeneficiaire'] ?>
-								</td>
+								<?php if (!$estsorti && $beneficiaire['codeEtatBeneficiaire'] == "R"): ?>
+									<td align="center" style="font-size:10pt; background-color:blue; color:white;"> Retrait différé </td>
+								<?php else: ?>
+									<td align="center" style="font-size:10pt; background-color:red; color:white;">
+										<?= $beneficiaire['etatbeneficiaire'] ?>
+									</td>
+								<?php endif; ?>
 							<?php endif; ?>
 						<?php endif; ?>
 					<?php else: ?>

From fbe6f791f7ef573e84245785fa7d13333b2d8800 Mon Sep 17 00:00:00 2001
From: KONE SOREL <skone@ebene.info>
Date: Mon, 30 Mar 2026 10:06:36 +0000
Subject: [PATCH 12/20] fr

---
 Js/fonctions.js                 | 3 +++
 Vue/Fichebeneficiaire/index.php | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Js/fonctions.js b/Js/fonctions.js
index 71147d9..090beea 100644
--- a/Js/fonctions.js
+++ b/Js/fonctions.js
@@ -1038,6 +1038,8 @@ function prestation_possible()
 	dateEcheancePolice	= $("#dateEcheancePolice_C").val();
 	
 	dateEffetCouvert	= $("#dateEffetCouvert").val();
+	//estSorti			= $("#estSorti").val();
+
 	/*
 	if (dateEffetCouvert!="1") 
 	{
@@ -1050,6 +1052,7 @@ function prestation_possible()
 	
 	if (enVigueur!="1") 
 	{
+		if()
 		v_msg="Attention! cette personne n'est pas en vigueur";
 		v_msgEng="Warning! This person is not in force";
 		alert_ebene(v_msg, v_msgEng);
diff --git a/Vue/Fichebeneficiaire/index.php b/Vue/Fichebeneficiaire/index.php
index 5db1cd7..e81d33e 100644
--- a/Vue/Fichebeneficiaire/index.php
+++ b/Vue/Fichebeneficiaire/index.php
@@ -60,7 +60,7 @@
 <INPUT 	class="sr-only" TYPE="text" id="faceRegistered" name="faceRegistered" value="<?= $faceRegistered ?>">		
 <INPUT 	class="sr-only" TYPE="text" id="prestationPossible" name="prestationPossible" value="<?= $prestationPossible ?>">
 
-<INPUT 	class="sr-only" TYPE="text" id="estsorti" name="estsorti" value="<?= $estsorti ?>">
+<INPUT 	TYPE="text" id="estsorti" name="estsorti" value="<?= $estsorti ?>">
 
 
 <legend><?= _("Bénéficiaire") . " : (" . $beneficiaire['numeroBeneficiaire'] . ") => " . _("Date Effet") . " : " . dateLang($this->nettoyer($beneficiaire['dateEffetBeneficiaire']), $_SESSION['p_lang']) ?></legend>

From 8e9f259995bc3764af02cbe822bd3340bcd823fc Mon Sep 17 00:00:00 2001
From: KONE SOREL <skone@ebene.info>
Date: Mon, 30 Mar 2026 10:11:01 +0000
Subject: [PATCH 13/20] frtz

---
 Js/fonctions.js | 6 +++++-
 Vue/gabarit.php | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Js/fonctions.js b/Js/fonctions.js
index 090beea..7364d92 100644
--- a/Js/fonctions.js
+++ b/Js/fonctions.js
@@ -1038,7 +1038,11 @@ function prestation_possible()
 	dateEcheancePolice	= $("#dateEcheancePolice_C").val();
 	
 	dateEffetCouvert	= $("#dateEffetCouvert").val();
-	//estSorti			= $("#estSorti").val();
+
+	estsorti			= $("#estsorti").val();
+
+	alert("codeEtatBeneficiaire="+codeEtatBeneficiaire+" estsorti="+estsorti);
+	return;
 
 	/*
 	if (dateEffetCouvert!="1") 
diff --git a/Vue/gabarit.php b/Vue/gabarit.php
index ce5142b..9207fe8 100644
--- a/Vue/gabarit.php
+++ b/Vue/gabarit.php
@@ -265,7 +265,7 @@ actesHarmonises : <?= $_SESSION['p_actesHarmonises'] ?>
 			<script src="Js/datepicker-fr.js"></script>
 		<?php endif; ?>
 
-		<script src="Js/fonctions.js?ver=2026.03.03.07"></script> 
+		<script src="Js/fonctions.js?ver=2026.03.03.08"></script> 
 
 		<script src="Bootstrap/js/timer.jquery.js"></script>
 

From 22b9faaa55952241b788e846769ebe85534c5eef Mon Sep 17 00:00:00 2001
From: KONE SOREL <skone@ebene.info>
Date: Mon, 30 Mar 2026 10:12:23 +0000
Subject: [PATCH 14/20] eza

---
 Js/fonctions.js | 1 -
 Vue/gabarit.php | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Js/fonctions.js b/Js/fonctions.js
index 7364d92..d6c2da2 100644
--- a/Js/fonctions.js
+++ b/Js/fonctions.js
@@ -1056,7 +1056,6 @@ function prestation_possible()
 	
 	if (enVigueur!="1") 
 	{
-		if()
 		v_msg="Attention! cette personne n'est pas en vigueur";
 		v_msgEng="Warning! This person is not in force";
 		alert_ebene(v_msg, v_msgEng);
diff --git a/Vue/gabarit.php b/Vue/gabarit.php
index 9207fe8..2bddc39 100644
--- a/Vue/gabarit.php
+++ b/Vue/gabarit.php
@@ -265,7 +265,7 @@ actesHarmonises : <?= $_SESSION['p_actesHarmonises'] ?>
 			<script src="Js/datepicker-fr.js"></script>
 		<?php endif; ?>
 
-		<script src="Js/fonctions.js?ver=2026.03.03.08"></script> 
+		<script src="Js/fonctions.js?ver=2026.03.03.09"></script> 
 
 		<script src="Bootstrap/js/timer.jquery.js"></script>
 

From 334034d72992c9d9c4de2efa2c12a53bbed73f91 Mon Sep 17 00:00:00 2001
From: KONE SOREL <skone@ebene.info>
Date: Mon, 30 Mar 2026 10:16:59 +0000
Subject: [PATCH 15/20] daze

---
 Js/fonctions.js                 | 4 ++--
 Vue/Fichebeneficiaire/index.php | 7 ++++---
 Vue/gabarit.php                 | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Js/fonctions.js b/Js/fonctions.js
index d6c2da2..bff5107 100644
--- a/Js/fonctions.js
+++ b/Js/fonctions.js
@@ -1039,9 +1039,9 @@ function prestation_possible()
 	
 	dateEffetCouvert	= $("#dateEffetCouvert").val();
 
-	estsorti			= $("#estsorti").val();
+	radiation			= $("#radiation").val();
 
-	alert("codeEtatBeneficiaire="+codeEtatBeneficiaire+" estsorti="+estsorti);
+	alert("codeEtatBeneficiaire="+codeEtatBeneficiaire+" radiation="+radiation);
 	return;
 
 	/*
diff --git a/Vue/Fichebeneficiaire/index.php b/Vue/Fichebeneficiaire/index.php
index e81d33e..3e0ce93 100644
--- a/Vue/Fichebeneficiaire/index.php
+++ b/Vue/Fichebeneficiaire/index.php
@@ -17,6 +17,7 @@
 	//var_dump($dateSortieBeneficiaire);
 	
 	$estsorti 					= false;
+	
 	// maj 15/10/2018 => si dateSortie < dateJour => on n'est pas couvert
 	if($dateSortieBeneficiaire>"2000-01-01")
 	{
@@ -24,6 +25,8 @@
 		$estcouvert 			= ($estcouvert && ($dateSortieBeneficiaire>$datejour));
 	}
 
+	$radiation = $estsorti ? "1" : "0";
+
 	$dateEffetCouvert 			= $_SESSION['p_dateEffetCouvert'];
 	
 	$derogation_finger_en_cours = $_SESSION['p_derogation_finger_en_cours_C'];
@@ -41,8 +44,6 @@
 	
 	$prestationPossible		= $this->nettoyer($beneficiaire['prestationPossible']);
 	$pointvente				= $this->nettoyer($beneficiaire['pointvente']);
-
-	
 ?>
 
 <script type="text/javascript">
@@ -60,7 +61,7 @@
 <INPUT 	class="sr-only" TYPE="text" id="faceRegistered" name="faceRegistered" value="<?= $faceRegistered ?>">		
 <INPUT 	class="sr-only" TYPE="text" id="prestationPossible" name="prestationPossible" value="<?= $prestationPossible ?>">
 
-<INPUT 	TYPE="text" id="estsorti" name="estsorti" value="<?= $estsorti ?>">
+<INPUT 	TYPE="text" id="radiation" name="radiation" value="<?= $radiation ?>">
 
 
 <legend><?= _("Bénéficiaire") . " : (" . $beneficiaire['numeroBeneficiaire'] . ") => " . _("Date Effet") . " : " . dateLang($this->nettoyer($beneficiaire['dateEffetBeneficiaire']), $_SESSION['p_lang']) ?></legend>
diff --git a/Vue/gabarit.php b/Vue/gabarit.php
index 2bddc39..28713f7 100644
--- a/Vue/gabarit.php
+++ b/Vue/gabarit.php
@@ -265,7 +265,7 @@ actesHarmonises : <?= $_SESSION['p_actesHarmonises'] ?>
 			<script src="Js/datepicker-fr.js"></script>
 		<?php endif; ?>
 
-		<script src="Js/fonctions.js?ver=2026.03.03.09"></script> 
+		<script src="Js/fonctions.js?ver=2026.03.03.10"></script> 
 
 		<script src="Bootstrap/js/timer.jquery.js"></script>
 

From 425412e78e9dc54c96059776d83041ec46cec460 Mon Sep 17 00:00:00 2001
From: KONE SOREL <skone@ebene.info>
Date: Mon, 30 Mar 2026 10:20:37 +0000
Subject: [PATCH 16/20] aqxce

---
 Js/fonctions.js                 | 17 +++++++++--------
 Vue/Fichebeneficiaire/index.php |  3 +--
 Vue/gabarit.php                 |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Js/fonctions.js b/Js/fonctions.js
index bff5107..16a2c8d 100644
--- a/Js/fonctions.js
+++ b/Js/fonctions.js
@@ -1041,9 +1041,6 @@ function prestation_possible()
 
 	radiation			= $("#radiation").val();
 
-	alert("codeEtatBeneficiaire="+codeEtatBeneficiaire+" radiation="+radiation);
-	return;
-
 	/*
 	if (dateEffetCouvert!="1") 
 	{
@@ -1064,11 +1061,15 @@ function prestation_possible()
 
 	if (codeEtatBeneficiaire!="V") 
 	{
-		v_msg="Attention! "+etatbeneficiaire;
-		v_msgEng="Warning! "+etatbeneficiaire;
-		
-		alert_ebene(v_msg, v_msgEng);
-		return false;
+		if(radiation=="0" && codeEtatBeneficiaire=="R"){
+			return true;
+		}else{
+			v_msg="Attention! "+etatbeneficiaire;
+			v_msgEng="Warning! "+etatbeneficiaire;
+			
+			alert_ebene(v_msg, v_msgEng);
+			return false;
+		}
 	}
 
 	if (college_couvert<1 && derogation_en_cours<1)
diff --git a/Vue/Fichebeneficiaire/index.php b/Vue/Fichebeneficiaire/index.php
index 3e0ce93..d39e1de 100644
--- a/Vue/Fichebeneficiaire/index.php
+++ b/Vue/Fichebeneficiaire/index.php
@@ -61,8 +61,7 @@
 <INPUT 	class="sr-only" TYPE="text" id="faceRegistered" name="faceRegistered" value="<?= $faceRegistered ?>">		
 <INPUT 	class="sr-only" TYPE="text" id="prestationPossible" name="prestationPossible" value="<?= $prestationPossible ?>">
 
-<INPUT 	TYPE="text" id="radiation" name="radiation" value="<?= $radiation ?>">
-
+<INPUT 	class="sr-only" TYPE="text" id="radiation" name="radiation" value="<?= $radiation ?>">
 
 <legend><?= _("Bénéficiaire") . " : (" . $beneficiaire['numeroBeneficiaire'] . ") => " . _("Date Effet") . " : " . dateLang($this->nettoyer($beneficiaire['dateEffetBeneficiaire']), $_SESSION['p_lang']) ?></legend>
 <button class="sr-only" id="btn_pop_save_face" name="btn_pop_save_face" type="button" data-toggle="modal" data-target="#pop_rec_faciale"  >  </button>
diff --git a/Vue/gabarit.php b/Vue/gabarit.php
index 28713f7..e108d44 100644
--- a/Vue/gabarit.php
+++ b/Vue/gabarit.php
@@ -265,7 +265,7 @@ actesHarmonises : <?= $_SESSION['p_actesHarmonises'] ?>
 			<script src="Js/datepicker-fr.js"></script>
 		<?php endif; ?>
 
-		<script src="Js/fonctions.js?ver=2026.03.03.10"></script> 
+		<script src="Js/fonctions.js?ver=2026.03.03.11"></script> 
 
 		<script src="Bootstrap/js/timer.jquery.js"></script>
 

From 3862d78b4b41a7e5ec1764e99d3961af165e2233 Mon Sep 17 00:00:00 2001
From: KONE SOREL <skone@ebene.info>
Date: Mon, 30 Mar 2026 10:29:50 +0000
Subject: [PATCH 17/20] ser

---
 Controleur/ControleurConsultation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Controleur/ControleurConsultation.php b/Controleur/ControleurConsultation.php
index adca547..47429e8 100644
--- a/Controleur/ControleurConsultation.php
+++ b/Controleur/ControleurConsultation.php
@@ -53,7 +53,7 @@ class ControleurConsultation extends Controleur {
 		$feuillemaladie = $this->feuillemaladie->getfeuillemaladie($numeroFeuilleMaladie);
 		$acteconsultation = $this->prestation->getconsultationfeuille($numeroFeuilleMaladie, $codePrestataire);
 		
-		$codeFamilleActe = $acteconsultation['codeFamilleActe'];
+		$codeFamilleActe = is_array($acteconsultation) ? $acteconsultation['codeFamilleActe'] : "";
 		
 		$acte = $this->acte->getactespossibles($codeTypePrestation, $codeFamilleActe);
 		

From 112075c8cd8ddfa15eeef9eb9bc08afc58398654 Mon Sep 17 00:00:00 2001
From: KONE SOREL <skone@ebene.info>
Date: Mon, 30 Mar 2026 10:36:16 +0000
Subject: [PATCH 18/20] aze

---
 Modele/Feuillemaladie.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Modele/Feuillemaladie.php b/Modele/Feuillemaladie.php
index 39790e6..a7b17f7 100644
--- a/Modele/Feuillemaladie.php
+++ b/Modele/Feuillemaladie.php
@@ -135,8 +135,8 @@ class Feuillemaladie extends Modele {
 			 $_SESSION['p_tm_C'] = "0";
 		}
 		$_SESSION['p_chirurgie_C'] 				= $ligne['chirurgie'];	
-		$_SESSION['p_codeMedecin_C'] 				= $ligne['codeMedecin'];	
-		$_SESSION['p_medecinConsultation_C'] 		= $ligne['medecinConsultation'];	
+		$_SESSION['p_codeMedecin_C'] 			= $ligne['codeMedecin'];	
+		$_SESSION['p_medecinConsultation_C'] 	= is_array($ligne) ? $ligne['medecinConsultation']:"";	
 
 		return $ligne;
     }	

From d1bc208a946b1878aef6a4c8225f73748c4b4518 Mon Sep 17 00:00:00 2001
From: KONE SOREL <skone@ebene.info>
Date: Mon, 30 Mar 2026 10:41:41 +0000
Subject: [PATCH 19/20] qawxs

---
 Modele/Feuillemaladie.php | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/Modele/Feuillemaladie.php b/Modele/Feuillemaladie.php
index a7b17f7..b71a82b 100644
--- a/Modele/Feuillemaladie.php
+++ b/Modele/Feuillemaladie.php
@@ -113,30 +113,30 @@ class Feuillemaladie extends Modele {
 		
 		$ligne = $feuillemaladie->fetch(PDO::FETCH_ASSOC);
 		
-		$_SESSION['p_numeroFeuilleMaladie_C'] 	= $ligne['numeroFeuilleMaladie'];
-		$_SESSION['p_idFacture_C'] 				= $ligne['idFacture'];
+		$_SESSION['p_numeroFeuilleMaladie_C'] 		= is_array($ligne) ? $ligne['numeroFeuilleMaladie']:"0";
+		$_SESSION['p_idFacture_C'] 					= is_array($ligne) ? $ligne['idFacture']:"0";
 
-		$_SESSION['p_numeroBonConsultation_C']	= $ligne['numeroBonConsultation'];
-		$_SESSION['p_numeroBonHospitalisation_C'] = $ligne['numeroBonHospitalisation'];
+		$_SESSION['p_numeroBonConsultation_C']		= is_array($ligne) ? $ligne['numeroBonConsultation']:"0";
+		$_SESSION['p_numeroBonHospitalisation_C'] 	= is_array($ligne) ? $ligne['numeroBonHospitalisation']:"0";
 
-		$_SESSION['p_numeroBonOrdonnance_C'] 		= $ligne['numeroBonOrdonnance'];
-		$_SESSION['p_numeroBonOptique_C'] 		= $ligne['numeroBonOptique'];		
-		$_SESSION['p_numeroBonExamen_C']			= $ligne['numeroBonExamen'];
-		$_SESSION['p_numeroBonKine_C']			= $ligne['numeroBonKine'];
+		$_SESSION['p_numeroBonOrdonnance_C'] 		= is_array($ligne) ? $ligne['numeroBonOrdonnance']:"0";
+		$_SESSION['p_numeroBonOptique_C'] 			= is_array($ligne) ? $ligne['numeroBonOptique']:"";		
+		$_SESSION['p_numeroBonExamen_C']			= is_array($ligne) ? $ligne['numeroBonExamen']:"0";
+		$_SESSION['p_numeroBonKine_C']				= is_array($ligne) ? $ligne['numeroBonKine']:"0";
 
-		$_SESSION['p_numeroPrescription_C'] 		= $ligne['numeroPrescription'];
-		$_SESSION['p_numeroOptique_C'] 			= $ligne['numeroOptique'];	
-		$_SESSION['p_numeroExamen_C'] 			= $ligne['numeroExamen'];	
-		$_SESSION['p_numeroPrescriptionKine_C'] 	= $ligne['numeroPrescriptionKine'];	
+		$_SESSION['p_numeroPrescription_C'] 		= is_array($ligne) ? $ligne['numeroPrescription']:"0";
+		$_SESSION['p_numeroOptique_C'] 				= is_array($ligne) ? $ligne['numeroOptique']:"0";	
+		$_SESSION['p_numeroExamen_C'] 				= is_array($ligne) ? $ligne['numeroExamen']:"0";	
+		$_SESSION['p_numeroPrescriptionKine_C'] 	= is_array($ligne) ? $ligne['numeroPrescriptionKine']:"0";	
 
-		$_SESSION['p_hospitalisation_C'] 			= $ligne['hospitalisation'];	
+		$_SESSION['p_hospitalisation_C'] 			= is_array($ligne) ? $ligne['hospitalisation']:"0";	
 		if($_SESSION['p_hospitalisation_C']>0 && $_SESSION['p_appliquerTmHospit_C']>0)
 		{
 			 $_SESSION['p_tm_C'] = "0";
 		}
-		$_SESSION['p_chirurgie_C'] 				= $ligne['chirurgie'];	
-		$_SESSION['p_codeMedecin_C'] 			= $ligne['codeMedecin'];	
-		$_SESSION['p_medecinConsultation_C'] 	= is_array($ligne) ? $ligne['medecinConsultation']:"";	
+		$_SESSION['p_chirurgie_C'] 					= is_array($ligne) ? $ligne['chirurgie']:"0";	
+		$_SESSION['p_codeMedecin_C'] 				= is_array($ligne) ? $ligne['codeMedecin']:"";	
+		$_SESSION['p_medecinConsultation_C'] 		= is_array($ligne) ? $ligne['medecinConsultation']:"";	
 
 		return $ligne;
     }	

From 4e8b02f3b7a4af7784e51bb95ffefff6525f8b6b Mon Sep 17 00:00:00 2001
From: KANE LAZENI <lkane@ebene.info>
Date: Mon, 30 Mar 2026 11:51:56 +0000
Subject: [PATCH 20/20] Update .gitignore

---
 .gitignore | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4892476..e03716f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-
 Config/
 Config
 Config/dev.ini
@@ -10,4 +9,6 @@ Cron/prod.ini
 Temp/
 Temp
 *.ssh
-.ssh/
\ No newline at end of file
+.ssh/
+Gettext/
+Gettext
\ No newline at end of file