From f0fd249498236f314a06aeb63ba5fc76b8de4c0a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 26 Jun 2023 15:34:09 +0200
Subject: [PATCH] Fix warnings

---
 htdocs/adherents/class/adherentstats.class.php  |  4 +++-
 htdocs/adherents/index.php                      | 11 ++++++++++-
 htdocs/core/class/html.formcompany.class.php    |  5 ++++-
 htdocs/core/modules/DolibarrModules.class.php   |  9 +++++++--
 htdocs/core/modules/modECM.class.php            |  2 +-
 htdocs/core/modules/modGravatar.class.php       |  2 +-
 htdocs/core/modules/modIncoterm.class.php       |  2 +-
 htdocs/core/modules/modOauth.class.php          |  2 +-
 htdocs/core/modules/modPaybox.class.php         |  2 +-
 htdocs/core/modules/modPaypal.class.php         |  2 +-
 htdocs/core/modules/modReceiptPrinter.class.php |  2 +-
 htdocs/core/modules/modTicket.class.php         |  2 +-
 htdocs/core/modules/modWorkflow.class.php       |  2 +-
 htdocs/societe/list.php                         |  2 +-
 htdocs/user/class/user.class.php                |  1 -
 15 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/htdocs/adherents/class/adherentstats.class.php b/htdocs/adherents/class/adherentstats.class.php
index 5124e1ba612..b17708a3e13 100644
--- a/htdocs/adherents/class/adherentstats.class.php
+++ b/htdocs/adherents/class/adherentstats.class.php
@@ -206,10 +206,11 @@ class AdherentStats extends Stats
 		dol_syslog("box_members_by_type::select nb of members per type", LOG_DEBUG);
 		$result = $this->db->query($sql);
 
+		$MembersCountArray = array();
+
 		if ($result) {
 			$num = $this->db->num_rows($result);
 			$i = 0;
-			$MembersCountArray = [];
 			$totalstatus = array(
 				'label' => 'Total',
 				'members_draft' => 0,
@@ -244,6 +245,7 @@ class AdherentStats extends Stats
 			$MembersCountArray['total'] = $totalstatus;
 			$MembersCountArray['total']['all'] = array_sum($totalstatus);
 		}
+
 		return $MembersCountArray;
 	}
 
diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index 3d737cd1763..3b78f0305dc 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -103,7 +103,16 @@ if ($conf->use_javascript_ajax) {
 
 	// Show array
 	$sumMembers = $stats->countMembersByTypeAndStatus($numberyears);
-	$total = $sumMembers['total']['members_draft'] + $sumMembers['total']['members_pending'] + $sumMembers['total']['members_uptodate'] + $sumMembers['total']['members_expired'] + $sumMembers['total']['members_excluded'] + $sumMembers['total']['members_resiliated'];
+	if (is_array($sumMembers) && !empty($sumMembers)) {
+		$total = $sumMembers['total']['members_draft'] + $sumMembers['total']['members_pending'] + $sumMembers['total']['members_uptodate'] + $sumMembers['total']['members_expired'] + $sumMembers['total']['members_excluded'] + $sumMembers['total']['members_resiliated'];
+	} else {
+		$total = 0;
+	}
+	foreach (array('members_draft', 'members_pending', 'members_uptodate', 'members_expired', 'members_excluded', 'members_resiliated') as $val) {
+		if (empty($sumMembers['total'][$val])) {
+			$sumMembers['total'][$val] = 0;
+		}
+	}
 
 	$dataseries = array();
 	$dataseries[] = array($langs->transnoentitiesnoconv("MembersStatusToValid"), $sumMembers['total']['members_draft']);			// Draft, not yet validated
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index c983d503126..b075f7a70f2 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -1135,8 +1135,11 @@ class FormCompany extends Form
 		global $langs;
 
 		if ($mode === "html") {
+			$actioncode = empty($prospectstatic->cacheprospectstatus[$statusprospect]) ? '' : $prospectstatic->cacheprospectstatus[$statusprospect]['code'];
+			$actionpicto = empty($prospectstatic->cacheprospectstatus[$statusprospect]['picto']) ? '' : $prospectstatic->cacheprospectstatus[$statusprospect]['picto'];
+
 			//print $prospectstatic->LibProspCommStatut($statusprospect, 2, $prospectstatic->cacheprospectstatus[$statusprospect]['label'], $prospectstatic->cacheprospectstatus[$statusprospect]['picto']);
-			print img_action('', $prospectstatic->cacheprospectstatus[$statusprospect]['code'], $prospectstatic->cacheprospectstatus[$statusprospect]['picto'], 'class="inline-block valignmiddle paddingright"');
+			print img_action('', $actioncode, $actionpicto, 'class="inline-block valignmiddle paddingright"');
 			print '<select class="flat selectprospectstatus maxwidth150" id="'. $htmlname.$idprospect .'" data-socid="'.$idprospect.'" name="' . $htmlname .'">';
 			foreach ($prospectstatic->cacheprospectstatus as $key => $val) {
 				$titlealt = (empty($val['label']) ? 'default' : $val['label']);
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index fe0bc4e490e..aa22a704700 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -120,12 +120,17 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 	public $cronjobs = array();
 
 	/**
-	 * @var array Module access rights
+	 * @var array 	Module access rights
 	 */
 	public $rights;
 
 	/**
-	 * @var string Module access rights family
+	 * @var int		1=Admin is always granted of permission of modules (even when module is disabled)
+	 */
+	public $rights_admin_allowed;
+
+	/**
+	 * @var string 	Module access rights family
 	 */
 	public $rights_class;
 
diff --git a/htdocs/core/modules/modECM.class.php b/htdocs/core/modules/modECM.class.php
index 3dbd624bb51..719468c076b 100644
--- a/htdocs/core/modules/modECM.class.php
+++ b/htdocs/core/modules/modECM.class.php
@@ -113,7 +113,7 @@ class modECM extends DolibarrModules
 
 		// Menus
 		//------
-		$this->menus = array(); // List of menus to add
+		$this->menu = array(); // List of menus to add
 		$r = 0;
 
 		// Top menu
diff --git a/htdocs/core/modules/modGravatar.class.php b/htdocs/core/modules/modGravatar.class.php
index b39d4921918..25c5e7ac2d3 100644
--- a/htdocs/core/modules/modGravatar.class.php
+++ b/htdocs/core/modules/modGravatar.class.php
@@ -116,7 +116,7 @@ class modGravatar extends DolibarrModules
 
 
 		// Main menu entries
-		$this->menus = array(); // List of menus to add
+		$this->menu = array(); // List of menus to add
 		$r = 0;
 
 		// Add here entries to declare new menus
diff --git a/htdocs/core/modules/modIncoterm.class.php b/htdocs/core/modules/modIncoterm.class.php
index 1a4717e9d44..dccaa02aef4 100644
--- a/htdocs/core/modules/modIncoterm.class.php
+++ b/htdocs/core/modules/modIncoterm.class.php
@@ -105,7 +105,7 @@ class modIncoterm extends DolibarrModules
 		$r = 0;
 
 		// Main menu entries
-		$this->menus = array(); // List of menus to add
+		$this->menu = array(); // List of menus to add
 		$r = 0;
 	}
 }
diff --git a/htdocs/core/modules/modOauth.class.php b/htdocs/core/modules/modOauth.class.php
index e7c23d30455..783f6300774 100644
--- a/htdocs/core/modules/modOauth.class.php
+++ b/htdocs/core/modules/modOauth.class.php
@@ -102,7 +102,7 @@ class modOauth extends DolibarrModules
 		$this->rights[$r][4] = 'read';*/
 
 		// Main menu entries
-		$this->menus = array(); // List of menus to add
+		$this->menu = array(); // List of menus to add
 		$r = 0;
 
 		// This is to declare the Top Menu entry:
diff --git a/htdocs/core/modules/modPaybox.class.php b/htdocs/core/modules/modPaybox.class.php
index 3df0b8f6a1d..f86e90eab9e 100644
--- a/htdocs/core/modules/modPaybox.class.php
+++ b/htdocs/core/modules/modPaybox.class.php
@@ -113,7 +113,7 @@ class modPayBox extends DolibarrModules
 
 
 		// Main menu entries
-		$this->menus = array(); // List of menus to add
+		$this->menu = array(); // List of menus to add
 		$r = 0;
 
 		// Add here entries to declare new menus
diff --git a/htdocs/core/modules/modPaypal.class.php b/htdocs/core/modules/modPaypal.class.php
index 4879221eec1..4863e9c53bd 100644
--- a/htdocs/core/modules/modPaypal.class.php
+++ b/htdocs/core/modules/modPaypal.class.php
@@ -105,7 +105,7 @@ class modPaypal extends DolibarrModules
 
 
 		// Main menu entries
-		$this->menus = array(); // List of menus to add
+		$this->menu = array(); // List of menus to add
 		$r = 0;
 		/*$this->menu[$r]=array(
 			'fk_menu'=>'fk_mainmenu=billing,fk_leftmenu=customers_bills_payment',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
diff --git a/htdocs/core/modules/modReceiptPrinter.class.php b/htdocs/core/modules/modReceiptPrinter.class.php
index 4741bc48197..b857300431e 100644
--- a/htdocs/core/modules/modReceiptPrinter.class.php
+++ b/htdocs/core/modules/modReceiptPrinter.class.php
@@ -102,7 +102,7 @@ class modReceiptPrinter extends DolibarrModules
 		$this->rights[$r][4] = 'read';
 
 		// Main menu entries
-		$this->menus = array(); // List of menus to add
+		$this->menu = array(); // List of menus to add
 		$r = 0;
 
 		// This is to declare the Top Menu entry:
diff --git a/htdocs/core/modules/modTicket.class.php b/htdocs/core/modules/modTicket.class.php
index 01ae671bad7..a165a4acd2e 100644
--- a/htdocs/core/modules/modTicket.class.php
+++ b/htdocs/core/modules/modTicket.class.php
@@ -226,7 +226,7 @@ class modTicket extends DolibarrModules
 		*/
 
 		// Main menu entries
-		$this->menus = array(); // List of menus to add
+		$this->menu = array(); // List of menus to add
 		$r = 0;
 
 		/*$this->menu[$r] = array('fk_menu' => 0, // Put 0 if this is a top menu
diff --git a/htdocs/core/modules/modWorkflow.class.php b/htdocs/core/modules/modWorkflow.class.php
index 1fd6a89e66a..819df467fa3 100644
--- a/htdocs/core/modules/modWorkflow.class.php
+++ b/htdocs/core/modules/modWorkflow.class.php
@@ -115,7 +115,7 @@ class modWorkflow extends DolibarrModules
 		*/
 
 		// Main menu entries
-		$this->menus = array(); // List of menus to add
+		$this->menu = array(); // List of menus to add
 		$r = 0;
 		/*
 		$this->menu[$r]=array('fk_menu'=>0,
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 6b57b0b94a7..9d9a3c7a9ef 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -1562,7 +1562,7 @@ while ($i < $imaxinloop) {
 		$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
 
 		$companystatic->fk_prospectlevel = $obj->fk_prospectlevel;
-		$companystatic->fk_parent = $obj->fk_parent;
+		$companystatic->parent = $obj->fk_parent;
 		$companystatic->entity = $obj->entity;
 	}
 
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index be45f6a0922..8e9fdf95575 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -367,7 +367,6 @@ class User extends CommonObject
 		$this->db = $db;
 
 		// User preference
-		$this->liste_limit = 0;
 		$this->clicktodial_loaded = 0;
 
 		// For cache usage