Merge remote-tracking branch 'origin/3.5' into 3.6

Conflicts:
	htdocs/theme/eldy/graph-color.php

Author: eldy

ChangeLog

@@ -126,6 +126,7 @@ Fix: Update impayees.php
 Fix: Link product, In list view and label product
 Fix: visible task into area "time" for "My task" must limit task to tasks i am assigned to.
 Fix: When disabled, all fields to add time into task line must be disabled.
+Fix: Missing include files.lib.php in some pages that use dol_delete_recursive
 
 ***** ChangeLog for 3.5.4 compared to 3.5.3 *****
 Fix: Hide title of event when agenda module disabled.

htdocs/adherents/fiche.php

@@ -328,6 +328,7 @@
 			{
 				if (GETPOST('deletephoto'))
 				{
+					require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
 					$fileimg=$conf->adherent->dir_output.'/'.get_exdir($object->id,2,0,1).'/photos/'.$object->photo;
 					$dirthumbs=$conf->adherent->dir_output.'/'.get_exdir($object->id,2,0,1).'/photos/thumbs';
 					dol_delete_file($fileimg);

htdocs/admin/tools/update.php

@@ -23,7 +23,7 @@
  */
 
 require '../../main.inc.php';
-include_once $dolibarr_main_document_root.'/core/lib/files.lib.php';
+include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
 
 $langs->load("admin");
 $langs->load("other");

htdocs/contrat/class/contrat.class.php

@@ -833,6 +833,7 @@ function create($user)
 	function delete($user)
 	{
 		global $conf, $langs;
+		require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
 
 		$error=0;
 

htdocs/product/class/product.class.php

@@ -768,6 +768,7 @@ function update($id, $user, $notrigger=false, $action='update')
 	function delete($id=0)
 	{
 		global $conf,$user,$langs;
+		require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
 
 		$error=0;
 

htdocs/projet/class/task.class.php

@@ -354,6 +354,7 @@ function delete($user, $notrigger=0)
     {
 
         global $conf, $langs;
+        require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
 
         $error=0;
 

htdocs/theme/eldy/graph-color.php

@@ -28,7 +28,7 @@
 
 global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
 $theme_bordercolor = array(235,235,224);
-$theme_datacolor = array(array(190,190,220), array(200,160,180), array(125,135,150), array(170,140,190), array(190,190,170), array(190,170,190), array(170,190,190), array(150,135,125));
+$theme_datacolor = array(array(190,190,220), array(200,160,180), array(125,135,150), array(170,140,190), array(190,190,170), array(190,170,190), array(170,190,190), array(150,135,125), array(85,135,150), array(150,135,80), array(150,80,150));
 $theme_bgcolor = array(hexdec('F4'),hexdec('F4'),hexdec('F4'));
 $theme_bgcoloronglet = array(hexdec('DE'),hexdec('E7'),hexdec('EC'));