diff --git a/Controleur/ControleurHospitalisationproforma_test.php b/Controleur/ControleurHospitalisationproforma_test.php
new file mode 100755
index 0000000..3c08bf3
--- /dev/null
+++ b/Controleur/ControleurHospitalisationproforma_test.php
@@ -0,0 +1,91 @@
+<?php
+require_once 'Framework/Controleur.php';
+require_once 'Modele/Menuvueutilisateur.php';
+require_once 'Modele/Beneficiaire.php';
+require_once 'Modele/Feuillemaladie.php';
+require_once 'Modele/Prestationactes.php';
+require_once 'Modele/Medecin.php';
+require_once 'Modele/Affection.php';
+
+class ControleurHospitalisationproforma extends Controleur {
+	private $menuvue;
+	private $ben;
+	private $prestation;
+	private $medecin;
+	private $affection;
+	private $feuillemaladie;
+
+    public function __construct() {
+		$this->menuvue = new Menuvueutilisateur();
+		$this->menuvue->getMenuVue('Hospitalisationproforma');	
+
+		$this->ben 				= new Beneficiaire();
+		$this->prestation 		= new Prestationactes();
+		$this->medecin 			= new Medecin();
+		$this->affection 		= new Affection();
+		$this->feuillemaladie 	= new Feuillemaladie();
+    }
+
+    public function index() 
+	{
+		$id          		 = $this->requete->getParametreFormulaire("id");
+		$codePrestataire 	 = $_SESSION['p_codePrestataire_C'];
+
+		$typeHospitalisation =  $this->prestation->gettypehospitalisation();
+		$medecins 			 =  $this->medecin->getpraticiensprestataire($codePrestataire);
+		
+		if($id==""){
+			$idProformaHospitalisation = "0";
+		}else{
+			$idProformaHospitalisation = $id;
+			$_SESSION['p_idProformaHospitalisation_C'] = $id;
+		}
+		
+		if($idProformaHospitalisation > "0"){
+			$proforma = $this->prestation->getenteteproformahospitalisation($idProformaHospitalisation);
+		}elseif($_SESSION['p_numeroFeuilleMaladie_C'] > "0" && $idProformaHospitalisation == "0"){
+			$numeroFeuilleMaladie							= $_SESSION['p_numeroFeuilleMaladie_C'];
+			$_SESSION['p_idProforma_C'] 					= '0';
+			
+			$_SESSION['p_codeMedecinProforma_C']			= $_SESSION['p_codeMedecin_C'];
+			$_SESSION['p_codeReponseEntentePrealable_C'] 	= '';
+			$_SESSION['p_numeroEntentePrealable_C'] 		= '0';
+			$_SESSION['p_observation_C'] 					= "";
+			$_SESSION['p_motifRefus_C'] 					= "";
+			
+			$_SESSION['p_demandeTraite_C'] 					= "0";
+			$_SESSION['p_numeroBonHospitalisation_C'] 		= "0";
+		}else{
+			$_SESSION['p_idProforma_C'] 					= '0';
+			$_SESSION['p_codeMedecinProforma_C']			= '';
+			$_SESSION['p_codeReponseEntentePrealable_C'] 	= '';
+			$_SESSION['p_numeroEntentePrealable_C'] 		= '0';
+			$_SESSION['p_observation_C'] 					= "";
+			$_SESSION['p_motifRefus_C'] 					= "";
+			$_SESSION['p_demandeTraite_C'] 					= "0";
+			$_SESSION['p_numeroBonHospitalisation_C'] 		= "0";
+			$_SESSION['p_numeroFeuilleMaladie_C'] 			= "0";
+			$_SESSION['p_codeAffection_C']					= "";
+			$_SESSION['p_numeroFeuilleMaladie_C'] 			= "0";
+		}
+		
+		$idBeneficiaire 	 = isset($_SESSION['p_idBeneficiaire_C'])? $_SESSION['p_idBeneficiaire_C']:"0";
+		
+		if($idBeneficiaire > 0){
+			$beneficiaire    = $this->ben->getContexteBeneficiaireId($idBeneficiaire);
+		}
+		
+		$affections 		 			= $this->affection->getListes();
+		$ligneZero 			 			= $this->prestation->proformaLigneZero($idProformaHospitalisation);
+		$autoriserBonHospitAvantDate 	= $this->feuillemaladie->getAutoriserBonHospitAvantDate();
+		
+		$this->genererVue(array(
+			'idBeneficiaire' 				=> $idBeneficiaire,
+			'typeHospitalisation' 			=> $typeHospitalisation,
+			'medecins' 						=> $medecins,
+			'affections' 					=> $affections,
+			'ligneZero' 					=> $ligneZero,
+			'autoriserBonHospitAvantDate' 	=> $autoriserBonHospitAvantDate
+		));
+    }
+}
\ No newline at end of file
diff --git a/Controleur/ControleurProformahospitalisation.php b/Controleur/ControleurProformahospitalisation.php
index c8dbc16..42fe58f 100755
--- a/Controleur/ControleurProformahospitalisation.php
+++ b/Controleur/ControleurProformahospitalisation.php
@@ -28,11 +28,52 @@ class ControleurProformahospitalisation extends Controleur {
 
     public function index() 
 	{
-		$codePrestataire 	= $_SESSION['p_codePrestataire_C'];
-		$idBeneficiaire 	= $_SESSION['p_idBeneficiaire_C'];
+		$id          		 = $this->requete->getParametreFormulaire("id");
+		$codePrestataire 	 = $_SESSION['p_codePrestataire_C'];
+
+		$typeHospitalisation =  $this->prestation->gettypehospitalisation();
+		$medecins 			 =  $this->medecin->getpraticiensprestataire($codePrestataire);
 		
-		if($idBeneficiaire > "0")
-		{
+		if($id==""){
+			$idProformaHospitalisation = "0";
+		}else{
+			$idProformaHospitalisation = $id;
+			$_SESSION['p_idProformaHospitalisation_C'] = $id;
+		}
+
+		if($idProformaHospitalisation > "0"){
+			$proforma = $this->prestation->getenteteproformahospitalisation($idProformaHospitalisation);
+		}elseif($_SESSION['p_numeroFeuilleMaladie_C'] > "0" && $idProformaHospitalisation == "0"){
+			$numeroFeuilleMaladie							= "0";
+			$_SESSION['p_idProforma_C'] 					= '0';
+			
+			$_SESSION['p_codeMedecinProforma_C']			= "";
+			$_SESSION['p_codeReponseEntentePrealable_C'] 	= '';
+			$_SESSION['p_numeroEntentePrealable_C'] 		= '0';
+			$_SESSION['p_observation_C'] 					= "";
+			$_SESSION['p_motifRefus_C'] 					= "";
+			
+			$_SESSION['p_demandeTraite_C'] 					= "0";
+			$_SESSION['p_numeroBonHospitalisation_C'] 		= "0";
+		}else{
+			$_SESSION['p_idProforma_C'] 					= '0';
+			$_SESSION['p_codeMedecinProforma_C']			= '';
+			$_SESSION['p_codeReponseEntentePrealable_C'] 	= '';
+			$_SESSION['p_numeroEntentePrealable_C'] 		= '0';
+			$_SESSION['p_observation_C'] 					= "";
+			$_SESSION['p_motifRefus_C'] 					= "";
+			$_SESSION['p_demandeTraite_C'] 					= "0";
+			$_SESSION['p_numeroBonHospitalisation_C'] 		= "0";
+			$_SESSION['p_numeroFeuilleMaladie_C'] 			= "0";
+			$_SESSION['p_codeAffection_C']					= "";
+			$_SESSION['p_numeroFeuilleMaladie_C'] 			= "0";
+		}
+		
+		$idBeneficiaire 	 = isset($_SESSION['p_idBeneficiaire_C'])? $_SESSION['p_idBeneficiaire_C']:"0";
+		
+		if($idBeneficiaire > 0){
+			$beneficiaire    = $this->ben->getContexteBeneficiaireId($idBeneficiaire);
+
 			$adh = $this->ben->trouverBeneficiaireId($idBeneficiaire);
 			
 			$_SESSION['p_numeroBeneficiaire_P'] 	= $adh['numero'];
@@ -48,10 +89,7 @@ class ControleurProformahospitalisation extends Controleur {
 			$_SESSION['p_codeEtatBeneficiaire_P'] 	= $adh['codeEtatBeneficiaire'];
 			$_SESSION['p_etatbeneficiaireEng_P'] 	= $adh['etatbeneficiaireEng'];
 			$_SESSION['p_etatbeneficiaire_P'] 		= $adh['etatbeneficiaire'];
-		
-			// $beneficiaire      = $this->ben->getContexteBeneficiaireId($idBeneficiaire);
 		}
-		/*
 		else{
 			$_SESSION['p_numeroBeneficiaire_P'] 	= '';
 			$_SESSION['p_beneficiaire_P'] 			= '';
@@ -67,7 +105,6 @@ class ControleurProformahospitalisation extends Controleur {
 			$_SESSION['p_etatbeneficiaireEng_P'] 	= '';
 			$_SESSION['p_etatbeneficiaire_P'] 		= '';
 		}
-		*/
 					
 		$numeroBeneficiaire		= (isset($_SESSION['p_numeroBeneficiaire_P']) && $idBeneficiaire > "0")? $_SESSION['p_numeroBeneficiaire_P']:"";
 		$beneficiaire			= (isset($_SESSION['p_beneficiaire_P']) && $idBeneficiaire > "0")? $_SESSION['p_beneficiaire_P']:"";
@@ -79,15 +116,6 @@ class ControleurProformahospitalisation extends Controleur {
 		$noAdherent				= (isset($_SESSION['p_numeroAdherent_P']) && $idBeneficiaire > "0")? $_SESSION['p_numeroAdherent_P']:"";
 		$nomAdherent			= (isset($_SESSION['p_adherent_P']) && $idBeneficiaire > "0")? $_SESSION['p_adherent_P']:"";
 		
-		$typeHospitalisation 	=  $this->prestation->gettypehospitalisation();
-		$medecins 			 	=  $this->medecin->getpraticiensprestataire($codePrestataire);
-		
-		$idProforma 			= isset($_SESSION['p_idProforma_C']) ? $_SESSION['p_idProforma_C'] : '0';
-		
-		if($idProforma > "0" && $idBeneficiaire > "0"){
-			$this->prestation->getenteteproformahospitalisation($idProforma);
-		}
-		
 		$affections 		 	= $this->affection->getListes();
 		$actesChambre			= $this->feuillemaladie->getActeChambreHospitalisation();
 
diff --git a/Js/fonctions.js b/Js/fonctions.js
index dc73677..cfacbc1 100755
--- a/Js/fonctions.js
+++ b/Js/fonctions.js
@@ -25012,7 +25012,6 @@ function save_nv_consommable_proformahospit()
 	
 	libelleconsommable  = $("#libelleconsommable").val();
 	
-	
 	if (libelleconsommable<=" ") 
 	{
 		v_msg="Veuillez saisir le nom!";
@@ -25104,8 +25103,6 @@ function save_nv_consommable_proformahospit()
 					window.location.assign($("#racineWeb" ).val()+"Proformahospitalisation/");
 				}
 			}
-						
-			
 		}
 	});
 }
@@ -26850,8 +26847,6 @@ function imprimer_facture_seance(idFacture)
 
 function creer_proforma_hospitalistation()
 {
-	
-	
 	prestationPossible 	= $("#prestationPossible").val();
 	face_confirmee  	= $("#face_confirmee").val();
 	faceActif 			= $("#faceActif").val();
@@ -26870,9 +26865,7 @@ function creer_proforma_hospitalistation()
 	if ((face_confirmee == "1") || (faceActif != '1')){
 		
 		window.location.assign($("#racineWeb" ).val()+"Proformahospitalisation/");
-		
 	}else{
-		
 		v_msg="Veuillez authentifier la photo du patient!";
 		v_msgEng="Please authenticate the patient's photo!";