Mise aux normes graphiques

This commit is contained in:
Rodolphe Quiedeville 2004-05-25 14:16:03 +00:00
parent b288a22263
commit f4d652fdd9

View File

@ -70,7 +70,13 @@ if ($_GET["id"] > 0)
$author->id = $commande->user_author_id; $author->id = $commande->user_author_id;
$author->fetch(); $author->fetch();
print_titre("Commande : ".$commande->ref);
$head[0][0] = DOL_URL_ROOT.'/comm/propal.php?propalid='.$propal->id;
$head[0][1] = "Commande : $commande->ref";
$h = 1;
$a = 0;
dolibarr_fiche_head($head, $a);
/* /*
* Commande * Commande
@ -198,34 +204,6 @@ if ($_GET["id"] > 0)
print $db->error(); print $db->error();
} }
print '</table>'; print '</table>';
/*
* Barre d'actions
*/
if ($user->societe_id == 0 && !$commande->facturee)
{
print '<p><table id="actions" width="100%"><tr>';
print '<td align="center" width="20%">';
print '<a href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&amp;commandeid='.$commande->id.'&amp;socidp='.$commande->soc_id.'">Facturer</a>';
print '</td>';
print '<td align="center" width="20%">-</td>';
print '<td align="center" width="20%">-</td>';
if (!$commande->facturee)
{
print '<td align="center" width="20%">';
print '<a href="'.DOL_URL_ROOT.'/compta/commande.php?action=facturee&amp;id='.$commande->id.'">Classer comme facturée</a>';
print '</td>';
}
else
{
print '<td align="center" width="20%">-</td>';
}
print '<td align="center" width="20%">-</td>';
print "</tr></table>";
}
print "<p>\n";
/* /*
* Documents générés * Documents générés
@ -263,6 +241,9 @@ if ($_GET["id"] > 0)
{ {
$num_fac_asso = $db->num_rows(); $num_fac_asso = $db->num_rows();
$i = 0; $total = 0; $i = 0; $total = 0;
if ($num_fac_asso > 0)
{
print "<br>"; print "<br>";
if ($num_fac_asso > 1) if ($num_fac_asso > 1)
{ {
@ -307,6 +288,7 @@ if ($_GET["id"] > 0)
} }
print "<tr><td align=\"right\" colspan=\"4\">Total : <b>$total</b> Euros HT</td></tr>\n"; print "<tr><td align=\"right\" colspan=\"4\">Total : <b>$total</b> Euros HT</td></tr>\n";
print "</table>"; print "</table>";
}
$db->free(); $db->free();
} }
else else
@ -317,6 +299,25 @@ if ($_GET["id"] > 0)
* *
* *
*/ */
print '</div>';
/*
* Barre d'actions
*/
if ($user->societe_id == 0 && !$commande->facturee)
{
print "<br><div class=\"tabsAction\">\n";
print '<a class="tabAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&amp;commandeid='.$commande->id.'&amp;socidp='.$commande->soc_id.'">Facturer</a>';
if (!$commande->facturee && $num_fac_asso)
{
print '<a class="tabAction" href="'.DOL_URL_ROOT.'/compta/commande.php?action=facturee&amp;id='.$commande->id.'">Classer comme facturée</a>';
}
print '</div>';
}
} }