Fixed issue with inexistent constant in commande STATUS_ACCEPTED

Dolibarr · Oct 9, 2017 · 666e62b · 666e62b
1 parent e1fa96c
commit 666e62b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
@@ -2479,7 +2479,7 @@
 				}
 
 				// Create contract
-				if ($conf->contrat->enabled && ($object->statut == Commande::STATUS_VALIDATED || $object->statut == Commande::STATUS_ACCEPTED || $object->statut == Commande::STATUS_CLOSED)) {
+				if ($conf->contrat->enabled && ($object->statut == Commande::STATUS_VALIDATED || $object->statut == Commande::STATUS_SHIPMENTONPROCESS || $object->statut == Commande::STATUS_CLOSED)) {
 				    $langs->load("contracts");
 
 				    if ($user->rights->contrat->creer) {
@@ -2512,7 +2512,7 @@
 				}
 
 				// Set to shipped
-				if (($object->statut == Commande::STATUS_VALIDATED || $object->statut == Commande::STATUS_ACCEPTED) && $user->rights->commande->cloturer) {
+				if (($object->statut == Commande::STATUS_VALIDATED || $object->statut == Commande::STATUS_SHIPMENTONPROCESS) && $user->rights->commande->cloturer) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=shipped">' . $langs->trans('ClassifyShipped') . '</a></div>';
 				}
 

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
@@ -917,7 +917,7 @@
     	$liststatus=array(
     	    Commande::STATUS_DRAFT=>$langs->trans("StatusOrderDraftShort"),
     	    Commande::STATUS_VALIDATED=>$langs->trans("StatusOrderValidated"),
-    	    Commande::STATUS_ACCEPTED=>$langs->trans("StatusOrderSentShort"),
+    	    Commande::STATUS_SHIPMENTONPROCESS=>$langs->trans("StatusOrderSentShort"),
     	    Commande::STATUS_CLOSED=>$langs->trans("StatusOrderDelivered"),
     	    -3=>$langs->trans("StatusOrderValidatedShort").'+'.$langs->trans("StatusOrderSentShort").'+'.$langs->trans("StatusOrderDelivered"),
     	    Commande::STATUS_CANCELED=>$langs->trans("StatusOrderCanceledShort")

diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
@@ -280,7 +280,7 @@
     $liststatus=array(
         Commande::STATUS_DRAFT=>$langs->trans("StatusOrderDraft"),
         Commande::STATUS_VALIDATED=>$langs->trans("StatusOrderValidated"),
-        Commande::STATUS_ACCEPTED=>$langs->trans("StatusOrderSent"),
+        Commande::STATUS_SHIPMENTONPROCESS=>$langs->trans("StatusOrderSent"),
         Commande::STATUS_CLOSED=>$langs->trans("StatusOrderDelivered"),
         Commande::STATUS_CANCELED=>$langs->trans("StatusOrderCanceled")
     );