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

Amelioration de l'interface

Browse Source
This commit is contained in:
Rodolphe Quiedeville 2005-04-15 10:34:44 +00:00
parent 239020df37
commit 02aeceb85b
1 changed files with 224 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
htdocs/expedition/fiche.php
View File

@ -1,5 +1,5 @@
<?php <?php
/* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2005 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -21,7 +21,7 @@
* *
*/ */
/** /*!
\file htdocs/expedition/fiche.php \file htdocs/expedition/fiche.php
\ingroup expedition \ingroup expedition
\brief Fiche descriptive d'une expedition \brief Fiche descriptive d'une expedition
@ -30,8 +30,7 @@
require("./pre.inc.php"); require("./pre.inc.php");
$user->getrights('commande');
$user->getrights('expedition');
if (!$user->rights->expedition->lire) if (!$user->rights->expedition->lire)
accessforbidden(); accessforbidden();
@ -113,7 +112,6 @@ $html = new Form($db);
* Mode creation * Mode creation
* *
* *
*
************************************************************************/ ************************************************************************/
if ($_POST["action"] == 'create') if ($_POST["action"] == 'create')
{ {
@ -175,8 +173,11 @@ if ($_POST["action"] == 'create')
$lignes = $commande->fetch_lignes(1); $lignes = $commande->fetch_lignes(1);
/* Lecture des livraisons déjà effectuées */
$commande->livraison_array();
$num = sizeof($commande->lignes); $num = sizeof($commande->lignes);
$i = 0; $total = 0; $i = 0;
if ($num) if ($num)
{ {
@ -278,9 +279,8 @@ else
$expedition = New Expedition($db); $expedition = New Expedition($db);
$result = $expedition->fetch($_GET["id"]); $result = $expedition->fetch($_GET["id"]);
if ( $result > 0) if ( $expedition->id > 0)
{ {
$author = new User($db); $author = new User($db);
$author->id = $expedition->user_author_id; $author->id = $expedition->user_author_id;
$author->fetch(); $author->fetch();
@ -293,7 +293,13 @@ else
$soc = new Societe($db); $soc = new Societe($db);
$soc->fetch($commande->soc_id); $soc->fetch($commande->soc_id);
print_titre($langs->trans("Sending").": ".$expedition->ref); $h=0;
$head[$h][0] = DOL_URL_ROOT."/expedition/fiche.php?id=".$expedition->id;
$head[$h][1] = $langs->trans("SendingCard");
$hselected = $h;
$h++;
dolibarr_fiche_head($head, $hselected, $langs->trans("Sending")." : ".$expedition->ref);
/* /*
* Confirmation de la suppression * Confirmation de la suppression
@ -330,7 +336,7 @@ else
print '<input type="hidden" name="action" value="setremise">'; print '<input type="hidden" name="action" value="setremise">';
} }
print '<table class="border" cellspacing="0" cellpadding="2" width="100%">'; print '<br /><table class="border" cellspacing="0" cellpadding="2" width="100%">';
print '<tr><td width="20%">Client</td>'; print '<tr><td width="20%">Client</td>';
print '<td width="30%">'; print '<td width="30%">';
print '<b><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$soc->id.'">'.$soc->nom.'</a></b></td>'; print '<b><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$soc->id.'">'.$soc->nom.'</a></b></td>';
@ -340,8 +346,9 @@ else
print "</tr>"; print "</tr>";
print "<tr><td>Commande</td>"; print "<tr><td>Commande</td>";
print '<td><a href="'.DOL_URL_ROOT.'/commande/fiche.php?id='.$commande->id.'">'.$commande->ref."</a></td>\n"; print '<td><a href="'.DOL_URL_ROOT.'/expedition/commande.php?id='.$commande->id.'">'.$commande->ref."</a></td>\n";
print '<td>&nbsp;</td><td>&nbsp;</td></tr>'; print '<td>&nbsp;</td><td>&nbsp;</td></tr>';
print "<tr><td>Date</td>"; print "<tr><td>Date</td>";
print "<td>".strftime("%A %d %B %Y",$expedition->date)."</td>\n"; print "<td>".strftime("%A %d %B %Y",$expedition->date)."</td>\n";
@ -358,28 +365,29 @@ else
*/ */
echo '<br><table class="noborder" width="100%">'; echo '<br><table class="noborder" width="100%">';
$sql = "SELECT cd.fk_product, cd.description, cd.rowid, cd.qty as qty_commande, ed.qty as qty_livre"; $sql = "SELECT cd.fk_product, cd.description, cd.rowid, cd.qty as qty_commande";
$sql .= " , ed.qty as qty_livre";
$sql .= " FROM ".MAIN_DB_PREFIX."commandedet as cd , ".MAIN_DB_PREFIX."expeditiondet as ed"; $sql .= " FROM ".MAIN_DB_PREFIX."commandedet as cd , ".MAIN_DB_PREFIX."expeditiondet as ed";
$sql .= " WHERE ed.fk_expedition = $expedition->id AND cd.rowid = ed.fk_commande_ligne "; $sql .= " WHERE ed.fk_expedition = $expedition->id AND cd.rowid = ed.fk_commande_ligne ";
$result = $db->query($sql); $resql = $db->query($sql);
if ($result)
{
$num = $db->num_rows();
$i = 0; $total = 0;
if ($num) if ($resql)
{ {
$num_prod = $db->num_rows($resql);
$i = 0;
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td width="54%">'.$langs->trans("Description").'</td>'; print '<td width="54%">'.$langs->trans("Description").'</td>';
print '<td align="center">Quan. commandée</td>'; print '<td align="center">Quan. commandée</td>';
print '<td align="center">Quan. livrée</td>'; print '<td align="center">Quan. livrée</td>';
print "</tr>\n"; print "</tr>\n";
}
$var=True; $var=True;
while ($i < $num) while ($i < $num_prod)
{ {
$objp = $db->fetch_object($result); $objp = $db->fetch_object($resql);
print "<TR $bc[$var]>"; print "<TR $bc[$var]>";
if ($objp->fk_product > 0) if ($objp->fk_product > 0)
{ {
@ -398,7 +406,7 @@ else
$i++; $i++;
$var=!$var; $var=!$var;
} }
$db->free(); $db->free($resql);
} }
else else
{ {
@ -406,7 +414,7 @@ else
} }
print "</table>"; print "</table>\n</div>\n";
/* /*
* *
*/ */
@ -414,7 +422,7 @@ else
{ {
print '<div class="tabsAction">'; print '<div class="tabsAction">';
if ($expedition->statut == 0 && $user->rights->expedition->valider) if ($expedition->statut == 0 && $user->rights->expedition->valider && $num_prod > 0)
{ {
print '<a class="butAction" href="fiche.php?id='.$expedition->id.'&amp;action=valid">'.$langs->trans("Validate").'</a>'; print '<a class="butAction" href="fiche.php?id='.$expedition->id.'&amp;action=valid">'.$langs->trans("Validate").'</a>';
} }
@ -433,15 +441,22 @@ else
* *
* *
*/ */
$sql = "SELECT cd.fk_product, cd.description, cd.rowid, cd.qty as qty_commande, ed.qty as qty_livre, e.ref"; $sql = "SELECT cd.fk_product, cd.description, cd.rowid, cd.qty as qty_commande";
$sql .= " FROM ".MAIN_DB_PREFIX."commandedet as cd , ".MAIN_DB_PREFIX."expeditiondet as ed, ".MAIN_DB_PREFIX."expedition as e"; $sql .= " , ed.qty as qty_livre, e.ref";
$sql .= " WHERE cd.fk_commande = $expedition->commande_id AND e.rowid <> $expedition->id AND cd.rowid = ed.fk_commande_ligne AND ed.fk_expedition = e.rowid"; $sql .= ",".$db->pdate("e.date_expedition")." as date_expedition";
$sql .= " FROM ".MAIN_DB_PREFIX."commandedet as cd";
$sql .= " , ".MAIN_DB_PREFIX."expeditiondet as ed, ".MAIN_DB_PREFIX."expedition as e";
$sql .= " WHERE cd.fk_commande = $expedition->commande_id";
$sql .= " AND e.rowid <> $expedition->id";
$sql .= " AND cd.rowid = ed.fk_commande_ligne";
$sql .= " AND ed.fk_expedition = e.rowid";
$sql .= " ORDER BY cd.fk_product"; $sql .= " ORDER BY cd.fk_product";
$result = $db->query($sql);
if ($result) $resql = $db->query($sql);
if ($resql)
{ {
$num = $db->num_rows(); $num = $db->num_rows($resql);
$i = 0; $total = 0; $i = 0;
if ($num) if ($num)
{ {
@ -450,13 +465,14 @@ else
print '<td width="54%">'.$langs->trans("Description").'</td>'; print '<td width="54%">'.$langs->trans("Description").'</td>';
print '<td align="center">Quan. livrée</td>'; print '<td align="center">Quan. livrée</td>';
print '<td align="center">Expédition</td>'; print '<td align="center">Expédition</td>';
print '<td align="center">'.$langs->trans("Date").'</td>';
print "</tr>\n"; print "</tr>\n";
$var=True; $var=True;
while ($i < $num) while ($i < $num)
{ {
$objp = $db->fetch_object($result); $objp = $db->fetch_object($resql);
print "<TR $bc[$var]>"; print "<TR $bc[$var]>";
if ($objp->fk_product > 0) if ($objp->fk_product > 0)
{ {
@ -469,14 +485,15 @@ else
} }
print '<td align="center">'.$objp->qty_livre.'</td>'; print '<td align="center">'.$objp->qty_livre.'</td>';
print '<td align="center">'.$objp->ref.'</td>'; print '<td align="center">'.$objp->ref.'</td>';
print '<td align="center">'.dolibarr_print_date($objp->date_expedition).'</td>';
$i++; $i++;
} }
print '</table>'; print '</table>';
} }
$db->free($resql);
} }
/* /*
* Documents générés * Documents générés
* *
@ -506,22 +523,24 @@ else
* *
*/ */
$sql = "SELECT ".$db->pdate("a.datea")." as da, a.note"; $sql = "SELECT ".$db->pdate("a.datea")." as da, a.note";
$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a WHERE a.fk_soc = $commande->socidp AND a.fk_action in (9,10) AND a.fk_commande = $expedition->id"; $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a";
$sql .= " WHERE a.fk_soc = $commande->socidp AND a.fk_action in (9,10)";
$sql .= " AND a.fk_commande = $expedition->id";
$result = $db->query($sql); $resql = $db->query($sql);
if ($result) if ($resql)
{ {
$num = $db->num_rows(); $num = $db->num_rows($resql);
if ($num) if ($num)
{ {
$i = 0; $total = 0; $i = 0;
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print "<tr $bc[$var]><td>".$langs->trans("Date")."</td><td>".$langs->trans("Action")."</td></tr>\n"; print "<tr $bc[$var]><td>".$langs->trans("Date")."</td><td>".$langs->trans("Action")."</td></tr>\n";
$var=True; $var=True;
while ($i < $num) while ($i < $num)
{ {
$objp = $db->fetch_object($result); $objp = $db->fetch_object($resql);
$var=!$var; $var=!$var;
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print "<td>".strftime("%d %B %Y",$objp->da)."</td>\n"; print "<td>".strftime("%d %B %Y",$objp->da)."</td>\n";
@ -531,6 +550,7 @@ else
} }
print "</table>"; print "</table>";
} }
$db->free($resql);
} }
else else
{ {
@ -577,10 +597,17 @@ else
} }
else else
{ {
/* Commande non trouvée */ /* Expedition non trouvée */
print "Commande inexistante ou accés refusé"; llxHeader('','Fiche expedition','ch-expedition.html',$form_search);
print "Expedition inexistante ou accés refusé";
} }
} }
else
{
/* Expedition non trouvée */
llxHeader('','Fiche expedition','ch-expedition.html',$form_search);
print "Expedition inexistante ou accés refusé";
}
} }
$db->close(); $db->close();