diff --git a/Controleur/ControleurModifierbaremepriseencharge.php b/Controleur/ControleurModifierbaremepriseencharge.php index 1e676296..2f196905 100755 --- a/Controleur/ControleurModifierbaremepriseencharge.php +++ b/Controleur/ControleurModifierbaremepriseencharge.php @@ -39,16 +39,13 @@ class ControleurModifierbaremepriseencharge extends Controleur { $taux = $this->bareme->getTauxBareme(); $garant = $this->garant->getListeGarantDansProduit(); - $chemin = $this->menuvue->getChemin('Modifierbaremepriseencharge'); - $this->genererVue(array( 'bareme' => $bareme, 'clients' => $clients, 'territoire' => $territoire, 'taux' => $taux, 'garant' => $garant, - 'produits' => $produit, - 'chemin' => $chemin + 'produits' => $produit )); } diff --git a/Modele/Baremepriseencharge.php b/Modele/Baremepriseencharge.php index 0d1a8ff1..1a82844e 100755 --- a/Modele/Baremepriseencharge.php +++ b/Modele/Baremepriseencharge.php @@ -21,25 +21,7 @@ class Baremepriseencharge extends Modele public function getBaremepriseenchargeId($idBaremePriseEnCharge) { - - if (est_anglophone()){ - $sql = "SELECT A.*,concat(B.nom,' ',B.prenoms) as nomClient, - C.libelleEng AS territoire, D.libelle as tauxRemboursement - from baremepriseencharge A - LEFT JOIN clients B ON (B.numeroClient=A.numeroClient) - LEFT JOIN etendueterritoire C ON (C.codeTerritoire=A.codeTerritoire) - LEFT JOIN tauxcouverture D ON (D.id=A.idTauxCouverture) - WHERE A.id=?;"; - }else{ - - $sql = "SELECT A.*,concat(B.nom,' ',B.prenoms) as nomClient, - C.libelle AS territoire, D.libelle as tauxRemboursement - from baremepriseencharge A - LEFT JOIN clients B ON (B.numeroClient=A.numeroClient) - LEFT JOIN etendueterritoire C ON (C.codeTerritoire=A.codeTerritoire) - LEFT JOIN tauxcouverture D ON (D.id=A.idTauxCouverture) - WHERE A.id=?;"; - } + $sql = "CALL sp_get_bareme_pec_id(?)"; $resultat = $this->executerRequete($sql, array($idBaremePriseEnCharge)); diff --git a/Vue/Modifierbaremepriseencharge/index.php b/Vue/Modifierbaremepriseencharge/index.php index aff772f3..0c9d581c 100755 --- a/Vue/Modifierbaremepriseencharge/index.php +++ b/Vue/Modifierbaremepriseencharge/index.php @@ -24,7 +24,7 @@ @@ -108,12 +108,6 @@ - -