@@ -392,14 +392,14 @@ class modAgenda extends DolibarrModules
$this->export_sql_start[$r]='SELECT DISTINCT ';
$this->export_sql_end[$r]=' FROM '.MAIN_DB_PREFIX.'actioncomm as ac';
$this->export_sql_end[$r].=' LEFT JOIN '.MAIN_DB_PREFIX.'c_actioncomm as cac on ac.fk_action = cac.id';
if(empty($user->rights->agenda->allactions->read))$this->export_sql_end[$r].=' LEFT JOIN '.MAIN_DB_PREFIX.'actioncomm_resources acr on ac.id = acr.fk_actioncomm';
if(!empty($user)&&empty($user->rights->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->rights->societe->client->voir))$this->export_sql_end[$r].=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
if(!empty($user)&&empty($user->rights->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';
$this->export_sql_end[$r].=' WHERE ac.entity IN ('.getEntity('agenda',1).')';
if(empty($user->rights->societe->client->voir))$this->export_sql_end[$r].=' AND (sc.fk_user = '.$user->id.' OR ac.fk_soc IS NULL)';
if(empty($user->rights->agenda->allactions->read))$this->export_sql_end[$r].=' AND acr.fk_element = '.$user->id;
if(!empty($user)&&empty($user->rights->societe->client->voir))$this->export_sql_end[$r].=' AND (sc.fk_user = '.$user->id.' OR ac.fk_soc IS NULL)';
if(!empty($user)&&empty($user->rights->agenda->allactions->read))$this->export_sql_end[$r].=' AND acr.fk_element = '.$user->id;