From 1f4a079f015905be25839ce0a4a08e5fe374b67a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 2 Dec 2017 15:03:14 +0100
Subject: [PATCH] Fix bug reported by scrutinizers

---
 htdocs/comm/propal/class/propal.class.php | 2 ++
 htdocs/compta/facture/card.php            | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index d9a5f7fdfd2..ce2aa8d6630 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -2959,6 +2959,8 @@ class Propal extends CommonObject
 	 */
 	function demand_reason($demand_reason_id, $notrigger=0)
 	{
+		global $user;
+
 		if ($this->statut >= self::STATUS_DRAFT)
 		{
 			$error=0;
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 733ef9e9f16..8268fc40670 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -1098,7 +1098,7 @@ if (empty($reshook))
 						$exp = new Expedition($db);
 						$exp->fetch($object->origin_id);
 						$exp->fetchObjectLinked();
-						if (count($exp->linkedObjectsIds['commande']) > 0) {
+						if (is_array($exp->linkedObjectsIds['commande']) && count($exp->linkedObjectsIds['commande']) > 0) {
 							foreach ($exp->linkedObjectsIds['commande'] as $key => $value){
 								$object->linked_objects['commande'] = $value;
 							}