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 @@ - - + " . _("Date Effet") . " : " . dateLang($this->nettoyer($beneficiaire['dateEffetBeneficiaire']), $_SESSION['p_lang']) ?> 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 : - +