From 350ef9078aa035b45e4e860c557d5a1e60a1d804 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 28 Dec 2004 14:08:50 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20Le=20statut=20s'affichait=20par=20l'id?=
 =?UTF-8?q?=20au=20lieu=20du=20libell=E9.=20Trad:=20Quelques=20traductions?=
 =?UTF-8?q?=20oubli=E9es.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/compta/paiement/fiche.php | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/htdocs/compta/paiement/fiche.php b/htdocs/compta/paiement/fiche.php
index 3cfdbc2a2ea..9d758c9cfbd 100644
--- a/htdocs/compta/paiement/fiche.php
+++ b/htdocs/compta/paiement/fiche.php
@@ -30,6 +30,7 @@
 
 require("./pre.inc.php");
 require("../../paiement.class.php");
+require("../../facture.class.php");
 
 $user->getrights('facture');
 
@@ -98,17 +99,15 @@ $html = new Form($db);
 
    }
 
+print '<br>';
 
 print '<table class="noborder" width="100%">';
 
 print '<tr><td valign="top">';
 
-print $langs->trans("Numero").' : '.$paiement->numero."<br>";
-
-print $langs->trans("Date").' : '.strftime("%d %B %Y",$paiement->date)."<br>";
-
+print $langs->trans("Date").' : '.dolibarr_print_date($paiement->date)."<br>";
 print $langs->trans("Type").' : '.$paiement->type_libelle."<br>";
-
+if ($paiement->numero) { print $langs->trans("Numero").' : '.$paiement->numero."<br>"; }
 print $langs->trans("Amount").' : '.$paiement->montant."&nbsp;".$conf->monnaie."<br>";
 
 print '</td></tr>';
@@ -121,7 +120,7 @@ print nl2br($paiement->note);
  *
  */
 $allow_delete = 1 ;
-$sql = "SELECT f.facnumber, f.total_ttc, pf.amount, f.rowid as facid, f.paye, s.nom, s.idp";
+$sql = "SELECT f.facnumber, f.total_ttc, pf.amount, f.rowid as facid, f.paye, f.fk_statut, s.nom, s.idp";
 $sql .= " FROM ".MAIN_DB_PREFIX."paiement_facture as pf,".MAIN_DB_PREFIX."facture as f,".MAIN_DB_PREFIX."societe as s";
 $sql .= " WHERE pf.fk_facture = f.rowid AND f.fk_soc = s.idp";
 $sql .= " AND pf.fk_paiement = ".$paiement->id;
@@ -135,7 +134,7 @@ if ($db->query($sql))
   print '<br><table class="noborder" width="100%">';
   print '<tr class="liste_titre">';
   print '<td>'.$langs->trans("Bill").'</td><td>'.$langs->trans("Company").'</td>';
-  print '<td align="right">'.$langs->trans("AmountTTC").'</td><td>&nbsp;</td>';
+  print '<td align="right">'.$langs->trans("AmountTTC").'</td><td align="center">'.$langs->trans("Status").'</td>';
   print "</tr>\n";
   
   if ($num > 0) 
@@ -152,7 +151,9 @@ if ($db->query($sql))
 	  print ' <a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$objp->facid.'">' . $objp->facnumber;
 	  print "</a></td>\n";
 	  print '<td><a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$objp->idp.'">' . $objp->nom.'</a></td>';
-	  print '<td align="right">'.price($objp->amount).'</td><td align="center">'.$objp->paye.'</td>';
+	  print '<td align="right">'.price($objp->amount).'</td>';
+	  $fac=new Facture($db);
+	  print '<td align="center">'.$fac->LibStatut($objp->paye,$objp->fk_statut).'</td>';
 	  print "</tr>\n";
 	  if ($objp->paye == 1)
 	    {
@@ -165,13 +166,16 @@ if ($db->query($sql))
   $var=!$var;
   print "<tr $bc[$var]>";
   print '<td>&nbsp;</td>';
-  print '<td align="right">Total</td>';
+  print '<td align="right">'.$langs->trans("Total").'</td>';
   print '<td align="right">'.price($total).'</td><td>&nbsp;</td>';
   print "</tr>\n";
 
   print "</table>\n";
   $db->free();	
 }
+else {
+    dolibarr_print_error($db);   
+}
 
 
 /*
@@ -183,7 +187,7 @@ print '<div class="tabsAction">';
 
 if ($user->societe_id == 0 && $paiement->statut == 0 && $_GET["action"] == '')
 {
-  print '<a class="tabAction" href="fiche.php?id='.$_GET["id"].'&amp;action=valide">'.$langs->trans("Valider").'</a>';
+  print '<a class="tabAction" href="fiche.php?id='.$_GET["id"].'&amp;action=valide">'.$langs->trans("Valid").'</a>';
 }
 
 
-- 
GitLab