Merge branch 'master' of gitlab.utc.fr:nf17-camp-p14/clivi

class/facture.php

@@ -22,7 +22,7 @@ class Facture extends Objet
         ),
         "date_paiement" => array(
             "label" => "Date de paiement",
-            "i" => -1
+            "i" => 8
         ),
         "moyen_paiement" => array(
             "label" => "Moyen de paiement",

controller/fact.php

@@ -22,13 +22,17 @@ switch($action) {
 		include 'view/form.php';
 		break;
 	case "detailFacture":
-		$list = Facture::getList("Liste des Factures");
+		/*$list = Facture::getList("Liste des Factures");
 		$facture = new Facture();
         $facture->select($_GET['id']);
         $formConf = $facture->getForm();
-        include 'view/formDetail.php';
+        include 'view/formDetail.php';*/
+
+        $ligneFacture = new LigneFacture();
+        $formConf = $ligneFacture->getForm();
+        include 'view/form.php';
 
-        $list = LigneFacture::getList("Détail de la facture", $_GET["id"]);
+        $list = LigneFacture::getList("Détails de la facture", $_GET["id"]);
         include 'view/list.php';
 		break;
 	default: