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

Fix: A better fix for status/list of orders.

Browse Source 
There was a confusion because of bad translation key StatusOrderToBill
that in fact mean "StatusOrderDelivered".
More explanation:
http://wiki.dolibarr.org/index.php/Module_Customers_Orders#Life_cycle_.2F_Business_rules
This commit is contained in:
Laurent Destailleur 2013-03-16 17:02:13 +01:00
parent d590aa56eb
commit 013b7eca10
6 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/commande/liste.php
View File

@ -129,7 +129,8 @@ if ($viewstatut <> '')
{ {
if ($viewstatut < 4 && $viewstatut > -3) if ($viewstatut < 4 && $viewstatut > -3)
{ {
$sql.= ' AND c.fk_statut ='.$viewstatut; // brouillon, validee, en cours, annulee if ($viewstatut == 1 && empty($conf->expedition->enabled)) $sql.= ' AND c.fk_statut IN (1,2)'; // If module expedition disabled, we include order with status 'sending in process' into 'validated'
else $sql.= ' AND c.fk_statut = '.$viewstatut; // brouillon, validee, en cours, annulee
if ($viewstatut == 3) if ($viewstatut == 3)
{ {
$sql.= ' AND c.facture = 0'; // need to create invoice $sql.= ' AND c.facture = 0'; // need to create invoice
@ -222,7 +223,7 @@ if ($resql)
if ($viewstatut == -2) if ($viewstatut == -2)
$title.=' - '.$langs->trans('StatusOrderToProcessShort'); $title.=' - '.$langs->trans('StatusOrderToProcessShort');
if ($viewstatut == -3) if ($viewstatut == -3)
$title.=' - '.$langs->trans('StatusOrderValidated').', '.$langs->trans("StatusOrderSent").', '.$langs->trans('StatusOrderToBill'); $title.=' - '.$langs->trans('StatusOrderValidated').', '.(empty($conf->expedition->enabled)?'':$langs->trans("StatusOrderSent").', ').$langs->trans('StatusOrderToBill');
$param='&socid='.$socid.'&viewstatut='.$viewstatut; $param='&socid='.$socid.'&viewstatut='.$viewstatut;
if ($ordermonth) $param.='&ordermonth='.$ordermonth; if ($ordermonth) $param.='&ordermonth='.$ordermonth;

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":"-3"), $langs->trans("StatusOrderToBill"), 2, $user->rights->commande->lire); if ($leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=3", $langs->trans("StatusOrderToBill"), 2, $user->rights->commande->lire); // The translation key is StatusOrderToBill but it means StatusDelivered. TODO We should renamed this later
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);

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

@ -32,7 +32,8 @@ StatusOrderOnProcessShort=En procés
StatusOrderSentShort=Expedició en curs StatusOrderSentShort=Expedició en curs
StatusOrderSent=Enviament en curs StatusOrderSent=Enviament en curs
StatusOrderProcessedShort=Processada StatusOrderProcessedShort=Processada
StatusOrderToBillShort=A facturar StatusOrderToBillShort=Emès
StatusOrderToBillShort2=A facturar
StatusOrderApprovedShort=Aprovada StatusOrderApprovedShort=Aprovada
StatusOrderRefusedShort=Rebutjada StatusOrderRefusedShort=Rebutjada
StatusOrderToProcessShort=A processar StatusOrderToProcessShort=A processar
@ -43,7 +44,8 @@ StatusOrderDraft=Esborrany (a validar)
StatusOrderValidated=Validada StatusOrderValidated=Validada
StatusOrderOnProcess=Pendent de rebre StatusOrderOnProcess=Pendent de rebre
StatusOrderProcessed=Processada StatusOrderProcessed=Processada
StatusOrderToBill=A facturar StatusOrderToBill=Emès
StatusOrderToBill2=A facturar
StatusOrderApproved=Aprovada StatusOrderApproved=Aprovada
StatusOrderRefused=Rebutjada StatusOrderRefused=Rebutjada
StatusOrderReceivedPartially=Rebuda parcialment StatusOrderReceivedPartially=Rebuda parcialment

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

@ -85,7 +85,7 @@ NumberOfOrdersByMonth=Number of orders by month
AmountOfOrdersByMonthHT=amount of orders by month (net of tax) AmountOfOrdersByMonthHT=amount of orders by month (net of tax)
ListOfOrders=List of orders ListOfOrders=List of orders
CloseOrder=Close order CloseOrder=Close order
ConfirmCloseOrder=Are you sure you want to close this order ? Once an order is closed, it can only be billed. ConfirmCloseOrder=Are you sure you want to set this order to deliverd ? Once an order is delivered, it can be set to billed.
ConfirmCloseOrderIfSending=Are you sure you want to close this order ? You must close an order only when all shipping are done. ConfirmCloseOrderIfSending=Are you sure you want to close this order ? You must close an order only when all shipping are done.
ConfirmDeleteOrder=Are you sure you want to delete this order ? ConfirmDeleteOrder=Are you sure you want to delete this order ?
ConfirmValidateOrder=Are you sure you want to validate this order under name <b>%s</b> ? ConfirmValidateOrder=Are you sure you want to validate this order under name <b>%s</b> ?

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

@ -32,7 +32,8 @@ 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
StatusOrderToBillShort=A facturar StatusOrderToBillShort=Emitido
StatusOrderToBillShort2=A facturar
StatusOrderApprovedShort=Aprobado StatusOrderApprovedShort=Aprobado
StatusOrderRefusedShort=Rechazado StatusOrderRefusedShort=Rechazado
StatusOrderToProcessShort=A procesar StatusOrderToProcessShort=A procesar
@ -43,7 +44,8 @@ StatusOrderDraft=Borrador (a validar)
StatusOrderValidated=Validado StatusOrderValidated=Validado
StatusOrderOnProcess=Pendiente de recibir StatusOrderOnProcess=Pendiente de recibir
StatusOrderProcessed=Procesado StatusOrderProcessed=Procesado
StatusOrderToBill=A facturar StatusOrderToBill=Emitido
StatusOrderToBill2=A facturar
StatusOrderApproved=Aprobado StatusOrderApproved=Aprobado
StatusOrderRefused=Rechazado StatusOrderRefused=Rechazado
StatusOrderReceivedPartially=Recibido parcialmente StatusOrderReceivedPartially=Recibido parcialmente

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

@ -85,7 +85,7 @@ NumberOfOrdersByMonth=Nombre de commandes par mois
AmountOfOrdersByMonthHT=Montant total de commandes par mois (HT) AmountOfOrdersByMonthHT=Montant total de commandes par mois (HT)
ListOfOrders=Liste des commandes ListOfOrders=Liste des commandes
CloseOrder=Clôturer commande CloseOrder=Clôturer commande
ConfirmCloseOrder=Êtes-vous sûr de vouloir clôturer cette commande ? Une fois une commande clôturée, elle peut être facturée. ConfirmCloseOrder=Êtes-vous sûr de vouloir classer cette commande à Délivrée ? Une fois une commande délivrée, elle peut aussi être passée à facturée.
ConfirmCloseOrderIfSending=Êtes-vous sûr de vouloir clôturer cette commande ? Vous ne devez clôturer une commande qu'une fois les produits expédiés. ConfirmCloseOrderIfSending=Êtes-vous sûr de vouloir clôturer cette commande ? Vous ne devez clôturer une commande qu'une fois les produits expédiés.
ConfirmDeleteOrder=Êtes-vous sûr de vouloir effacer cette commande ? ConfirmDeleteOrder=Êtes-vous sûr de vouloir effacer cette commande ?
ConfirmValidateOrder=Êtes-vous sûr de vouloir valider cette commande sous la référence <b>%s</b> ? ConfirmValidateOrder=Êtes-vous sûr de vouloir valider cette commande sous la référence <b>%s</b> ?