Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0

Conflicts: htdocs/commande/class/commande.class.php
2018-03-13 18:04:18 +01:00
parent f88536068f 6b2490f4e4
commit ca809a11af
2 changed files with 9 additions and 3 deletions
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -3143,6 +3143,12 @@ class Commande extends CommonOrder
            // End call triggers
        }

+		if ($this->nb_expedition() != 0)
+		{
+			$this->errors[] = $langs->trans('SomeShipmentExists');
+			$error++;
+		}
+
        if (! $error)
        {
        	// Delete order details