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

Fix: Bad orders list viewstatut filter if expeditons module is disabled

Browse Source
This commit is contained in:
simnandez 2013-03-15 16:18:14 +01:00
parent ed85869394
commit c0e5cacafc
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/menus/standard/eldy.lib.php
View File

@ -857,7 +857,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after)
if ($leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=0", $langs->trans("StatusOrderDraftShort"), 2, $user->rights->commande->lire); if ($leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=0", $langs->trans("StatusOrderDraftShort"), 2, $user->rights->commande->lire);
if ($leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=1", $langs->trans("StatusOrderValidated"), 2, $user->rights->commande->lire); if ($leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=1", $langs->trans("StatusOrderValidated"), 2, $user->rights->commande->lire);
if ($leftmenu=="orders" && ! empty($conf->expedition->enabled)) $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=2", $langs->trans("StatusOrderOnProcessShort"), 2, $user->rights->commande->lire); if ($leftmenu=="orders" && ! empty($conf->expedition->enabled)) $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=2", $langs->trans("StatusOrderOnProcessShort"), 2, $user->rights->commande->lire);
if ($leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=".($conf->expedition->enabled?"3":"-2"), $langs->trans("StatusOrderToBill"), 2, $user->rights->commande->lire); if ($leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=".($conf->expedition->enabled?"3":"-3"), $langs->trans("StatusOrderToBill"), 2, $user->rights->commande->lire);
if ($leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=4", $langs->trans("StatusOrderProcessed"), 2, $user->rights->commande->lire); if ($leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=4", $langs->trans("StatusOrderProcessed"), 2, $user->rights->commande->lire);
if ($leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=-1", $langs->trans("StatusOrderCanceledShort"), 2, $user->rights->commande->lire); if ($leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=-1", $langs->trans("StatusOrderCanceledShort"), 2, $user->rights->commande->lire);
$newmenu->add("/commande/stats/index.php?leftmenu=orders", $langs->trans("Statistics"), 1, $user->rights->commande->lire); $newmenu->add("/commande/stats/index.php?leftmenu=orders", $langs->trans("Statistics"), 1, $user->rights->commande->lire);

2
htdocs/index.php
View File

@ -308,7 +308,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
$board->load_board($user); $board->load_board($user);
$board->warning_delay=$conf->commande->client->warning_delay/60/60/24; $board->warning_delay=$conf->commande->client->warning_delay/60/60/24;
$board->label=$langs->trans("OrdersToProcess"); $board->label=$langs->trans("OrdersToProcess");
$board->url=DOL_URL_ROOT.'/commande/liste.php?viewstatut=-2'; $board->url=DOL_URL_ROOT.'/commande/liste.php?viewstatut=-3';
$board->img=img_object($langs->trans("Orders"),"order"); $board->img=img_object($langs->trans("Orders"),"order");
$rowspan++; $rowspan++;
$dashboardlines[]=$board; $dashboardlines[]=$board;

2
htdocs/langs/ca_ES/orders.lang
View File

@ -28,7 +28,7 @@ SuppliersOrdersToProcess=Comandes a proveïdors a processar
StatusOrderCanceledShort=Anul·lada StatusOrderCanceledShort=Anul·lada
StatusOrderDraftShort=Esborrany StatusOrderDraftShort=Esborrany
StatusOrderValidatedShort=Validada StatusOrderValidatedShort=Validada
StatusOrderOnProcessShort=Per rebre StatusOrderOnProcessShort=En procés
StatusOrderSentShort=Expedició en curs StatusOrderSentShort=Expedició en curs
StatusOrderSent=Enviament en curs StatusOrderSent=Enviament en curs
StatusOrderProcessedShort=Processada StatusOrderProcessedShort=Processada

2
htdocs/langs/es_ES/orders.lang
View File

@ -28,7 +28,7 @@ SuppliersOrdersToProcess=Pedidos a proveedores a procesar
StatusOrderCanceledShort=Anulado StatusOrderCanceledShort=Anulado
StatusOrderDraftShort=Borrador StatusOrderDraftShort=Borrador
StatusOrderValidatedShort=Validado StatusOrderValidatedShort=Validado
StatusOrderOnProcessShort=Pdte. Recibir StatusOrderOnProcessShort=En proceso
StatusOrderSentShort=Expedición en curso StatusOrderSentShort=Expedición en curso
StatusOrderSent=Envío en curso StatusOrderSent=Envío en curso
StatusOrderProcessedShort=Procesado StatusOrderProcessedShort=Procesado