Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0

Conflicts:
	htdocs/expensereport/class/expensereport.class.php
	htdocs/holiday/class/holiday.class.php
	htdocs/index.php

htdocs/expensereport/class/expensereport.class.php

@@ -2318,7 +2318,7 @@ class ExpenseReport extends CommonObject
     public function load_state_board()
     {
         // phpcs:enable
-        global $conf;
+        global $conf, $user;
 
         $this->nb = array();
 
@@ -2326,6 +2326,12 @@ class ExpenseReport extends CommonObject
         $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as ex";
         $sql .= " WHERE ex.fk_statut > 0";
         $sql .= " AND ex.entity IN (".getEntity('expensereport').")";
+		if (empty($user->rights->expensereport->readall))
+		{
+			$userchildids = $user->getAllChildIds(1);
+			$sql .= " AND (ex.fk_user_author IN (".join(',', $userchildids).")";
+			$sql .= " OR ex.fk_user_validator IN (".join(',', $userchildids)."))";
+		}
 
         $resql = $this->db->query($sql);
         if ($resql) {
@@ -2360,15 +2366,17 @@ class ExpenseReport extends CommonObject
 
         $now = dol_now();
 
-        $userchildids = $user->getAllChildIds(1);
-
         $sql = "SELECT ex.rowid, ex.date_valid";
         $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as ex";
         if ($option == 'toapprove') $sql .= " WHERE ex.fk_statut = 2";
         else $sql .= " WHERE ex.fk_statut = 5";
         $sql .= " AND ex.entity IN (".getEntity('expensereport').")";
+        if (empty($user->rights->expensereport->readall))
+        {
+			$userchildids = $user->getAllChildIds(1);
 			$sql .= " AND (ex.fk_user_author IN (".join(',', $userchildids).")";
 			$sql .= " OR ex.fk_user_validator IN (".join(',', $userchildids)."))";
+		}
 
         $resql = $this->db->query($sql);
         if ($resql)

htdocs/fourn/class/fournisseur.commande.class.php

@@ -1881,7 +1881,6 @@ class CommandeFournisseur extends CommonOrder
 					if ($result < 0)
                     {
                         $error++;
-                        return -1;
                     }
 					// End call triggers
                 }
@@ -1989,6 +1988,7 @@ class CommandeFournisseur extends CommonOrder
             {
             	$this->errors[] = 'ErrorWhenRunningTrigger';
             	dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
+            	$this->db->rollback();
             	return -1;
             }
             // End call triggers

htdocs/holiday/class/holiday.class.php

@@ -2173,12 +2173,20 @@ class Holiday extends CommonObject
     public function load_state_board()
     {
         // phpcs:enable
+		global $user;
+
         $this->nb = array();
 
         $sql = "SELECT count(h.rowid) as nb";
         $sql .= " FROM ".MAIN_DB_PREFIX."holiday as h";
         $sql .= " WHERE h.statut > 1";
         $sql .= " AND h.entity IN (".getEntity('holiday').")";
+		if (empty($user->rights->expensereport->read_all))
+		{
+			$userchildids = $user->getAllChildIds(1);
+			$sql.= " AND (h.fk_user IN (".join(',', $userchildids).")";
+			$sql.= " OR h.fk_validator IN (".join(',', $userchildids)."))";
+		}
 
         $resql = $this->db->query($sql);
         if ($resql) {
@@ -2212,14 +2220,16 @@ class Holiday extends CommonObject
 
         $now=dol_now();
 
-        $userchildids = $user->getAllChildIds(1);
-
         $sql = "SELECT h.rowid, h.date_debut";
         $sql.= " FROM ".MAIN_DB_PREFIX."holiday as h";
         $sql.= " WHERE h.statut = 2";
         $sql.= " AND h.entity IN (".getEntity('holiday').")";
+		if(!$user->rights->expensereport->read_all)
+		{
+			$userchildids = $user->getAllChildIds(1);
 			$sql.= " AND (h.fk_user IN (".join(',', $userchildids).")";
 			$sql.= " OR h.fk_validator IN (".join(',', $userchildids)."))";
+		}
 
         $resql=$this->db->query($sql);
         if ($resql)

htdocs/index.php

@@ -322,7 +322,7 @@ if (empty($user->socid) && empty($conf->global->MAIN_DISABLE_GLOBAL_BOXSTATS))
 	            	include_once $includes[$key]; // Loading a class cost around 1Mb
 
 	                $board = new $classe($db);
-	                $board->load_state_board($user);
+	                $board->load_state_board();
 	                $boardloaded[$classe] = $board;
 	            }
 	            else