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

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

@ -19,14 +19,13 @@
*
* $Id$
* $Source$
*
*/
/**
\file htdocs/fourn/commande/fiche.php
\ingroup commande
\brief Fiche commande
\version $Revision$
\file htdocs/fourn/commande/fiche.php
\ingroup commande
\brief Fiche commande
\version $Revision$
*/
require("./pre.inc.php");
@ -36,14 +35,13 @@ if (!$user->rights->fournisseur->commande->lire) accessforbidden();
require_once(DOL_DOCUMENT_ROOT."/project.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)
{
$action = '';
$socidp = $user->societe_id;
}
/*
*
*/
@ -63,10 +61,6 @@ if ($_GET["action"] == 'pdf')
$commande->generate_pdf();
}
/*
*
*/
if ($_POST["action"] == 'setremise' && $user->rights->commande->creer)
{
$commande = new CommandeFournisseur($db);
@ -74,6 +68,7 @@ if ($_POST["action"] == 'setremise' && $user->rights->commande->creer)
$commande->set_remise($user, $_POST["remise"]);
}
/*
*
*/
@ -100,7 +95,7 @@ if ($_POST["action"] == 'addligne' && $user->rights->fournisseur->commande->cree
0,
$_POST["remise_percent"]);
}
Header("Location: fiche.php?id=".$_GET["id"]);
Header("Location: fiche.php?id=".$_GET["id"]);
}
if ($_POST["action"] == 'updateligne' && $user->rights->commande->creer)
@ -206,6 +201,8 @@ if ($_GET["action"] == 'create')
}
}
llxHeader('',$langs->trans("OrderCard"),"CommandeFournisseur");
$html = new Form($db);
@ -319,7 +316,7 @@ if ($_GET["id"] > 0)
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">';
@ -337,16 +334,16 @@ if ($_GET["id"] > 0)
// Ligne de 3 colonnes
print '<tr><td>'.$langs->trans("AmountHT").'</td>';
print '<td align="right"><b>'.price($commande->total_ht).'</b></td>';
print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td>';
print '<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("VAT").'</td><td align="right">'.price($commande->total_tva).'</td>';
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 '<td>'.$langs->trans("Currency".$conf->monnaie).'</td><td colspan="3">&nbsp;</td></tr>';
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>";
@ -355,7 +352,7 @@ if ($_GET["id"] > 0)
* 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 .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as l ";
@ -364,7 +361,7 @@ if ($_GET["id"] > 0)
$resql = $db->query($sql);
if ($resql)
{
$num_lignes = $db->num_rows();
$num_lignes = $db->num_rows($resql);
$i = 0; $total = 0;
if ($num_lignes)
@ -382,7 +379,7 @@ if ($_GET["id"] > 0)
$var=True;
while ($i < $num_lignes)
{
$objp = $db->fetch_object();
$objp = $db->fetch_object($resql);
print "<tr $bc[$var]>";
print "<td>".$objp->ref."</td>\n";
if ($objp->fk_product > 0)
@ -392,10 +389,10 @@ if ($_GET["id"] > 0)
}
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->qty.'</TD>';
print '<td align="center">'.$objp->tva_tx.'%</td>';
print '<td align="center">'.$objp->qty.'</td>';
if ($objp->remise_percent > 0)
{
print '<td align="right">'.$objp->remise_percent." %</td>\n";
@ -445,35 +442,35 @@ if ($_GET["id"] > 0)
* Ajouter une ligne
*
*/
if ($_GET["action"] <> 'valid' && $commande->statut == 0 && $user->rights->fournisseur->commande->creer)
{
$sql = "SELECT p.rowid,p.label,p.ref ";
$sql .=" , (pf.price / pf.quantity) as priceunit";
$sql .= " FROM ".MAIN_DB_PREFIX."product as p ";
$sql .= " , ".MAIN_DB_PREFIX."product_fournisseur_price as pf ";
$sql .= " WHERE p.rowid = pf.fk_product AND pf.fk_soc = ".$commande->fourn_id;
$sql .= " ORDER BY p.ref ";
$resql = $db->query($sql);
if ($resql)
{
$opt = '<option value="0" selected="true"></option>';
if ($resql)
{
$num = $db->num_rows($resql);
$i = 0;
while ($i < $num)
{
$objp = $db->fetch_object($resql);
$opt .= "<option value=\"$objp->rowid\">[$objp->ref] $objp->label : $objp->priceunit</option>\n";
$i++;
}
}
$db->free($resql);
}
else
{
print $db->error();
}
if ($_GET["action"] <> 'valid' && $commande->statut == 0 && $user->rights->fournisseur->commande->creer)
{
$sql = "SELECT p.rowid,p.label,p.ref ";
$sql .=" , (pf.price / pf.quantity) as priceunit";
$sql .= " FROM ".MAIN_DB_PREFIX."product as p ";
$sql .= " , ".MAIN_DB_PREFIX."product_fournisseur_price as pf ";
$sql .= " WHERE p.rowid = pf.fk_product AND pf.fk_soc = ".$commande->fourn_id;
$sql .= " ORDER BY p.ref ";
$resql = $db->query($sql);
if ($resql)
{
$opt = '<option value="0" selected="true"></option>';
if ($resql)
{
$num = $db->num_rows($resql);
$i = 0;
while ($i < $num)
{
$objp = $db->fetch_object($resql);
$opt .= "<option value=\"$objp->rowid\">[$objp->ref] $objp->label : $objp->priceunit</option>\n";
$i++;
}
}
$db->free($resql);
}
else
{
dolibarr_print_error($db);
}
print '<form action="fiche.php?id='.$commande->id.'" method="post">';
print '<input type="hidden" name="action" value="addligne">';
@ -496,6 +493,7 @@ if ($_GET["id"] > 0)
print "</form>";
}
print "</table><br>";
/*
* Fin Ajout ligne
@ -549,38 +547,39 @@ if ($_GET["id"] > 0)
print "</div>";
}
print "<p>\n";
/*
* Documents générés
*
*/
$file = $conf->commande->dir_output . "/" . $commande->ref . "/" . $commande->ref . ".pdf";
$relativepath=$commande->ref . "/" . $commande->ref . ".pdf";
$var=true;
if (file_exists($file))
{
print_titre($langs->trans("Documents"));
print '<table width="100%" class="border">';
print "<tr $bc[$var]><td>".$langs->trans("Order")." PDF</td>";
print '<td><a href="'.DOL_URL_ROOT.'/document.php?modulepart=commande&file='.urlencode($relativepath).'">'.$commande->ref.'.pdf</a></td>';
print '<td align="right">'.filesize($file). ' bytes</td>';
print '<td align="right">'.strftime("%d %b %Y %H:%M:%S",filemtime($file)).'</td>';
print '</tr>';
print "</table>\n";
print '</td><td valign="top" width="50%">';
}
/*
* Documents générés
*
*/
$file = $conf->commande->dir_output . "/" . $commande->ref . "/" . $commande->ref . ".pdf";
$relativepath=$commande->ref . "/" . $commande->ref . ".pdf";
$var=true;
if (file_exists($file))
{
print_titre($langs->trans("Documents"));
print '<table width="100%" class="border">';
print "<tr $bc[$var]><td>".$langs->trans("Order")." PDF</td>";
print '<td><a href="'.DOL_URL_ROOT.'/document.php?modulepart=commande&file='.urlencode($relativepath).'">'.$commande->ref.'.pdf</a></td>';
print '<td align="right">'.filesize($file). ' bytes</td>';
print '<td align="right">'.strftime("%d %b %Y %H:%M:%S",filemtime($file)).'</td>';
print '</tr>';
print "</table>\n";
print '</td><td valign="top" width="50%">';
}
/*
*
*
*/
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 '<table class="border">';
print '<tr><td>Projet</td><td>';
@ -603,7 +602,7 @@ if ($_GET["id"] > 0)
$form = new Form($db);
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><td>Date commande</td><td>';
print $form->select_date();
@ -634,7 +633,7 @@ if ($_GET["id"] > 0)
print '<form action="fiche.php?id='.$commande->id.'" method="post">';
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><td>Date de livraison</td><td>';
print $form->select_date();
@ -664,5 +663,5 @@ if ($_GET["id"] > 0)
$db->close();
llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");
llxFooter('$Date$ - $Revision$');
?>

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

@ -18,14 +18,13 @@
*
* $Id$
* $Source$
*
*/
/*!
\file htdocs/fourn/commande/history.php
\ingroup commande
\brief Fiche commande
\version $Revision$
/**
\file htdocs/fourn/commande/history.php
\ingroup commande
\brief Fiche commande
\version $Revision$
*/
require("./pre.inc.php");
@ -37,9 +36,7 @@ $langs->load("companies");
$user->getrights('fournisseur');
if (!$user->rights->fournisseur->commande->lire) accessforbidden();
/*
*
*/
/* *************************************************************************** */
/* */
@ -81,6 +78,7 @@ if ($_GET["id"] > 0)
$h++;
dolibarr_fiche_head($head, $a, $soc->nom);
/*
* Commande
@ -99,7 +97,7 @@ if ($_GET["id"] > 0)
if ($commande->methode_commande_id > 0)
{
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></tr>";
}
@ -108,55 +106,56 @@ if ($_GET["id"] > 0)
print '<td>&nbsp;</td></tr>';
print "</table>\n";
/*
* Historique
*
*/
echo '<br><table class="border" width="100%">';
echo '<br><table class="border" width="100%">';
$sql = "SELECT l.fk_statut, ".$db->pdate("l.datelog") ."as dl, u.firstname, u.name";
$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur_log as l ";
$sql .= " , ".MAIN_DB_PREFIX."user as u ";
$sql .= " WHERE l.fk_commande = ".$commande->id." AND u.rowid = l.fk_user";
$sql .= " ORDER BY l.rowid DESC";
$resql = $db->query($sql);
$sql = "SELECT l.fk_statut, ".$db->pdate("l.datelog") ."as dl, u.firstname, u.name";
$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur_log as l ";
$sql .= " , ".MAIN_DB_PREFIX."user as u ";
$sql .= " WHERE l.fk_commande = ".$commande->id." AND u.rowid = l.fk_user";
$sql .= " ORDER BY l.rowid DESC";
$resql = $db->query($sql);
if ($resql)
{
$num = $db->num_rows($resql);
$i = 0;
$var=True;
while ($i < $num)
{
$obj = $db->fetch_object($resql);
print "<tr $bc[$var]>";
print '<td width="20%">'.strftime("%a %d %B %Y %H:%M:%S",$obj->dl)."</td>\n";
print '<td width="10%"><img src="statut'.$obj->fk_statut.'.png">&nbsp;';
print $commande->statuts[$obj->fk_statut]."</td>\n";
print '<td width="70%">'.$obj->firstname. " " . $obj->name.'</td>';
print "</tr>";
$i++;
$var=!$var;
}
$db->free($resql);
}
else
{
print $db->error();
}
print "</table>";
print '<br /></div>';
if ($resql)
{
$num = $db->num_rows($resql);
$i = 0;
$var=True;
while ($i < $num)
{
$obj = $db->fetch_object($resql);
print "<tr $bc[$var]>";
print '<td width="20%">'.strftime("%a %d %B %Y %H:%M:%S",$obj->dl)."</td>\n";
print '<td width="10%"><img src="statut'.$obj->fk_statut.'.png">&nbsp;';
print $commande->statuts[$obj->fk_statut]."</td>\n";
print '<td width="70%">'.$obj->firstname. " " . $obj->name.'</td>';
print "</tr>";
$i++;
$var=!$var;
}
$db->free($resql);
}
else
{
dolibarr_print_error($db);
}
print "</table>";
print '</div>';
}
else
{
@ -167,5 +166,5 @@ if ($_GET["id"] > 0)
$db->close();
llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");
llxFooter('$Date$ - $Revision$');
?>

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

@ -18,7 +18,6 @@
*
* $Id$
* $Source$
*
*/
/**
@ -73,22 +72,22 @@ $sql .= " WHERE cf.fk_soc = s.idp ";
if ($socid)
{
$sql .= " AND s.idp=$socid";
$sql .= " AND s.idp=$socid";
}
if (strlen($_GET["statut"]))
{
$sql .= " AND fk_statut =".$_GET["statut"];
$sql .= " AND fk_statut =".$_GET["statut"];
}
if (strlen($_GET["search_ref"]))
{
$sql .= " AND cf.ref LIKE '%".$_GET["search_ref"]."%'";
$sql .= " AND cf.ref LIKE '%".$_GET["search_ref"]."%'";
}
if (strlen($_GET["search_nom"]))
{
$sql .= " AND s.nom LIKE '%".$_GET["search_nom"]."%'";
$sql .= " AND s.nom LIKE '%".$_GET["search_nom"]."%'";
}
$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset);
@ -96,59 +95,70 @@ $sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $
$resql = $db->query($sql);
if ($resql)
{
$num = $db->num_rows($resql);
$i = 0;
$num = $db->num_rows($resql);
$i = 0;
print_barre_liste($title, $page, "liste.php", "", $sortfield, $sortorder, '', $num);
print '<table class="liste">';
print '<tr class="liste_titre">';
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("OrderDate"),$_SERVER["PHP_SELF"],"dc");
print "</tr>\n";
print_barre_liste($title, $page, "liste.php", "", $sortfield, $sortorder, '', $num);
print '<tr class="liste_titre">';
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_nom" value="'.$_GET["search_nom"].'"></td>';
print '<td><input class="button" type="submit" value="'.$langs->trans("Search").'"></td>';
print '</form>';
print '</tr>';
print '<table class="liste">';
print '<tr class="liste_titre">';
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("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";
$var=true;
print '<tr class="liste_titre">';
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_nom" value="'.$_GET["search_nom"].'"></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 '</tr>';
while ($i < min($num,$conf->liste_limit))
$var=true;
while ($i < min($num,$conf->liste_limit))
{
$obj = $db->fetch_object($resql);
$var=!$var;
$obj = $db->fetch_object($resql);
$var=!$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";
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 "<tr $bc[$var]>";
print "<td align=\"right\" width=\"100\">";
if ($obj->dc)
{
print dolibarr_print_date($obj->dc,"%e %b %Y");
}
else
{
print "-";
}
print '</td>';
print "</tr>\n";
$i++;
// 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 $obj->nom.'</a></td>'."\n";
// Date
print "<td align=\"center\" width=\"100\">";
if ($obj->dc)
{
print dolibarr_print_date($obj->dc,"%e %b %Y");
}
else
{
print "-";
}
print '</td>';
// Statut
print '<td align="center"><img src="statut'.$obj->fk_statut.'.png"></td>';
print "</tr>\n";
$i++;
}
print "</table>";
$db->free($resql);
print "</table>";
$db->free($resql);
}
else
else
{
dolibarr_print_error($db);
dolibarr_print_error($db);
}
$db->close();

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

@ -18,7 +18,6 @@
*
* $Id$
* $Source$
*
*/
/**
@ -133,12 +132,12 @@ if ($_GET["id"] > 0)
print '<tr><td>'.$langs->trans("AmountHT").'</td>';
print '<td align="right"><b>'.price($commande->total_ht).'</b></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 '<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 '<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)
@ -151,7 +150,7 @@ if ($_GET["id"] > 0)
print '<tr><td>'.$langs->trans("Note").'</td><td colspan="3">'.nl2br($commande->note)."</td></tr>";
}
print "</table><br></form>";
print "</table></form>";
}
else
{
@ -163,5 +162,5 @@ if ($_GET["id"] > 0)
$db->close();
llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");
llxFooter('$Date$ - $Revision$');
?>