mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-02-20 13:46:52 +01:00
Merge pull request #11793 from altatof/supplierorderstatus
Differentiate supplier orders status
This commit is contained in:
Laurent Destailleur
GitHub
commit
a481fac289
|
|
@ -915,16 +915,16 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
|
|||
$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers", $langs->trans("List"), 1, $user->rights->fournisseur->commande->lire);
|
||||
|
||||
if ($usemenuhider || empty($leftmenu) || $leftmenu=="orders_suppliers") {
|
||||
$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=0", $langs->trans("StatusOrderDraftShort"), 2, $user->rights->fournisseur->commande->lire);
|
||||
if (empty($conf->global->SUPPLIER_ORDER_HIDE_VALIDATED)) $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=1", $langs->trans("StatusOrderValidated"), 2, $user->rights->fournisseur->commande->lire);
|
||||
$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=2", $langs->trans("StatusOrderApprovedShort"), 2, $user->rights->fournisseur->commande->lire);
|
||||
$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=3", $langs->trans("StatusOrderOnProcessShort"), 2, $user->rights->fournisseur->commande->lire);
|
||||
$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=4", $langs->trans("StatusOrderReceivedPartiallyShort"), 2, $user->rights->fournisseur->commande->lire);
|
||||
$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=5", $langs->trans("StatusOrderReceivedAll"), 2, $user->rights->fournisseur->commande->lire);
|
||||
$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=6,7", $langs->trans("StatusOrderCanceled"), 2, $user->rights->fournisseur->commande->lire);
|
||||
$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=9", $langs->trans("StatusOrderRefused"), 2, $user->rights->fournisseur->commande->lire);
|
||||
$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=0", $langs->trans("StatusSupplierOrderDraftShort"), 2, $user->rights->fournisseur->commande->lire);
|
||||
if (empty($conf->global->SUPPLIER_ORDER_HIDE_VALIDATED)) $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=1", $langs->trans("StatusSupplierOrderValidated"), 2, $user->rights->fournisseur->commande->lire);
|
||||
$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=2", $langs->trans("StatusSupplierOrderApprovedShort"), 2, $user->rights->fournisseur->commande->lire);
|
||||
$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=3", $langs->trans("StatusSupplierOrderOnProcessShort"), 2, $user->rights->fournisseur->commande->lire);
|
||||
$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=4", $langs->trans("StatusSupplierOrderReceivedPartiallyShort"), 2, $user->rights->fournisseur->commande->lire);
|
||||
$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=5", $langs->trans("StatusSupplierOrderReceivedAll"), 2, $user->rights->fournisseur->commande->lire);
|
||||
$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=6,7", $langs->trans("StatusSupplierOrderCanceled"), 2, $user->rights->fournisseur->commande->lire);
|
||||
$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=9", $langs->trans("StatusSupplierOrderRefused"), 2, $user->rights->fournisseur->commande->lire);
|
||||
}
|
||||
// Billed is another field. We should add instead a dedicated filter on list. if ($usemenuhider || empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&billed=1", $langs->trans("StatusOrderBilled"), 2, $user->rights->fournisseur->commande->lire);
|
||||
// Billed is another field. We should add instead a dedicated filter on list. if ($usemenuhider || empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&billed=1", $langs->trans("StatusSupplierOrderBilled"), 2, $user->rights->fournisseur->commande->lire);
|
||||
|
||||
|
||||
$newmenu->add("/commande/stats/index.php?leftmenu=orders_suppliers&mode=supplier", $langs->trans("Statistics"), 1, $user->rights->fournisseur->commande->lire);
|
||||
|
|
|
|||
|
|
@ -639,28 +639,28 @@ class CommandeFournisseur extends CommonOrder
|
|||
{
|
||||
$langs->load('orders');
|
||||
|
||||
$this->statuts[0] = 'StatusOrderDraft';
|
||||
$this->statuts[1] = 'StatusOrderValidated';
|
||||
$this->statuts[2] = 'StatusOrderApproved';
|
||||
if (empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS)) $this->statuts[3] = 'StatusOrderOnProcess';
|
||||
else $this->statuts[3] = 'StatusOrderOnProcessWithValidation';
|
||||
$this->statuts[4] = 'StatusOrderReceivedPartially';
|
||||
$this->statuts[5] = 'StatusOrderReceivedAll';
|
||||
$this->statuts[6] = 'StatusOrderCanceled'; // Approved->Canceled
|
||||
$this->statuts[7] = 'StatusOrderCanceled'; // Process running->canceled
|
||||
//$this->statuts[8] = 'StatusOrderBilled'; // Everything is finished, order received totally and bill received
|
||||
$this->statuts[9] = 'StatusOrderRefused';
|
||||
$this->statuts[0] = 'StatusSupplierOrderDraft';
|
||||
$this->statuts[1] = 'StatusSupplierOrderValidated';
|
||||
$this->statuts[2] = 'StatusSupplierOrderApproved';
|
||||
if (empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS)) $this->statuts[3] = 'StatusSupplierOrderOnProcess';
|
||||
else $this->statuts[3] = 'StatusSupplierOrderOnProcessWithValidation';
|
||||
$this->statuts[4] = 'StatusSupplierOrderReceivedPartially';
|
||||
$this->statuts[5] = 'StatusSupplierOrderReceivedAll';
|
||||
$this->statuts[6] = 'StatusSupplierOrderCanceled'; // Approved->Canceled
|
||||
$this->statuts[7] = 'StatusSupplierOrderCanceled'; // Process running->canceled
|
||||
//$this->statuts[8] = 'StatusSupplierOrderBilled'; // Everything is finished, order received totally and bill received
|
||||
$this->statuts[9] = 'StatusSupplierOrderRefused';
|
||||
|
||||
// List of language codes for status
|
||||
$this->statutshort[0] = 'StatusOrderDraftShort';
|
||||
$this->statutshort[1] = 'StatusOrderValidatedShort';
|
||||
$this->statutshort[2] = 'StatusOrderApprovedShort';
|
||||
$this->statutshort[3] = 'StatusOrderOnProcessShort';
|
||||
$this->statutshort[4] = 'StatusOrderReceivedPartiallyShort';
|
||||
$this->statutshort[5] = 'StatusOrderReceivedAllShort';
|
||||
$this->statutshort[6] = 'StatusOrderCanceledShort';
|
||||
$this->statutshort[7] = 'StatusOrderCanceledShort';
|
||||
$this->statutshort[9] = 'StatusOrderRefusedShort';
|
||||
$this->statutshort[0] = 'StatusSupplierOrderDraftShort';
|
||||
$this->statutshort[1] = 'StatusSupplierOrderValidatedShort';
|
||||
$this->statutshort[2] = 'StatusSupplierOrderApprovedShort';
|
||||
$this->statutshort[3] = 'StatusSupplierOrderOnProcessShort';
|
||||
$this->statutshort[4] = 'StatusSupplierOrderReceivedPartiallyShort';
|
||||
$this->statutshort[5] = 'StatusSupplierOrderReceivedAllShort';
|
||||
$this->statutshort[6] = 'StatusSupplierOrderCanceledShort';
|
||||
$this->statutshort[7] = 'StatusSupplierOrderCanceledShort';
|
||||
$this->statutshort[9] = 'StatusSupplierOrderRefusedShort';
|
||||
}
|
||||
|
||||
$billedtext='';
|
||||
|
|
|
|||
|
|
@ -156,3 +156,33 @@ OptionToSetOrderBilledNotEnabled=Option (from module Workflow) to set order to '
|
|||
IfValidateInvoiceIsNoOrderStayUnbilled=If invoice validation is 'No', the order will remain to status 'Unbilled' until the invoice is validated.
|
||||
CloseReceivedSupplierOrdersAutomatically=Close order to status "%s" automatically if all products are received.
|
||||
SetShippingMode=Set shipping mode
|
||||
|
||||
#### supplier orders status
|
||||
StatusSupplierOrderCanceledShort=Canceled
|
||||
StatusSupplierOrderDraftShort=Draft
|
||||
StatusSupplierOrderValidatedShort=Validated
|
||||
StatusSupplierOrderSentShort=In process
|
||||
StatusSupplierOrderSent=Shipment in process
|
||||
StatusSupplierOrderOnProcessShort=Ordered
|
||||
StatusSupplierOrderProcessedShort=Processed
|
||||
StatusSupplierOrderDelivered=Delivered
|
||||
StatusSupplierOrderDeliveredShort=Delivered
|
||||
StatusSupplierOrderToBillShort=Delivered
|
||||
StatusSupplierOrderApprovedShort=Approved
|
||||
StatusSupplierOrderRefusedShort=Refused
|
||||
StatusSupplierOrderBilledShort=Billed
|
||||
StatusSupplierOrderToProcessShort=To process
|
||||
StatusSupplierOrderReceivedPartiallyShort=Partially received
|
||||
StatusSupplierOrderReceivedAllShort=Products received
|
||||
StatusSupplierOrderCanceled=Canceled
|
||||
StatusSupplierOrderDraft=Draft (needs to be validated)
|
||||
StatusSupplierOrderValidated=Validated
|
||||
StatusSupplierOrderOnProcess=Ordered - Standby reception
|
||||
StatusSupplierOrderOnProcessWithValidation=Ordered - Standby reception or validation
|
||||
StatusSupplierOrderProcessed=Processed
|
||||
StatusSupplierOrderToBill=Delivered
|
||||
StatusSupplierOrderApproved=Approved
|
||||
StatusSupplierOrderRefused=Refused
|
||||
StatusSupplierOrderBilled=Billed
|
||||
StatusSupplierOrderReceivedPartially=Partially received
|
||||
StatusSupplierOrderReceivedAll=All products received
|
||||
|
|
@ -156,3 +156,33 @@ OptionToSetOrderBilledNotEnabled=L'option (issue du module Workflow) pour défin
|
|||
IfValidateInvoiceIsNoOrderStayUnbilled=Si la validation de facture est à "Non", la commande restera au statut "Non facturé" jusqu'à ce que la facture soit validée.
|
||||
CloseReceivedSupplierOrdersAutomatically=Fermer la commande au statut "%s" automatiquement si tous les produits ont été reçus.
|
||||
SetShippingMode=Définir la méthode d'expédition
|
||||
|
||||
###### statuts commandes fournisseurs
|
||||
StatusSupplierOrderCanceledShort=Annulée
|
||||
StatusSupplierOrderDraftShort=Brouillon
|
||||
StatusSupplierOrderValidatedShort=Validée
|
||||
StatusSupplierOrderSentShort=En cours
|
||||
StatusSupplierOrderSent=Envoi en cours
|
||||
StatusSupplierOrderOnProcessShort=Commandé
|
||||
StatusSupplierOrderProcessedShort=Traitée
|
||||
StatusSupplierOrderDelivered=Livrée
|
||||
StatusSupplierOrderDeliveredShort=Livrée
|
||||
StatusSupplierOrderToBillShort=Livré
|
||||
StatusSupplierOrderApprovedShort=Approuvée
|
||||
StatusSupplierOrderRefusedShort=Refusée
|
||||
StatusSupplierOrderBilledShort=Facturée
|
||||
StatusSupplierOrderToProcessShort=À traiter
|
||||
StatusSupplierOrderReceivedPartiallyShort=Reçue partiellement
|
||||
StatusSupplierOrderReceivedAllShort=Produits reçus
|
||||
StatusSupplierOrderCanceled=Annulée
|
||||
StatusSupplierOrderDraft=Brouillon (à valider)
|
||||
StatusSupplierOrderValidated=Validée
|
||||
StatusSupplierOrderOnProcess=Commandé - en attente de réception
|
||||
StatusSupplierOrderOnProcessWithValidation=Commandé - en attente de réception ou validation
|
||||
StatusSupplierOrderProcessed=Traitée
|
||||
StatusSupplierOrderToBill=Livrée
|
||||
StatusSupplierOrderApproved=Approuvée
|
||||
StatusSupplierOrderRefused=Refusée
|
||||
StatusSupplierOrderBilled=Facturée
|
||||
StatusSupplierOrderReceivedPartially=Reçue partiellement
|
||||
StatusSupplierOrderReceivedAll=Tous les produits reçus
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user