a
This commit is contained in:
parent
eabadd6b5c
commit
e9071cbd1f
|
|
@ -26,7 +26,6 @@ class ControleurAjaxdetailexamen extends Controleur {
|
||||||
|
|
||||||
$detailprescriptions = $this->detailprescription->getdetailexamenfeuille();
|
$detailprescriptions = $this->detailprescription->getdetailexamenfeuille();
|
||||||
|
|
||||||
|
|
||||||
$detailnonlivres = $this->prescription->getdetailnonlivre();
|
$detailnonlivres = $this->prescription->getdetailnonlivre();
|
||||||
|
|
||||||
$detaillivres = $this->prescription->getdetaillivre();
|
$detaillivres = $this->prescription->getdetaillivre();
|
||||||
|
|
|
||||||
|
|
@ -160,6 +160,7 @@ class ControleurExamensmedicaux extends Controleur {
|
||||||
$geds = $this->ged->getgedexamen();
|
$geds = $this->ged->getgedexamen();
|
||||||
|
|
||||||
$prixActeModifiable = $this->acte->getPrixActeModifiable();
|
$prixActeModifiable = $this->acte->getPrixActeModifiable();
|
||||||
|
$_SESSION['p_prixActeModifiable'] = $prixActeModifiable;
|
||||||
|
|
||||||
$this->genererVue(array('prescription' => $prescription, 'detailprescriptions' => $detailprescriptions,'tauxCouverture' => $tauxCouverture,
|
$this->genererVue(array('prescription' => $prescription, 'detailprescriptions' => $detailprescriptions,'tauxCouverture' => $tauxCouverture,
|
||||||
'detailnonlivres' => $detailnonlivres, 'detaillivres' => $detaillivres, 'prestations_total' => $prestations_total, 'geds' => $geds,
|
'detailnonlivres' => $detailnonlivres, 'detaillivres' => $detaillivres, 'prestations_total' => $prestations_total, 'geds' => $geds,
|
||||||
|
|
|
||||||
|
|
@ -9760,14 +9760,10 @@ function ajouterexamen_tous()
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
success: function(data) {
|
success: function(data) {
|
||||||
$("#livraison").html(data);
|
$("#livraison").html(data);
|
||||||
//afficheDivPlafond();
|
|
||||||
//getstatutacte("PH");
|
|
||||||
|
|
||||||
},
|
},
|
||||||
error: function(data) {
|
error: function(data) {
|
||||||
},
|
},
|
||||||
complete: function() {
|
complete: function() {
|
||||||
//alerter_depassement_limite_cso();
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,8 @@
|
||||||
|
<?php
|
||||||
|
$prixActeModifiable = $_SESSION['p_prixActeModifiable'];
|
||||||
|
echo "prixActeModifiable => $prixActeModifiable";
|
||||||
|
|
||||||
|
?>
|
||||||
<div id="livraison">
|
<div id="livraison">
|
||||||
<div id="recap">
|
<div id="recap">
|
||||||
<table class="table table-responsive table-condensed" style='font-size:12pt;' >
|
<table class="table table-responsive table-condensed" style='font-size:12pt;' >
|
||||||
|
|
@ -32,11 +37,6 @@
|
||||||
<th width="10%" style="text-align:center"> <?= _("Prix Unitaire") ?> </th>
|
<th width="10%" style="text-align:center"> <?= _("Prix Unitaire") ?> </th>
|
||||||
<th width="5%" style="text-align:center"> <?= _("Qté") ?> </th>
|
<th width="5%" style="text-align:center"> <?= _("Qté") ?> </th>
|
||||||
<th width="10%" style="text-align:center"> <?= _("Prix Total") ?> </th>
|
<th width="10%" style="text-align:center"> <?= _("Prix Total") ?> </th>
|
||||||
<!--
|
|
||||||
<th width="10%" style="text-align:center"> <?= _("T M") ?> </th>
|
|
||||||
<th width="10%" style="text-align:center"> <?= _("Remb") ?> </th>
|
|
||||||
<th width="10%" style="text-align:center"> <?= _("Dépass") ?> </th>
|
|
||||||
-->
|
|
||||||
<th width ="5%" style="text-align:center"> <?= _("Accord") ?> </th>
|
<th width ="5%" style="text-align:center"> <?= _("Accord") ?> </th>
|
||||||
</thead>
|
</thead>
|
||||||
|
|
||||||
|
|
@ -47,8 +47,6 @@
|
||||||
$ententePrealable = $this->nettoyer($detailnonlivre['ententePrealable']);
|
$ententePrealable = $this->nettoyer($detailnonlivre['ententePrealable']);
|
||||||
$codeActe = $this->nettoyer($detailnonlivre['codeActe']);
|
$codeActe = $this->nettoyer($detailnonlivre['codeActe']);
|
||||||
$libelleActe = $this->nettoyer($detailnonlivre['libelleActe']);
|
$libelleActe = $this->nettoyer($detailnonlivre['libelleActe']);
|
||||||
|
|
||||||
|
|
||||||
$codeGarantie = $this->nettoyer($detailnonlivre['codeGarantie']);
|
$codeGarantie = $this->nettoyer($detailnonlivre['codeGarantie']);
|
||||||
$tarif = $this->nettoyer($detailnonlivre['tarif']);
|
$tarif = $this->nettoyer($detailnonlivre['tarif']);
|
||||||
?>
|
?>
|
||||||
|
|
@ -89,7 +87,6 @@
|
||||||
<?php
|
<?php
|
||||||
$nbLivre = 0;
|
$nbLivre = 0;
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<table class="table table-striped table-bordered table-hover table-condensed table-responsive" style='font-size:10pt;'>
|
<table class="table table-striped table-bordered table-hover table-condensed table-responsive" style='font-size:10pt;'>
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
|
|
@ -126,13 +123,6 @@
|
||||||
$libelleActe = $this->nettoyer($detaillivre['libelleActe']);
|
$libelleActe = $this->nettoyer($detaillivre['libelleActe']);
|
||||||
$codeActe = $this->nettoyer($detaillivre['codeActe']);
|
$codeActe = $this->nettoyer($detaillivre['codeActe']);
|
||||||
|
|
||||||
/*
|
|
||||||
if($actVisible!="1")
|
|
||||||
{
|
|
||||||
$libelleActe = $codeActe;
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
$tm = $this->nettoyer($detaillivre['tm']);
|
$tm = $this->nettoyer($detaillivre['tm']);
|
||||||
|
|
||||||
$taux = (100-$tm)."%";
|
$taux = (100-$tm)."%";
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user