diff --git a/Vue/Pharmacien/index.php b/Vue/Pharmacien/index.php
index 5e656fa..b337580 100755
--- a/Vue/Pharmacien/index.php
+++ b/Vue/Pharmacien/index.php
@@ -501,152 +501,154 @@
 							<input class="form-control" style="text-align: center; font-size: 12pt;font-weight: bold;"  type="text" value="<?= _("Liste des médicaments non servis") ?>" readonly >	
 						</div>
 						
-						<table class="table table-striped table-bordered table-hover table-condensed table-responsive" style='font-size:9pt;'>
-							<thead>
-							  <tr>
-								<th width="5%" style="text-align:center" > <input class="form-control  btn btn-primary" type="button" value=" + + " onClick="javascript:ajoutermedicament_pha_tous();" style='font-size:9pt;' >  </th>
-								<th width="50%" > <?= _("Nom") ?> </th>
-								<th width="5%" style="text-align:center"> <?= _("Forme") ?>  </th>
-								<th width="12%" style="text-align:center"> <?= _("Prix Unitaire") ?> </th>
-								<th width="5%" style="text-align:center"> <?= _("Qté") ?> </th>
-								<th width="10%" style="text-align:center"> <?= _("Prix Total") ?> </th>
-								<th width="5%" style="text-align:center"> <?= _("T M") ?> </th>
-								<th width="10%" style="text-align:center"> <?= _("A Remb") ?> </th>
-								<th width="10%" style="text-align:center"> <?= _("Dépass") ?> </th>
-								<th width="5%" style="text-align:center"> <?= _("Accord") ?>  </th>
-							  </tr>
-							</thead>
-
-							<tbody>
-							<?php foreach ($detailnonlivres as $detailnonlivre):
-								$idNonLivre=$this->nettoyer($detailnonlivre['id']);
-								$valeurActe = $this->nettoyer($detailnonlivre['valeurActe']);
-								
-								$substituable = $this->nettoyer($detailnonlivre['substituable']);
-								$substitue = $this->nettoyer($detailnonlivre['substitue']);
-								
-								$nomSubstitut = $this->nettoyer($detailnonlivre['nomSubstitut']);
-								$libelleMedicament = $this->nettoyer($detailnonlivre['libelleMedicament']);
-								
-								$depassement = $this->nettoyer($detailnonlivre['depassement']);
-								
-								if($substituable=="1")
-								{
-									$libelleMedicament = $libelleMedicament . " => " .  $nomSubstitut;
-								}
-								
-								$ententePrealable2=$this->nettoyer($detailnonlivre['ententePrealable']);
-								
-								$forme 	= $this->nettoyer($detailnonlivre['forme']);
-						
-								if (est_anglophone()){$forme 	= $this->nettoyer($detailnonlivre['formeEng']);}
-								
-								$exclu 	= $this->nettoyer($detailnonlivre['exclu']);
-								
-								$substitution = $this->nettoyer($detailnonlivre['substitution']);
-								
-								$valeurActe = $this->nettoyer($detailnonlivre['valeurActe']);
-								$fraisReel = $this->nettoyer($detailnonlivre['fraisReel']);
-				
-								//var_dump($substitution);
-								
-								if($exclu =="1" || $ententePrealable2=="9")
-								{
-									$montantTm = $this->nettoyer($detailnonlivre['fraisReel']);
-									$montantArembourser = "0";
-									$fraisExclu = $this->nettoyer($detailnonlivre['fraisReel']);
-									$depassement = $this->nettoyer($detailnonlivre['depassement']);
-									$fraisRetenu ="0";
-									$montantTmTemp = $this->nettoyer($detailnonlivre['fraisReel']);
-									$montantArembourserTemp = "0";
-									$fraisRetenuTemp = "0";
-								}else{
-									$montantTm = $this->nettoyer($detailnonlivre['montantTm']);
-									$montantArembourser = $this->nettoyer($detailnonlivre['montantArembourser']);
-									$fraisExclu = $this->nettoyer($detailnonlivre['fraisExclu']);
-									$depassement = $this->nettoyer($detailnonlivre['depassement']);
-									$fraisRetenu = $this->nettoyer($detailnonlivre['fraisRetenu']);
-									$montantTmTemp = $this->nettoyer($detailnonlivre['montantTmTemp']);
-									$montantArembourserTemp = $this->nettoyer($detailnonlivre['montantArembourserTemp']);
-									$fraisRetenuTemp = $this->nettoyer($detailnonlivre['fraisRetenuTemp']);
-								}
-								
-								if($substitution=="1"){
-									$libelleMedicament = $this->nettoyer($detailnonlivre['libelleMedicamentSubstitut']);
-									
-									$libelleMedicament = $this->nettoyer($detailnonlivre['libelleMedicament']) . " => " .  $libelleMedicament;
-									
-									$forme = $this->nettoyer($detailnonlivre['formeSubstitut']);
-									if (est_anglophone()){$forme 	= $this->nettoyer($detailnonlivre['formeSubstitutEng']);}									
-									
-									$montantTm = $this->nettoyer($detailnonlivre['montantTmMedicamentSubstitut']);
-									$montantArembourser = $this->nettoyer($detailnonlivre['montantArembourserMedicamentSubstitut']);
-									$fraisExclu = $this->nettoyer($detailnonlivre['fraisExcluMedicamentSubstitut']);
-									//$depassement = $this->nettoyer($detailnonlivre['depassement']);
-									$fraisRetenu = $this->nettoyer($detailnonlivre['montantArembourserMedicamentSubstitut']);
-									$montantTmTemp = $this->nettoyer($detailnonlivre['montantTmMedicamentSubstitut']);
-									$montantArembourserTemp = $this->nettoyer($detailnonlivre['montantArembourserMedicamentSubstitut']);
-									$fraisRetenuTemp = $this->nettoyer($detailnonlivre['montantArembourserMedicamentSubstitut']);
-									$valeurActe	= $this->nettoyer($detailnonlivre['valeurMedicamentSubstitut']);
-									$fraisReel = $this->nettoyer($detailnonlivre['fraisReelMedicamentSubstitut']);
-								}
-								
-							?>
-								
-								<tr valign="top">
-								<?php if($ententePrealable2=='2'): ?>
-									<td width="5%" align='center'> </td>
-								<?php elseif($ententePrealable2=='3'): ?>
-									<td width="5%" align='center'> W </td>
-								<?php elseif($ententePrealable2=='9'): ?>
-									<td width="5%" align='center'> R </td>
-								<?php else: ?>
-									<?php if($exclu=="1"): ?>
-										<td width="5%" align='center'> <input type="button" style="color:black;" value=" + " onClick="javascript:ajoutermedicament_pha('<?= $idNonLivre ?>');"></td>
-									<?php else: ?>
-										<td width="5%" align='center'> <input type="button" value=" + " onClick="javascript:ajoutermedicament_pha('<?= $idNonLivre ?>');"></td>
-									<?php endif; ?>
-								<?php endif; ?>
-									
-								<?php if($substitution=="1") : ?>
-									<td style="font-weight:bold;">  <?= $libelleMedicament ?> </td>
-								<?php else: ?>
-									<td> <?= $libelleMedicament ?> </td>
-								<?php endif; ?>
-
-									<td align='center'> <?= $forme ?> </td>
-									<td align='center'> <?= format_N($valeurActe) ?> </td>
-									<td align='center'> <?= $this->nettoyer($detailnonlivre['quantite'])  ?> </td>				
-									<td align='center'> <?= format_N($fraisReel) ?> </td>
-									<td align='center'> <?= format_N($this->nettoyer($montantTm)) ?> </td>
-									<td align='center'> <?= format_N($this->nettoyer($montantArembourser)) ?> </td>	
-									<td align='center'> <?= format_N($depassement) ?> </td>	
-								<?php if($ententePrealable2<>"0"): ?>
-									<?php if($ententePrealable2=='2' || $ententePrealable2=='3'): ?>
-									<td align='center' style="background-color: yellow;"> <input type="checkbox" checked disabled> </td>
-									<?php elseif($ententePrealable2=='1'): ?>
-									<td align='center' style="background-color: #00ff00;"> <input type="checkbox" checked disabled> </td>
-									<?php elseif($ententePrealable2=='9' || $exclu=='1'): ?>
-									<td align='center' style="background-color: red;color:white;"> <input type="checkbox" checked disabled> </td>
-									<?php else: ?>
-									<td align='center'> <input type="checkbox" checked disabled> </td>
-									<?php endif; ?>
-								<?php else: ?>
-									<td align='center' > <input type="checkbox" disabled></td>
-								<?php endif; ?>
+						<?php if($otpStatus=="-1"  || $otpStatus=="1"): ?>
+							<table class="table table-striped table-bordered table-hover table-condensed table-responsive" style='font-size:9pt;'>
+								<thead>
+								<tr>
+									<th width="5%" style="text-align:center" > <input class="form-control  btn btn-primary" type="button" value=" + + " onClick="javascript:ajoutermedicament_pha_tous();" style='font-size:9pt;' >  </th>
+									<th width="50%" > <?= _("Nom") ?> </th>
+									<th width="5%" style="text-align:center"> <?= _("Forme") ?>  </th>
+									<th width="12%" style="text-align:center"> <?= _("Prix Unitaire") ?> </th>
+									<th width="5%" style="text-align:center"> <?= _("Qté") ?> </th>
+									<th width="10%" style="text-align:center"> <?= _("Prix Total") ?> </th>
+									<th width="5%" style="text-align:center"> <?= _("T M") ?> </th>
+									<th width="10%" style="text-align:center"> <?= _("A Remb") ?> </th>
+									<th width="10%" style="text-align:center"> <?= _("Dépass") ?> </th>
+									<th width="5%" style="text-align:center"> <?= _("Accord") ?>  </th>
 								</tr>
-							<?php endforeach; ?>
-							</tbody>
-						</table>
+								</thead>
+
+								<tbody>
+								<?php foreach ($detailnonlivres as $detailnonlivre):
+									$idNonLivre=$this->nettoyer($detailnonlivre['id']);
+									$valeurActe = $this->nettoyer($detailnonlivre['valeurActe']);
+									
+									$substituable = $this->nettoyer($detailnonlivre['substituable']);
+									$substitue = $this->nettoyer($detailnonlivre['substitue']);
+									
+									$nomSubstitut = $this->nettoyer($detailnonlivre['nomSubstitut']);
+									$libelleMedicament = $this->nettoyer($detailnonlivre['libelleMedicament']);
+									
+									$depassement = $this->nettoyer($detailnonlivre['depassement']);
+									
+									if($substituable=="1")
+									{
+										$libelleMedicament = $libelleMedicament . " => " .  $nomSubstitut;
+									}
+									
+									$ententePrealable2=$this->nettoyer($detailnonlivre['ententePrealable']);
+									
+									$forme 	= $this->nettoyer($detailnonlivre['forme']);
+							
+									if (est_anglophone()){$forme 	= $this->nettoyer($detailnonlivre['formeEng']);}
+									
+									$exclu 	= $this->nettoyer($detailnonlivre['exclu']);
+									
+									$substitution = $this->nettoyer($detailnonlivre['substitution']);
+									
+									$valeurActe = $this->nettoyer($detailnonlivre['valeurActe']);
+									$fraisReel = $this->nettoyer($detailnonlivre['fraisReel']);
+					
+									//var_dump($substitution);
+									
+									if($exclu =="1" || $ententePrealable2=="9")
+									{
+										$montantTm = $this->nettoyer($detailnonlivre['fraisReel']);
+										$montantArembourser = "0";
+										$fraisExclu = $this->nettoyer($detailnonlivre['fraisReel']);
+										$depassement = $this->nettoyer($detailnonlivre['depassement']);
+										$fraisRetenu ="0";
+										$montantTmTemp = $this->nettoyer($detailnonlivre['fraisReel']);
+										$montantArembourserTemp = "0";
+										$fraisRetenuTemp = "0";
+									}else{
+										$montantTm = $this->nettoyer($detailnonlivre['montantTm']);
+										$montantArembourser = $this->nettoyer($detailnonlivre['montantArembourser']);
+										$fraisExclu = $this->nettoyer($detailnonlivre['fraisExclu']);
+										$depassement = $this->nettoyer($detailnonlivre['depassement']);
+										$fraisRetenu = $this->nettoyer($detailnonlivre['fraisRetenu']);
+										$montantTmTemp = $this->nettoyer($detailnonlivre['montantTmTemp']);
+										$montantArembourserTemp = $this->nettoyer($detailnonlivre['montantArembourserTemp']);
+										$fraisRetenuTemp = $this->nettoyer($detailnonlivre['fraisRetenuTemp']);
+									}
+									
+									if($substitution=="1"){
+										$libelleMedicament = $this->nettoyer($detailnonlivre['libelleMedicamentSubstitut']);
+										
+										$libelleMedicament = $this->nettoyer($detailnonlivre['libelleMedicament']) . " => " .  $libelleMedicament;
+										
+										$forme = $this->nettoyer($detailnonlivre['formeSubstitut']);
+										if (est_anglophone()){$forme 	= $this->nettoyer($detailnonlivre['formeSubstitutEng']);}									
+										
+										$montantTm = $this->nettoyer($detailnonlivre['montantTmMedicamentSubstitut']);
+										$montantArembourser = $this->nettoyer($detailnonlivre['montantArembourserMedicamentSubstitut']);
+										$fraisExclu = $this->nettoyer($detailnonlivre['fraisExcluMedicamentSubstitut']);
+										//$depassement = $this->nettoyer($detailnonlivre['depassement']);
+										$fraisRetenu = $this->nettoyer($detailnonlivre['montantArembourserMedicamentSubstitut']);
+										$montantTmTemp = $this->nettoyer($detailnonlivre['montantTmMedicamentSubstitut']);
+										$montantArembourserTemp = $this->nettoyer($detailnonlivre['montantArembourserMedicamentSubstitut']);
+										$fraisRetenuTemp = $this->nettoyer($detailnonlivre['montantArembourserMedicamentSubstitut']);
+										$valeurActe	= $this->nettoyer($detailnonlivre['valeurMedicamentSubstitut']);
+										$fraisReel = $this->nettoyer($detailnonlivre['fraisReelMedicamentSubstitut']);
+									}
+									
+								?>
+									
+									<tr valign="top">
+									<?php if($ententePrealable2=='2'): ?>
+										<td width="5%" align='center'> </td>
+									<?php elseif($ententePrealable2=='3'): ?>
+										<td width="5%" align='center'> W </td>
+									<?php elseif($ententePrealable2=='9'): ?>
+										<td width="5%" align='center'> R </td>
+									<?php else: ?>
+										<?php if($exclu=="1"): ?>
+											<td width="5%" align='center'> <input type="button" style="color:black;" value=" + " onClick="javascript:ajoutermedicament_pha('<?= $idNonLivre ?>');"></td>
+										<?php else: ?>
+											<td width="5%" align='center'> <input type="button" value=" + " onClick="javascript:ajoutermedicament_pha('<?= $idNonLivre ?>');"></td>
+										<?php endif; ?>
+									<?php endif; ?>
+										
+									<?php if($substitution=="1") : ?>
+										<td style="font-weight:bold;">  <?= $libelleMedicament ?> </td>
+									<?php else: ?>
+										<td> <?= $libelleMedicament ?> </td>
+									<?php endif; ?>
+
+										<td align='center'> <?= $forme ?> </td>
+										<td align='center'> <?= format_N($valeurActe) ?> </td>
+										<td align='center'> <?= $this->nettoyer($detailnonlivre['quantite'])  ?> </td>				
+										<td align='center'> <?= format_N($fraisReel) ?> </td>
+										<td align='center'> <?= format_N($this->nettoyer($montantTm)) ?> </td>
+										<td align='center'> <?= format_N($this->nettoyer($montantArembourser)) ?> </td>	
+										<td align='center'> <?= format_N($depassement) ?> </td>	
+									<?php if($ententePrealable2<>"0"): ?>
+										<?php if($ententePrealable2=='2' || $ententePrealable2=='3'): ?>
+										<td align='center' style="background-color: yellow;"> <input type="checkbox" checked disabled> </td>
+										<?php elseif($ententePrealable2=='1'): ?>
+										<td align='center' style="background-color: #00ff00;"> <input type="checkbox" checked disabled> </td>
+										<?php elseif($ententePrealable2=='9' || $exclu=='1'): ?>
+										<td align='center' style="background-color: red;color:white;"> <input type="checkbox" checked disabled> </td>
+										<?php else: ?>
+										<td align='center'> <input type="checkbox" checked disabled> </td>
+										<?php endif; ?>
+									<?php else: ?>
+										<td align='center' > <input type="checkbox" disabled></td>
+									<?php endif; ?>
+									</tr>
+								<?php endforeach; ?>
+								</tbody>
+							</table>
+						<?php endif; ?>
 					</div>	
 
 					<div id="livre">
 						<?php $nbLivre = 0; ?>
 						<div >
 							<?php if($idPrestationactes=="0") : ?>
-							<input class="form-control" style="text-align: center; font-size: 12pt;font-weight: bold;"  type="text" value="<?= _("Liste des médicaments servis") ?>" readonly >	
-							<?php else: ?>
-							<input class="form-control" style="text-align: center; font-size: 12pt;font-weight: bold;"  type="text" value="<?= _("Liste des médicaments facturés") ?>" readonly >	
+								<input class="form-control" style="text-align: center; font-size: 12pt;font-weight: bold;"  type="text" value="<?= _("Liste des médicaments servis") ?>" readonly >	
+								<?php else: ?>
+								<input class="form-control" style="text-align: center; font-size: 12pt;font-weight: bold;"  type="text" value="<?= _("Liste des médicaments facturés") ?>" readonly >	
 							<?php endif; ?>
 						</div>
 						
@@ -863,7 +865,7 @@
 						<input  class="sr-only" type="text" id="cout_f" name="cout_f" value="<?= format_N($this->nettoyer($prescription['fraisReelLivre'])) ?>" >
 						
 						<input  class="sr-only" type="text" id="montantTm_f" name="montantTm_f" value="<?= format_N($this->nettoyer($prescription['montantTmLivre'])) ?>" >
-					</div>		
+					</div>
 					
 					<?php else: ?>
 						<div  class="alert alert-danger" style="height:40px; padding:5px; text-align:center;" >