From 95a42f06160ed7ff5cd2b81ed428b985dadebfef Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 23 Jun 2023 12:12:58 +0200 Subject: [PATCH] Fix null object --- htdocs/core/modules/modAgenda.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php index f3d237c35dd..43a7128b1d0 100644 --- a/htdocs/core/modules/modAgenda.class.php +++ b/htdocs/core/modules/modAgenda.class.php @@ -466,12 +466,12 @@ class modAgenda extends DolibarrModules $this->export_sql_end[$r] = ' FROM '.MAIN_DB_PREFIX.'actioncomm as ac'; $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'actioncomm_extrafields as extra ON ac.id = extra.fk_object'; $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_actioncomm as cac on ac.fk_action = cac.id'; - if (!empty($user) && empty($user->rights->agenda->allactions->read)) { + if (!empty($user) && !$user->hasRight('agenda', 'allactions', 'read')) { $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'actioncomm_resources acr on ac.id = acr.fk_actioncomm'; } $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople as sp on ac.fk_contact = sp.rowid'; $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s on ac.fk_soc = s.rowid'; - if (!empty($user) && empty($user->rights->societe->client->voir)) { + if (!empty($user) && !$user->hasRight('societe', 'client', 'voir')) { $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid'; } $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co on s.fk_pays = co.rowid'; @@ -480,7 +480,7 @@ class modAgenda extends DolibarrModules if (empty($user->rights->societe->client->voir)) { $this->export_sql_end[$r] .= ' AND (sc.fk_user = '.(empty($user) ? 0 : $user->id).' OR ac.fk_soc IS NULL)'; } - if (!$user->hasRight('agenda', 'allactions', 'read')) { + if (!empty($user) && !$user->hasRight('agenda', 'allactions', 'read')) { $this->export_sql_end[$r] .= ' AND acr.fk_element = '.(empty($user) ? 0 : $user->id); } $this->export_sql_order[$r] = ' ORDER BY ac.datep';