Merge pull request #8367 from atm-quentin/6.0

FIX check shipping on delete order
2018-03-13 09:53:57 +01:00 · 2018-03-13 09:53:57 +01:00 · f82bedb36c
commit f82bedb36c
parent d045dca003 dcd3387a30
1 changed files with 7 additions and 1 deletions
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@ -3126,7 +3126,13 @@ class Commande extends CommonOrder
            if ($result < 0) $error++;
            // End call triggers
        }
-
+        
+        if ($this->nb_expedition() != 0) 
+	{
+		$this->errors[] = $langs->trans('SomeShipmentExists');
+		$error++;
+	}
+	    
        //TODO: Check for error after each action. If one failed we rollback, don't waste time to do action if previous fail
        if (! $error)
        {