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

Patch sladame

Browse Source
This commit is contained in:
Laurent Destailleur 2008-08-08 17:58:50 +00:00
parent 7f187041fe
commit 6a39c5f290
3 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
htdocs/commande/liste.php
View File

@ -48,7 +48,7 @@ $result = restrictedArea($user, 'commande', $orderid,'');
/* /*
* Affichage page * View
*/ */
$html = new Form($db); $html = new Form($db);
@ -91,7 +91,7 @@ if ($socid)
} }
if ($viewstatut <> '') if ($viewstatut <> '')
{ {
if ($viewstatut < 4) if ($viewstatut < 4 && $viewstatut > -2)
{ {
$sql .= ' AND c.fk_statut ='.$viewstatut; // brouillon, validée, en cours, annulée $sql .= ' AND c.fk_statut ='.$viewstatut; // brouillon, validée, en cours, annulée
if ($viewstatut == 3) if ($viewstatut == 3)
@ -99,10 +99,14 @@ if ($viewstatut <> '')
$sql .= ' AND c.facture = 0'; // à facturer $sql .= ' AND c.facture = 0'; // à facturer
} }
} }
else if ($viewstatut == 4) if ($viewstatut == 4)
{ {
$sql .= ' AND c.facture = 1'; // facturée $sql .= ' AND c.facture = 1'; // facturée
} }
if ($viewstatut == -2)
{
$sql .= ' AND c.fk_statut >= 0 and c.fk_statut <= 3 and c.facture = 0';
}
} }
if ($_GET['month'] > 0) if ($_GET['month'] > 0)
{ {
@ -142,8 +146,21 @@ if ($resql)
{ {
$title = $langs->trans('ListOfOrders'); $title = $langs->trans('ListOfOrders');
} }
if ($_GET['status'] == 3) if (strval($_GET['viewstatut']) == '0')
$title.=' - '.$langs->trans('StatusOrderToBill'); $title.=' - '.$langs->trans('StatusOrderDraftShort');
if ($_GET['viewstatut'] == 1)
$title.=' - '.$langs->trans('StatusOrderValidatedShort');
if ($_GET['viewstatut'] == 2)
$title.=' - '.$langs->trans('StatusOrderOnProcessShort');
if ($_GET['viewstatut'] == 3)
$title.=' - '.$langs->trans('StatusOrderToBillShort');
if ($_GET['viewstatut'] == 4)
$title.=' - '.$langs->trans('StatusOrderProcessedShort');
if ($_GET['viewstatut'] == -1)
$title.=' - '.$langs->trans('StatusOrderCanceledShort');
if ($_GET['viewstatut'] == -2)
$title.=' - '.$langs->trans('StatusOrderToProcessShort');
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
print_barre_liste($title, $_GET['page'], 'liste.php','&amp;socid='.$socid.'&amp;viewstatut='.$viewstatut,$sortfield,$sortorder,'',$num); print_barre_liste($title, $_GET['page'], 'liste.php','&amp;socid='.$socid.'&amp;viewstatut='.$viewstatut,$sortfield,$sortorder,'',$num);
$i = 0; $i = 0;

6
htdocs/index.php
View File

@ -291,7 +291,7 @@ if ($conf->agenda->enabled && $user->rights->agenda->myactions->read)
print "\n"; print "\n";
} }
// Nbre commandes clients à honorer // Nbre commandes clients à traiter
if ($conf->commande->enabled && $user->rights->commande->lire) if ($conf->commande->enabled && $user->rights->commande->lire)
{ {
include_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php"); include_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
@ -300,9 +300,9 @@ if ($conf->commande->enabled && $user->rights->commande->lire)
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td width="16">'.img_object($langs->trans("Orders"),"order").'</td><td>'.$langs->trans("OrdersToProcess").'</td>'; print '<tr '.$bc[$var].'><td width="16">'.img_object($langs->trans("Orders"),"order").'</td><td>'.$langs->trans("OrdersToProcess").'</td>';
print '<td align="right"><a href="'.DOL_URL_ROOT.'/commande/liste.php">'.$board->nbtodo.'</a></td>'; print '<td align="right"><a href="'.DOL_URL_ROOT.'/commande/liste.php?viewstatut=-2">'.$board->nbtodo.'</a></td>';
print '<td align="right">'; print '<td align="right">';
print '<a href="'.DOL_URL_ROOT.'/commande/liste.php">'; print '<a href="'.DOL_URL_ROOT.'/commande/liste.php?viewstatut=-2">';
print $board->nbtodolate; print $board->nbtodolate;
print '</a></td><td nowrap align="right">'; print '</a></td><td nowrap align="right">';
print ' (>'.ceil($conf->commande->traitement->warning_delay/60/60/24).' '.$langs->trans("days").')'; print ' (>'.ceil($conf->commande->traitement->warning_delay/60/60/24).' '.$langs->trans("days").')';

1
htdocs/langs/fr_FR/orders.lang
View File

@ -28,6 +28,7 @@ StatusOrderProcessedShort=Trait
StatusOrderToBillShort=À facturer StatusOrderToBillShort=À facturer
StatusOrderApprovedShort=Approuvée StatusOrderApprovedShort=Approuvée
StatusOrderRefusedShort=Refusée StatusOrderRefusedShort=Refusée
StatusOrderToProcessShort=A traiter
StatusOrderReceivedPartiallyShort=Reçu partiellement StatusOrderReceivedPartiallyShort=Reçu partiellement
StatusOrderReceivedAllShort=Reçu complètement StatusOrderReceivedAllShort=Reçu complètement
StatusOrderCanceled=Annulée StatusOrderCanceled=Annulée