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

New: Link to wiki help

Browse Source
This commit is contained in:
Laurent Destailleur 2009-08-24 13:01:29 +00:00
parent 3d09d88543
commit 5b158fc84a
2 changed files with 116 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

161
htdocs/expedition/index.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2006 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -19,11 +19,11 @@
*/ */
/** /**
\file htdocs/expedition/index.php * \file htdocs/expedition/index.php
\ingroup expedition * \ingroup expedition
\brief Page accueil du module expedition * \brief Page accueil du module expedition
\version $Id$ * \version $Id$
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
@ -31,10 +31,11 @@ $langs->load("sendings");
/* /*
* View * View
*/ */
llxHeader('',$langs->trans("Sendings"),'ch-expedition.html',$form_search); $helpurl='EN:Module_Shipments|FR:Module_Exp&eacute;ditions|ES:M&oacute;dulo_Expediciones';
llxHeader('',$langs->trans("Sendings"),$helpurl);
print_fiche_titre($langs->trans("SendingsArea")); print_fiche_titre($langs->trans("SendingsArea"));
@ -51,7 +52,7 @@ print $langs->trans("Ref").':</td><td><input type="text" class="flat" name="sf_r
print "</form></table><br />\n"; print "</form></table><br />\n";
/* /*
* Expeditions à valider * Shipments to validate
*/ */
$clause = " WHERE "; $clause = " WHERE ";
@ -76,30 +77,30 @@ if ($socid) $sql.= " AND c.fk_soc = ".$socid;
$resql=$db->query($sql); $resql=$db->query($sql);
if ($resql) if ($resql)
{ {
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
if ($num) if ($num)
{ {
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td colspan="3">'.$langs->trans("SendingsToValidate").'</td></tr>'; print '<td colspan="3">'.$langs->trans("SendingsToValidate").'</td></tr>';
$i = 0; $i = 0;
$var = True; $var = True;
while ($i < $num) while ($i < $num)
{ {
$var=!$var; $var=!$var;
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
print "<tr $bc[$var]><td nowrap=\"nowrap\"><a href=\"fiche.php?id=".$obj->rowid."\">".$obj->ref."</a></td>"; print "<tr $bc[$var]><td nowrap=\"nowrap\"><a href=\"fiche.php?id=".$obj->rowid."\">".$obj->ref."</a></td>";
print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socid.'">'.$obj->nom.'</a></td>'; print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socid.'">'.$obj->nom.'</a></td>';
print '<td><a href="'.DOL_URL_ROOT.'/commande/fiche.php?id='.$obj->commande_id.'">'.$obj->commande_ref.'</a></td></tr>'; print '<td><a href="'.DOL_URL_ROOT.'/commande/fiche.php?id='.$obj->commande_id.'">'.$obj->commande_ref.'</a></td></tr>';
$i++; $i++;
} }
print "</table><br>"; print "</table><br>";
} }
} }
/* /*
* Commandes à traiter * Commandes a traiter
*/ */
$sql = "SELECT c.rowid, c.ref, s.nom, s.rowid as socid"; $sql = "SELECT c.rowid, c.ref, s.nom, s.rowid as socid";
$sql.= " FROM ".MAIN_DB_PREFIX."commande as c"; $sql.= " FROM ".MAIN_DB_PREFIX."commande as c";
@ -114,18 +115,18 @@ $sql.= " ORDER BY c.rowid ASC";
if ( $db->query($sql) ) if ( $db->query($sql) )
{ {
$num = $db->num_rows(); $num = $db->num_rows();
if ($num) if ($num)
{
$langs->load("orders");
$i = 0;
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td colspan="2">'.$langs->trans("OrdersToProcess").'</td></tr>';
$var = True;
while ($i < $num)
{ {
$langs->load("orders");
$i = 0;
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td colspan="2">'.$langs->trans("OrdersToProcess").'</td></tr>';
$var = True;
while ($i < $num)
{
$var=!$var; $var=!$var;
$obj = $db->fetch_object(); $obj = $db->fetch_object();
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
@ -133,9 +134,9 @@ if ( $db->query($sql) )
print "<a href=\"commande.php?id=".$obj->rowid."\">".img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref.'</a></td>'; print "<a href=\"commande.php?id=".$obj->rowid."\">".img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref.'</a></td>';
print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socid.'">'.dol_trunc($obj->nom,20).'</a></td></tr>'; print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socid.'">'.dol_trunc($obj->nom,20).'</a></td></tr>';
$i++; $i++;
}
print "</table><br>";
} }
print "</table><br>";
}
} }
@ -161,32 +162,32 @@ if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.
$resql = $db->query($sql); $resql = $db->query($sql);
if ( $resql ) if ( $resql )
{ {
$langs->load("orders"); $langs->load("orders");
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
if ($num) if ($num)
{
$i = 0;
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td colspan="2">'.$langs->trans("OrdersInProcess").'</td></tr>';
$var = True;
while ($i < $num)
{ {
$i = 0;
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td colspan="2">'.$langs->trans("OrdersInProcess").'</td></tr>';
$var = True;
while ($i < $num)
{
$var=!$var; $var=!$var;
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
print "<tr $bc[$var]><td width=\"30%\"><a href=\"commande.php?id=".$obj->rowid."\">".img_object($langs->trans("ShowOrder"),"order").' '; print "<tr $bc[$var]><td width=\"30%\"><a href=\"commande.php?id=".$obj->rowid."\">".img_object($langs->trans("ShowOrder"),"order").' ';
print $obj->ref.'</a></td>'; print $obj->ref.'</a></td>';
print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socid.'">'.$obj->nom.'</a></td></tr>'; print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socid.'">'.$obj->nom.'</a></td></tr>';
$i++; $i++;
}
print "</table><br>";
} }
print "</table><br>";
}
} }
/* /*
* Expeditions à valider * Last shipments
*/ */
$clause = " WHERE "; $clause = " WHERE ";
$sql = "SELECT e.rowid, e.ref"; $sql = "SELECT e.rowid, e.ref";
@ -211,27 +212,33 @@ $sql.= $db->plimit(5, 0);
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) if ($resql)
{ {
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
if ($num) if ($num)
{ {
$i = 0; $i = 0;
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td colspan="3">'.$langs->trans("LastSendings",$num).'</td></tr>'; print '<td colspan="3">'.$langs->trans("LastSendings",$num).'</td></tr>';
$var = True; $var = True;
while ($i < $num) while ($i < $num)
{ {
$var=!$var; $var=!$var;
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
print "<tr $bc[$var]><td width=\"20%\"><a href=\"fiche.php?id=$obj->rowid\">".img_object($langs->trans("ShowSending"),"sending").' '; print "<tr $bc[$var]><td width=\"20%\"><a href=\"fiche.php?id=$obj->rowid\">".img_object($langs->trans("ShowSending"),"sending").' ';
print $obj->ref.'</a></td>'; print $obj->ref.'</a></td>';
print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.'</a></td>'; print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.'</a></td>';
print '<td><a href="'.DOL_URL_ROOT.'/commande/fiche.php?id='.$obj->commande_id.'">'.img_object($langs->trans("ShowOrder"),"order").' '.$obj->commande_ref.'</a></td></tr>'; print '<td>';
$i++; if ($obj->commande_id)
} {
print "</table><br>"; print '<a href="'.DOL_URL_ROOT.'/commande/fiche.php?id='.$obj->commande_id.'">';
} print img_object($langs->trans("ShowOrder"),"order").' '.$obj->commande_ref.'</a>';
$db->free($resql); } else print '&nbsp;';
print '</td></tr>';
$i++;
}
print "</table><br>";
}
$db->free($resql);
} }
print '</td></tr></table>'; print '</td></tr></table>';

25
htdocs/expedition/liste.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -19,11 +19,11 @@
*/ */
/** /**
\file htdocs/expedition/liste.php * \file htdocs/expedition/liste.php
\ingroup expedition * \ingroup expedition
\brief Page de la liste des expéditions/livraisons * \brief Page de la liste des exp<EFBFBD>ditions/livraisons
\version $Id$ * \version $Id$
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
@ -44,15 +44,12 @@ $limit = $conf->liste_limit;
$offset = $limit * $_GET["page"] ; $offset = $limit * $_GET["page"] ;
/*
* View
*/
/******************************************************************************/ $helpurl='EN:Module_Shipments|FR:Module_Exp&eacute;ditions|ES:M&oacute;dulo_Expediciones';
/* */ llxHeader('',$langs->trans('ListOfSendings'),$helpurl);
/* Fin des Actions */
/* */
/******************************************************************************/
llxHeader('',$langs->trans('ListOfSendings'));
$sql = "SELECT e.rowid, e.ref,".$db->pdate("e.date_expedition")." as date_expedition, e.fk_statut"; $sql = "SELECT e.rowid, e.ref,".$db->pdate("e.date_expedition")." as date_expedition, e.fk_statut";
$sql.= ", s.nom as socname, s.rowid as socid"; $sql.= ", s.nom as socname, s.rowid as socid";