lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Look: Modifications esthtiques mineures

Browse Source
This commit is contained in:
Laurent Destailleur 2004-06-09 00:23:00 +00:00
parent faa2d81a95
commit 18557e677d
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/commande/fiche.php
View File

@ -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>';
}
/*
*

12
htdocs/compta/facture.php
View File

@ -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++;
}

3
htdocs/product/stats/fiche.php
View File

@ -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">';