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

Look: Modif esthtiques mineures

Browse Source
This commit is contained in:
Laurent Destailleur 2005-08-31 21:56:05 +00:00
parent 094fd356d1
commit feebc9f134
4 changed files with 194 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
htdocs/fourn/commande/fiche.php
View File

@ -19,7 +19,6 @@
* *
* $Id$ * $Id$
* $Source$ * $Source$
*
*/ */
/** /**
@ -36,14 +35,13 @@ if (!$user->rights->fournisseur->commande->lire) accessforbidden();
require_once(DOL_DOCUMENT_ROOT."/project.class.php"); require_once(DOL_DOCUMENT_ROOT."/project.class.php");
require_once(DOL_DOCUMENT_ROOT."/propal.class.php"); require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
/* // Sécurité accés client
* Sécurité accés client
*/
if ($user->societe_id > 0) if ($user->societe_id > 0)
{ {
$action = ''; $action = '';
$socidp = $user->societe_id; $socidp = $user->societe_id;
} }
/* /*
* *
*/ */
@ -63,10 +61,6 @@ if ($_GET["action"] == 'pdf')
$commande->generate_pdf(); $commande->generate_pdf();
} }
/*
*
*/
if ($_POST["action"] == 'setremise' && $user->rights->commande->creer) if ($_POST["action"] == 'setremise' && $user->rights->commande->creer)
{ {
$commande = new CommandeFournisseur($db); $commande = new CommandeFournisseur($db);
@ -74,6 +68,7 @@ if ($_POST["action"] == 'setremise' && $user->rights->commande->creer)
$commande->set_remise($user, $_POST["remise"]); $commande->set_remise($user, $_POST["remise"]);
} }
/* /*
* *
*/ */
@ -206,6 +201,8 @@ if ($_GET["action"] == 'create')
} }
} }
llxHeader('',$langs->trans("OrderCard"),"CommandeFournisseur"); llxHeader('',$langs->trans("OrderCard"),"CommandeFournisseur");
$html = new Form($db); $html = new Form($db);
@ -319,7 +316,7 @@ if ($_GET["id"] > 0)
if ($commande->date_commande) if ($commande->date_commande)
{ {
print strftime("%A %d %B %Y",$commande->date_commande)."\n"; print dolibarr_print_date($commande->date_commande,"%A %d %B %Y")."\n";
} }
print '</td><td width="50%" colspan="3">'; print '</td><td width="50%" colspan="3">';
@ -337,16 +334,16 @@ if ($_GET["id"] > 0)
// Ligne de 3 colonnes // Ligne de 3 colonnes
print '<tr><td>'.$langs->trans("AmountHT").'</td>'; print '<tr><td>'.$langs->trans("AmountHT").'</td>';
print '<td align="right"><b>'.price($commande->total_ht).'</b></td>'; print '<td align="right"><b>'.price($commande->total_ht).'</b></td>';
print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td>'; print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td><td colspan="3">&nbsp;</td></tr>';
print '<td>'.$langs->trans("VAT").'</td><td align="right">'.price($commande->total_tva).'</td>'; print '<tr><td>'.$langs->trans("VAT").'</td><td align="right">'.price($commande->total_tva).'</td>';
print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td><td colspan="3">&nbsp;</td></tr>';
print '<tr><td>'.$langs->trans("TotalTTC").'</td><td align="right">'.price($commande->total_ttc).'</td>'; print '<tr><td>'.$langs->trans("TotalTTC").'</td><td align="right">'.price($commande->total_ttc).'</td>';
print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td><td colspan="3">&nbsp;</td></tr>'; print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td><td colspan="3">&nbsp;</td></tr>';
if ($commande->note) if ($commande->note)
{ {
print '<tr><td>Note</td><td colspan="5">'.nl2br($commande->note)."</td></tr>"; print '<tr><td>'.$langs->trans("Note").'</td><td colspan="5">'.nl2br($commande->note)."</td></tr>";
} }
print "</table>"; print "</table>";
@ -355,7 +352,7 @@ if ($_GET["id"] > 0)
* Lignes de commandes * Lignes de commandes
* *
*/ */
echo '<br><table class="noborder" width="100%">'; print '<br><table class="noborder" width="100%">';
$sql = "SELECT l.ref, l.fk_product, l.description, l.price, l.qty, l.rowid, l.tva_tx, l.remise_percent, l.subprice"; $sql = "SELECT l.ref, l.fk_product, l.description, l.price, l.qty, l.rowid, l.tva_tx, l.remise_percent, l.subprice";
$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as l "; $sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as l ";
@ -364,7 +361,7 @@ if ($_GET["id"] > 0)
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) if ($resql)
{ {
$num_lignes = $db->num_rows(); $num_lignes = $db->num_rows($resql);
$i = 0; $total = 0; $i = 0; $total = 0;
if ($num_lignes) if ($num_lignes)
@ -382,7 +379,7 @@ if ($_GET["id"] > 0)
$var=True; $var=True;
while ($i < $num_lignes) while ($i < $num_lignes)
{ {
$objp = $db->fetch_object(); $objp = $db->fetch_object($resql);
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print "<td>".$objp->ref."</td>\n"; print "<td>".$objp->ref."</td>\n";
if ($objp->fk_product > 0) if ($objp->fk_product > 0)
@ -392,10 +389,10 @@ if ($_GET["id"] > 0)
} }
else else
{ {
print "<td>".stripslashes(nl2br($objp->description))."</TD>\n"; print "<td>".stripslashes(nl2br($objp->description))."</td>\n";
} }
print '<td align="center">'.$objp->tva_tx.' %</TD>'; print '<td align="center">'.$objp->tva_tx.'%</td>';
print '<td align="center">'.$objp->qty.'</TD>'; print '<td align="center">'.$objp->qty.'</td>';
if ($objp->remise_percent > 0) if ($objp->remise_percent > 0)
{ {
print '<td align="right">'.$objp->remise_percent." %</td>\n"; print '<td align="right">'.$objp->remise_percent." %</td>\n";
@ -472,7 +469,7 @@ if ($_GET["id"] > 0)
} }
else else
{ {
print $db->error(); dolibarr_print_error($db);
} }
print '<form action="fiche.php?id='.$commande->id.'" method="post">'; print '<form action="fiche.php?id='.$commande->id.'" method="post">';
@ -496,6 +493,7 @@ if ($_GET["id"] > 0)
print "</form>"; print "</form>";
} }
print "</table><br>"; print "</table><br>";
/* /*
* Fin Ajout ligne * Fin Ajout ligne
@ -549,7 +547,6 @@ if ($_GET["id"] > 0)
print "</div>"; print "</div>";
} }
print "<p>\n";
/* /*
* Documents générés * Documents générés
@ -572,15 +569,17 @@ if ($_GET["id"] > 0)
print '</tr>'; print '</tr>';
print "</table>\n"; print "</table>\n";
print '</td><td valign="top" width="50%">'; print '</td><td valign="top" width="50%">';
} }
/* /*
* *
* *
*/ */
if ($_GET["action"] == 'classer') if ($_GET["action"] == 'classer')
{ {
print '<p><form method="post" action="fiche.php?id='.$commande->id.'">'; print '<form method="post" action="fiche.php?id='.$commande->id.'">';
print '<input type="hidden" name="action" value="classin">'; print '<input type="hidden" name="action" value="classin">';
print '<table class="border">'; print '<table class="border">';
print '<tr><td>Projet</td><td>'; print '<tr><td>Projet</td><td>';
@ -603,7 +602,7 @@ if ($_GET["id"] > 0)
$form = new Form($db); $form = new Form($db);
print '<form action="fiche.php?id='.$commande->id.'&amp;action=commande" method="post">'; print '<form action="fiche.php?id='.$commande->id.'&amp;action=commande" method="post">';
print '<table class="noborder" cellpadding="4" cellspacing="0">'; print '<table class="noborder">';
print '<tr class="liste_titre"><td colspan="2">Commander</td></tr>'; print '<tr class="liste_titre"><td colspan="2">Commander</td></tr>';
print '<tr><td>Date commande</td><td>'; print '<tr><td>Date commande</td><td>';
print $form->select_date(); print $form->select_date();
@ -634,7 +633,7 @@ if ($_GET["id"] > 0)
print '<form action="fiche.php?id='.$commande->id.'" method="post">'; print '<form action="fiche.php?id='.$commande->id.'" method="post">';
print '<input type="hidden" name="action" value="livraison">'; print '<input type="hidden" name="action" value="livraison">';
print '<table class="noborder" cellpadding="4" cellspacing="0">'; print '<table class="noborder">';
print '<tr class="liste_titre"><td colspan="2">Réceptionner</td></tr>'; print '<tr class="liste_titre"><td colspan="2">Réceptionner</td></tr>';
print '<tr><td>Date de livraison</td><td>'; print '<tr><td>Date de livraison</td><td>';
print $form->select_date(); print $form->select_date();
@ -664,5 +663,5 @@ if ($_GET["id"] > 0)
$db->close(); $db->close();
llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>"); llxFooter('$Date$ - $Revision$');
?> ?>

17
htdocs/fourn/commande/history.php
View File

@ -18,10 +18,9 @@
* *
* $Id$ * $Id$
* $Source$ * $Source$
*
*/ */
/*! /**
\file htdocs/fourn/commande/history.php \file htdocs/fourn/commande/history.php
\ingroup commande \ingroup commande
\brief Fiche commande \brief Fiche commande
@ -37,9 +36,7 @@ $langs->load("companies");
$user->getrights('fournisseur'); $user->getrights('fournisseur');
if (!$user->rights->fournisseur->commande->lire) accessforbidden(); if (!$user->rights->fournisseur->commande->lire) accessforbidden();
/*
*
*/
/* *************************************************************************** */ /* *************************************************************************** */
/* */ /* */
@ -82,6 +79,7 @@ if ($_GET["id"] > 0)
dolibarr_fiche_head($head, $a, $soc->nom); dolibarr_fiche_head($head, $a, $soc->nom);
/* /*
* Commande * Commande
*/ */
@ -99,7 +97,7 @@ if ($_GET["id"] > 0)
if ($commande->methode_commande_id > 0) if ($commande->methode_commande_id > 0)
{ {
print '<tr><td>'.$langs->trans("Date").'</td>'; print '<tr><td>'.$langs->trans("Date").'</td>';
print '<td colspan="2">'.strftime("%A %e %B %Y",$commande->date_commande)."</td>\n"; print '<td colspan="2">'.dolibarr_print_date($commande->date_commande,"%A %e %B %Y")."</td>\n";
print '<td width="50%">&nbsp;'; print '<td width="50%">&nbsp;';
print "</td></tr>"; print "</td></tr>";
} }
@ -109,6 +107,7 @@ if ($_GET["id"] > 0)
print '<td>&nbsp;</td></tr>'; print '<td>&nbsp;</td></tr>';
print "</table>\n"; print "</table>\n";
/* /*
* Historique * Historique
* *
@ -152,11 +151,11 @@ if ($_GET["id"] > 0)
} }
else else
{ {
print $db->error(); dolibarr_print_error($db);
} }
print "</table>"; print "</table>";
print '<br /></div>'; print '</div>';
} }
else else
{ {
@ -167,5 +166,5 @@ if ($_GET["id"] > 0)
$db->close(); $db->close();
llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>"); llxFooter('$Date$ - $Revision$');
?> ?>

22
htdocs/fourn/commande/liste.php
View File

@ -18,7 +18,6 @@
* *
* $Id$ * $Id$
* $Source$ * $Source$
*
*/ */
/** /**
@ -106,14 +105,17 @@ if ($resql)
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"cf.ref"); print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"cf.ref");
print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom"); print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom");
print_liste_field_titre($langs->trans("OrderDate"),$_SERVER["PHP_SELF"],"dc"); print_liste_field_titre($langs->trans("OrderDate"),$_SERVER["PHP_SELF"],"dc","","",'align="center"');
print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"cf.fk_statut","","",'align="center"');
print "</tr>\n"; print "</tr>\n";
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<form action="liste.php" method="GET">'; print '<form action="liste.php" method="GET">';
print '<td><input type="text" class="flat" name="search_ref" value="'.$_GET["search_ref"].'"></td>'; print '<td><input type="text" class="flat" name="search_ref" value="'.$_GET["search_ref"].'"></td>';
print '<td><input type="text" class="flat" name="search_nom" value="'.$_GET["search_nom"].'"></td>'; print '<td><input type="text" class="flat" name="search_nom" value="'.$_GET["search_nom"].'"></td>';
print '<td><input class="button" type="submit" value="'.$langs->trans("Search").'"></td>'; print '<td colspan="2" class="liste_titre" align="right">';
print '<input type="image" class="liste_titre" name="button_search" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/search.png" alt="'.$langs->trans("Search").'">';
print '</td>';
print '</form>'; print '</form>';
print '</tr>'; print '</tr>';
@ -125,12 +127,16 @@ if ($resql)
$var=!$var; $var=!$var;
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print '<td><img src="statut'.$obj->fk_statut.'.png">';
print '&nbsp;<a href="'.DOL_URL_ROOT.'/fourn/commande/fiche.php?id='.$obj->rowid.'">'.$obj->ref.'</a></td>'."\n"; // Ref
print '<td><a href="'.DOL_URL_ROOT.'/fourn/commande/fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref.'</a></td>'."\n";
// Société
print '<td><a href="'.DOL_URL_ROOT.'/fourn/fiche.php?socid='.$obj->idp.'">'.img_object($langs->trans("ShowCompany"),"company").' '; print '<td><a href="'.DOL_URL_ROOT.'/fourn/fiche.php?socid='.$obj->idp.'">'.img_object($langs->trans("ShowCompany"),"company").' ';
print $obj->nom.'</a></td>'."\n"; print $obj->nom.'</a></td>'."\n";
print "<td align=\"right\" width=\"100\">"; // Date
print "<td align=\"center\" width=\"100\">";
if ($obj->dc) if ($obj->dc)
{ {
print dolibarr_print_date($obj->dc,"%e %b %Y"); print dolibarr_print_date($obj->dc,"%e %b %Y");
@ -140,6 +146,10 @@ if ($resql)
print "-"; print "-";
} }
print '</td>'; print '</td>';
// Statut
print '<td align="center"><img src="statut'.$obj->fk_statut.'.png"></td>';
print "</tr>\n"; print "</tr>\n";
$i++; $i++;
} }

11
htdocs/fourn/commande/note.php
View File

@ -18,7 +18,6 @@
* *
* $Id$ * $Id$
* $Source$ * $Source$
*
*/ */
/** /**
@ -133,12 +132,12 @@ if ($_GET["id"] > 0)
print '<tr><td>'.$langs->trans("AmountHT").'</td>'; print '<tr><td>'.$langs->trans("AmountHT").'</td>';
print '<td align="right"><b>'.price($commande->total_ht).'</b></td>'; print '<td align="right"><b>'.price($commande->total_ht).'</b></td>';
print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td>'; print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td>';
print '<td rowspan="3" valign="top">&nbsp;</td></tr>'; print '<td valign="top">&nbsp;</td></tr>';
print '<tr><td>'.$langs->trans("VAT").'</td><td align="right">'.price($commande->total_tva).'</td>'; print '<tr><td>'.$langs->trans("VAT").'</td><td align="right">'.price($commande->total_tva).'</td>';
print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td><td>&nbsp;</td></tr>';
print '<tr><td>'.$langs->trans("TotalTTC").'</td><td align="right">'.price($commande->total_ttc).'</td>'; print '<tr><td>'.$langs->trans("TotalTTC").'</td><td align="right">'.price($commande->total_ttc).'</td>';
print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td><td>&nbsp;</td></tr>';
if ($user->rights->fournisseur->commande->creer) if ($user->rights->fournisseur->commande->creer)
@ -151,7 +150,7 @@ if ($_GET["id"] > 0)
print '<tr><td>'.$langs->trans("Note").'</td><td colspan="3">'.nl2br($commande->note)."</td></tr>"; print '<tr><td>'.$langs->trans("Note").'</td><td colspan="3">'.nl2br($commande->note)."</td></tr>";
} }
print "</table><br></form>"; print "</table></form>";
} }
else else
{ {
@ -163,5 +162,5 @@ if ($_GET["id"] > 0)
$db->close(); $db->close();
llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>"); llxFooter('$Date$ - $Revision$');
?> ?>