Merge pull request #8816 from atm-gauthier/6.0_fix_test_before_delete…

…_invoice FIX : test is_erasable() must be done before call function delete()
Dolibarr · May 25, 2018 · b25c7e4 · b25c7e4
2 parents 5451339 + 0a581e4
commit b25c7e4
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
@@ -186,13 +186,17 @@
 			$qualified_for_stock_change = $object->hasProductsOrServices(1);
 		}
 
-		$result = $object->delete($user, 0, $idwarehouse);
-		if ($result > 0) {
-			header('Location: ' . DOL_URL_ROOT . '/compta/facture/list.php');
-			exit();
-		} else {
-			setEventMessages($object->error, $object->errors, 'errors');
-			$action='';
+		if ($object->is_erasable()) {
+
+			$result = $object->delete($user, 0, $idwarehouse);
+			if ($result > 0) {
+				header('Location: ' . DOL_URL_ROOT . '/compta/facture/list.php');
+				exit();
+			} else {
+				setEventMessages($object->error, $object->errors, 'errors');
+				$action='';
+			}
+
 		}
 	}