From 6c2a17b29ad629bc7922c1ee1891d8cda44026aa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 24 Dec 2020 02:59:00 +0100
Subject: [PATCH] Fix warning

---
 htdocs/contrat/list.php            | 6 +++---
 htdocs/core/class/notify.class.php | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index d273dd7cdf7..72a8ec2974d 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -614,14 +614,14 @@ while ($i < min($num, $limit))
 	$socstatic->logo = $obj->logo;
 	$socstatic->country_id = $obj->country_id;
 	$socstatic->country_code = '';
-	$socstatic->country_label = '';*/
+	$socstatic->country = '';*/
 	if ($obj->country_id > 0) {
 		if (!isset($cacheCountryIDCode[$obj->country_id]['code'])) {
 			$tmparray = getCountry($obj->country_id, 'all');
 			$cacheCountryIDCode[$obj->country_id] = array('code'=> empty($tmparray['code']) ? '' : $tmparray['code'], 'label' => empty($tmparray['label']) ? '' : $tmparray['label']);
 		}
 		$socstatic->country_code = $cacheCountryIDCode[$obj->country_id]['code'];
-		$socstatic->country_label = $cacheCountryIDCode[$obj->country_id]['label'];
+		$socstatic->country = $cacheCountryIDCode[$obj->country_id]['label'];
 	}
 
 
@@ -695,7 +695,7 @@ while ($i < min($num, $limit))
 	if (!empty($arrayfields['country.code_iso']['checked']))
 	{
 		print '<td class="center">';
-		print $socstatic->country_label;
+		print $socstatic->country;
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index 6f60f6cdca6..f9f1c3b99ef 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -112,6 +112,7 @@ class Notify
 
 		$listofnotiftodo = $this->getNotificationsArray($action, $socid, $object, 0);
 
+		$texte = '';
 		$nb = -1;
 		if (is_array($listofnotiftodo)) {
 			$nb = count($listofnotiftodo);
@@ -170,6 +171,8 @@ class Notify
 		if (is_object($object)) {
 			$valueforthreshold = $object->total_ht;
 		}
+
+		$sqlnotifcode = '';
 		if ($notifcode) {
 			if (is_numeric($notifcode)) {
 				$sqlnotifcode = " AND n.fk_action = ".$notifcode; // Old usage