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

27
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,10 +19,10 @@
*/ */
/** /**
\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");
@ -34,7 +34,8 @@ $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 ";
@ -99,7 +100,7 @@ if ($resql)
/* /*
* 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";
@ -186,7 +187,7 @@ if ( $resql )
/* /*
* Expeditions à valider * Last shipments
*/ */
$clause = " WHERE "; $clause = " WHERE ";
$sql = "SELECT e.rowid, e.ref"; $sql = "SELECT e.rowid, e.ref";
@ -226,7 +227,13 @@ if ($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>';
if ($obj->commande_id)
{
print '<a href="'.DOL_URL_ROOT.'/commande/fiche.php?id='.$obj->commande_id.'">';
print img_object($langs->trans("ShowOrder"),"order").' '.$obj->commande_ref.'</a>';
} else print '&nbsp;';
print '</td></tr>';
$i++; $i++;
} }
print "</table><br>"; print "</table><br>";

23
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,10 +19,10 @@
*/ */
/** /**
\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";