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

NEW Add an explanation message on shipment page to explain you can't

Browse Source 
make shipment if order is not validated
This commit is contained in:
Laurent Destailleur 2016-02-25 18:18:33 +01:00
parent 7fc58ddabc
commit 0d6546e18e
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/expedition/shipment.php
View File

@ -701,7 +701,13 @@ if ($id > 0 || ! empty($ref))
// Bouton expedier avec gestion des stocks
if (! empty($conf->stock->enabled) && ($commande->statut > Commande::STATUS_DRAFT && $commande->statut < Commande::STATUS_CLOSED))
if (! empty($conf->stock->enabled) && $commande->statut == Commande::STATUS_DRAFT)
{
print $langs->trans("ValidateOrderFirstBeforeShipment");
}
if (! empty($conf->stock->enabled) && ($commande->statut > Commande::STATUS_DRAFT && $commande->statut < Commande::STATUS_CLOSED))
{
if ($user->rights->expedition->creer)
{

1
htdocs/langs/en_US/sendings.lang
View File

@ -71,6 +71,7 @@ ProductQtyInShipmentAlreadySent=Product quantity from opened customer order alre
ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
WeightVolShort=Weight/Vol.
ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
# Sending methods
SendingMethodCATCH=Catch by customer