From 18557e677dd6088b86730d2321d47ee8fe452017 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 9 Jun 2004 00:23:00 +0000
Subject: [PATCH] =?UTF-8?q?Look:=20Modifications=20esth=E9tiques=20mineure?=
 =?UTF-8?q?s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/commande/fiche.php      |  6 +++---
 htdocs/compta/facture.php      | 12 +++++++-----
 htdocs/product/stats/fiche.php |  3 +--
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index c7366eec62b..8efa7d485f7 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -665,7 +665,7 @@ else
 
 	    print "</form>";
 	  }
-	print "</table>";
+	print "</table><br>";
 	/*
 	 * Fin Ajout ligne
 	 *
@@ -675,7 +675,7 @@ else
 
 	if ($user->societe_id == 0 && $commande->statut < 3)
 	  {
-	    print '<p><div class="tabsAction">';
+	    print '<div class="tabsAction">';
 	
 	    if ($commande->statut == 0 && $user->rights->commande->supprimer)
 	      {
@@ -825,7 +825,7 @@ else
 	    $html->select_array("projetid",$proj->liste_array($commande->soc_id));
 	    
 	    print "</td></tr>";
-	    print '<tr><td colspan="2" align="center"><input type="submit" value="Envoyer"></td></tr></table></form></p>';
+	    print '<tr><td colspan="2" align="center"><input type="submit" value="Envoyer"></td></tr></table></form>';
 	  }
 	/*
 	 *
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 0ba90bc3536..7a3ffb35cc8 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1131,8 +1131,9 @@ else
     * Liste des actions propres aux document
     *
     */
-    $sql = "SELECT ".$db->pdate("a.datea")." as da,  a.note";
-    $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a WHERE a.fk_soc = $fac->socidp AND a.fk_action in (9,10) AND a.fk_facture = $fac->id";
+    $sql = "SELECT ".$db->pdate("a.datea")." as da,  a.note, code ";
+    $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a, ".MAIN_DB_PREFIX."user as u ";
+    $sql .= " WHERE a.fk_user_author = u.rowid and a.fk_soc = $fac->socidp AND a.fk_action in (9,10) AND a.fk_facture = $fac->id";
     
     $result = $db->query($sql);
     if ($result)
@@ -1144,7 +1145,7 @@ else
     
             $i = 0; $total = 0;
             print '<table class="border" cellspacing="0" cellpadding="4" width="100%">';
-            print "<tr $bc[$var]><td>Date</td><td>Action</td></tr>\n";
+            print "<tr $bc[$var]><td>Date</td><td>Action</td><td>Par</td></tr>\n";
     
             $var=True;
             while ($i < $num)
@@ -1152,8 +1153,9 @@ else
                 $objp = $db->fetch_object( $i);
                 $var=!$var;
                 print "<tr $bc[$var]>";
-                print "<td>".strftime("%d %B %Y",$objp->da)."</TD>\n";
-                print '<td>'.stripslashes($objp->note).'</TD>';
+                print "<td>".dolibarr_print_date($objp->da)."</td>\n";
+                print '<td>'.stripslashes($objp->note).'</td>';
+                print '<td>'.$objp->code.'</td>';
                 print "</tr>";
                 $i++;
             }
diff --git a/htdocs/product/stats/fiche.php b/htdocs/product/stats/fiche.php
index 5d1e537fa0f..69e5a13e57b 100644
--- a/htdocs/product/stats/fiche.php
+++ b/htdocs/product/stats/fiche.php
@@ -22,7 +22,6 @@
  */
 require("./pre.inc.php");
 require("../../propal.class.php");
-//require("../../graph.class.php");
 
 llxHeader();
 
@@ -78,7 +77,7 @@ if ($id)
       print "<br>Proposé à <b>".$product->count_propale_client()."</b> clients";
       print '<br><a href="facture.php?id='.$id.'">Factures</a> : '.$product->count_facture();
       print '</td></tr>';
-      print '<tr><td>Prix</td><td>'.price($product->price).'</td></tr>';
+      print '<tr><td>Prix actuel</td><td>'.price($product->price).'</td></tr>';
       print "</table>";
 
       print '<br><table class="border" width="100%" cellspacing="0" cellpadding="4">';